diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 7755b681..e70933fb 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -17,6 +17,7 @@ import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.core.ModuleCore; import binnie.extratrees.genetics.*; import binnie.extratrees.item.ModuleItems; +import binnie.extratrees.kitchen.ModuleKitchen; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.proxy.Proxy; import forestry.api.arboriculture.ITreeRoot; @@ -80,6 +81,8 @@ public class ExtraTrees extends AbstractMod { private static ModuleCarpentry carpentry; @Nullable private static ModuleMachine machine; + @Nullable + private static ModuleKitchen kitchen; public static ModuleItems items() { Preconditions.checkState(items != null); @@ -107,6 +110,11 @@ public class ExtraTrees extends AbstractMod { return machine; } + public static ModuleKitchen getKitchen() { + Preconditions.checkState(kitchen != null); + return kitchen; + } + @Override protected void registerModules() { this.addModule(blocks = new ModuleBlocks()); @@ -116,6 +124,7 @@ public class ExtraTrees extends AbstractMod { this.addModule(carpentry = new ModuleCarpentry()); this.addModule(machine = new ModuleMachine()); this.addModule(new ModuleCore()); + this.addModule(kitchen = new ModuleKitchen()); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index 4f755f20..b9e07f52 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -51,7 +51,7 @@ public enum Glassware { // } public ItemStack get(final int i) { - return ExtraTrees.drink.getStack(this, null); + return ExtraTrees.alcohol().drink.getStack(this, null); } public float getContentBottom() { diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index ddd2c9e9..124fa267 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -29,16 +29,16 @@ import java.util.List; import java.util.Objects; public class ModuleAlcohol implements IInitializable { - public static ItemDrink drink; - public static Block blockDrink; - public static int drinkRendererID; - public static BinnieIcon liquid; + public ItemDrink drink; + public Block blockDrink; + public int drinkRendererID; + public BinnieIcon liquid; @Override public void preInit() { - ModuleAlcohol.liquid = Binnie.RESOURCE.getBlockIcon(ExtraTrees.instance, "liquids/liquid"); + this.liquid = Binnie.RESOURCE.getBlockIcon(ExtraTrees.instance, "liquids/liquid"); //ModuleAlcohol.drinkRendererID = BinnieCore.proxy.getUniqueRenderID(); - drink = new ItemDrink(); + this.drink = new ItemDrink(); ExtraTrees.proxy.registerItem(drink); //BinnieCore.proxy.registerCustomItemRenderer(ExtraTrees.drink, new CocktailRenderer()); Binnie.LIQUID.createLiquids(Juice.values(), ItemFluidContainer.LiquidJuice); diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 194d093a..f7d82bb1 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -539,7 +539,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return "Apple"; } for (final ItemStack stack : this.products.keySet()) { - if (stack.getItem() == ExtraTrees.itemFood) { + if (stack.getItem() == ExtraTrees.items().itemFood) { return Food.values()[stack.getItemDamage()].toString(); } } 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 f7c81f15..ce40b882 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java @@ -31,9 +31,9 @@ public class LumbermillRecipeWrapper extends BlankRecipeWrapper { ExtraTrees.items(); ExtraTrees.items(); ingredients.setOutputs(ItemStack.class, Arrays.asList( - ModuleItems.itemMisc.getStack(ExtraTreeItems.Bark, 1), + ExtraTreeItems.Bark.get(1), outputPlanks, - ModuleItems.itemMisc.getStack(ExtraTreeItems.Sawdust, 1) + ExtraTreeItems.Sawdust.get(1) )); } } diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index 5f72b8b3..97bd3730 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -33,7 +33,7 @@ public enum KitchenMachine implements IMachineType { } public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.blockKitchen, i, this.ordinal()); + return new ItemStack(ExtraTrees.getKitchen().blockKitchen, i, this.ordinal()); } public abstract static class PackageKitchenMachine extends MachinePackage { diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index f49c7dfc..25a10b43 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -49,8 +49,8 @@ public class LumbermillLogic extends ComponentProcessSetCost implements IProcess return; } this.getUtil().addStack(LumbermillMachine.SLOT_PLANKS, result); - this.getUtil().addStack(LumbermillMachine.SLOT_SAWDUST, ExtraTrees.itemMisc.getStack(ExtraTreeItems.Sawdust, 1)); - this.getUtil().addStack(LumbermillMachine.SLOT_BARK, ExtraTrees.itemMisc.getStack(ExtraTreeItems.Bark, 1)); + this.getUtil().addStack(LumbermillMachine.SLOT_SAWDUST, ExtraTreeItems.Sawdust.get(1)); + this.getUtil().addStack(LumbermillMachine.SLOT_BARK, ExtraTreeItems.Bark.get(1)); this.getUtil().decreaseStack(LumbermillMachine.SLOT_LOG, 1); }