From 98a436d2f70ad9e227bde521778a732c1918fe63 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 16 Aug 2013 11:50:58 -0400 Subject: [PATCH] Cleanup --- common/mekanism/common/LiquidSlot.java | 39 ------------------- .../nei/MetallurgicInfuserRecipeHandler.java | 1 + common/mekanism/nei/NEIMekanismConfig.java | 8 ++++ 3 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 common/mekanism/common/LiquidSlot.java diff --git a/common/mekanism/common/LiquidSlot.java b/common/mekanism/common/LiquidSlot.java deleted file mode 100644 index ebfd7c15b..000000000 --- a/common/mekanism/common/LiquidSlot.java +++ /dev/null @@ -1,39 +0,0 @@ -package mekanism.common; - -/** - * Used to manage a slot that stores liquid. Has 3 main values -- a stored amount of liquid, - * maximum liquid, and liquid ID. - * @author AidanBrady - * - */ -public class LiquidSlot -{ - /** The amount of liquid this slot is currently holding. */ - public int liquidStored; - - /** The maximum amount of liquid this slot can handle. */ - public int MAX_LIQUID; - - /** The liquid's still block ID. 9 for water. */ - public int liquidID; - - /** - * Creates a LiquidSlot with a defined liquid ID and max liquid. The liquid stored starts at 0. - * @param max - max liquid - * @param id - liquid id - */ - public LiquidSlot(int max, int id) - { - MAX_LIQUID = max; - liquidID = id; - } - - /** - * Sets the liquid to a new amount. - * @param liquid - amount to store - */ - public void setLiquid(int amount) - { - liquidStored = Math.max(Math.min(amount, MAX_LIQUID), 0); - } -} diff --git a/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java b/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java index e3340be2a..4a0826199 100644 --- a/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java +++ b/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java @@ -188,6 +188,7 @@ public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler public CachedIORecipe(ItemStack input, ItemStack output, ItemStack infuse, InfuseType type) { super(); + inputStack = new PositionedStack(input, 46, 28); outputStack = new PositionedStack(output, 104, 28); diff --git a/common/mekanism/nei/NEIMekanismConfig.java b/common/mekanism/nei/NEIMekanismConfig.java index fde6c2076..eb341b303 100644 --- a/common/mekanism/nei/NEIMekanismConfig.java +++ b/common/mekanism/nei/NEIMekanismConfig.java @@ -1,5 +1,7 @@ package mekanism.nei; +import java.util.ArrayList; + import mekanism.client.GuiCombiner; import mekanism.client.GuiCrusher; import mekanism.client.GuiEnrichmentChamber; @@ -17,16 +19,22 @@ public class NEIMekanismConfig implements IConfigureNEI { API.registerRecipeHandler(new EnrichmentChamberRecipeHandler()); API.registerUsageHandler(new EnrichmentChamberRecipeHandler()); + API.registerRecipeHandler(new OsmiumCompressorRecipeHandler()); API.registerUsageHandler(new OsmiumCompressorRecipeHandler()); + API.registerRecipeHandler(new CrusherRecipeHandler()); API.registerUsageHandler(new CrusherRecipeHandler()); + API.registerRecipeHandler(new CombinerRecipeHandler()); API.registerUsageHandler(new CombinerRecipeHandler()); + API.registerRecipeHandler(new MetallurgicInfuserRecipeHandler()); API.registerUsageHandler(new MetallurgicInfuserRecipeHandler()); + API.registerRecipeHandler(new PurificationChamberRecipeHandler()); API.registerUsageHandler(new PurificationChamberRecipeHandler()); + API.registerRecipeHandler(new MekanismRecipeHandler()); API.registerUsageHandler(new MekanismRecipeHandler());