tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup

Browse source
This commit is contained in:
Aidan C. Brady 2013-08-16 11:50:58 -04:00
parent 38e772107c
commit 98a436d2f7
3 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
common/mekanism/common/LiquidSlot.java
View file

@ -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);
}
}

1
common/mekanism/nei/MetallurgicInfuserRecipeHandler.java
View file

@ -188,6 +188,7 @@ public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler
public CachedIORecipe(ItemStack input, ItemStack output, ItemStack infuse, InfuseType type) public CachedIORecipe(ItemStack input, ItemStack output, ItemStack infuse, InfuseType type)
{ {
super(); super();
inputStack = new PositionedStack(input, 46, 28); inputStack = new PositionedStack(input, 46, 28);
outputStack = new PositionedStack(output, 104, 28); outputStack = new PositionedStack(output, 104, 28);

8
common/mekanism/nei/NEIMekanismConfig.java
View file

@ -1,5 +1,7 @@
package mekanism.nei; package mekanism.nei;
import java.util.ArrayList;
import mekanism.client.GuiCombiner; import mekanism.client.GuiCombiner;
import mekanism.client.GuiCrusher; import mekanism.client.GuiCrusher;
import mekanism.client.GuiEnrichmentChamber; import mekanism.client.GuiEnrichmentChamber;
@ -17,16 +19,22 @@ public class NEIMekanismConfig implements IConfigureNEI
{ {
API.registerRecipeHandler(new EnrichmentChamberRecipeHandler()); API.registerRecipeHandler(new EnrichmentChamberRecipeHandler());
API.registerUsageHandler(new EnrichmentChamberRecipeHandler()); API.registerUsageHandler(new EnrichmentChamberRecipeHandler());
API.registerRecipeHandler(new OsmiumCompressorRecipeHandler()); API.registerRecipeHandler(new OsmiumCompressorRecipeHandler());
API.registerUsageHandler(new OsmiumCompressorRecipeHandler()); API.registerUsageHandler(new OsmiumCompressorRecipeHandler());
API.registerRecipeHandler(new CrusherRecipeHandler()); API.registerRecipeHandler(new CrusherRecipeHandler());
API.registerUsageHandler(new CrusherRecipeHandler()); API.registerUsageHandler(new CrusherRecipeHandler());
API.registerRecipeHandler(new CombinerRecipeHandler()); API.registerRecipeHandler(new CombinerRecipeHandler());
API.registerUsageHandler(new CombinerRecipeHandler()); API.registerUsageHandler(new CombinerRecipeHandler());
API.registerRecipeHandler(new MetallurgicInfuserRecipeHandler()); API.registerRecipeHandler(new MetallurgicInfuserRecipeHandler());
API.registerUsageHandler(new MetallurgicInfuserRecipeHandler()); API.registerUsageHandler(new MetallurgicInfuserRecipeHandler());
API.registerRecipeHandler(new PurificationChamberRecipeHandler()); API.registerRecipeHandler(new PurificationChamberRecipeHandler());
API.registerUsageHandler(new PurificationChamberRecipeHandler()); API.registerUsageHandler(new PurificationChamberRecipeHandler());
API.registerRecipeHandler(new MekanismRecipeHandler()); API.registerRecipeHandler(new MekanismRecipeHandler());
API.registerUsageHandler(new MekanismRecipeHandler()); API.registerUsageHandler(new MekanismRecipeHandler());