diff --git a/src/main/java/forestry/api/storage/ICrateRegistry.java b/src/main/java/forestry/api/storage/ICrateRegistry.java index 27ea23b3c..aef1691bf 100644 --- a/src/main/java/forestry/api/storage/ICrateRegistry.java +++ b/src/main/java/forestry/api/storage/ICrateRegistry.java @@ -12,25 +12,25 @@ import net.minecraft.item.ItemStack; public interface ICrateRegistry { /** - * Makes a new crate, registers it with the game registry with uid, + * Makes a new crate, registers it with the game registry, * and creates crating and uncrating recipes for the Carpenter. * The icon is rendered automatically from the contained item. * * Can only be called during the Init stage. */ - void registerCrate(Item item, String uid); + void registerCrate(Item item); - void registerCrate(Block block, String uid); + void registerCrate(Block block); - void registerCrate(ItemStack stack, String uid); + void registerCrate(ItemStack stack); /** - * Same as the above, but uses the ore dictionary for the Carpenter crating recipe. + * Same as the above, but uses the ore dictionary for inputs in the Carpenter crating recipe. */ - void registerCrateUsingOreDict(Item item, String uid); + void registerCrateUsingOreDict(Item item); - void registerCrateUsingOreDict(Block block, String uid); + void registerCrateUsingOreDict(Block block); - void registerCrateUsingOreDict(ItemStack stack, String uid); + void registerCrateUsingOreDict(ItemStack stack); } diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 2dec588b9..d0e025766 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -395,28 +395,28 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void registerCrates() { ICrateRegistry crateRegistry = StorageManager.crateRegistry; - crateRegistry.registerCrate(PluginCore.items.beeswax.getItemStack(), "cratedBeeswax"); - crateRegistry.registerCrate(items.pollenCluster.get(EnumPollenCluster.NORMAL, 1), "cratedPollen"); - crateRegistry.registerCrate(items.pollenCluster.get(EnumPollenCluster.CRYSTALLINE, 1), "cratedCrystallinePollen"); - crateRegistry.registerCrate(items.propolis.getItemStack(), "cratedPropolis"); - crateRegistry.registerCrate(items.honeydew.getItemStack(), "cratedHoneydew"); - crateRegistry.registerCrate(items.royalJelly.getItemStack(), "cratedRoyalJelly"); + crateRegistry.registerCrate(PluginCore.items.beeswax.getItemStack()); + crateRegistry.registerCrate(items.pollenCluster.get(EnumPollenCluster.NORMAL, 1)); + crateRegistry.registerCrate(items.pollenCluster.get(EnumPollenCluster.CRYSTALLINE, 1)); + crateRegistry.registerCrate(items.propolis.getItemStack()); + crateRegistry.registerCrate(items.honeydew.getItemStack()); + crateRegistry.registerCrate(items.royalJelly.getItemStack()); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.HONEY, 1), "cratedHoneycombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.COCOA, 1), "cratedCocoaComb"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.SIMMERING, 1), "cratedSimmeringCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.STRINGY, 1), "cratedStringyCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.FROZEN, 1), "cratedFrozenCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.DRIPPING, 1), "cratedDrippingCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.SILKY, 1), "cratedSilkyCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.PARCHED, 1), "cratedParchedCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), "cratedMysteriousCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.POWDERY, 1), "cratedPowderyCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.WHEATEN, 1), "cratedWheatenCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MOSSY, 1), "cratedMossyCombs"); - crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MELLOW, 1), "cratedMellowCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.HONEY, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.COCOA, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.SIMMERING, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.STRINGY, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.FROZEN, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.DRIPPING, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.SILKY, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.PARCHED, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.POWDERY, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.WHEATEN, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MOSSY, 1)); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MELLOW, 1)); - crateRegistry.registerCrate(PluginCore.items.refractoryWax.getItemStack(), "cratedRefractoryWax"); + crateRegistry.registerCrate(PluginCore.items.refractoryWax.getItemStack()); } @Override diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index f5bee4d11..1e3570fbc 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -177,13 +177,13 @@ public class PluginArboriculture extends BlankForestryPlugin { @Override public void registerCrates() { ICrateRegistry crateRegistry = StorageManager.crateRegistry; - crateRegistry.registerCrate(EnumFruit.CHERRY.getStack(), "cratedCherry"); - crateRegistry.registerCrate(EnumFruit.WALNUT.getStack(), "cratedWalnut"); - crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack(), "cratedChestnut"); - crateRegistry.registerCrate(EnumFruit.LEMON.getStack(), "cratedLemon"); - crateRegistry.registerCrate(EnumFruit.PLUM.getStack(), "cratedPlum"); - crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack(), "cratedPapaya"); - crateRegistry.registerCrate(EnumFruit.DATES.getStack(), "cratedDates"); + crateRegistry.registerCrate(EnumFruit.CHERRY.getStack()); + crateRegistry.registerCrate(EnumFruit.WALNUT.getStack()); + crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack()); + crateRegistry.registerCrate(EnumFruit.LEMON.getStack()); + crateRegistry.registerCrate(EnumFruit.PLUM.getStack()); + crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack()); + crateRegistry.registerCrate(EnumFruit.DATES.getStack()); } @Override diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index 3c9e5c104..64e63c322 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -139,70 +139,70 @@ public class PluginCore extends BlankForestryPlugin { ICrateRegistry crateRegistry = StorageManager.crateRegistry; // forestry items - crateRegistry.registerCrate(items.peat, "cratedPeat"); - crateRegistry.registerCrate(items.apatite, "cratedApatite"); - crateRegistry.registerCrate(items.fertilizerCompound, "cratedFertilizer"); - crateRegistry.registerCrate(items.mulch, "cratedMulch"); - crateRegistry.registerCrate(items.phosphor, "cratedPhosphor"); - crateRegistry.registerCrate(items.ash, "cratedAsh"); - crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin"); - crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper"); - crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze"); + crateRegistry.registerCrate(items.peat); + crateRegistry.registerCrate(items.apatite); + crateRegistry.registerCrate(items.fertilizerCompound); + crateRegistry.registerCrate(items.mulch); + crateRegistry.registerCrate(items.phosphor); + crateRegistry.registerCrate(items.ash); + crateRegistry.registerCrateUsingOreDict(items.ingotTin); + crateRegistry.registerCrateUsingOreDict(items.ingotCopper); + crateRegistry.registerCrateUsingOreDict(items.ingotBronze); // forestry blocks - crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.HUMUS, 1), "cratedHumus"); - crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.BOG_EARTH, 1), "cratedBogearth"); + crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.HUMUS, 1)); + crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.BOG_EARTH, 1)); // vanilla items - crateRegistry.registerCrate(Items.wheat, "cratedWheat"); - crateRegistry.registerCrate(Items.cookie, "cratedCookies"); - crateRegistry.registerCrate(Items.redstone, "cratedRedstone"); - crateRegistry.registerCrate(new ItemStack(Items.dye, 1, 4), "cratedLapis"); - crateRegistry.registerCrate(Items.reeds, "cratedReeds"); - crateRegistry.registerCrate(Items.clay_ball, "cratedClay"); - crateRegistry.registerCrate(Items.glowstone_dust, "cratedGlowstone"); - crateRegistry.registerCrate(Items.apple, "cratedApples"); - crateRegistry.registerCrate(new ItemStack(Items.nether_wart), "cratedNetherwart"); - crateRegistry.registerCrate(new ItemStack(Items.coal, 1, 1), "cratedCharcoal"); - crateRegistry.registerCrate(new ItemStack(Items.coal, 1, 0), "cratedCoal"); - crateRegistry.registerCrate(Items.wheat_seeds, "cratedSeeds"); - crateRegistry.registerCrate(Items.potato, "cratedPotatoes"); - crateRegistry.registerCrate(Items.carrot, "cratedCarrots"); + crateRegistry.registerCrate(Items.wheat); + crateRegistry.registerCrate(Items.cookie); + crateRegistry.registerCrate(Items.redstone); + crateRegistry.registerCrate(new ItemStack(Items.dye, 1, 4)); + crateRegistry.registerCrate(Items.reeds); + crateRegistry.registerCrate(Items.clay_ball); + crateRegistry.registerCrate(Items.glowstone_dust); + crateRegistry.registerCrate(Items.apple); + crateRegistry.registerCrate(new ItemStack(Items.nether_wart)); + crateRegistry.registerCrate(new ItemStack(Items.coal, 1, 1)); + crateRegistry.registerCrate(new ItemStack(Items.coal, 1, 0)); + crateRegistry.registerCrate(Items.wheat_seeds); + crateRegistry.registerCrate(Items.potato); + crateRegistry.registerCrate(Items.carrot); // vanilla blocks - crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 0), "cratedWood"); - crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 1), "cratedSpruceWood"); - crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 2), "cratedBirchWood"); - crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 3), "cratedJungleWood"); - crateRegistry.registerCrate(new ItemStack(Blocks.log2, 1, 0), "cratedAcaciaWood"); - crateRegistry.registerCrate(new ItemStack(Blocks.log2, 1, 1), "cratedDarkOakWood"); - crateRegistry.registerCrate(Blocks.cobblestone, "cratedCobblestone"); - crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 0), "cratedDirt"); - crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 2), "cratedPodzol"); - crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 0), "cratedStone"); - crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 1), "cratedGranite"); - crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 3), "cratedDiorite"); - crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 5), "cratedAndesite"); - crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 0), "cratedPrismarine"); - crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 1), "cratedPrismarinebrick"); - crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 2), "cratedPrismarinedark"); - crateRegistry.registerCrate(Blocks.brick_block, "cratedBrick"); - crateRegistry.registerCrate(Blocks.cactus, "cratedCacti"); - crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 0), "cratedSand"); - crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 1), "cratedRedSand"); - crateRegistry.registerCrate(Blocks.obsidian, "cratedObsidian"); - crateRegistry.registerCrate(Blocks.netherrack, "cratedNetherrack"); - crateRegistry.registerCrate(Blocks.soul_sand, "cratedSoulsand"); - crateRegistry.registerCrate(Blocks.sandstone, "cratedSandstone"); - crateRegistry.registerCrate(Blocks.nether_brick, "cratedNetherbrick"); - crateRegistry.registerCrate(Blocks.mycelium, "cratedMycelium"); - crateRegistry.registerCrate(Blocks.gravel, "cratedGravel"); - crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 0), "cratedSaplings"); - crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 1), "cratedSpruceSapling"); - crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 2), "cratedBirchSapling"); - crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 3), "cratedJungleSapling"); - crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 4), "cratedAcaciaSapling"); - crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 5), "cratedDarkOakSapling"); + crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 1)); + crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 2)); + crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 3)); + crateRegistry.registerCrate(new ItemStack(Blocks.log2, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.log2, 1, 1)); + crateRegistry.registerCrate(Blocks.cobblestone); + crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 2)); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 1)); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 3)); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 5)); + crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 1)); + crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 2)); + crateRegistry.registerCrate(Blocks.brick_block); + crateRegistry.registerCrate(Blocks.cactus); + crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 1)); + crateRegistry.registerCrate(Blocks.obsidian); + crateRegistry.registerCrate(Blocks.netherrack); + crateRegistry.registerCrate(Blocks.soul_sand); + crateRegistry.registerCrate(Blocks.sandstone); + crateRegistry.registerCrate(Blocks.nether_brick); + crateRegistry.registerCrate(Blocks.mycelium); + crateRegistry.registerCrate(Blocks.gravel); + crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 0)); + crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 1)); + crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 2)); + crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 3)); + crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 4)); + crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 5)); } @Override diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index 179193a04..1f3e3da16 100644 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -180,31 +180,31 @@ public class PluginIC2 extends BlankForestryPlugin { } if (resin != null) { - crateRegistry.registerCrate(resin, "cratedResin"); + crateRegistry.registerCrate(resin); } if (rubber != null) { - crateRegistry.registerCrate(rubber, "cratedRubber"); + crateRegistry.registerCrate(rubber); } ItemStack scrap = IC2Items.getItem("crafting", "scrap"); if (scrap != null) { - crateRegistry.registerCrate(scrap, "cratedScrap"); + crateRegistry.registerCrate(scrap); } ItemStack uuMatter = IC2Items.getItem("misc_resource", "matter"); if (uuMatter != null) { - crateRegistry.registerCrate(uuMatter, "cratedUUM"); + crateRegistry.registerCrate(uuMatter); } ItemStack silver = IC2Items.getItem("ingot", "silver"); if (silver != null) { - crateRegistry.registerCrateUsingOreDict(silver, "cratedSilver"); + crateRegistry.registerCrateUsingOreDict(silver); } ItemStack brass = IC2Items.getItem("ingot", "bronze"); if (brass != null) { - crateRegistry.registerCrateUsingOreDict(brass, "cratedBrass"); + crateRegistry.registerCrateUsingOreDict(brass); } } diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index c3ce2f493..6d496a435 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -122,83 +122,83 @@ public class PluginNatura extends BlankForestryPlugin { ICrateRegistry crateRegistry = StorageManager.crateRegistry; if (berryBlight != null) { - crateRegistry.registerCrate(berryBlight, "cratedNaturaBerryBlight"); + crateRegistry.registerCrate(berryBlight); } if (berryDusk != null) { - crateRegistry.registerCrate(berryDusk, "cratedNaturaBerryDusk"); + crateRegistry.registerCrate(berryDusk); } if (berrySky != null) { - crateRegistry.registerCrate(berrySky, "cratedNaturaBerrySky"); + crateRegistry.registerCrate(berrySky); } if (berrySting != null) { - crateRegistry.registerCrate(berrySting, "cratedNaturaBerrySting"); + crateRegistry.registerCrate(berrySting); } if (berryRasp != null) { - crateRegistry.registerCrate(berryRasp, "cratedNaturaBerryRasp"); + crateRegistry.registerCrate(berryRasp); } if (berryBlue != null) { - crateRegistry.registerCrate(berryBlue, "cratedNaturaBerryBlue"); + crateRegistry.registerCrate(berryBlue); } if (berryBlack != null) { - crateRegistry.registerCrate(berryBlack, "cratedNaturaBerryBlack"); + crateRegistry.registerCrate(berryBlack); } if (berryMalo != null) { - crateRegistry.registerCrate(berryMalo, "cratedNaturaBerryMalo"); + crateRegistry.registerCrate(berryMalo); } if (itemBarley != null) { - crateRegistry.registerCrate(itemBarley, "cratedNaturaBarley"); + crateRegistry.registerCrate(itemBarley); } if (saplingNatura != null) { - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 0), "cratedNaturaSaplingRedwood"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 1), "cratedNaturaSaplingEucalyptus"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 2), "cratedNaturaSaplingHopseed"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 3), "cratedNaturaSaplingSakura"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 4), "cratedNaturaSaplingGhostwood"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 5), "cratedNaturaSaplingBlood"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 6), "cratedNaturaSaplingDarkwood"); - crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 7), "cratedNaturaSaplingFusewood"); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 0)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 1)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 2)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 3)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 4)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 5)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 6)); + crateRegistry.registerCrate(new ItemStack(saplingNatura, 1, 7)); } if (saplingNaturaRare != null) { - crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 0), "cratedNaturaSaplingMaple"); - crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 1), "cratedNaturaSaplingSilverbell"); - crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 2), "cratedNaturaSaplingPurpleheart"); - crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 3), "cratedNaturaSaplingTiger"); - crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 4), "cratedNaturaSaplingWillow"); + crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 0)); + crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 1)); + crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 2)); + crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 3)); + crateRegistry.registerCrate(new ItemStack(saplingNaturaRare, 1, 4)); } Item potashApple = GameRegistry.findItem(NATURA, "Natura.netherfood"); if (potashApple != null) { - crateRegistry.registerCrate(new ItemStack(potashApple, 1, 0), "cratedNaturaPotashApple"); + crateRegistry.registerCrate(new ItemStack(potashApple, 1, 0)); } Item glowShroom = GameRegistry.findItem(NATURA, "Glowshroom"); if (glowShroom != null) { - crateRegistry.registerCrate(new ItemStack(glowShroom, 1, 0), "cratedNaturaGreenGlowshroom"); - crateRegistry.registerCrate(new ItemStack(glowShroom, 1, 1), "cratedNaturaPurpleGlowshroom"); - crateRegistry.registerCrate(new ItemStack(glowShroom, 1, 2), "cratedNaturaBlueGlowshroom"); + crateRegistry.registerCrate(new ItemStack(glowShroom, 1, 0)); + crateRegistry.registerCrate(new ItemStack(glowShroom, 1, 1)); + crateRegistry.registerCrate(new ItemStack(glowShroom, 1, 2)); } if (logNatura != null) { - crateRegistry.registerCrate(new ItemStack(logNatura, 1, 0), "cratedNaturaLogEucalyptus"); - crateRegistry.registerCrate(new ItemStack(logNatura, 1, 1), "cratedNaturaLogSakura"); - crateRegistry.registerCrate(new ItemStack(logNatura, 1, 2), "cratedNaturaLogGhostwood"); - crateRegistry.registerCrate(new ItemStack(logNatura, 1, 3), "cratedNaturaLogHopseed"); - crateRegistry.registerCrate(new ItemStack(logWillow, 1, 0), "cratedNaturaLogWillow"); + crateRegistry.registerCrate(new ItemStack(logNatura, 1, 0)); + crateRegistry.registerCrate(new ItemStack(logNatura, 1, 1)); + crateRegistry.registerCrate(new ItemStack(logNatura, 1, 2)); + crateRegistry.registerCrate(new ItemStack(logNatura, 1, 3)); + crateRegistry.registerCrate(new ItemStack(logWillow, 1, 0)); } Item bloodWood = GameRegistry.findItem(NATURA, "bloodwood"); if (bloodWood != null) { - crateRegistry.registerCrate(new ItemStack(bloodWood, 1, 0), "cratedNaturaLogBloodwood"); + crateRegistry.registerCrate(new ItemStack(bloodWood, 1, 0)); } Item darkTree = GameRegistry.findItem(NATURA, "Dark Tree"); if (darkTree != null) { - crateRegistry.registerCrate(new ItemStack(darkTree, 1, 0), "cratedNaturaLogDarkwood"); - crateRegistry.registerCrate(new ItemStack(darkTree, 1, 1), "cratedNaturaLogFusewood"); + crateRegistry.registerCrate(new ItemStack(darkTree, 1, 0)); + crateRegistry.registerCrate(new ItemStack(darkTree, 1, 1)); } Item heatSand = GameRegistry.findItem(NATURA, "heatsand"); if (heatSand != null) { - crateRegistry.registerCrate(new ItemStack(heatSand, 1, 0), "cratedNaturaBlockHeatsand"); + crateRegistry.registerCrate(new ItemStack(heatSand, 1, 0)); } Item taintedSoil = GameRegistry.findItem(NATURA, "soil.tainted"); if (taintedSoil != null) { - crateRegistry.registerCrate(new ItemStack(taintedSoil, 1, 0), "cratedNaturaBlockTainted"); + crateRegistry.registerCrate(new ItemStack(taintedSoil, 1, 0)); } } diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index fc8511eb9..dc80cab21 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -19,55 +19,53 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.storage.ICrateRegistry; import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; public class CrateRegistry implements ICrateRegistry { - private static void registerCrate(ItemStack stack, String uid, boolean useOreDict) { + private static void registerCrate(ItemStack stack, boolean useOreDict) { if (stack == null || stack.getItem() == null) { Log.warning("Tried to make a crate without an item"); return; } - if (uid == null) { - Log.warning("Tried to make a crate without a uid"); - return; - } - + String itemName = ItemStackUtil.getStringForItemStack(stack).replace(':', '.'); + String crateName = "crated." + itemName; ItemCrated crate = new ItemCrated(stack, useOreDict); - crate.setUnlocalizedName(uid); - GameRegistry.registerItem(crate, uid); + crate.setUnlocalizedName(crateName); + GameRegistry.registerItem(crate, crateName); Proxies.render.registerModelCrate(crate); PluginStorage.registerCrate(crate); } @Override - public void registerCrate(Item item, String uid) { - registerCrate(new ItemStack(item), uid, false); + public void registerCrate(Item item) { + registerCrate(new ItemStack(item), false); } @Override - public void registerCrateUsingOreDict(Item item, String uid) { - registerCrate(new ItemStack(item), uid, true); + public void registerCrateUsingOreDict(Item item) { + registerCrate(new ItemStack(item), true); } @Override - public void registerCrate(Block block, String uid) { - registerCrate(new ItemStack(block), uid, false); + public void registerCrate(Block block) { + registerCrate(new ItemStack(block), false); } @Override - public void registerCrateUsingOreDict(Block block, String uid) { - registerCrate(new ItemStack(block), uid, true); + public void registerCrateUsingOreDict(Block block) { + registerCrate(new ItemStack(block), true); } @Override - public void registerCrate(ItemStack stack, String uid) { - registerCrate(stack, uid, false); + public void registerCrate(ItemStack stack) { + registerCrate(stack, false); } @Override - public void registerCrateUsingOreDict(ItemStack stack, String uid) { - registerCrate(stack, uid, true); + public void registerCrateUsingOreDict(ItemStack stack) { + registerCrate(stack, true); } }