diff --git a/botany/src/main/java/binnie/botany/Botany.java b/botany/src/main/java/binnie/botany/Botany.java index 8039ca56..4cefd4e0 100644 --- a/botany/src/main/java/binnie/botany/Botany.java +++ b/botany/src/main/java/binnie/botany/Botany.java @@ -25,7 +25,7 @@ import binnie.genetics.api.acclimatiser.IAcclimatiserManager; @Mod( modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", - dependencies = "required-after:" + Constants.CORE_MOD_ID + dependencies = "required-after:" + Constants.CORE_MOD_ID + ";" + "after:" + Constants.GENETICS_MOD_ID ) public class Botany extends BlankModuleContainer { @@ -45,9 +45,11 @@ public class Botany extends BlankModuleContainer { GeneticsApi.registerAnalystPagePlugin(new FlowerAnalystPagePlugin()); IAcclimatiserManager acclimatiserManager = GeneticsApi.acclimatiserManager; - acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType()); - acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType()); - acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh()); + if(acclimatiserManager != null) { + acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType()); + acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType()); + acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh()); + } } @Mod.EventHandler diff --git a/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java index 22f883fb..072baebe 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java @@ -1,6 +1,5 @@ package binnie.botany.modules; -import binnie.core.modules.BotanyModuleUIDs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -10,14 +9,13 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; -import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.blocks.BlockCeramic; import binnie.botany.blocks.BlockCeramicBrick; import binnie.botany.blocks.BlockCeramicPatterned; import binnie.botany.blocks.BlockStainedGlass; -import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; import binnie.botany.items.CeramicItems; import binnie.botany.items.ItemCeramic; @@ -27,13 +25,15 @@ import binnie.botany.items.ItemPigment; import binnie.botany.items.ItemStainedGlass; import binnie.botany.recipes.CeramicTileRecipe; import binnie.botany.recipes.PigmentRecipe; +import binnie.core.Constants; import binnie.core.api.block.TileEntityMetadata; import binnie.core.item.ItemMisc; -import binnie.core.util.RecipeUtil; -import binnie.extratrees.items.ItemDesign; import binnie.core.modules.BinnieModule; +import binnie.core.modules.BotanyModuleUIDs; import binnie.core.modules.Module; import binnie.core.modules.ModuleManager; +import binnie.core.util.RecipeUtil; +import binnie.extratrees.items.ItemDesign; @BinnieModule(moduleID = BotanyModuleUIDs.CERAMIC, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Ceramic", unlocalizedDescription = "botany.module.ceramic") public class ModuleCeramic extends Module { @@ -70,7 +70,7 @@ public class ModuleCeramic extends Module { } @Override - public void postInit() { + public void init() { RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); ForgeRegistries.RECIPES.register(new CeramicTileRecipe()); diff --git a/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java b/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java index 4ee4e955..71e6a8c9 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java @@ -1,6 +1,5 @@ package binnie.botany.modules; -import binnie.core.modules.BotanyModuleUIDs; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -9,16 +8,18 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.recipes.RecipeManagers; -import binnie.core.Binnie; -import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.items.ItemDatabaseBotany; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.ManagerLiquid; import binnie.core.modules.BinnieModule; +import binnie.core.modules.BotanyModuleUIDs; import binnie.core.modules.Module; -import net.minecraftforge.oredict.OreDictionary; @BinnieModule(moduleID = BotanyModuleUIDs.DATABASE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Database", unlocalizedDescription = "botany.module.database") public class ModuleDatabase extends Module { @@ -32,7 +33,7 @@ public class ModuleDatabase extends Module { } @Override - public void postInit() { + public void init() { RecipeManagers.carpenterManager.addRecipe( 100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), diff --git a/botany/src/main/java/binnie/botany/modules/ModuleFarming.java b/botany/src/main/java/binnie/botany/modules/ModuleFarming.java index 9623ed66..7f5de0fd 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleFarming.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleFarming.java @@ -1,6 +1,5 @@ package binnie.botany.modules; -import binnie.core.modules.BotanyModuleUIDs; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -8,7 +7,6 @@ import java.util.Set; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumMoisture; @@ -16,10 +14,12 @@ import binnie.botany.farming.CircuitGarden; import binnie.botany.items.EnumTubeInsulate; import binnie.botany.items.EnumTubeMaterial; import binnie.botany.items.ItemInsulatedTube; +import binnie.core.Constants; import binnie.core.Mods; -import binnie.core.util.RecipeUtil; import binnie.core.modules.BinnieModule; +import binnie.core.modules.BotanyModuleUIDs; import binnie.core.modules.Module; +import binnie.core.util.RecipeUtil; @BinnieModule(moduleID = BotanyModuleUIDs.FARMING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Farming", unlocalizedDescription = "botany.module.farming") public class ModuleFarming extends Module { @@ -63,10 +63,7 @@ public class ModuleFarming extends Module { } } } - } - @Override - public void postInit() { for (EnumTubeMaterial mat: EnumTubeMaterial.VALUES) { RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); for (EnumTubeInsulate insulate : EnumTubeInsulate.VALUES) { diff --git a/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java b/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java index 83410991..f1a94b75 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java @@ -1,6 +1,5 @@ package binnie.botany.modules; -import binnie.botany.genetics.FlowerColorMutations; import com.google.common.collect.ImmutableSet; import javax.annotation.Nullable; @@ -43,6 +42,7 @@ import binnie.botany.api.genetics.IFlowerRoot; import binnie.botany.blocks.BlockFlower; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.FlowerBreedingSystem; +import binnie.botany.genetics.FlowerColorMutations; import binnie.botany.genetics.FlowerDefinition; import binnie.botany.genetics.FlowerFactory; import binnie.botany.genetics.allele.AlleleEffectNone; @@ -119,10 +119,7 @@ public class ModuleFlowers extends Module { public void init() { FlowerColorMutations.registerFlowerColorAlleles(); FlowerDefinition.initFlowers(); - } - @Override - public void postInit() { RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); FlowerManager.flowerRegistry.registerAcceptableFlower(flower, "flowersVanilla"); recipeUtil.addRecipe("botanist_backpack", botanistBackpack, diff --git a/botany/src/main/java/binnie/botany/modules/ModuleGardening.java b/botany/src/main/java/binnie/botany/modules/ModuleGardening.java index 8ca88c40..3d13a446 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleGardening.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleGardening.java @@ -3,7 +3,6 @@ package binnie.botany.modules; import java.util.Locale; import java.util.Map; -import binnie.core.modules.BotanyModuleUIDs; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -21,7 +20,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.gardening.EnumAcidity; @@ -41,12 +39,14 @@ import binnie.botany.items.ItemWeed; import binnie.botany.tile.TileCeramic; import binnie.botany.tile.TileCeramicBrick; import binnie.core.BinnieCore; +import binnie.core.Constants; import binnie.core.Mods; import binnie.core.item.ItemMisc; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.BotanyModuleUIDs; +import binnie.core.modules.Module; import binnie.core.util.OreDictionaryUtil; import binnie.core.util.RecipeUtil; -import binnie.core.modules.BinnieModule; -import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.GARDENING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Gardening", unlocalizedDescription = "botany.module.gardening") public class ModuleGardening extends Module { @@ -118,7 +118,7 @@ public class ModuleGardening extends Module { } @Override - public void postInit() { + public void init() { RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); IGardeningManager gardening = BotanyCore.getGardening(); diff --git a/botany/src/main/java/binnie/botany/modules/ModuleMachine.java b/botany/src/main/java/binnie/botany/modules/ModuleMachine.java index 539aba95..eb84ab60 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleMachine.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleMachine.java @@ -1,5 +1,11 @@ package binnie.botany.modules; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; + +import forestry.api.core.Tabs; + import binnie.botany.Botany; import binnie.botany.machines.BotanyMachine; import binnie.core.Constants; @@ -7,15 +13,11 @@ import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.core.modules.BinnieModule; import binnie.core.modules.BotanyModuleUIDs; +import binnie.core.modules.ExtraTreesModuleUIDs; import binnie.core.modules.Module; import binnie.core.modules.ModuleManager; import binnie.core.util.RecipeUtil; import binnie.extratrees.items.ExtraTreeItems; -import binnie.core.modules.ExtraTreesModuleUIDs; -import forestry.api.core.Tabs; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; @BinnieModule(moduleID = BotanyModuleUIDs.MACHINES, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Machines", unlocalizedDescription = "botany.module.machines") public class ModuleMachine extends Module { @@ -29,7 +31,7 @@ public class ModuleMachine extends Module { } @Override - public void postInit() { + public void init() { RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) { recipeUtil.addRecipe("tileworker", BotanyMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing")); diff --git a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java index fd9b624b..1eb7b0ba 100644 --- a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java +++ b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,29 +1,20 @@ package binnie.extrabees; -import binnie.core.api.genetics.IBreedingSystem; -import binnie.core.gui.BinnieGUIHandler; -import binnie.core.liquid.ManagerLiquid; -import binnie.extrabees.genetics.gui.analyst.AnalystPagePlugin; -import binnie.extrabees.gui.ExtraBeesGUID; -import binnie.genetics.api.GeneticsApi; import com.google.common.collect.Lists; +import javax.annotation.Nullable; import java.io.File; import java.lang.reflect.Method; import java.util.List; -import forestry.api.recipes.RecipeManagers; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; - -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; + import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -43,11 +34,15 @@ import forestry.core.proxy.Proxies; import binnie.core.Binnie; import binnie.core.Constants; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.gui.BinnieGUIHandler; import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart; import binnie.extrabees.genetics.BeeBreedingSystem; import binnie.extrabees.genetics.ExtraBeeDefinition; import binnie.extrabees.genetics.ExtraBeesFlowers; import binnie.extrabees.genetics.effect.ExtraBeesEffect; +import binnie.extrabees.genetics.gui.analyst.AnalystPagePlugin; +import binnie.extrabees.gui.ExtraBeesGUID; import binnie.extrabees.init.BlockRegister; import binnie.extrabees.init.ItemRegister; import binnie.extrabees.init.RecipeRegister; @@ -60,6 +55,7 @@ import binnie.extrabees.utils.MaterialBeehive; import binnie.extrabees.utils.config.ConfigHandler; import binnie.extrabees.utils.config.ConfigurationMain; import binnie.extrabees.worldgen.ExtraBeesWorldGenerator; +import binnie.genetics.api.GeneticsApi; @Mod( modid = ExtraBees.MODID, @@ -84,16 +80,25 @@ public class ExtraBees { public static ConfigHandler configHandler; + @Nullable public static Material materialBeehive; + @Nullable public static Block hive; + @Nullable public static Block alveary; + @Nullable public static Block ectoplasm; + @Nullable public static Item comb; + @Nullable public static Item propolis; + @Nullable public static Item honeyDrop; + @Nullable public static ItemHoneyCrystal honeyCrystal; - public static Item dictionary; + @Nullable public static ItemMiscProduct itemMisc; + @Nullable public static Item dictionaryBees; @Mod.EventHandler @@ -104,13 +109,7 @@ public class ExtraBees { configHandler.addConfigurable(new ConfigurationMain()); BlockRegister.preInitBlocks(); ItemRegister.preInitItems(); - try { - Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class); - m.setAccessible(true); - m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)}); - } catch (Exception e) { - throw new RuntimeException(e); - } + registerGuis(); Proxies.render.registerModels(); NetworkRegistry.INSTANCE.registerGuiHandler(this, new BinnieGUIHandler(ExtraBeesGUID.values())); @@ -131,27 +130,24 @@ public class ExtraBees { ExtraBeesEffect.doInit(); ExtraBeesFlowers.doInit(); ExtraBeeDefinition.doInit(); + BlockRegister.doInitBlocks(); + RecipeRegister.doInitRecipes(); } @Mod.EventHandler public void postInit(final FMLPostInitializationEvent evt) { - BlockRegister.postInitBlocks(); - RecipeRegister.postInitRecipes(); //Register mutations AlvearyMutationHandler.registerMutationItems(); - RecipeManagers.carpenterManager.addRecipe( - 100, - Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), - ItemStack.EMPTY, - new ItemStack(dictionaryBees), - "X#X", "YEY", "RDR", - '#', Blocks.GLASS_PANE, - 'X', Items.GOLD_INGOT, - 'Y', "ingotTin", - 'R', Items.REDSTONE, - 'D', Items.DIAMOND, - 'E', Items.EMERALD - ); + } + + private void registerGuis(){ + try { + Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class); + m.setAccessible(true); + m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)}); + } catch (Exception e) { + throw new RuntimeException(e); + } } @SubscribeEvent diff --git a/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java b/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java index 84109b57..6ce407d3 100644 --- a/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -26,7 +26,7 @@ public final class BlockRegister { GameRegistry.registerTileEntity(TileEntityExtraBeesAlvearyPart.class, "TileEntityExtraBeesAlvearyPart"); } - public static void postInitBlocks() { + public static void doInitBlocks() { registerHiveDrops(); } diff --git a/extrabees/src/main/java/binnie/extrabees/init/RecipeRegister.java b/extrabees/src/main/java/binnie/extrabees/init/RecipeRegister.java index f2bdf869..5c28ab3a 100644 --- a/extrabees/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/extrabees/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -18,6 +18,8 @@ import forestry.apiculture.blocks.BlockAlvearyType; import forestry.core.PluginCore; import forestry.core.fluids.Fluids; +import binnie.core.Binnie; +import binnie.core.liquid.ManagerLiquid; import binnie.core.util.RecipeUtil; import binnie.extrabees.ExtraBees; import binnie.extrabees.alveary.EnumAlvearyLogicType; @@ -29,12 +31,11 @@ import binnie.extrabees.items.types.EnumHoneyComb; import binnie.extrabees.items.types.EnumHoneyDrop; import binnie.extrabees.items.types.EnumPropolis; import binnie.extrabees.items.types.ExtraBeeItems; -import binnie.extrabees.utils.Utils; public final class RecipeRegister { private static final RecipeUtil RECIPE_UTIL = new RecipeUtil(ExtraBees.MODID); - public static void postInitRecipes() { + public static void doInitRecipes() { if (Loader.isModLoaded("ic2")) { RECIPE_UTIL.addRecipe("honey_crystal", ExtraBees.honeyCrystal.getCharged(0), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1)); } @@ -49,7 +50,6 @@ public final class RecipeRegister { } EnumHiveFrame.init(RECIPE_UTIL); addForestryRecipes(); - addForestryRecipes(); addMiscItemRecipes(); addAlvearyRecipes(); } @@ -77,7 +77,19 @@ public final class RecipeRegister { } private static void addForestryRecipes() { - RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe( + 100, + Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), + ItemStack.EMPTY, + new ItemStack(ExtraBees.dictionaryBees), + "X#X", "YEY", "RDR", + '#', Blocks.GLASS_PANE, + 'X', Items.GOLD_INGOT, + 'Y', "ingotTin", + 'R', Items.REDSTONE, + 'D', Items.DIAMOND, + 'E', Items.EMERALD + ); } private static void addMiscItemRecipes() { diff --git a/extrabees/src/main/java/binnie/extrabees/package-info.java b/extrabees/src/main/java/binnie/extrabees/package-info.java new file mode 100644 index 00000000..2e6fad99 --- /dev/null +++ b/extrabees/src/main/java/binnie/extrabees/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleAlcohol.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleAlcohol.java index 6d12c4e4..c829354d 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleAlcohol.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleAlcohol.java @@ -68,7 +68,7 @@ public class ModuleAlcohol extends Module { } @Override - public void postInit() { + public void init() { IBreweryManager breweryManager = ExtraTreesRecipeManager.breweryManager; IFruitPressManager fruitPressManager = ExtraTreesRecipeManager.fruitPressManager; diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java index f3960186..52cb7bd1 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java @@ -101,10 +101,6 @@ public class ModuleCarpentry extends Module { MinecraftForge.EVENT_BUS.register(blockCarpentry); } - @Override - public void init() { - } - @Override public void postInit() { for (final EnumDesign design : EnumDesign.values()) { diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java index 0ffcacc1..bd3a54f1 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java @@ -148,10 +148,7 @@ public class ModuleCore extends Module { Food.MANGO.addJuice(10, 400, 20); Food.STARFRUIT.addJuice(10, 300, 10); Food.CANDLENUT.addJuice(20, 50, 10); - } - @Override - public void postInit() { RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); MinecraftForge.addGrassSeed(new ItemStack(itemHops), 5); @@ -185,107 +182,6 @@ public class ModuleCore extends Module { FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Resin.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Resin.get(1).getFluid(), 30, 10000, 1)); - /* if (BinnieCore.getBinnieProxy().isDebug()) { - try { - final PrintWriter outputSpecies = new PrintWriter(new FileWriter("data/species.html")); - final PrintWriter outputLogs = new PrintWriter(new FileWriter("data/logs.html")); - final PrintWriter outputPlanks = new PrintWriter(new FileWriter("data/planks.html")); - final PrintWriter outputFruit = new PrintWriter(new FileWriter("data/fruit.html")); - final PrintWriter outputDesigns = new PrintWriter(new FileWriter("data/designs.html")); - final Queue speciesQueue = new LinkedList<>(); - for (final ETTreeDefinition s : ETTreeDefinition.values()) { - speciesQueue.add(s.getSpecies()); - } - final Queue logQueue = new LinkedList<>(); - Collections.addAll(logQueue, EnumETLog.values()); - final Queue plankQueue = new LinkedList<>(); - Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values()); - final Queue fruitQueue = new LinkedList<>(); - fruitQueue.addAll(AlleleETFruit.values()); - final Queue designQueue = new LinkedList<>(); - designQueue.addAll(CarpentryManager.carpentryInterface.getSortedDesigns()); - fruitQueue.remove(AlleleETFruit.Apple); - outputSpecies.println(""); - while (!speciesQueue.isEmpty()) { - outputSpecies.println(""); - for (int i = 0; i < 4; ++i) { - final IAlleleTreeSpecies species = speciesQueue.poll(); - outputSpecies.println(""); - } - outputSpecies.println(""); - } - outputSpecies.println("
" + ((species == null) ? "" : species.getAlleleName()) + "
"); - outputLogs.println(""); - while (!logQueue.isEmpty()) { - outputLogs.println(""); - for (int i = 0; i < 4; ++i) { - final EnumETLog wood5 = (EnumETLog) logQueue.poll(); - if (wood5 == null) { - outputLogs.println(""); - } else { - final String img = "\"""; - outputLogs.println(""); - } - } - outputLogs.println(""); - } - outputLogs.println("
" + img + " " + wood5.getName() + "
"); - outputPlanks.println(""); - while (!plankQueue.isEmpty()) { - outputPlanks.println(""); - for (int i = 0; i < 4; ++i) { - final IDesignMaterial wood2 = plankQueue.poll(); - if (wood2 == null) { - outputPlanks.println(""); - } else { - final String img = "\"""; - outputPlanks.println(""); - } - } - outputPlanks.println(""); - } - outputPlanks.println("
" + img + " " + wood2.getDesignMaterialName() + "
"); - outputFruit.println(""); - while (!fruitQueue.isEmpty()) { - outputFruit.println(""); - for (int i = 0; i < 4; ++i) { - final AlleleETFruit wood6 = fruitQueue.poll(); - if (wood6 == null) { - outputFruit.println(""); - } else { - final String fruit = wood6.getNameOfFruit(); - final String img2 = "\"""; - outputFruit.println(""); - } - } - outputFruit.println(""); - } - outputFruit.println("
" + img2 + " " + wood6.getAlleleName() + "
"); - outputDesigns.println(""); - while (!designQueue.isEmpty()) { - outputDesigns.println(""); - for (int i = 0; i < 4; ++i) { - final IDesign wood4 = designQueue.poll(); - if (wood4 == null) { - outputDesigns.println(""); - } else { - final String texture = wood4.getTopPattern().getPattern().toString().toLowerCase(); - final String img2 = "\"""; - outputDesigns.println(""); - } - } - outputDesigns.println(""); - } - outputDesigns.println("
" + img2 + " " + wood4.getName() + "
"); - outputSpecies.close(); - outputLogs.close(); - outputPlanks.close(); - outputFruit.close(); - outputDesigns.close(); - } catch (IOException e) { - e.printStackTrace(); - } - }*/ } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleKitchen.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleKitchen.java index 11a30ebc..7402261a 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleKitchen.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleKitchen.java @@ -21,12 +21,4 @@ public class ModuleKitchen extends Module { machineGroup.customRenderer = false; blockKitchen = machineGroup.getBlock();*/ } - - @Override - public void init() { - } - - @Override - public void postInit() { - } } diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleMachine.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMachine.java index 870cf904..5f7b6333 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMachine.java @@ -61,7 +61,7 @@ public class ModuleMachine extends Module { } @Override - public void postInit() { + public void init() { RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); recipeUtil.addRecipe("lumbermill", ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); recipeUtil.addRecipe("press", ExtraTreeMachine.Press.get(1), "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.GLASS, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java index a4ac8489..73ac7103 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java @@ -5,19 +5,20 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.recipes.ICarpenterManager; import forestry.api.recipes.RecipeManagers; import binnie.core.Binnie; -import binnie.core.Constants; import binnie.core.BinnieCore; +import binnie.core.Constants; import binnie.core.liquid.ManagerLiquid; +import binnie.core.modules.BinnieModule; import binnie.core.modules.ExtraTreesModuleUIDs; +import binnie.core.modules.Module; import binnie.extratrees.ExtraTrees; import binnie.extratrees.items.ItemMothDatabase; -import binnie.core.modules.BinnieModule; -import binnie.core.modules.Module; -import net.minecraftforge.oredict.OreDictionary; @BinnieModule(moduleID = ExtraTreesModuleUIDs.MOTH_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.moth") public class ModuleMothDatabase extends Module { @@ -32,7 +33,7 @@ public class ModuleMothDatabase extends Module { } @Override - public void postInit() { + public void init() { ICarpenterManager carpenterManager = RecipeManagers.carpenterManager; carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java index 4836479c..f55027fb 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java @@ -5,18 +5,19 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.recipes.ICarpenterManager; import forestry.api.recipes.RecipeManagers; import binnie.core.Binnie; import binnie.core.Constants; import binnie.core.liquid.ManagerLiquid; +import binnie.core.modules.BinnieModule; import binnie.core.modules.ExtraTreesModuleUIDs; +import binnie.core.modules.Module; import binnie.extratrees.ExtraTrees; import binnie.extratrees.items.ItemArboristDatabase; -import binnie.core.modules.BinnieModule; -import binnie.core.modules.Module; -import net.minecraftforge.oredict.OreDictionary; @BinnieModule(moduleID = ExtraTreesModuleUIDs.TREE_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.tree") public class ModuleTreeDatabase extends Module { @@ -30,7 +31,7 @@ public class ModuleTreeDatabase extends Module { } @Override - public void postInit() { + public void init() { ICarpenterManager carpenterManager = RecipeManagers.carpenterManager; carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(ModuleTreeDatabase.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java index c3e0346b..1dc186a7 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java @@ -128,10 +128,6 @@ public class ModuleWood extends Module { public static IBreedingSystem treeBreedingSystem; - //TODO: Unused ? - public static String[] branches = new String[]{"Malus Maleae Amygdaloideae Rosaceae", "Musa Musaceae Zingiberales Commelinids Angiosperms", "Sorbus Maleae", "Tsuga Pinaceae", "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems"};; - public static List> classifications = new ArrayList<>(); - private static void registerOreDictWildcard(String oreDictName, Block block) { OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); } @@ -142,7 +138,7 @@ public class ModuleWood extends Module { } @Override - public void preInit() { + public void registerItemsAndBlocks() { MinecraftForge.EVENT_BUS.register(this); WoodAccess woodAccess = WoodAccess.getInstance(); registerPlanks(); @@ -372,10 +368,7 @@ public class ModuleWood extends Module { if (BinnieCore.isLepidopteryActive()) { ButterflySpecies.initButterflies(); } - } - @Override - public void postInit() { RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); for (BlockETLog log : logs) { ItemStack logInput = new ItemStack(log, 1, OreDictionary.WILDCARD_VALUE); diff --git a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java index 014bacb9..b54157b5 100644 --- a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java @@ -1,7 +1,18 @@ package binnie.genetics.item; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.GameRegistry; + +import forestry.api.recipes.RecipeManagers; + import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.Constants; @@ -15,13 +26,6 @@ import binnie.core.util.RecipeUtil; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.recipes.RegistryRecipe; -import com.google.common.base.Preconditions; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; public class ModuleItems implements IInitializable { public static BinnieSprite iconNight; @@ -94,7 +98,7 @@ public class ModuleItems implements IInitializable { } @Override - public void postInit() { + public void init() { RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID); recipeUtil.addShapelessRecipe("dna_dye_from_glowstone", GeneticsItems.DNADye.get(8), Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5) diff --git a/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java b/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java index a1cbb0d4..8ed6228e 100644 --- a/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -1,17 +1,17 @@ package binnie.genetics.machine; -import binnie.core.Constants; -import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraftforge.oredict.OreDictionary; +import binnie.core.Constants; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.core.machines.inventory.ValidatorSprite; +import binnie.core.util.RecipeUtil; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; @@ -47,10 +47,7 @@ public class ModuleMachine implements IInitializable { @Override public void init() { Incubator.addRecipes(); - } - @Override - public void postInit() { RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID); Acclimatiser.setupRecipes(); final Object[] standardCircuit = {Mods.Forestry.stack("chipsets", 1, 1)};