More messing with the OreDictionary and tidying things

This commit is contained in:
mezz committed 2016-05-24 03:01:02 -07:00
1 parent aa4b4a18d1
commit 3c85f3a7be
7 files changed
+163 -92

No files matched your search

@@ -116,6 +116,7 @@ import forestry.core.utils.EntityUtil;
import forestry.core.utils.IMCUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.core.utils.OreDictUtil;
import forestry.core.utils.Stack;
import forestry.core.utils.Translator;
import forestry.core.utils.VillagerTradeLists;
@@ -464,18 +465,18 @@ public class PluginApiculture extends BlankForestryPlugin {
" X ",
"X#X",
" X ",
'#', "dustRedstone", 'X', "ingotBronze");
'#', OreDictUtil.DUST_REDSTONE, 'X', OreDictUtil.INGOT_BRONZE);
// Bees
RecipeUtil.addRecipe(items.scoop,
"#X#", "###", " # ",
'#', "stickWood",
'#', OreDictUtil.STICK_WOOD,
'X', Blocks.WOOL);
RecipeUtil.addRecipe(items.smoker,
"LS#",
"LF#",
"###",
'#', "ingotTin", 'S', "stickWood", 'F', Items.FLINT_AND_STEEL, 'L', "leather");
'#', "ingotTin", 'S', OreDictUtil.STICK_WOOD, 'F', Items.FLINT_AND_STEEL, 'L', OreDictUtil.LEATHER);
RecipeUtil.addRecipe(new ItemStack(Items.SLIME_BALL),
"#X#", "#X#", "#X#",
'#', items.propolis,
@@ -487,7 +488,7 @@ public class PluginApiculture extends BlankForestryPlugin {
'Y', Items.MELON);
RecipeUtil.addRecipe(items.frameUntreated,
"###", "#S#", "###",
'#', "stickWood",
'#', OreDictUtil.STICK_WOOD,
'S', Items.STRING);
RecipeUtil.addRecipe(items.frameImpregnated,
"###", "#S#", "###",
@@ -540,7 +541,7 @@ public class PluginApiculture extends BlankForestryPlugin {
// / BITUMINOUS PEAT
RecipeUtil.addRecipe(PluginCore.items.bituminousPeat.getItemStack(),
" # ", "XYX", " # ",
'#', "dustAsh",
'#', OreDictUtil.DUST_ASH,
'X', PluginCore.items.peat,
'Y', items.propolis);
@@ -548,7 +549,7 @@ public class PluginApiculture extends BlankForestryPlugin {
RecipeUtil.addRecipe(new ItemStack(Blocks.TORCH, 3),
" # ", " # ", " Y ",
'#', PluginCore.items.beeswax,
'Y', "stickWood");
'Y', OreDictUtil.STICK_WOOD);
RecipeUtil.addRecipe(PluginCore.items.craftingMaterial.getPulsatingMesh(),
"# #", " # ", "# #",
'#', items.propolis.get(EnumPropolis.PULSATING, 1));
@@ -575,7 +576,7 @@ public class PluginApiculture extends BlankForestryPlugin {
"#G#",
'#', PluginCore.items.tubes.get(EnumElectronTube.DIAMOND, 1),
'X', alvearyPlainBlock,
'G', "ingotGold");
'G', OreDictUtil.INGOT_GOLD);
// FAN
RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.FAN),
"I I",
@@ -583,7 +584,7 @@ public class PluginApiculture extends BlankForestryPlugin {
"I#I",
'#', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1),
'X', alvearyPlainBlock,
'I', "ingotIron");
'I', OreDictUtil.INGOT_IRON);
// HEATER
RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.HEATER),
"#I#",
@@ -591,29 +592,29 @@ public class PluginApiculture extends BlankForestryPlugin {
"YYY",
'#', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1),
'X', alvearyPlainBlock,
'I', "ingotIron", 'Y', "stone");
'I', OreDictUtil.INGOT_IRON, 'Y', OreDictUtil.STONE);
// HYGROREGULATOR
RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.HYGRO),
"GIG",
"GXG",
"GIG",
'X', alvearyPlainBlock,
'I', "ingotIron",
'G', "blockGlass");
'I', OreDictUtil.INGOT_IRON,
'G', OreDictUtil.BLOCK_GLASS);
// STABILISER
RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.STABILISER),
"G G",
"GXG",
"G G",
'X', alvearyPlainBlock,
'G', "gemQuartz");
'G', OreDictUtil.GEM_QUARTZ);
// SIEVE
RecipeUtil.addRecipe(blocks.getAlvearyBlock(BlockAlvearyType.SIEVE),
"III",
" X ",
"WWW",
'X', alvearyPlainBlock,
'I', "ingotIron",
'I', OreDictUtil.INGOT_IRON,
'W', PluginCore.items.craftingMaterial.getWovenSilk());
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) {
@@ -630,7 +631,7 @@ public class PluginApiculture extends BlankForestryPlugin {
// / CARPENTER
RecipeManagers.carpenterManager.addRecipe(50, Fluids.FOR_HONEY.getFluid(500), null, PluginCore.items.craftingMaterial.getScentedPaneling(),
" J ", "###", "WPW",
'#', "plankWood",
'#', OreDictUtil.PLANK_WOOD,
'J', items.royalJelly,
'W', PluginCore.items.beeswax,
'P', items.pollenCluster.get(EnumPollenCluster.NORMAL, 1));
@@ -750,25 +751,25 @@ public class PluginApiculture extends BlankForestryPlugin {
"XXX",
"#C#",
"###",
'X', "slabWood",
'#', "plankWood",
'X', OreDictUtil.SLAB_WOOD,
'#', OreDictUtil.PLANK_WOOD,
'C', PluginCore.items.impregnatedCasing);
RecipeUtil.addRecipe(blocks.beeChest,
" # ",
"XYX",
"XXX",
'#', "blockGlass",
'X', "beeComb",
'Y', "chestWood");
'#', OreDictUtil.BLOCK_GLASS,
'X', OreDictUtil.BEE_COMB,
'Y', OreDictUtil.CHEST_WOOD);
RecipeUtil.addRecipe(blocks.beeHouse,
"XXX",
"#C#",
"###",
'X', "slabWood",
'#', "plankWood",
'C', "beeComb");
'X', OreDictUtil.SLAB_WOOD,
'#', OreDictUtil.PLANK_WOOD,
'C', OreDictUtil.BEE_COMB);
}
private static void registerBeehiveDrops() {
+62 -50
View File
@@ -64,6 +64,7 @@ import forestry.core.recipes.RecipeUtil;
import forestry.core.render.TextureManager;
import forestry.core.utils.ClimateUtil;
import forestry.core.utils.ForestryModEnvWarningCallable;
import forestry.core.utils.OreDictUtil;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
@@ -150,18 +151,18 @@ public class PluginCore extends BlankForestryPlugin {
crateRegistry.registerCrate(items.mulch);
crateRegistry.registerCrate(items.phosphor);
crateRegistry.registerCrate(items.ash);
crateRegistry.registerCrate("ingotTin");
crateRegistry.registerCrate("ingotCopper");
crateRegistry.registerCrate("ingotBronze");
crateRegistry.registerCrate(OreDictUtil.INGOT_TIN);
crateRegistry.registerCrate(OreDictUtil.INGOT_COPPER);
crateRegistry.registerCrate(OreDictUtil.INGOT_BRONZE);
// forestry blocks
crateRegistry.registerCrate(blocks.humus);
crateRegistry.registerCrate(blocks.bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, 1));
// vanilla items
crateRegistry.registerCrate("cropWheat");
crateRegistry.registerCrate(OreDictUtil.CROP_WHEAT);
crateRegistry.registerCrate(Items.COOKIE);
crateRegistry.registerCrate("dustRedstone");
crateRegistry.registerCrate(OreDictUtil.DUST_REDSTONE);
crateRegistry.registerCrate(new ItemStack(Items.DYE, 1, 4));
crateRegistry.registerCrate("sugarcane");
crateRegistry.registerCrate(Items.CLAY_BALL);
@@ -223,59 +224,59 @@ public class PluginCore extends BlankForestryPlugin {
if (Config.isCraftingBronzeEnabled()) {
ItemStack ingotBronze = items.ingotBronze.copy();
ingotBronze.stackSize = 4;
RecipeUtil.addShapelessRecipe(ingotBronze, "ingotTin", "ingotCopper", "ingotCopper", "ingotCopper");
RecipeUtil.addShapelessRecipe(ingotBronze, OreDictUtil.INGOT_TIN, OreDictUtil.INGOT_COPPER, OreDictUtil.INGOT_COPPER, OreDictUtil.INGOT_COPPER);
}
/* STURDY MACHINE */
RecipeUtil.addRecipe(items.sturdyCasing, "###", "# #", "###", '#', "ingotBronze");
RecipeUtil.addRecipe(items.sturdyCasing, "###", "# #", "###", '#', OreDictUtil.INGOT_BRONZE);
// / EMPTY CANS
int canAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.can");
ItemStack canOutput = PluginFluids.items.canEmpty.getItemStack(canAmount);
RecipeUtil.addRecipe(canOutput, " # ", "# #", '#', "ingotTin");
RecipeUtil.addRecipe(canOutput, " # ", "# #", '#', OreDictUtil.INGOT_TIN);
// / GEARS
List<ItemStack> stoneGear = OreDictionary.getOres("gearStone");
List<ItemStack> stoneGear = OreDictionary.getOres(OreDictUtil.GEAR_STONE);
Object gearCenter;
if (!stoneGear.isEmpty()) {
gearCenter = "gearStone";
gearCenter = OreDictUtil.GEAR_STONE;
} else {
gearCenter = "ingotCopper";
gearCenter = OreDictUtil.INGOT_COPPER;
}
RecipeUtil.addRecipe(items.gearBronze, " # ", "#X#", " # ", '#', "ingotBronze", 'X', gearCenter);
RecipeUtil.addRecipe(items.gearCopper, " # ", "#X#", " # ", '#', "ingotCopper", 'X', gearCenter);
RecipeUtil.addRecipe(items.gearTin, " # ", "#X#", " # ", '#', "ingotTin", 'X', gearCenter);
RecipeUtil.addRecipe(items.gearBronze, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_BRONZE, 'X', gearCenter);
RecipeUtil.addRecipe(items.gearCopper, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_COPPER, 'X', gearCenter);
RecipeUtil.addRecipe(items.gearTin, " # ", "#X#", " # ", '#', OreDictUtil.INGOT_TIN, 'X', gearCenter);
// / SURVIVALIST TOOLS
RecipeUtil.addRecipe(items.bronzePickaxe, " X ", " X ", "###", '#', "ingotBronze", 'X', "stickWood");
RecipeUtil.addRecipe(items.bronzeShovel, " X ", " X ", " # ", '#', "ingotBronze", 'X', "stickWood");
RecipeUtil.addRecipe(items.bronzePickaxe, " X ", " X ", "###", '#', OreDictUtil.INGOT_BRONZE, 'X', OreDictUtil.STICK_WOOD);
RecipeUtil.addRecipe(items.bronzeShovel, " X ", " X ", " # ", '#', OreDictUtil.INGOT_BRONZE, 'X', OreDictUtil.STICK_WOOD);
RecipeUtil.addShapelessRecipe(items.kitPickaxe, items.bronzePickaxe, items.carton);
RecipeUtil.addShapelessRecipe(items.kitShovel, items.bronzeShovel, items.carton);
/* NATURALIST'S ARMOR */
RecipeUtil.addRecipe(items.spectacles, " X ", "Y Y", 'X', "ingotBronze", 'Y', "paneGlass");
RecipeUtil.addRecipe(items.spectacles, " X ", "Y Y", 'X', OreDictUtil.INGOT_BRONZE, 'Y', OreDictUtil.PANE_GLASS);
// / WRENCH
RecipeUtil.addRecipe(items.wrench, "# #", " # ", " # ", '#', "ingotBronze");
RecipeUtil.addRecipe(items.wrench, "# #", " # ", " # ", '#', OreDictUtil.INGOT_BRONZE);
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) {
// / CARPENTER
RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, PluginCore.items.portableAlyzer.getItemStack(),
"X#X", "X#X", "RDR",
'#', "paneGlass",
'X', "ingotTin",
'R', "dustRedstone",
'D', "gemDiamond");
'#', OreDictUtil.PANE_GLASS,
'X', OreDictUtil.INGOT_TIN,
'R', OreDictUtil.DUST_REDSTONE,
'D', OreDictUtil.GEM_DIAMOND);
}else{
// Portable ANALYZER
RecipeUtil.addRecipe(PluginCore.items.portableAlyzer.getItemStack(),
"X#X",
"X#X",
"RDR",
'#', "paneGlass",
'X', "ingotTin",
'R', "dustRedstone",
'D', "gemDiamond");
'#', OreDictUtil.PANE_GLASS,
'X', OreDictUtil.INGOT_TIN,
'R', OreDictUtil.DUST_REDSTONE,
'D', OreDictUtil.GEM_DIAMOND);
}
// ANALYZER
@@ -285,31 +286,31 @@ public class PluginCore extends BlankForestryPlugin {
"X X",
'Y', PluginCore.items.sturdyCasing,
'T', PluginCore.items.portableAlyzer,
'X', "ingotBronze");
'X', OreDictUtil.INGOT_BRONZE);
// Manure and Fertilizer
int compostWheatAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.wheat");
if (compostWheatAmount > 0) {
ItemStack compost = items.fertilizerBio.getItemStack(compostWheatAmount);
RecipeUtil.addRecipe(compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', "cropWheat");
RecipeUtil.addRecipe(compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', OreDictUtil.CROP_WHEAT);
}
int compostAshAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.ash");
if (compostAshAmount > 0) {
ItemStack compost = items.fertilizerBio.getItemStack(compostAshAmount);
RecipeUtil.addRecipe(compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', "dustAsh");
RecipeUtil.addRecipe(compost, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', OreDictUtil.DUST_ASH);
}
int fertilizerApatiteAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.fertilizer.apatite");
if (fertilizerApatiteAmount > 0) {
ItemStack fertilizer = items.fertilizerCompound.getItemStack(fertilizerApatiteAmount);
RecipeUtil.addRecipe(fertilizer, " # ", " X ", " # ", '#', "sand", 'X', "gemApatite");
RecipeUtil.addRecipe(fertilizer, " # ", " X ", " # ", '#', OreDictUtil.SAND, 'X', OreDictUtil.GEM_APATITE);
}
int fertilizerAshAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.fertilizer.ash");
if (fertilizerAshAmount > 0) {
ItemStack fertilizer = items.fertilizerCompound.getItemStack(fertilizerAshAmount);
RecipeUtil.addRecipe(fertilizer, "###", "#X#", "###", '#', "dustAsh", 'X', "gemApatite");
RecipeUtil.addRecipe(fertilizer, "###", "#X#", "###", '#', OreDictUtil.DUST_ASH, 'X', OreDictUtil.GEM_APATITE);
}
// Humus
@@ -329,7 +330,7 @@ public class PluginCore extends BlankForestryPlugin {
int bogEarthOutputBucket = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.bucket");
if (bogEarthOutputBucket > 0) {
ItemStack bogEarth = blocks.bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputBucket);
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', Items.WATER_BUCKET, 'Y', "sand");
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', Items.WATER_BUCKET, 'Y', OreDictUtil.SAND);
}
int bogEarthOutputCan = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.can");
@@ -338,36 +339,47 @@ public class PluginCore extends BlankForestryPlugin {
ItemStack canWater = PluginFluids.items.getContainer(EnumContainerType.CAN, Fluids.WATER).getItemStack();
ItemStack waxCapsuleWater = PluginFluids.items.getContainer(EnumContainerType.CAPSULE, Fluids.WATER).getItemStack();
ItemStack refractoryWater = PluginFluids.items.getContainer(EnumContainerType.REFRACTORY, Fluids.WATER).getItemStack();
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', canWater, 'Y', "sand");
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waxCapsuleWater, 'Y', "sand");
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', refractoryWater, 'Y', "sand");
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', canWater, 'Y', OreDictUtil.SAND);
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waxCapsuleWater, 'Y', OreDictUtil.SAND);
RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', refractoryWater, 'Y', OreDictUtil.SAND);
}
// Crafting Material
RecipeUtil.addRecipe(new ItemStack(Items.STRING), "#", "#", "#", '#', items.craftingMaterial.getSilkWisp());
// / Pipette
RecipeUtil.addRecipe(items.pipette, " #", " X ", "X ", 'X', "paneGlass", '#', new ItemStack(Blocks.WOOL, 1, OreDictionary.WILDCARD_VALUE));
RecipeUtil.addRecipe(items.pipette, " #", " X ", "X ", 'X', OreDictUtil.PANE_GLASS, '#', new ItemStack(Blocks.WOOL, 1, OreDictionary.WILDCARD_VALUE));
// Storage Blocks
RecipeUtil.addRecipe(blocks.resourceStorage.get(EnumResourceType.APATITE), "###", "###", "###", '#', "gemApatite");
RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
{
RecipeUtil.addRecipe(blocks.resourceStorageApatite, "###", "###", "###", '#', OreDictUtil.GEM_APATITE);
RecipeUtil.addRecipe(blocks.resourceStorage.get(EnumResourceType.COPPER), "###", "###", "###", '#', "ingotCopper");
RecipeUtil.addRecipe(blocks.resourceStorage.get(EnumResourceType.TIN), "###", "###", "###", '#', "ingotTin");
RecipeUtil.addRecipe(blocks.resourceStorage.get(EnumResourceType.BRONZE), "###", "###", "###", '#', "ingotBronze");
RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), OreDictUtil.BLOCK_APATITE);
}
ItemStack ingotCopper = items.ingotCopper.copy();
ingotCopper.stackSize = 9;
RecipeUtil.addShapelessRecipe(ingotCopper, "blockCopper");
{
RecipeUtil.addRecipe(blocks.resourceStorageCopper, "###", "###", "###", '#', OreDictUtil.INGOT_COPPER);
ItemStack ingotTin = items.ingotTin.copy();
ingotTin.stackSize = 9;
RecipeUtil.addShapelessRecipe(ingotTin, "blockTin");
ItemStack ingotCopper = items.ingotCopper.copy();
ingotCopper.stackSize = 9;
RecipeUtil.addShapelessRecipe(ingotCopper, OreDictUtil.BLOCK_COPPER);
}
ItemStack ingotBronze = items.ingotBronze.copy();
ingotBronze.stackSize = 9;
RecipeUtil.addShapelessRecipe(ingotBronze, "blockBronze");
{
RecipeUtil.addRecipe(blocks.resourceStorageTin, "###", "###", "###", '#', OreDictUtil.INGOT_TIN);
ItemStack ingotTin = items.ingotTin.copy();
ingotTin.stackSize = 9;
RecipeUtil.addShapelessRecipe(ingotTin, OreDictUtil.BLOCK_TIN);
}
{
RecipeUtil.addRecipe(blocks.resourceStorageBronze, "###", "###", "###", '#', OreDictUtil.INGOT_BRONZE);
ItemStack ingotBronze = items.ingotBronze.copy();
ingotBronze.stackSize = 9;
RecipeUtil.addShapelessRecipe(ingotBronze, OreDictUtil.BLOCK_BRONZE);
}
// alternate recipes
if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
@@ -10,6 +10,9 @@
******************************************************************************/
package forestry.core.blocks;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
@@ -18,6 +21,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import forestry.core.proxy.Proxies;
import forestry.core.utils.OreDictUtil;
import forestry.plugins.PluginManager;
public abstract class BlockRegistry {
@@ -44,4 +48,15 @@ public abstract class BlockRegistry {
protected static void registerOreDictWildcard(String oreDictName, Block block) {
OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE));
}
@Nonnull
public static ItemStack registerOreDictIfFirst(String oreName, ItemStack oreItem) {
ItemStack firstSuitableOre = OreDictUtil.getFirstSuitableOre(oreName);
if (firstSuitableOre != null) {
return firstSuitableOre;
}
OreDictionary.registerOre(oreName, oreItem);
return oreItem;
}
}
@@ -11,6 +11,7 @@
package forestry.core.blocks;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -23,7 +24,10 @@ public class BlockRegistryCore extends BlockRegistry {
public final BlockBogEarth bogEarth;
public final BlockHumus humus;
public final BlockResourceOre resources;
public final BlockResourceStorage resourceStorage;
public final ItemStack resourceStorageApatite;
public final ItemStack resourceStorageTin;
public final ItemStack resourceStorageCopper;
public final ItemStack resourceStorageBronze;
public BlockRegistryCore() {
analyzer = new BlockCore(BlockTypeCoreTesr.ANALYZER);
@@ -47,13 +51,14 @@ public class BlockRegistryCore extends BlockRegistry {
OreDictionary.registerOre(OreDictUtil.ORE_COPPER, resources.get(EnumResourceType.COPPER, 1));
OreDictionary.registerOre(OreDictUtil.ORE_TIN, resources.get(EnumResourceType.TIN, 1));
resourceStorage = new BlockResourceStorage();
BlockResourceStorage resourceStorage = new BlockResourceStorage();
registerBlock(resourceStorage, new ItemBlockForestry(resourceStorage), "resourceStorage");
resourceStorage.setHarvestLevel("pickaxe", 0);
OreDictionary.registerOre(OreDictUtil.BLOCK_APATITE, resourceStorage.get(EnumResourceType.APATITE));
OreDictionary.registerOre(OreDictUtil.BLOCK_COPPER, resourceStorage.get(EnumResourceType.COPPER));
OreDictionary.registerOre(OreDictUtil.BLOCK_TIN, resourceStorage.get(EnumResourceType.TIN));
OreDictionary.registerOre(OreDictUtil.BLOCK_BRONZE, resourceStorage.get(EnumResourceType.BRONZE));
resourceStorageApatite = registerOreDictIfFirst(OreDictUtil.BLOCK_APATITE, resourceStorage.get(EnumResourceType.APATITE));
resourceStorageCopper = registerOreDictIfFirst(OreDictUtil.BLOCK_COPPER, resourceStorage.get(EnumResourceType.COPPER));
resourceStorageTin = registerOreDictIfFirst(OreDictUtil.BLOCK_TIN, resourceStorage.get(EnumResourceType.TIN));
resourceStorageBronze = registerOreDictIfFirst(OreDictUtil.BLOCK_BRONZE, resourceStorage.get(EnumResourceType.BRONZE));
// register some common oreDict names for our recipes
OreDictionary.registerOre(OreDictUtil.CRAFTING_TABLE_WOOD, Blocks.CRAFTING_TABLE);
@@ -28,7 +28,9 @@ public abstract class ItemRegistry {
throw new RuntimeException("Tried to register Item outside of REGISTER");
}
item.setUnlocalizedName("for." + name);
GameRegistry.registerItem(item, name);
item.setRegistryName(name);
GameRegistry.register(item);
Proxies.common.registerItem(item);
return item;
}
@@ -39,9 +41,15 @@ public abstract class ItemRegistry {
@Nonnull
public static ItemStack createItemForOreName(String oreName) {
Item oreItem = registerItem(new ItemForestry(), oreName);
ItemStack oreItem = new ItemStack(registerItem(new ItemForestry(), oreName));
ItemStack firstSuitableOre = OreDictUtil.getFirstSuitableOre(oreName);
if (firstSuitableOre != null) {
return firstSuitableOre;
}
OreDictionary.registerOre(oreName, oreItem);
return OreDictUtil.getFirstSuitableOre(oreName);
return oreItem;
}
}
@@ -10,12 +10,15 @@
******************************************************************************/
package forestry.core.items;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.core.Tabs;
import forestry.core.circuits.ItemCircuitBoard;
import forestry.core.genetics.ItemResearchNote;
import forestry.core.utils.OreDictUtil;
public class ItemRegistryCore extends ItemRegistry {
/* Fertilizer */
@@ -92,15 +95,15 @@ public class ItemRegistryCore extends ItemRegistry {
fertilizerCompound = registerItem(new ItemFertilizer(), "fertilizerCompound");
apatite = registerItem(new ItemForestry(), "apatite");
OreDictionary.registerOre("gemApatite", apatite);
OreDictionary.registerOre(OreDictUtil.GEM_APATITE, apatite);
researchNote = registerItem(new ItemResearchNote(), "researchNote");
portableAlyzer = registerItem(new ItemAlyzer(), "portableAlyzer");
ingotCopper = createItemForOreName("ingotCopper");
ingotTin = createItemForOreName("ingotTin");
ingotBronze = createItemForOreName("ingotBronze");
ingotCopper = createItemForOreName(OreDictUtil.INGOT_COPPER);
ingotTin = createItemForOreName(OreDictUtil.INGOT_TIN);
ingotBronze = createItemForOreName(OreDictUtil.INGOT_BRONZE);
wrench = registerItem(new ItemWrench(), "wrench");
pipette = registerItem(new ItemPipette(), "pipette");
@@ -114,16 +117,16 @@ public class ItemRegistryCore extends ItemRegistry {
spectacles = registerItem(new ItemArmorNaturalist(), "naturalistHelmet");
peat = registerItem(new ItemForestry(), "peat");
OreDictionary.registerOre("brickPeat", peat);
OreDictionary.registerOre(OreDictUtil.BRICK_PEAT, peat);
ash = registerItem(new ItemForestry(), "ash");
OreDictionary.registerOre("dustAsh", ash);
OreDictionary.registerOre(OreDictUtil.DUST_ASH, ash);
bituminousPeat = registerItem(new ItemForestry(), "bituminousPeat");
gearBronze = createItemForOreName("gearBronze");
gearCopper = createItemForOreName("gearCopper");
gearTin = createItemForOreName("gearTin");
gearBronze = createItemForOreName(OreDictUtil.GEAR_BRONZE);
gearCopper = createItemForOreName(OreDictUtil.GEAR_COPPER);
gearTin = createItemForOreName(OreDictUtil.GEAR_TIN);
circuitboards = registerItem(new ItemCircuitBoard(), "chipsets");
@@ -139,7 +142,7 @@ public class ItemRegistryCore extends ItemRegistry {
// / CRAFTING CARPENTER
stickImpregnated = registerItem(new ItemForestry(), "oakStick");
woodPulp = registerItem(new ItemForestry(), "woodPulp");
OreDictionary.registerOre("pulpWood", woodPulp);
OreDictionary.registerOre(OreDictUtil.PULP_WOOD, woodPulp);
// / RECLAMATION
brokenBronzePickaxe = registerItem(new ItemForestry(), "brokenBronzePickaxe");
@@ -174,7 +177,7 @@ public class ItemRegistryCore extends ItemRegistry {
// / BEE RESOURCES
beeswax = registerItem(new ItemForestry(), "beeswax");
beeswax.setCreativeTab(Tabs.tabApiculture);
OreDictionary.registerOre("itemBeeswax", beeswax);
OreDictionary.registerOre(OreDictUtil.ITEM_BEESWAX, beeswax);
refractoryWax = registerItem(new ItemForestry(), "refractoryWax");
@@ -15,6 +15,14 @@ public class OreDictUtil {
public static final String BLOCK_COPPER = "blockCopper";
public static final String BLOCK_TIN = "blockTin";
public static final String BLOCK_BRONZE = "blockBronze";
public static final String GEM_APATITE = "gemApatite";
public static final String INGOT_COPPER = "ingotCopper";
public static final String INGOT_TIN = "ingotTin";
public static final String INGOT_BRONZE = "ingotBronze";
public static final String GEAR_BRONZE = "gearBronze";
public static final String GEAR_COPPER = "gearCopper";
public static final String GEAR_TIN = "gearTin";
public static final String GEAR_STONE = "gearStone";
public static final String CRAFTING_TABLE_WOOD = "craftingTableWood";
@@ -23,6 +31,7 @@ public class OreDictUtil {
public static final String DROP_HONEYDEW = "dropHoneydew";
public static final String ITEM_POLLEN = "itemPollen";
public static final String DROP_HONEY = "dropHoney";
public static final String ITEM_BEESWAX = "itemBeeswax";
public static final String TREE_SAPLING = "treeSapling";
public static final String LOG_WOOD = "logWood";
@@ -36,6 +45,10 @@ public class OreDictUtil {
public static final String EMPTIED_LETTER_ORE_DICT = "emptiedLetter";
public static final String DUST_ASH = "dustAsh";
public static final String BRICK_PEAT = "brickPeat";
public static final String PULP_WOOD = "pulpWood";
public static final String CROP_CHERRY = "cropCherry";
public static final String CROP_WALNUT = "cropWalnut";
public static final String CROP_CHESTNUT = "cropChestnut";
@@ -44,6 +57,20 @@ public class OreDictUtil {
public static final String CROP_DATE = "cropDate";
public static final String CROP_PAPAYA = "cropPapaya";
public static final String PANE_GLASS = "paneGlass";
public static final String SAND = "sand";
public static final String CROP_WHEAT = "cropWheat";
public static final String DUST_REDSTONE = "dustRedstone";
public static final String GEM_DIAMOND = "gemDiamond";
public static final String STICK_WOOD = "stickWood";
public static final String INGOT_GOLD = "ingotGold";
public static final String INGOT_IRON = "ingotIron";
public static final String STONE = "stone";
public static final String BLOCK_GLASS = "blockGlass";
public static final String GEM_QUARTZ = "gemQuartz";
public static final String CHEST_WOOD = "chestWood";
public static final String LEATHER = "leather";
/**
* Used for ores and metals where conflicts are common.
* This way, Forestry can choose whatever is first in the oreDictionary instead of its own metals.