aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/OreRecipies.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/OreRecipies.cpp')
-rw-r--r--Minecraft.World/OreRecipies.cpp34
1 files changed, 9 insertions, 25 deletions
diff --git a/Minecraft.World/OreRecipies.cpp b/Minecraft.World/OreRecipies.cpp
index f18e985c..387d059b 100644
--- a/Minecraft.World/OreRecipies.cpp
+++ b/Minecraft.World/OreRecipies.cpp
@@ -1,10 +1,3 @@
-// package net.minecraft.world.item.crafting;
-//
-// import net.minecraft.world.item.DyePowderItem;
-// import net.minecraft.world.item.Item;
-// import net.minecraft.world.item.ItemInstance;
-// import net.minecraft.world.level.tile.Tile;
-
#include "stdafx.h"
#include "net.minecraft.world.item.h"
#include "DyePowderItem.h"
@@ -13,25 +6,8 @@
#include "Recipes.h"
#include "OreRecipies.h"
-
-/*
- private Object[][] map = {
- {
- Tile.goldBlock, new ItemInstance(Item.goldIngot, 9)
- }, {
- Tile.ironBlock, new ItemInstance(Item.ironIngot, 9)
- }, {
- Tile.diamondBlock, new ItemInstance(Item.diamond, 9)
- }, {
- Tile.lapisBlock, new ItemInstance(Item.dye_powder, 9, DyePowderItem.BLUE)
- },
- };
-*/
-
void OreRecipies::_init()
{
- map = new vector <Object *> [MAX_ORE_RECIPES];
-
ADD_OBJECT(map[0],Tile::goldBlock);
ADD_OBJECT(map[0],new ItemInstance(Item::goldIngot, 9));
@@ -46,10 +22,18 @@ void OreRecipies::_init()
ADD_OBJECT(map[4],Tile::lapisBlock);
ADD_OBJECT(map[4],new ItemInstance(Item::dye_powder, 9, DyePowderItem::BLUE));
+
+ ADD_OBJECT(map[5],Tile::redstoneBlock);
+ ADD_OBJECT(map[5],new ItemInstance(Item::redStone, 9));
+
+ ADD_OBJECT(map[6],Tile::coalBlock);
+ ADD_OBJECT(map[6],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL));
+
+ ADD_OBJECT(map[7],Tile::hayBlock);
+ ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
}
void OreRecipies::addRecipes(Recipes *r)
{
-
for (int i = 0; i < MAX_ORE_RECIPES; i++)
{
Tile *from = (Tile*) map[i].at(0)->tile;