diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 7ab1ee31..a1204c5e 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -3,12 +3,6 @@ package binnie.extratrees; import static binnie.extratrees.ExtraTrees.EB_MOD_NAME; import static binnie.extratrees.ExtraTrees.ET_MODID; -import net.minecraft.block.Block; -import net.minecraft.item.Item; - -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; - import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; @@ -30,11 +24,16 @@ import binnie.extratrees.item.ModuleItems; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.nei.IMCForNEI; import binnie.extratrees.proxy.Proxy; +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; @Mod( modid = ET_MODID, @@ -45,7 +44,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; guiFactory = "binnie.extratrees.config.ETConfigGUIFactory") public class ExtraTrees extends AbstractMod { - public static final String ET_MODID = "ExtraTrees"; + public static final String ET_MODID = "extratrees"; public static final String EB_MOD_NAME = "Extra Trees"; @Mod.Instance("ExtraTrees") @@ -62,10 +61,6 @@ public class ExtraTrees extends AbstractMod { } } - public static Item itemDictionary; - public static Item itemDictionaryLepi; - public static Item itemMisc; - public static Item itemFood; public static Block blockStairs; public static Block blockLog; public static BlockCarpentry blockCarpentry; @@ -76,8 +71,6 @@ public class ExtraTrees extends AbstractMod { public static BlockCarpentry blockPanel; public static Block blockSlab; public static Block blockDoubleSlab; - public static Item itemHammer; - public static Item itemDurableHammer; public static Block blockGate; public static Block blockDoor; public static BlockMultiFence blockMultiFence; @@ -114,6 +107,19 @@ public class ExtraTrees extends AbstractMod { postInit(); } + @Mod.EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) { + final String[] name = m.name.split(":"); + if (name.length < 2) continue; + + if (name[0].equals("ExtraTrees")) { + if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(ET_MODID, name[1])); + else m.remap(GameRegistry.findItem(ET_MODID, name[1])); + } + } + } + @Override public IBinnieGUID[] getGUIDs() { return ExtraTreesGUID.values(); @@ -129,10 +135,9 @@ public class ExtraTrees extends AbstractMod { return ExtraTrees.proxy; } - // Concerningly, this isn't the same as the MODID @Override public String getModID() { - return "extratrees"; + return ET_MODID; } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index 799f7b78..7d79c616 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -1,11 +1,7 @@ package binnie.extratrees.carpentry; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import static binnie.extratrees.item.ETMisc.Items.GlassFitting; +import static binnie.extratrees.item.ETMisc.Items.WoodWax; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -15,7 +11,11 @@ import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.block.PlankType; -import binnie.extratrees.item.ExtraTreeItems; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; public enum DesignSystem implements IDesignSystem { @@ -81,8 +81,8 @@ public enum DesignSystem implements IDesignSystem { @Override public ItemStack getAdhesive() { return switch (this) { - case Glass -> ExtraTreeItems.GlassFitting.get(1); - case Wood -> ExtraTreeItems.WoodWax.get(1); + case Glass -> GlassFitting.get(1); + case Wood -> WoodWax.get(1); }; } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index dfb17089..fed41d2e 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -1,5 +1,6 @@ package binnie.extratrees.genetics; +import binnie.extratrees.item.ETItems; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -15,7 +16,6 @@ import com.gtnewhorizon.gtnhlib.reflect.Fields; import binnie.Binnie; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ETConfig; import binnie.extratrees.item.Food; @@ -435,7 +435,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { } for (ItemStack stack : products.keySet()) { - if (stack.getItem() == ExtraTrees.itemFood) { + if (stack.getItem() == ETItems.itemFood) { return Food.values()[stack.getItemDamage()].toString(); } } diff --git a/src/main/java/binnie/extratrees/item/ETItems.java b/src/main/java/binnie/extratrees/item/ETItems.java new file mode 100644 index 00000000..eafdf925 --- /dev/null +++ b/src/main/java/binnie/extratrees/item/ETItems.java @@ -0,0 +1,13 @@ +package binnie.extratrees.item; + +import binnie.core.item.DamageItems; +import net.minecraft.item.Item; + +public class ETItems { + public static DamageItems itemMisc; + public static Item itemDictionary; + public static Item itemDictionaryLepi; + public static Item itemFood; + public static Item itemHammer; + public static Item itemDurableHammer; +} diff --git a/src/main/java/binnie/extratrees/item/ETMisc.java b/src/main/java/binnie/extratrees/item/ETMisc.java new file mode 100644 index 00000000..9949653b --- /dev/null +++ b/src/main/java/binnie/extratrees/item/ETMisc.java @@ -0,0 +1,40 @@ +package binnie.extratrees.item; + +import static binnie.extratrees.ExtraTrees.ET_MODID; +import static binnie.extratrees.item.ETItems.itemMisc; + +import binnie.core.item.DamageItems; +import forestry.api.core.Tabs; +import java.util.Arrays; +import net.minecraft.item.ItemStack; + +public class ETMisc extends DamageItems { + public enum Items { + // Binnie never enabled this one, so it does nothing + // TODO: re-enable or remove this + CarpentryHammer("carpentryHammer"), + Sawdust("sawdust"), + Bark("bark"), + ProvenGear("provenGear"), + WoodWax("woodWax"), + GlassFitting("glassFitting"); + + final String name; + private static final Items[] VALUES = values(); + + Items(String name) { + this.name = name; + } + + public ItemStack get(int count) { + return itemMisc.getStack(count, ordinal()); + } + } + + protected ETMisc() { + super( + Tabs.tabArboriculture, + ET_MODID, + Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); + } +} diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java deleted file mode 100644 index b7cedd20..00000000 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ /dev/null @@ -1,53 +0,0 @@ -package binnie.extratrees.item; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; - -public enum ExtraTreeItems implements IItemMisc { - - CarpentryHammer("carpentryHammer"), - Sawdust("sawdust"), - Bark("bark"), - ProvenGear("provenGear"), - WoodWax("woodWax"), - GlassFitting("glassFitting"); - - private final String name; - private final String iconPath; - private IIcon icon; - - ExtraTreeItems(String name) { - this.name = name; - this.iconPath = name; - } - - @Override - public IIcon getIcon(ItemStack itemStack) { - return icon; - } - - @Override - public void registerIcons(IIconRegister register) { - icon = ExtraTrees.proxy.getIcon(register, iconPath); - } - - @Override - public String getName(ItemStack itemStack) { - return I18N.localise("extratrees.item." + name); - } - - @Override - public boolean isActive() { - return this != ExtraTreeItems.CarpentryHammer; - } - - @Override - public ItemStack get(int count) { - return new ItemStack(ExtraTrees.itemMisc, count, ordinal()); - } -} diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index ec592dd1..5c34cda0 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -165,7 +165,7 @@ public enum Food implements IItemMisc { @Override public ItemStack get(int count) { - return new ItemStack(ExtraTrees.itemFood, count, ordinal()); + return new ItemStack(ETItems.itemFood, count, ordinal()); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index a884aefd..993082a2 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -1,5 +1,20 @@ package binnie.extratrees.item; +import static binnie.extratrees.item.ETMisc.Items.Bark; +import static binnie.extratrees.item.ETMisc.Items.WoodWax; +import static binnie.extratrees.item.ETMisc.Items.ProvenGear; +import static binnie.extratrees.item.ETMisc.Items.GlassFitting; + +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; +import binnie.core.Mods; +import binnie.core.liquid.ItemFluidContainer; +import binnie.extratrees.block.ILogType; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.fuels.EngineBronzeFuel; +import forestry.api.fuels.FuelManager; +import forestry.api.recipes.RecipeManagers; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -10,40 +25,26 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.IInitializable; -import binnie.core.Mods; -import binnie.core.item.ItemMisc; -import binnie.core.liquid.ItemFluidContainer; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.ILogType; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.core.Tabs; -import forestry.api.fuels.EngineBronzeFuel; -import forestry.api.fuels.FuelManager; -import forestry.api.recipes.RecipeManagers; - public class ModuleItems implements IInitializable { @Override public void preInit() { - ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture); - ExtraTrees.itemDictionary = new ItemDictionary(); + ETItems.itemMisc = new ETMisc(); + ETItems.itemDictionary = new ItemDictionary(); if (BinnieCore.isLepidopteryActive()) { - ExtraTrees.itemDictionaryLepi = new ItemMothDatabase(); + ETItems.itemDictionaryLepi = new ItemMothDatabase(); } Binnie.Liquid.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree); - ExtraTrees.itemFood = new ItemFood(); + ETItems.itemFood = new ItemFood(); - ExtraTrees.itemHammer = new ItemHammer(false); - ExtraTrees.itemDurableHammer = new ItemHammer(true); + ETItems.itemHammer = new ItemHammer(false); + ETItems.itemDurableHammer = new ItemHammer(true); } @Override public void init() { - OreDictionary.registerOre("pulpWood", ExtraTreeItems.Sawdust.get(1)); + OreDictionary.registerOre("pulpWood", ETMisc.Items.Sawdust.get(1)); Food.registerOreDictionary(); OreDictionary.registerOre("cropApple", Items.apple); OreDictionary.registerOre("seedWheat", Items.wheat_seeds); @@ -104,7 +105,7 @@ public class ModuleItems implements IInitializable { public void postInit() { GameRegistry.addRecipe( new ShapedOreRecipe( - new ItemStack(ExtraTrees.itemDurableHammer, 1, 0), + new ItemStack(ETItems.itemDurableHammer, 1, 0), "wiw", " s ", " s ", @@ -117,7 +118,7 @@ public class ModuleItems implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( - new ItemStack(ExtraTrees.itemHammer, 1, 0), + new ItemStack(ETItems.itemHammer, 1, 0), "wiw", " s ", " s ", @@ -129,10 +130,10 @@ public class ModuleItems implements IInitializable { Items.stick)); GameRegistry - .addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.forestry.stack("oakStick")); + .addRecipe(ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.forestry.stack("oakStick")); GameRegistry.addRecipe( - ExtraTreeItems.GlassFitting.get(6), + GlassFitting.get(6), "s s", " i ", "s s", @@ -152,7 +153,7 @@ public class ModuleItems implements IInitializable { 100, Binnie.Liquid.getLiquidStack("water", 2000), null, - new ItemStack(ExtraTrees.itemDictionary), + new ItemStack(ETItems.itemDictionary), "X#X", "YEY", "RDR", @@ -173,7 +174,7 @@ public class ModuleItems implements IInitializable { 100, Binnie.Liquid.getLiquidStack("water", 2000), null, - new ItemStack(ExtraTrees.itemDictionaryLepi), + new ItemStack(ETItems.itemDictionaryLepi), "X#X", "YEY", "RDR", @@ -196,7 +197,7 @@ public class ModuleItems implements IInitializable { 25, ExtraTreeLiquid.Turpentine.get(50), null, - ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 4), + WoodWax.get(4), "x", 'x', Mods.forestry.stack("beeswax")); @@ -206,7 +207,7 @@ public class ModuleItems implements IInitializable { 25, Binnie.Liquid.getLiquidStack("Creosote Oil", 50), null, - ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 1), + WoodWax.get(1), "x", 'x', Mods.forestry.stack("beeswax")); @@ -221,7 +222,7 @@ public class ModuleItems implements IInitializable { "bwb", " b ", 'b', - ExtraTreeItems.Bark.get(1), + Bark.get(1), 'w', data.filledContainer.copy()); } diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 9fc5adc8..f0971a08 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -1,16 +1,16 @@ package binnie.extratrees.machines; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraftforge.oredict.ShapedOreRecipe; +import static binnie.extratrees.item.ETMisc.Items.ProvenGear; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.item.ExtraTreeItems; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { @@ -35,7 +35,7 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( ExtraTreeMachine.Lumbermill.get(1), - new Object[] { "gAg", "GsG", "gPg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), + new Object[] { "gAg", "GsG", "gPg", 'G', Blocks.glass, 'g', ProvenGear.get(1), 'A', Items.iron_axe, 's', Mods.forestry.stack("sturdyMachine"), 'P', "gearBronze" })); GameRegistry.addRecipe( @@ -47,7 +47,7 @@ public class ModuleMachine implements IInitializable { 'G', Blocks.glass, 'g', - ExtraTreeItems.ProvenGear.get(1), + ProvenGear.get(1), 'w', Blocks.planks, 's', @@ -62,7 +62,7 @@ public class ModuleMachine implements IInitializable { 'G', Blocks.glass, 'g', - ExtraTreeItems.ProvenGear.get(1), + ProvenGear.get(1), 'w', Blocks.wooden_slab, 's', @@ -77,7 +77,7 @@ public class ModuleMachine implements IInitializable { 'G', Blocks.glass, 'g', - ExtraTreeItems.ProvenGear.get(1), + ProvenGear.get(1), 'w', Blocks.glass, 's', @@ -92,7 +92,7 @@ public class ModuleMachine implements IInitializable { 'G', Blocks.glass, 'g', - ExtraTreeItems.ProvenGear.get(1), + ProvenGear.get(1), 'w', Items.clay_ball, 's', diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java index 4984a223..051c7f4f 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.lumbermill; -import net.minecraft.item.ItemStack; -import binnie.core.item.ItemMisc; +import static binnie.extratrees.item.ETMisc.Items.Bark; +import static binnie.extratrees.item.ETMisc.Items.Sawdust; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.item.ExtraTreeItems; +import net.minecraft.item.ItemStack; public class LumbermillComponentLogic extends ComponentProcessSetCost implements IProcess { @@ -58,8 +58,8 @@ public class LumbermillComponentLogic extends ComponentProcessSetCost implements getUtil().addStack(Lumbermill.SLOT_PLANKS, result); getUtil().addStack( Lumbermill.SLOT_SAWDUST, - ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Sawdust, 1)); - getUtil().addStack(Lumbermill.SLOT_BARK, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Bark, 1)); + Sawdust.get(1)); + getUtil().addStack(Lumbermill.SLOT_BARK, Bark.get(1)); getUtil().decreaseStack(Lumbermill.SLOT_WOOD, 1); } diff --git a/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java b/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java index 6254ade9..42e32767 100644 --- a/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java +++ b/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java @@ -1,23 +1,23 @@ package binnie.extratrees.nei; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; +import static binnie.extratrees.item.ETMisc.Items.Bark; +import static binnie.extratrees.item.ETMisc.Items.Sawdust; import binnie.Binnie; import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.RecipeHandlerBase; -import binnie.extratrees.item.ExtraTreeItems; import binnie.extratrees.machines.lumbermill.Lumbermill; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; public class NEIHandlerLumbermill extends RecipeHandlerBase { @@ -65,8 +65,8 @@ public class NEIHandlerLumbermill extends RecipeHandlerBase { @Override public void loadCraftingRecipes(ItemStack result) { - if (NEIServerUtils.areStacksSameTypeCrafting(ExtraTreeItems.Sawdust.get(1), result) - || (NEIServerUtils.areStacksSameTypeCrafting(ExtraTreeItems.Bark.get(1), result))) { + if (NEIServerUtils.areStacksSameTypeCrafting(Sawdust.get(1), result) + || (NEIServerUtils.areStacksSameTypeCrafting(Bark.get(1), result))) { this.loadAllRecipes(); } else { for (Map.Entry entry : Lumbermill.recipes.entrySet()) { @@ -101,8 +101,8 @@ public class NEIHandlerLumbermill extends RecipeHandlerBase { Binnie.Liquid.getLiquidStack("water", 300), 1000, new Rectangle(28, 6, 16, 58)); - public PositionedStack bark = new PositionedStack(ExtraTreeItems.Sawdust.get(1), 123, 6); - public PositionedStack sawDust = new PositionedStack(ExtraTreeItems.Bark.get(1), 123, 48); + public PositionedStack bark = new PositionedStack(Sawdust.get(1), 123, 6); + public PositionedStack sawDust = new PositionedStack(Bark.get(1), 123, 48); public PositionedStack wood; public PositionedStack plank; public List results = new ArrayList<>(); diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 5361ed7c..b82bf7a8 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -20,7 +20,6 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; -import java.util.List; @Mod( modid = Genetics.GENETICS_MODID, @@ -67,15 +66,14 @@ public class Genetics extends AbstractMod { @Mod.EventHandler public void missingMappings(FMLMissingMappingsEvent event) { - final List l = event.getAll(); - for (FMLMissingMappingsEvent.MissingMapping m : l) { + for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) { final String[] name = m.name.split(":"); if (name.length < 2) continue; if (name[0].equals("Genetics")) { if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(GENETICS_MODID, name[1])); else m.remap(GameRegistry.findItem(GENETICS_MODID, name[1])); - } else { m.warn(); } + } } } diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index ad6bb6f4..cb8899ed 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -1,17 +1,16 @@ package binnie.genetics.genetics; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; -import binnie.genetics.item.GeneticsItems; -import net.minecraft.item.ItemStack; - import binnie.genetics.api.IGene; import binnie.genetics.api.IItemChargable; import binnie.genetics.api.IItemSerum; +import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; +import net.minecraft.item.ItemStack; public class Engineering { @@ -60,7 +59,7 @@ public class Engineering { if (serum.getItem() instanceof IItemSerum) { return ((IItemSerum) serum.getItem()).getGenes(serum); } - if (serum.getItem() == SEQUENCER.getItem()) { + if (serum.getItem() == sequencer) { return new IGene[] { new SequencerItem(serum).gene }; } return new IGene[0]; diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 0aafe670..027adbf8 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -3,18 +3,16 @@ package binnie.genetics.item; import binnie.core.item.DamageItems; import net.minecraft.item.Item; -public enum GeneticsItems { +public class GeneticsItems { - SERUM(new ItemSerum()), - SERUM_ARRAY(new ItemSerumArray()), - SEQUENCER(new ItemSequence()), - DATABASE(new ItemDatabase()), - ANALYST(new ItemAnalyst()), - REGISTRY(new ItemRegistry()), - MASTER_REGISTRY(new ItemMasterRegistry()); - - // TODO: put this back in Genetics once the itemparser is killed - public static DamageItems itemGenetics; + public static final Item serum = new ItemSerum(); + public static final Item serumArray = new ItemSerumArray(); + public static final Item sequencer = new ItemSequence(); + public static final Item database = new ItemDatabase(); + public static final Item analyst = new ItemAnalyst(); + public static final Item registry = new ItemRegistry(); + public static final Item masterRegistry = new ItemMasterRegistry(); + public static DamageItems itemGenetics = new GeneticsMisc(); private final Item item; diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index acb16921..d4024d75 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,6 +1,7 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; + +import static binnie.genetics.item.GeneticsItems.sequencer; import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; @@ -45,7 +46,7 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl } public static ItemStack create(IGene gene, boolean sequenced) { - ItemStack item = new ItemStack(SEQUENCER.getItem()); + ItemStack item = new ItemStack(sequencer); item.setItemDamage(sequenced ? 0 : item.getMaxDamage()); SequencerItem seq = new SequencerItem(gene); seq.writeToItem(item); diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 7c3ea7f3..2a448148 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,14 +1,6 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItems.SERUM; - -import java.util.List; -import java.util.Map; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsItems.serum; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; @@ -24,6 +16,12 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; +import java.util.List; +import java.util.Map; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class ItemSerum extends ItemGene implements IItemSerum { @@ -33,7 +31,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { } public static ItemStack create(IGene gene) { - ItemStack item = new ItemStack(SERUM.getItem()); + ItemStack item = new ItemStack(serum); item.setItemDamage(item.getMaxDamage()); GeneItem seq = new GeneItem(gene); seq.writeToItem(item); diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 403a5481..e98430da 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,14 +1,6 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsItems.serumArray; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; @@ -27,6 +19,12 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class ItemSerumArray extends ItemGene implements IItemSerum { @@ -36,7 +34,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { } public static ItemStack create(IGene gene) { - ItemStack item = new ItemStack(SERUM_ARRAY.getItem()); + ItemStack item = new ItemStack(serumArray); item.setItemDamage(item.getMaxDamage()); GeneArrayItem seq = new GeneArrayItem(gene); seq.writeToItem(item); diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 80af399e..a7d16e9e 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -1,11 +1,12 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItems.ANALYST; -import static binnie.genetics.item.GeneticsItems.DATABASE; -import static binnie.genetics.item.GeneticsItems.REGISTRY; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; -import static binnie.genetics.item.GeneticsItems.SERUM; -import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.analyst; +import static binnie.genetics.item.GeneticsItems.database; +import static binnie.genetics.item.GeneticsItems.itemGenetics; +import static binnie.genetics.item.GeneticsItems.registry; +import static binnie.genetics.item.GeneticsItems.sequencer; +import static binnie.genetics.item.GeneticsItems.serum; +import static binnie.genetics.item.GeneticsItems.serumArray; import static binnie.genetics.item.GeneticsMisc.Items.Cylinder; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; @@ -18,6 +19,7 @@ import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; +import binnie.extratrees.item.ETItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -33,7 +35,6 @@ import binnie.core.Mods; import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees; -import binnie.extratrees.ExtraTrees; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; @@ -57,7 +58,10 @@ public class ModuleItem implements IInitializable { @Override public void preInit() { - GeneticsItems.itemGenetics = new GeneticsMisc(); + // Loads GeneticsItems.class, guaranteeing that items are init by this point + // TODO: is this needed? + itemGenetics.getUnlocalizedName(); + Binnie.Liquid.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics); } @@ -146,7 +150,7 @@ public class ModuleItem implements IInitializable { 100, Binnie.Liquid.getLiquidStack("water", 2000), null, - new ItemStack(DATABASE.getItem()), + new ItemStack(database), "X#X", "YEY", "RDR", @@ -163,9 +167,9 @@ public class ModuleItem implements IInitializable { 'E', Blocks.obsidian); - GameRegistry.addSmelting(SEQUENCER.getItem(), EmptySequencer.get(1), 0.0f); - GameRegistry.addSmelting(SERUM.getItem(), EmptySerum.get(1), 0.0f); - GameRegistry.addSmelting(SERUM_ARRAY.getItem(), EmptyGenome.get(1), 0.0f); + GameRegistry.addSmelting(sequencer, EmptySequencer.get(1), 0.0f); + GameRegistry.addSmelting(serum, EmptySerum.get(1), 0.0f); + GameRegistry.addSmelting(serumArray, EmptyGenome.get(1), 0.0f); // TODONE refactor refactor refactor this! // CombatZAK up to the task! @@ -185,7 +189,7 @@ public class ModuleItem implements IInitializable { ItemStack circuit = IntegratedCircuit.get(1); // get a reference to Integrated circuit Item diamond = Items.diamond; // save a reference to diamond - ItemStack analyst = new ItemStack(ANALYST.getItem()); // save a reference to the analyst, will make the next bit + ItemStack analystStack = new ItemStack(analyst); // save a reference to the analyst, will make the next bit // easier // the following code is a sufficient replacement for the 3 nested loops that preceded it; arguably this is @@ -198,7 +202,7 @@ public class ModuleItem implements IInitializable { // some cycles rather than spinning through an n^3 loop wasting most of the combinations. // expand the first one out for readability, but the following five are compressed to a single line GameRegistry.addShapedRecipe( - analyst, + analystStack, " b ", "tcf", " d ", @@ -214,7 +218,7 @@ public class ModuleItem implements IInitializable { diamond); GameRegistry.addShapedRecipe( - analyst, + analystStack, " b ", "fct", " d ", @@ -229,7 +233,7 @@ public class ModuleItem implements IInitializable { 'd', diamond); GameRegistry.addShapedRecipe( - analyst, + analystStack, " t ", "bcf", " d ", @@ -244,7 +248,7 @@ public class ModuleItem implements IInitializable { 'd', diamond); GameRegistry.addShapedRecipe( - analyst, + analystStack, " t ", "fcb", " d ", @@ -259,7 +263,7 @@ public class ModuleItem implements IInitializable { 'd', diamond); GameRegistry.addShapedRecipe( - analyst, + analystStack, " f ", "bct", " d ", @@ -274,7 +278,7 @@ public class ModuleItem implements IInitializable { 'd', diamond); GameRegistry.addShapedRecipe( - analyst, + analystStack, " f ", "tcb", " d ", @@ -292,14 +296,14 @@ public class ModuleItem implements IInitializable { // get some references to dictionary/databases for the various modules; these names are very inconsistent for // like items. // should be refactored in their respective modules. - ItemStack registry = new ItemStack(REGISTRY.getItem()); + ItemStack registryStack = new ItemStack(registry); Item beeDb = ExtraBees.dictionary; - Item treeDb = ExtraTrees.itemDictionary; + Item treeDb = ETItems.itemDictionary; Item flwrDb = Botany.database; // do a check to ensure that the butterfly module is enabled before using the butterfly dictionary. // a similar check could be done for arboriculture and apiculture as well, but that is left to the mod owner - Item lepiDb = BinnieCore.isLepidopteryActive() ? ExtraTrees.itemDictionaryLepi : Items.diamond; // just use a + Item lepiDb = BinnieCore.isLepidopteryActive() ? ETItems.itemDictionaryLepi : Items.diamond; // just use a // diamond if // Butterflies // is disabled @@ -317,7 +321,7 @@ public class ModuleItem implements IInitializable { // now go through each of the permutations and create a recipe for (String p : permutations) { GameRegistry.addShapedRecipe( - registry, // adding the recipe with registry as output + registryStack, // adding the recipe with registry as output // this line is the 3-string arrangement, with the characters pulled from the current // permutation String.format(" %c ", p.charAt(0)), diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 2e40b3a1..cc5a1635 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -1,21 +1,9 @@ package binnie.genetics.machine; -import static binnie.genetics.item.GeneticsItems.ANALYST; -import static binnie.genetics.item.GeneticsItems.DATABASE; -import static binnie.genetics.item.GeneticsItems.MASTER_REGISTRY; -import static binnie.genetics.item.GeneticsItems.REGISTRY; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; +import static binnie.genetics.item.GeneticsItems.analyst; +import static binnie.genetics.item.GeneticsItems.database; +import static binnie.genetics.item.GeneticsItems.masterRegistry; +import static binnie.genetics.item.GeneticsItems.registry; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -24,8 +12,18 @@ import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; import binnie.core.machines.network.INetwork; import binnie.extrabees.ExtraBees; -import binnie.extratrees.ExtraTrees; +import binnie.extratrees.item.ETItems; import buildcraft.api.tools.IToolWrench; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class ComponentGUIHolder extends MachineComponent implements INetwork.TilePacketSync, IInteraction.RightClick { @@ -126,16 +124,16 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til validSelections.add(ExtraBees.dictionary); } if (BinnieCore.isExtraTreesActive()) { - validSelections.add(ExtraTrees.itemDictionary); + validSelections.add(ETItems.itemDictionary); } if (BinnieCore.isLepidopteryActive()) { - validSelections.add(ExtraTrees.itemDictionaryLepi); + validSelections.add(ETItems.itemDictionaryLepi); } - validSelections.add(DATABASE.getItem()); - validSelections.add(ANALYST.getItem()); - validSelections.add(REGISTRY.getItem()); - validSelections.add(MASTER_REGISTRY.getItem()); + validSelections.add(database); + validSelections.add(analyst); + validSelections.add(registry); + validSelections.add(masterRegistry); validSelections.add(BinnieCore.genesis); if (stack == null && validSelections.contains(player.getHeldItem().getItem())) { diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index 1794d937..468c66cc 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -1,13 +1,12 @@ package binnie.genetics.machine.sequencer; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; - -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsItems.sequencer; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; +import net.minecraft.item.ItemStack; public class UnsequencedSlotValidator extends SlotValidator { @@ -17,7 +16,7 @@ public class UnsequencedSlotValidator extends SlotValidator { @Override public boolean isValid(ItemStack itemStack) { - if (itemStack.getItem() == SEQUENCER.getItem()) { + if (itemStack.getItem() == sequencer) { SequencerItem seq = new SequencerItem(itemStack); return seq.sequenced < 100; } diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index 1c0bdf72..a2b85b6d 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -1,15 +1,8 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; - import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -19,6 +12,11 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; public class AnalyserRecipeHandler extends RecipeHandlerBase { @@ -26,7 +24,7 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { @Override public void prepare() { - recipes.add(new AnalyserRecipe(new ItemStack(SEQUENCER.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new AnalyserRecipe(new ItemStack(sequencer, 1, OreDictionary.WILDCARD_VALUE))); if (BinnieCore.isApicultureActive()) { recipes.add(new AnalyserRecipe(Mods.forestry.stack("beeDroneGE", 1, OreDictionary.WILDCARD_VALUE))); @@ -131,8 +129,8 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { List analysableList = new ArrayList<>(); if (recipe.getAnalysable().getItem() instanceof ItemSequence) { - for (ItemStack seq : ItemList.itemMap.get(SEQUENCER.getItem())) { - for (int i = SEQUENCER.getItem().getMaxDamage(); i >= 0; i--) { + for (ItemStack seq : ItemList.itemMap.get(sequencer)) { + for (int i = sequencer.getMaxDamage(); i >= 0; i--) { ItemStack temp = seq.copy(); temp.setItemDamage(i); analysableList.add(temp); diff --git a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java index 872e3c8a..3cf9c4e3 100644 --- a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java @@ -1,23 +1,21 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.SERUM; -import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.serum; +import static binnie.genetics.item.GeneticsItems.serumArray; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; - import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.item.ItemSerumArray; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; public class DatabaseRecipeHandler extends RecipeHandlerBase { @@ -25,8 +23,8 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { @Override public void prepare() { - recipes.add(new DatabaseRecipe(new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new DatabaseRecipe(new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new DatabaseRecipe(new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new DatabaseRecipe(new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -92,7 +90,7 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { } } - private static class DatabaseRecipe { + public static class DatabaseRecipe { private final ItemStack serum; diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index 6fc46463..33f4da87 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -1,16 +1,7 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.SERUM; -import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; +import static binnie.genetics.item.GeneticsItems.serum; +import static binnie.genetics.item.GeneticsItems.serumArray; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -25,6 +16,13 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; public class InoculatorRecipeHandler extends RecipeHandlerBase { @@ -32,11 +30,11 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { recipes.add( - new InoculatorRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + new InoculatorRecipe(dnaManipulable, new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); recipes.add( new InoculatorRecipe( dnaManipulable, - new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java index 16b8c085..efc4aff1 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -1,18 +1,9 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -30,6 +21,13 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; public class IsolatorRecipeHandler extends RecipeHandlerBase { @@ -98,7 +96,7 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase { @Override public void loadCraftingRecipes(ItemStack result) { - if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(SEQUENCER.getItem()), result)) { + if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(sequencer), result)) { for (IsolatorRecipe recipe : recipes) { this.arecipes.add(new CachedIsolatorRecipe(recipe)); } diff --git a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java index f6872e92..5ceb2418 100644 --- a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java @@ -1,18 +1,8 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; -import static binnie.genetics.item.GeneticsItems.SERUM; -import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; +import static binnie.genetics.item.GeneticsItems.sequencer; +import static binnie.genetics.item.GeneticsItems.serum; +import static binnie.genetics.item.GeneticsItems.serumArray; import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; @@ -26,6 +16,14 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; public class PolymeriserRecipeHandler extends RecipeHandlerBase { @@ -33,9 +31,9 @@ public class PolymeriserRecipeHandler extends RecipeHandlerBase { @Override public void prepare() { - recipes.add(new PolymeriserRecipe(new ItemStack(SEQUENCER.getItem(), 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new PolymeriserRecipe(new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new PolymeriserRecipe(new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new PolymeriserRecipe(new ItemStack(sequencer, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new PolymeriserRecipe(new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new PolymeriserRecipe(new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java index e9bdc41f..7b43328e 100644 --- a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java @@ -1,21 +1,19 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.DATABASE; -import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.database; +import static binnie.genetics.item.GeneticsItems.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - import binnie.core.nei.RecipeHandlerBase; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; public class SequencerRecipeHandler extends RecipeHandlerBase { @@ -64,9 +62,9 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingredient) { - if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(SEQUENCER.getItem()), ingredient) + if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(sequencer), ingredient) || NEIServerUtils.areStacksSameTypeCrafting(FluorescentDye.get(1), ingredient) - || NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(DATABASE.getItem()), ingredient)) { + || NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(database), ingredient)) { this.loadAllRecipes(); } } @@ -75,7 +73,7 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { public PositionedStack seq; public PositionedStack fluorescentDye = new PositionedStack(FluorescentDye.get(1), 53, 40); - public PositionedStack database = new PositionedStack(new ItemStack(DATABASE.getItem()), 105, 19); + public PositionedStack databaseStack = new PositionedStack(new ItemStack(database), 105, 19); public PositionedStack emptySeq = new PositionedStack(EmptySequencer.get(1), 105, 40); public List ingredients = new ArrayList<>(); public List results = new ArrayList<>(); @@ -83,8 +81,8 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { public CachedSequencerRecipe() { List seqList = new ArrayList<>(); - for (ItemStack itemStack : ItemList.itemMap.get(SEQUENCER.getItem())) { - for (int i = SEQUENCER.getItem().getMaxDamage(); i >= 0; i--) { + for (ItemStack itemStack : ItemList.itemMap.get(sequencer)) { + for (int i = sequencer.getMaxDamage(); i >= 0; i--) { ItemStack temp = itemStack.copy(); temp.setItemDamage(i); seqList.add(temp); @@ -96,7 +94,7 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { this.ingredients.add(this.seq); this.ingredients.add(this.fluorescentDye); - this.results.add(this.database); + this.results.add(this.databaseStack); this.results.add(this.emptySeq); } diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index d4199791..e017e168 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -1,15 +1,7 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItems.SERUM; -import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; +import static binnie.genetics.item.GeneticsItems.serum; +import static binnie.genetics.item.GeneticsItems.serumArray; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -24,17 +16,23 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; public class SplicerRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); private void createSplicerRecipeForNEI(ItemStack dnaManipulable) { - recipes.add(new SplicerRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new SplicerRecipe(dnaManipulable, new ItemStack(serum, 1, OreDictionary.WILDCARD_VALUE))); recipes.add( new SplicerRecipe( dnaManipulable, - new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + new ItemStack(serumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/resources/assets/extratrees/lang/en_GB.lang b/src/main/resources/assets/extratrees/lang/en_GB.lang index cc7b9a27..19e781f0 100644 --- a/src/main/resources/assets/extratrees/lang/en_GB.lang +++ b/src/main/resources/assets/extratrees/lang/en_GB.lang @@ -304,13 +304,13 @@ extratrees.genetics.unknown= extratrees.genetics.discoveredBy=Discovered by %s extratrees.genetics.complexity=Complexity: %d -extratrees.item.carpentryHammer=Master Carpentry Hammer -extratrees.item.masterCarpentryHammer=Carpentry Hammer -extratrees.item.sawdust=Sawdust -extratrees.item.bark=Bark -extratrees.item.provenGear=Proven Gear -extratrees.item.woodWax=Wood Polish -extratrees.item.glassFitting=Glass Fittings +extratrees.item.carpentryHammer.name=Master Carpentry Hammer +extratrees.item.masterCarpentryHammer.name=Carpentry Hammer +extratrees.item.sawdust.name=Sawdust +extratrees.item.bark.name=Bark +extratrees.item.provenGear.name=Proven Gear +extratrees.item.woodWax.name=Wood Polish +extratrees.item.glassFitting.name=Glass Fittings for.extratrees.item.food.apple=Apple for.extratrees.item.food.crabapple=Crabapple @@ -375,12 +375,12 @@ for.extratrees.item.food.mango=Mango for.extratrees.item.food.starfruit=Starfruit for.extratrees.item.food.candlenut=Candlenut -extratrees.item.database=Arborist Database -extratrees.item.masterDatabase=Master Arborist Database +extratrees.item.database.name=Arborist Database +extratrees.item.masterDatabase.name=Master Arborist Database extratrees.item.database.tooltip=Sengir-in-a-can -extratrees.item.mothDatabase=Lepidopterist Database -extratrees.item.mothMasterDatabase=Master Lepidopterist Database +extratrees.item.mothDatabase.name=Lepidopterist Database +extratrees.item.mothMasterDatabase.name=Master Lepidopterist Database extratrees.item.mothDatabase.tooltip=Binnie's Emporium of Lepidopterans extratrees.fluid.sap=Sap diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index b740e2bb..51f65498 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -312,13 +312,13 @@ extratrees.genetics.unknown= extratrees.genetics.discoveredBy=Discovered by %s extratrees.genetics.complexity=Complexity: %d -extratrees.item.carpentryHammer=Master Carpentry Hammer -extratrees.item.masterCarpentryHammer=Carpentry Hammer -extratrees.item.sawdust=Sawdust -extratrees.item.bark=Bark -extratrees.item.provenGear=Proven Gear -extratrees.item.woodWax=Wood Polish -extratrees.item.glassFitting=Glass Fittings +extratrees.item.carpentryHammer.name=Master Carpentry Hammer +extratrees.item.masterCarpentryHammer.name=Carpentry Hammer +extratrees.item.sawdust.name=Sawdust +extratrees.item.bark.name=Bark +extratrees.item.provenGear.name=Proven Gear +extratrees.item.woodWax.name=Wood Polish +extratrees.item.glassFitting.name=Glass Fittings for.extratrees.item.food.apple=Apple for.extratrees.item.food.crabapple=Crabapple @@ -383,12 +383,12 @@ for.extratrees.item.food.mango=Mango for.extratrees.item.food.starfruit=Starfruit for.extratrees.item.food.candlenut=Candlenut -extratrees.item.database=Arborist Database -extratrees.item.masterDatabase=Master Arborist Database +extratrees.item.database.name=Arborist Database +extratrees.item.masterDatabase.name=Master Arborist Database extratrees.item.database.tooltip=Sengir-in-a-can -extratrees.item.mothDatabase=Lepidopterist Database -extratrees.item.mothMasterDatabase=Master Lepidopterist Database +extratrees.item.mothDatabase.name=Lepidopterist Database +extratrees.item.mothMasterDatabase.name=Master Lepidopterist Database extratrees.item.mothDatabase.tooltip=Binnie's Emporium of Lepidopterans extratrees.fluid.sap=Sap diff --git a/src/main/resources/assets/extratrees/lang/ru_RU.lang b/src/main/resources/assets/extratrees/lang/ru_RU.lang index 04816fd2..51bb80ee 100644 --- a/src/main/resources/assets/extratrees/lang/ru_RU.lang +++ b/src/main/resources/assets/extratrees/lang/ru_RU.lang @@ -309,13 +309,13 @@ extratrees.genetics.unknown=<Неизвестно> extratrees.genetics.discoveredBy=Изучено игроком %s extratrees.genetics.complexity=Сложность: %d -extratrees.item.carpentryHammer=Master Carpentry Hammer -extratrees.item.masterCarpentryHammer=Carpentry Hammer -extratrees.item.sawdust=Опилки -extratrees.item.bark=Кора -extratrees.item.provenGear=Проверенная шестерня -extratrees.item.woodWax=Полироль -extratrees.item.glassFitting=Стеклянные фитинги +extratrees.item.carpentryHammer.name=Master Carpentry Hammer +extratrees.item.masterCarpentryHammer.name=Carpentry Hammer +extratrees.item.sawdust.name=Опилки +extratrees.item.bark.name=Кора +extratrees.item.provenGear.name=Проверенная шестерня +extratrees.item.woodWax.name=Полироль +extratrees.item.glassFitting.name=Стеклянные фитинги for.extratrees.item.food.apple=Яблоко for.extratrees.item.food.crabapple=Яблоко-дичка @@ -381,12 +381,12 @@ for.extratrees.item.food.mango=Манго for.extratrees.item.food.starfruit=Карамбола for.extratrees.item.food.candlenut=Лумбанг -extratrees.item.database=База данных лесовода -extratrees.item.masterDatabase=База данных лесовода-мастера +extratrees.item.database.name=База данных лесовода +extratrees.item.masterDatabase.name=База данных лесовода-мастера extratrees.item.database.tooltip=Sengir-в-банке -extratrees.item.mothDatabase=База данных бабочковеда -extratrees.item.mothMasterDatabase=База данных бабочковеда-мастера +extratrees.item.mothDatabase.name=База данных бабочковеда +extratrees.item.mothMasterDatabase.name=База данных бабочковеда-мастера extratrees.item.mothDatabase.tooltip=Эмпиум Binnie о чешуекрылых extratrees.fluid.sap=Живица diff --git a/src/main/resources/assets/extratrees/lang/zh_CN.lang b/src/main/resources/assets/extratrees/lang/zh_CN.lang index 75c8b4f6..994461df 100644 --- a/src/main/resources/assets/extratrees/lang/zh_CN.lang +++ b/src/main/resources/assets/extratrees/lang/zh_CN.lang @@ -312,13 +312,13 @@ extratrees.genetics.unknown=<未知> extratrees.genetics.discoveredBy=由 %s 发现 extratrees.genetics.complexity=复杂度:%d -extratrees.item.carpentryHammer=木工大师锤 -extratrees.item.masterCarpentryHammer=木工锤 -extratrees.item.sawdust=锯末 -extratrees.item.bark=树皮 -extratrees.item.provenGear=标定齿轮 -extratrees.item.woodWax=光泽剂 -extratrees.item.glassFitting=玻璃配件 +extratrees.item.carpentryHammer.name=木工大师锤 +extratrees.item.masterCarpentryHammer.name=木工锤 +extratrees.item.sawdust.name=锯末 +extratrees.item.bark.name=树皮 +extratrees.item.provenGear.name=标定齿轮 +extratrees.item.woodWax.name=光泽剂 +extratrees.item.glassFitting.name=玻璃配件 for.extratrees.item.food.apple=苹果 for.extratrees.item.food.crabapple=海棠果 @@ -383,12 +383,12 @@ for.extratrees.item.food.mango=芒果 for.extratrees.item.food.starfruit=杨桃 for.extratrees.item.food.candlenut=石栗 -extratrees.item.database=林业员数据库 -extratrees.item.masterDatabase=林业员大师数据库 +extratrees.item.database.name=林业员数据库 +extratrees.item.masterDatabase.name=林业员大师数据库 extratrees.item.database.tooltip=内含关于 Sir. Sengir 的一切 -extratrees.item.mothDatabase=鳞翅目昆虫学家数据库 -extratrees.item.mothMasterDatabase=鳞翅目昆虫学大师数据库 +extratrees.item.mothDatabase.name=鳞翅目昆虫学家数据库 +extratrees.item.mothMasterDatabase.name=鳞翅目昆虫学大师数据库 extratrees.item.mothDatabase.tooltip=Binnie 为所有鳞翅目昆虫学家留下的宝藏 extratrees.fluid.sap=树液