diff --git a/src/main/java/binnie/botany/modules/ModuleFlowers.java b/src/main/java/binnie/botany/modules/ModuleFlowers.java index 2697ed5e..246f3647 100644 --- a/src/main/java/binnie/botany/modules/ModuleFlowers.java +++ b/src/main/java/binnie/botany/modules/ModuleFlowers.java @@ -71,15 +71,12 @@ public class ModuleFlowers extends Module { } @Override - public void preInit() { - MinecraftForge.EVENT_BUS.register(this); + public void registerItemsAndBlocks() { AlleleManager.alleleRegistry.registerAllele(ModuleFlowers.alleleEffectNone); EnumFlowerColor.setupMutations(); FlowerDefinition.preInitFlowers(); - - /* BACKPACK*/ - IBackpackInterface backpackInterface = BackpackManager.backpackInterface; + IBackpackInterface backpackInterface = BackpackManager.backpackInterface; if (ForestryAPI.enabledPlugins.contains("forestry.storage")) { Predicate filter = BackpackManager.backpackInterface.createNaturalistBackpackFilter("rootFlowers"); BackpackDefinition definition = new BackpackDefinition(new Color(0xf6e83e), Color.WHITE, filter); @@ -90,7 +87,7 @@ public class ModuleFlowers extends Module { } else { botanistBackpack = null; } - + /* ITEMS */ flower = new BlockFlower(); flowerItem = new ItemFlowerGE("itemFlower", EnumFlowerStage.FLOWER, ""); @@ -105,6 +102,11 @@ public class ModuleFlowers extends Module { BinnieCore.getBinnieProxy().registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null); } + @Override + public void preInit() { + MinecraftForge.EVENT_BUS.register(this); + } + @Override public void init() { EnumFlowerColor.initColours(); diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 659dc4d8..8448e305 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -71,11 +71,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { @Override public void preInit(FMLPreInitializationEvent event) { getProxy().setMod(this); - if (!this.isAvailable()) { - disabledSetupAPI(); - return; - } - setupAPI(); registerModules(); for (final Class cls : this.getConfigs()) { Binnie.CONFIGURATION.registerConfiguration(cls, this); @@ -99,10 +94,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { @Override public void init() { - if (!this.isAvailable()) { - disabledSetupAPI(); - return; - } this.getProxy().init(); this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel()); this.wrapper.registerMessage(this.getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT); @@ -115,10 +106,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { @Override public void postInit() { - if (!this.isAvailable()) { - disabledSetupAPI(); - return; - } this.getProxy().postInit(); for (final IInitializable module : this.modules) { module.postInit(); @@ -126,9 +113,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { } protected final void addModule(IInitializable init) { - if(!init.isAvailable()) { - return; - } this.modules.add(init); MinecraftForge.EVENT_BUS.register(init); } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 88356707..8adf71fe 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -161,9 +161,9 @@ public final class BinnieCore extends AbstractMod { @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { - ModuleManager.loadModules(evt); MinecraftForge.EVENT_BUS.register(Binnie.LIQUID); Binnie.CONFIGURATION.registerConfiguration(ConfigurationMods.class, this); + ModuleManager.loadModules(evt); for (FluidContainerType container : FluidContainerType.getBinnieContainers()) { Item item = new ItemFluidContainer(container); getProxy().registerItem(item); diff --git a/src/main/java/binnie/core/IInitializable.java b/src/main/java/binnie/core/IInitializable.java index b231094d..c00e4e39 100644 --- a/src/main/java/binnie/core/IInitializable.java +++ b/src/main/java/binnie/core/IInitializable.java @@ -28,19 +28,4 @@ public interface IInitializable { default void postInit(FMLPostInitializationEvent event){ postInit(); } - - /** - * For compat modules if the mod is not loaded the module will not be registered. - */ - default boolean isAvailable(){ - return true; - } - - default void setupAPI(){ - - } - - default void disabledSetupAPI(){ - - } } diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 6e730595..09084a6b 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -123,7 +123,7 @@ public class ModuleAlcohol extends Module { breweryManager.addGrainRecipe(OreDictionaryUtil.GRAIN_BARLEY, Alcohol.Ale.get(), OreDictionaryUtil.HOPS); - breweryManager.addGrainRecipe(OreDictionaryUtil.GRAIN_BARLEY, Alcohol.Lager.get(), OreDictionaryUtil.HOPS, ExtraTreeItems.LagerYeast.get(1)); + breweryManager.addGrainRecipe(OreDictionaryUtil.GRAIN_BARLEY, Alcohol.Lager.get(), OreDictionaryUtil.HOPS, ExtraTreeItems.LAGER_YEAST.get(1)); breweryManager.addGrainRecipe(OreDictionaryUtil.GRAIN_ROASTED, Alcohol.Stout.get(), OreDictionaryUtil.HOPS); breweryManager.addGrainRecipe(OreDictionaryUtil.GRAIN_CORN, Alcohol.CornBeer.get(), OreDictionaryUtil.HOPS); breweryManager.addGrainRecipe(OreDictionaryUtil.GRAIN_RYE, Alcohol.RyeBeer.get(), OreDictionaryUtil.HOPS); diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index c589f8ba..5dd2dfea 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -3,12 +3,12 @@ package binnie.extratrees.block; import java.util.Locale; public enum FruitPod { - Cocoa, - Banana, - Coconut, - Plantain, - RedBanana, - Papayimar; + COCOA, + BANANA, + COCONUT, + PLANTAIN, + RED_BANANA, + PAPAYIMAR; FruitPod() { } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index 50467496..fc8c7622 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -129,10 +129,10 @@ public enum DesignSystem implements IDesignSystem { public ItemStack getAdhesive() { switch (this) { case Glass: { - return ExtraTreeItems.GlassFitting.get(1); + return ExtraTreeItems.GLASS_FITTING.get(1); } case Wood: { - return ExtraTreeItems.WoodWax.get(1); + return ExtraTreeItems.WOOD_WAX.get(1); } default: { throw new IllegalStateException("Unknown design system: " + this); diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 4b96e850..ca73b01c 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -8,8 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -25,6 +23,7 @@ import binnie.Constants; import binnie.core.Mods; import binnie.core.item.ItemMisc; import binnie.core.liquid.ManagerLiquid; +import binnie.core.util.RecipeUtil; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.BlockHops; import binnie.extratrees.item.ExtraTreeItems; @@ -67,18 +66,18 @@ public class ModuleCore extends Module { itemHops = new ItemHops(hops, Blocks.FARMLAND); ExtraTrees.proxy.registerItem(itemHops); - OreDictionary.registerOre("pulpWood", ExtraTreeItems.Sawdust.get(1)); + OreDictionary.registerOre("pulpWood", ExtraTreeItems.SAWDUST.get(1)); Food.registerOreDictionary(); OreDictionary.registerOre("cropApple", Items.APPLE); OreDictionary.registerOre("cropHops", itemHops); OreDictionary.registerOre("seedWheat", Items.WHEAT_SEEDS); - OreDictionary.registerOre("seedWheat", ExtraTreeItems.GrainWheat.get(1)); - OreDictionary.registerOre("seedBarley", ExtraTreeItems.GrainBarley.get(1)); - OreDictionary.registerOre("seedCorn", ExtraTreeItems.GrainCorn.get(1)); - OreDictionary.registerOre("seedRye", ExtraTreeItems.GrainRye.get(1)); - OreDictionary.registerOre("seedRoasted", ExtraTreeItems.GrainRoasted.get(1)); + OreDictionary.registerOre("seedWheat", ExtraTreeItems.GRAIN_WHEAT.get(1)); + OreDictionary.registerOre("seedBarley", ExtraTreeItems.GRAIN_BARLEY.get(1)); + OreDictionary.registerOre("seedCorn", ExtraTreeItems.GRAIN_CORN.get(1)); + OreDictionary.registerOre("seedRye", ExtraTreeItems.GRAIN_RYE.get(1)); + OreDictionary.registerOre("seedRoasted", ExtraTreeItems.GRAIN_ROASTED.get(1)); - OreDictionary.registerOre("gearWood", ExtraTreeItems.ProvenGear.get(1)); + OreDictionary.registerOre("gearWood", ExtraTreeItems.PROVEN_GEAR.get(1)); } @Override @@ -141,34 +140,35 @@ public class ModuleCore extends Module { @Override public void postInit() { + RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); MinecraftForge.addGrassSeed(new ItemStack(itemHops), 5); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.LagerYeast.get(8), "mbm", " m ", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); - GameRegistry.addRecipe(ExtraTreeItems.GrainWheat.get(5), " s ", "sss", " s ", 's', Items.WHEAT_SEEDS); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.GrainBarley.get(3), false, " s ", "s ", " s ", 's', ExtraTreeItems.GrainWheat.get(1))); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.GrainCorn.get(3), false, " s ", " s", " s ", 's', ExtraTreeItems.GrainWheat.get(1))); - GameRegistry.addRecipe(ExtraTreeItems.GrainRye.get(3), " ", "s s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); - GameRegistry.addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oak_stick")); - GameRegistry.addRecipe(ExtraTreeItems.GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.IRON_INGOT, 's', Items.STICK); - GameRegistry.addSmelting(ExtraTreeItems.GrainWheat.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); - GameRegistry.addSmelting(ExtraTreeItems.GrainRye.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); - GameRegistry.addSmelting(ExtraTreeItems.GrainCorn.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); - GameRegistry.addSmelting(ExtraTreeItems.GrainBarley.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); + recipeUtil.addRecipe("durable_hammer", new ItemStack(itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK); + recipeUtil.addRecipe("hammer", new ItemStack(itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK); + recipeUtil.addRecipe("yeast", ExtraTreeItems.YEAST.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM); + recipeUtil.addRecipe("lager_yeast", ExtraTreeItems.LAGER_YEAST.get(8), "mbm", " m ", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM); + recipeUtil.addRecipe("grain_wheat", ExtraTreeItems.GRAIN_WHEAT.get(5), " s ", "sss", " s ", 's', Items.WHEAT_SEEDS); + recipeUtil.addRecipe("grain_barley", ExtraTreeItems.GRAIN_BARLEY.get(3), false, " s ", "s ", " s ", 's', ExtraTreeItems.GRAIN_WHEAT.get(1)); + recipeUtil.addRecipe("grain_corn", ExtraTreeItems.GRAIN_CORN.get(3), false, " s ", " s", " s ", 's', ExtraTreeItems.GRAIN_WHEAT.get(1)); + recipeUtil.addRecipe("grain_rye", ExtraTreeItems.GRAIN_RYE.get(3), " ", "s s", " s ", 's', ExtraTreeItems.GRAIN_WHEAT.get(1)); + recipeUtil.addRecipe("proven_gear", ExtraTreeItems.PROVEN_GEAR.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oak_stick")); + recipeUtil.addRecipe("glass_fitting", ExtraTreeItems.GLASS_FITTING.get(6), "s s", " i ", "s s", 'i', Items.IRON_INGOT, 's', Items.STICK); + GameRegistry.addSmelting(ExtraTreeItems.GRAIN_WHEAT.get(1), ExtraTreeItems.GRAIN_ROASTED.get(1), 0.0f); + GameRegistry.addSmelting(ExtraTreeItems.GRAIN_RYE.get(1), ExtraTreeItems.GRAIN_ROASTED.get(1), 0.0f); + GameRegistry.addSmelting(ExtraTreeItems.GRAIN_CORN.get(1), ExtraTreeItems.GRAIN_ROASTED.get(1), 0.0f); + GameRegistry.addSmelting(ExtraTreeItems.GRAIN_BARLEY.get(1), ExtraTreeItems.GRAIN_ROASTED.get(1), 0.0f); try { final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("minium_shard").get(null); - GameRegistry.addRecipe(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); + recipeUtil.addShapelessRecipe("papayimar", Food.PAPAYIMAR.get(1), minium, "cropPapaya"); } catch (Exception ignored) { } ICarpenterManager carpenterManager = RecipeManagers.carpenterManager; IStillManager stillManager = RecipeManagers.stillManager; stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), ItemStack.EMPTY, itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); + carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), ItemStack.EMPTY, itemMisc.getStack(ExtraTreeItems.WOOD_WAX, 4), "x", 'x', Mods.Forestry.stack("beeswax")); FluidStack creosoteOil = Binnie.LIQUID.getFluidStack(ManagerLiquid.CREOSOTE, 50); if (creosoteOil != null) { - carpenterManager.addRecipe(25, creosoteOil, ItemStack.EMPTY, itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); + carpenterManager.addRecipe(25, creosoteOil, ItemStack.EMPTY, itemMisc.getStack(ExtraTreeItems.WOOD_WAX, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 3f4697d7..bf7c26d8 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -67,9 +67,9 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public static final AlleleETFruit BuddhaHand = new AlleleETFruit("BuddhaHand", 10, 3665987, 16772192, FruitSprite.LARGE); public static final AlleleETFruit Apple = new AlleleETFruit("Apple", 10, 7915859, 16193046, FruitSprite.AVERAGE); public static final AlleleETFruit Crabapple = new AlleleETFruit("Crabapple", 10, 7915859, 16760140, FruitSprite.AVERAGE); - public static final AlleleETFruit Banana = new AlleleETFruit("Banana", FruitPod.Banana); - public static final AlleleETFruit RedBanana = new AlleleETFruit("Red Banana", FruitPod.RedBanana); - public static final AlleleETFruit Plantain = new AlleleETFruit("Platain", FruitPod.Plantain); + public static final AlleleETFruit Banana = new AlleleETFruit("Banana", FruitPod.BANANA); + public static final AlleleETFruit RedBanana = new AlleleETFruit("Red Banana", FruitPod.RED_BANANA); + public static final AlleleETFruit Plantain = new AlleleETFruit("Platain", FruitPod.PLANTAIN); public static final AlleleETFruit Hazelnut = new AlleleETFruit("Hazelnut", 7, 8223006, 14463606, FruitSprite.SMALL); public static final AlleleETFruit Butternut = new AlleleETFruit("Butternut", 7, 11712336, 16102498, FruitSprite.SMALL); public static final AlleleETFruit Beechnut = new AlleleETFruit("Beechnut", 8, 14401148, 6241845, FruitSprite.TINY); @@ -84,7 +84,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public static final AlleleETFruit Pear = new AlleleETFruit("Pear", 10, 10456913, 10474833, FruitSprite.PEAR); public static final AlleleETFruit OsangeOsange = new AlleleETFruit("OsangeOsange", 10, 9934674, 10665767, FruitSprite.LARGER); public static final AlleleETFruit Clove = new AlleleETFruit("Clove", 9, 6847532, 11224133, FruitSprite.TINY); - public static final AlleleETFruit Coconut = new AlleleETFruit("Coconut", FruitPod.Coconut); + public static final AlleleETFruit Coconut = new AlleleETFruit("Coconut", FruitPod.COCONUT); public static final AlleleETFruit Cashew = new AlleleETFruit("Cashew", 8, 12879132, 15289111, FruitSprite.AVERAGE); public static final AlleleETFruit Avacado = new AlleleETFruit("Avacado", 10, 10272370, 2170640, FruitSprite.PEAR); public static final AlleleETFruit Nutmeg = new AlleleETFruit("Nutmeg", 9, 14861101, 11305813, FruitSprite.TINY); @@ -94,7 +94,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public static final AlleleETFruit Mango = new AlleleETFruit("Mango", 10, 6654997, 15902262, FruitSprite.AVERAGE); public static final AlleleETFruit Starfruit = new AlleleETFruit("Starfruit", 10, 9814541, 15061550, FruitSprite.AVERAGE); public static final AlleleETFruit Candlenut = new AlleleETFruit("Candlenut", 8, 8235123, 14600882, FruitSprite.SMALL); - public static final AlleleETFruit Papayimar = new AlleleETFruit("Papayimar", FruitPod.Papayimar); + public static final AlleleETFruit Papayimar = new AlleleETFruit("Papayimar", FruitPod.PAPAYIMAR); public static final AlleleETFruit Blackcurrant = new AlleleETFruit("Blackcurrant", 8, 9407571, 4935251, FruitSprite.TINY); public static final AlleleETFruit Redcurrant = new AlleleETFruit("Redcurrant", 8, 13008910, 15080974, FruitSprite.TINY); public static final AlleleETFruit Blackberry = new AlleleETFruit("Blackberry", 8, 9399665, 4801393, FruitSprite.TINY); diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java index 2ea0aec4..ff4bca0c 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java @@ -24,7 +24,7 @@ public class BreweryRecipeHandler extends GenericRecipeHandler { public static void addRecipe(ILiquidStack input, ILiquidStack output, @Optional IItemStack yeast){ FluidStack inputStack = CraftTweakerUtil.getLiquidStack(input); FluidStack outputStack = CraftTweakerUtil.getLiquidStack(output); - ItemStack yeastStack = ExtraTreeItems.Yeast.get(1); + ItemStack yeastStack = ExtraTreeItems.YEAST.get(1); if(yeast != null) { yeastStack = CraftTweakerUtil.getItemStack(yeast); } @@ -34,7 +34,7 @@ public class BreweryRecipeHandler extends GenericRecipeHandler { @ZenMethod public static void addGrainRecipe(IOreDictEntry grainOreName, ILiquidStack output, @Optional IOreDictEntry ingredientOreName, @Optional IItemStack yeast){ FluidStack outputStack = CraftTweakerUtil.getLiquidStack(output); - ItemStack yeastStack = ExtraTreeItems.Yeast.get(1); + ItemStack yeastStack = ExtraTreeItems.YEAST.get(1); if(yeast != null) { yeastStack = CraftTweakerUtil.getItemStack(yeast); } diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java index 9b3c36b3..9931529b 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java @@ -31,7 +31,7 @@ public class LumbermillRecipeWrapper extends BlankRecipeWrapper { ingredients.setOutputs(ItemStack.class, Arrays.asList( ExtraTreeItems.Bark.get(1), outputPlanks, - ExtraTreeItems.Sawdust.get(1) + ExtraTreeItems.SAWDUST.get(1) )); } } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index 29af48ad..bc908997 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -12,19 +12,19 @@ import binnie.core.util.I18N; import binnie.extratrees.core.ModuleCore; public enum ExtraTreeItems implements IItemMiscProvider { - CarpentryHammer("carpentry_hammer"), - Sawdust("sawdust"), + CARPENTRY_HAMMER("carpentry_hammer"), + SAWDUST("sawdust"), Bark("bark"), - ProvenGear("proven_gear"), - WoodWax("wood_wax"), - Yeast("yeast"), - LagerYeast("yeast_lager"), - GrainWheat("grain_wheat"), - GrainBarley("grain_barley"), - GrainRye("grain_rye"), - GrainCorn("grain_corn"), - GrainRoasted("grain_roasted"), - GlassFitting("glass_fitting"); + PROVEN_GEAR("proven_gear"), + WOOD_WAX("wood_wax"), + YEAST("yeast"), + LAGER_YEAST("yeast_lager"), + GRAIN_WHEAT("grain_wheat"), + GRAIN_BARLEY("grain_barley"), + GRAIN_RYE("grain_rye"), + GRAIN_CORN("grain_corn"), + GRAIN_ROASTED("grain_roasted"), + GLASS_FITTING("glass_fitting"); String name; @@ -49,7 +49,7 @@ public enum ExtraTreeItems implements IItemMiscProvider { @Override public boolean isActive() { - return this != ExtraTreeItems.CarpentryHammer; + return this != ExtraTreeItems.CARPENTRY_HAMMER; } @Override diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index ef59266c..890f5923 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -6,18 +6,12 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import net.minecraftforge.fml.common.registry.GameRegistry; - import forestry.api.core.Tabs; -import binnie.Constants; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.core.machines.inventory.ValidatorSprite; -import binnie.core.util.RecipeUtil; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; import binnie.extratrees.item.ExtraTreeItems; @@ -68,15 +62,15 @@ public class ModuleMachine extends Module { @Override public void postInit() { RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); - recipeUtil.addRecipe("lumbermill", ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); + 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"); recipeUtil.addRecipe("brewery", ExtraTreeMachine.BREWERY.get(1), "bGb", "iSi", "bPb", 'i', "ingotIron", 'G', Blocks.GLASS, 'b', "gearBronze", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); recipeUtil.addRecipe("distillery", ExtraTreeMachine.Distillery.get(1), "rGr", "iSi", "rPr", 'i', "ingotIron", 'G', Blocks.GLASS, 'r', "dustRedstone", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); if(ModuleManager.isEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)){ - recipeUtil.addRecipe("woodworker", ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnated_casing")); - recipeUtil.addRecipe("panelworker", ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnated_casing")); - recipeUtil.addRecipe("glassworker", ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnated_casing")); - recipeUtil.addRecipe("tileworker", ExtraTreeMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("woodworker", ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("panelworker", ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("glassworker", ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("tileworker", ExtraTreeMachine.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")); } LumbermillRecipeManager.calculateProducts(); } diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java b/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java index 7ef532e9..72c8cf8c 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java +++ b/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java @@ -110,7 +110,7 @@ public class BreweryRecipeManager implements IBreweryManager { @Override public void addRecipe(FluidStack input, FluidStack output) { - addRecipe(input, output, ExtraTreeItems.Yeast.get(1)); + addRecipe(input, output, ExtraTreeItems.YEAST.get(1)); } @Override @@ -125,7 +125,7 @@ public class BreweryRecipeManager implements IBreweryManager { @Override public void addGrainRecipe(String grainOreName, FluidStack output, @Nullable String ingredientOreName) { - addGrainRecipe(grainOreName, output, ingredientOreName, ExtraTreeItems.Yeast.get(1)); + addGrainRecipe(grainOreName, output, ingredientOreName, ExtraTreeItems.YEAST.get(1)); } @Override diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index 042e8339..d0ed6d36 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -66,7 +66,7 @@ public class LumbermillLogic extends ComponentProcessSetCost implements IProcess return; } util.addStack(LumbermillMachine.SLOT_PLANKS, result); - util.addStack(LumbermillMachine.SLOT_SAWDUST, ExtraTreeItems.Sawdust.get(2)); + util.addStack(LumbermillMachine.SLOT_SAWDUST, ExtraTreeItems.SAWDUST.get(2)); util.addStack(LumbermillMachine.SLOT_BARK, ExtraTreeItems.Bark.get(2)); util.decreaseStack(LumbermillMachine.SLOT_LOG, 1); } diff --git a/src/main/java/binnie/modules/IModuleContainer.java b/src/main/java/binnie/modules/IModuleContainer.java index 1fad2f45..c2a8140c 100644 --- a/src/main/java/binnie/modules/IModuleContainer.java +++ b/src/main/java/binnie/modules/IModuleContainer.java @@ -24,4 +24,6 @@ public interface IModuleContainer { Set getLoadedModules(); Set getUnloadedModules(); + + boolean isAvailable(); } diff --git a/src/main/java/binnie/modules/ModuleManager.java b/src/main/java/binnie/modules/ModuleManager.java index 17937d19..cdbf3d76 100644 --- a/src/main/java/binnie/modules/ModuleManager.java +++ b/src/main/java/binnie/modules/ModuleManager.java @@ -74,6 +74,11 @@ public class ModuleManager { Iterator iterator = containerModules.iterator(); while (iterator.hasNext()) { Module module = iterator.next(); + if(!container.isAvailable()){ + iterator.remove(); + Log.info("Module disabled: {}", module); + continue; + } if (module.canBeDisabled()) { if (!isEnabled(config, module)) { iterator.remove();