diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index 4dbaaf0b..d7dc46e8 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -46,16 +46,14 @@ public class MachineGroup { } Binnie.Machine.registerMachineGroup(this); this.block = new BlockMachine(this, blockName); - if (this.block != null) { - GameRegistry.register(this.block); - Item i = GameRegistry.register(new ItemMachine(this.block)); - for (int j = 0; j < types.length; j++) { - BinnieCore.proxy.registermodel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j)); - } + GameRegistry.register(this.block); + Item i = GameRegistry.register(new ItemMachine(this.block)); + for (int j = 0; j < types.length; j++) { + BinnieCore.proxy.registermodel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j)); + } - for (final MachinePackage pack2 : this.getPackages()) { - pack2.register(); - } + for (final MachinePackage pack2 : this.getPackages()) { + pack2.register(); } } diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 4880f914..0311b44f 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -88,8 +88,10 @@ public class MachineUtil { return this.getTank(tank).drain(amount, true); } - public boolean liquidInTank(final int tank, final int amount) { - return this.getTank(tank).drain(amount, false) != null && this.getTank(tank).drain(amount, false).amount == amount; + public boolean liquidInTank(final int tankIndex, final int amount) { + IFluidTank tank = this.getTank(tankIndex); + FluidStack drain = tank.drain(amount, false); + return drain != null && drain.amount == amount; } public void damageItem(final int slot, final int damage) { diff --git a/src/main/java/binnie/craftgui/minecraft/ListMap.java b/src/main/java/binnie/craftgui/minecraft/ListMap.java index 733b2ffe..1bb10a77 100644 --- a/src/main/java/binnie/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/craftgui/minecraft/ListMap.java @@ -2,6 +2,7 @@ package binnie.craftgui.minecraft; import java.util.*; +// TODO: remove this, it's very questionable class ListMap implements List { private LinkedHashMap map; diff --git a/src/main/java/binnie/extratrees/machines/Lumbermill.java b/src/main/java/binnie/extratrees/machines/Lumbermill.java index 7fa47884..27166e1e 100644 --- a/src/main/java/binnie/extratrees/machines/Lumbermill.java +++ b/src/main/java/binnie/extratrees/machines/Lumbermill.java @@ -67,10 +67,10 @@ public class Lumbermill { if (recipe.recipeItems.size() != 1) { continue; } - if (!(recipe.recipeItems.get(0) instanceof ItemStack)) { + if (!(recipe.recipeItems.get(0) != null)) { continue; } - final ItemStack input = (ItemStack) recipe.recipeItems.get(0); + final ItemStack input = recipe.recipeItems.get(0); if (recipe.getRecipeOutput() != null && recipe.getRecipeOutput().isItemEqual(output)) { list.add(input); } diff --git a/src/main/java/binnie/genetics/machine/Incubator.java b/src/main/java/binnie/genetics/machine/Incubator.java index 67ecec24..b63841c3 100644 --- a/src/main/java/binnie/genetics/machine/Incubator.java +++ b/src/main/java/binnie/genetics/machine/Incubator.java @@ -42,7 +42,7 @@ public class Incubator { Incubator.RECIPES.add(new IncubatorRecipe(Binnie.Liquid.getLiquidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f) { @Override public boolean isItemStack(final ItemStack stack) { - return GeneticsItems.GrowthMedium.get(1).isItemEqual(stack); + return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack); } }); Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f) { @@ -54,7 +54,7 @@ public class Incubator { Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f) { @Override public boolean isItemStack(final ItemStack stack) { - return GeneticsItems.GrowthMedium.get(1).isItemEqual(stack); + return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack); } }); Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) { @@ -66,13 +66,13 @@ public class Incubator { Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.BacteriaPoly.get(0), GeneticLiquid.BacteriaPoly.get(5), 0.05f) { @Override public boolean isItemStack(final ItemStack stack) { - return GeneticsItems.GrowthMedium.get(1).isItemEqual(stack); + return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack); } }); Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.BacteriaVector.get(0), GeneticLiquid.BacteriaVector.get(5), 0.05f) { @Override public boolean isItemStack(final ItemStack stack) { - return GeneticsItems.GrowthMedium.get(1).isItemEqual(stack); + return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack); } }); Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaPoly.get(10), 0.1f) { diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index b5115634..b607ad09 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -2,6 +2,7 @@ package binnie.genetics.machine; import binnie.core.machines.Machine; import binnie.core.resource.BinnieResource; +import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -17,8 +18,9 @@ public class MachineRendererLab { private ModelMachine model; public MachineRendererLab() { - this.dummyEntityItem = new EntityItem((World) null); - this.itemSides = new EntityItem[]{new EntityItem((World) null), new EntityItem((World) null), new EntityItem((World) null), new EntityItem((World) null)}; + World world = Minecraft.getMinecraft().theWorld; + this.dummyEntityItem = new EntityItem(world); + this.itemSides = new EntityItem[]{new EntityItem(world), new EntityItem(world), new EntityItem(world), new EntityItem(world)}; this.model = new ModelMachine(); // (this.customRenderItem = new RenderItem() { // @Override