diff --git a/resources/assets/enderio/config/StillRecipes_User.xml b/resources/assets/enderio/config/StillRecipes_User.xml
deleted file mode 100644
index 552e3f0e..00000000
--- a/resources/assets/enderio/config/StillRecipes_User.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/resources/assets/enderio/config/StillRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml
similarity index 98%
rename from resources/assets/enderio/config/StillRecipes_Core.xml
rename to resources/assets/enderio/config/VatRecipes_Core.xml
index 4d174c90..6013e9c3 100644
--- a/resources/assets/enderio/config/StillRecipes_Core.xml
+++ b/resources/assets/enderio/config/VatRecipes_Core.xml
@@ -1,4 +1,4 @@
-
+
@@ -42,4 +42,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/resources/assets/enderio/config/VatRecipes_User.xml b/resources/assets/enderio/config/VatRecipes_User.xml
new file mode 100644
index 00000000..d0a9387c
--- /dev/null
+++ b/resources/assets/enderio/config/VatRecipes_User.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang
index dc2100f4..c7640235 100644
--- a/resources/assets/enderio/lang/en_US.lang
+++ b/resources/assets/enderio/lang/en_US.lang
@@ -95,7 +95,7 @@ tile.blockCapacitorBank.tooltipPrefix=Contains
tile.blockSagMill.name=SAG Mill
tile.blockHyperCube.name=Dimensional Transceiver
tile.blockPowerMonitor.name=Power Monitor
-tile.blockStill.name=The Vat
+tile.blockVat.name=The Vat
//Travel
tile.blockTravelAnchor.name=Travel Anchor
diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java
index 80917cb8..f60f53c2 100644
--- a/src/main/java/crazypants/enderio/EnderIO.java
+++ b/src/main/java/crazypants/enderio/EnderIO.java
@@ -61,8 +61,8 @@ import crazypants.enderio.machine.painter.BlockPainter;
import crazypants.enderio.machine.power.BlockCapacitorBank;
import crazypants.enderio.machine.reservoir.BlockReservoir;
import crazypants.enderio.machine.solar.BlockSolarPanel;
-import crazypants.enderio.machine.still.BlockStill;
-import crazypants.enderio.machine.still.StillRecipeManager;
+import crazypants.enderio.machine.still.BlockVat;
+import crazypants.enderio.machine.still.VatRecipeManager;
import crazypants.enderio.material.Alloy;
import crazypants.enderio.material.BlockFusedQuartz;
import crazypants.enderio.material.ItemAlloy;
@@ -135,7 +135,7 @@ public class EnderIO {
public static BlockCrusher blockCrusher;
public static BlockHyperCube blockHyperCube;
public static BlockPowerMonitor blockPowerMonitor;
- public static BlockStill blockStill;
+ public static BlockVat blockVat;
public static BlockElectricLight blockElectricLight;
public static BlockLightNode blockLightNode;
@@ -178,7 +178,7 @@ public class EnderIO {
blockCrusher = BlockCrusher.create();
blockAlloySmelter = BlockAlloySmelter.create();
- blockStill = BlockStill.create();
+ blockVat = BlockVat.create();
blockPowerMonitor = BlockPowerMonitor.create();
blockCapacitorBank = BlockCapacitorBank.create();
@@ -300,7 +300,7 @@ public class EnderIO {
CrusherRecipeManager.getInstance().loadRecipesFromConfig();
AlloyRecipeManager.getInstance().loadRecipesFromConfig();
- StillRecipeManager.getInstance().loadRecipesFromConfig();
+ VatRecipeManager.getInstance().loadRecipesFromConfig();
}
@EventHandler
diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java
index a6a5f230..2aafd8f6 100644
--- a/src/main/java/crazypants/enderio/ModObject.java
+++ b/src/main/java/crazypants/enderio/ModObject.java
@@ -37,7 +37,7 @@ public enum ModObject {
blockSagMill,
blockHyperCube,
blockPowerMonitor,
- blockStill,
+ blockVat,
blockElectricLight,
blockLightNode,
diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java
index f9ed3181..5f3ab5f3 100644
--- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java
+++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java
@@ -55,7 +55,7 @@ public class MachineRecipes {
}
//Still
- ItemStack still = new ItemStack(EnderIO.blockStill, 1, 0);
+ ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0);
GameRegistry.addShapedRecipe(crusher, "iii", "dmd", "gcg", 'd', Items.cauldron, 'g', basicGear, 'm', machineChassi, 'i', Items.iron_ingot, 'c', capacitor);
//transceiver
diff --git a/src/main/java/crazypants/enderio/machine/still/BlockStill.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java
similarity index 73%
rename from src/main/java/crazypants/enderio/machine/still/BlockStill.java
rename to src/main/java/crazypants/enderio/machine/still/BlockVat.java
index 02e7b470..da290e45 100644
--- a/src/main/java/crazypants/enderio/machine/still/BlockStill.java
+++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java
@@ -7,16 +7,16 @@ import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
-public class BlockStill extends AbstractMachineBlock {
+public class BlockVat extends AbstractMachineBlock {
- public static BlockStill create() {
- BlockStill res = new BlockStill();
+ public static BlockVat create() {
+ BlockVat res = new BlockVat();
res.init();
return res;
}
- public BlockStill() {
- super(ModObject.blockStill, TileStill.class);
+ public BlockVat() {
+ super(ModObject.blockVat, TileVat.class);
}
@Override
@@ -24,8 +24,8 @@ public class BlockStill extends AbstractMachineBlock {
// The server needs the container as it manages the adding and removing of
// items, which are then sent to the client for display
TileEntity te = world.getTileEntity(x, y, z);
- if(te instanceof TileStill) {
- return new ContainerStill(player.inventory, (TileStill) te);
+ if(te instanceof TileVat) {
+ return new ContainerVat(player.inventory, (TileVat) te);
}
return null;
}
@@ -33,8 +33,8 @@ public class BlockStill extends AbstractMachineBlock {
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
TileEntity te = world.getTileEntity(x, y, z);
- if(te instanceof TileStill) {
- return new GuiStill(player.inventory, (TileStill) te);
+ if(te instanceof TileVat) {
+ return new GuiVat(player.inventory, (TileVat) te);
}
return null;
}
diff --git a/src/main/java/crazypants/enderio/machine/still/ContainerStill.java b/src/main/java/crazypants/enderio/machine/still/ContainerVat.java
similarity index 85%
rename from src/main/java/crazypants/enderio/machine/still/ContainerStill.java
rename to src/main/java/crazypants/enderio/machine/still/ContainerVat.java
index 108c1128..d62bb39e 100644
--- a/src/main/java/crazypants/enderio/machine/still/ContainerStill.java
+++ b/src/main/java/crazypants/enderio/machine/still/ContainerVat.java
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
import crazypants.enderio.machine.AbstractMachineContainer;
import crazypants.enderio.machine.AbstractMachineEntity;
-public class ContainerStill extends AbstractMachineContainer {
+public class ContainerVat extends AbstractMachineContainer {
- public ContainerStill(InventoryPlayer playerInv, AbstractMachineEntity te) {
+ public ContainerVat(InventoryPlayer playerInv, AbstractMachineEntity te) {
super(playerInv, te);
}
diff --git a/src/main/java/crazypants/enderio/machine/still/GuiStill.java b/src/main/java/crazypants/enderio/machine/still/GuiVat.java
similarity index 92%
rename from src/main/java/crazypants/enderio/machine/still/GuiStill.java
rename to src/main/java/crazypants/enderio/machine/still/GuiVat.java
index a4eca6ce..1320d7c5 100644
--- a/src/main/java/crazypants/enderio/machine/still/GuiStill.java
+++ b/src/main/java/crazypants/enderio/machine/still/GuiVat.java
@@ -12,12 +12,12 @@ import crazypants.enderio.machine.IMachineRecipe.ResultStack;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.render.RenderUtil;
-public class GuiStill extends GuiMachineBase {
+public class GuiVat extends GuiMachineBase {
- private final TileStill still;
+ private final TileVat still;
- public GuiStill(InventoryPlayer inventory, TileStill te) {
- super(te, new ContainerStill(inventory, te));
+ public GuiVat(InventoryPlayer inventory, TileVat te) {
+ super(te, new ContainerVat(inventory, te));
still = te;
}
@@ -44,7 +44,7 @@ public class GuiStill extends GuiMachineBase {
break;
}
}
- StillMachineRecipe rec = (StillMachineRecipe) still.getCurrentTask().getRecipe();
+ VatMachineRecipe rec = (VatMachineRecipe) still.getCurrentTask().getRecipe();
IIcon outputIcon = null;
for (ResultStack res : rec.getCompletedResult(1.0f, still.getCurrentTask().getInputs())) {
if(res.fluid != null && res.fluid.getFluid() != null) {
diff --git a/src/main/java/crazypants/enderio/machine/still/TileStill.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java
similarity index 94%
rename from src/main/java/crazypants/enderio/machine/still/TileStill.java
rename to src/main/java/crazypants/enderio/machine/still/TileVat.java
index aa78a9f8..7e797523 100644
--- a/src/main/java/crazypants/enderio/machine/still/TileStill.java
+++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java
@@ -17,7 +17,7 @@ import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.PoweredTask;
import crazypants.enderio.machine.SlotDefinition;
-public class TileStill extends AbstractPoweredTaskEntity implements IFluidHandler {
+public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler {
private static final FluidStack WATER = new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME);
@@ -26,13 +26,13 @@ public class TileStill extends AbstractPoweredTaskEntity implements IFluidHandle
boolean tanksDirty = false;
- public TileStill() {
+ public TileVat() {
super(new SlotDefinition(0, 1, -1, -1, -1, -1));
}
@Override
public String getInventoryName() {
- return ModObject.blockStill.unlocalisedName;
+ return ModObject.blockVat.unlocalisedName;
}
@Override
@@ -42,12 +42,12 @@ public class TileStill extends AbstractPoweredTaskEntity implements IFluidHandle
@Override
public String getMachineName() {
- return ModObject.blockStill.unlocalisedName;
+ return ModObject.blockVat.unlocalisedName;
}
@Override
protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) {
- return StillRecipeManager.getInstance().isValidInput(new MachineRecipeInput(i, itemstack));
+ return VatRecipeManager.getInstance().isValidInput(new MachineRecipeInput(i, itemstack));
}
@Override
diff --git a/src/main/java/crazypants/enderio/machine/still/StillMachineRecipe.java b/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java
similarity index 86%
rename from src/main/java/crazypants/enderio/machine/still/StillMachineRecipe.java
rename to src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java
index de230d65..6b68b2ed 100644
--- a/src/main/java/crazypants/enderio/machine/still/StillMachineRecipe.java
+++ b/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java
@@ -15,7 +15,7 @@ import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.recipe.AbstractMachineRecipe;
import crazypants.enderio.machine.recipe.IRecipe;
-public class StillMachineRecipe extends AbstractMachineRecipe {
+public class VatMachineRecipe extends AbstractMachineRecipe {
@Override
public String getUid() {
@@ -24,7 +24,7 @@ public class StillMachineRecipe extends AbstractMachineRecipe {
@Override
public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) {
- return StillRecipeManager.instance.getRecipeForInput(inputs);
+ return VatRecipeManager.instance.getRecipeForInput(inputs);
}
@Override
@@ -32,12 +32,12 @@ public class StillMachineRecipe extends AbstractMachineRecipe {
if(input == null) {
return false;
}
- return StillRecipeManager.instance.isValidInput(input);
+ return VatRecipeManager.instance.isValidInput(input);
}
@Override
public String getMachineName() {
- return ModObject.blockStill.unlocalisedName;
+ return ModObject.blockVat.unlocalisedName;
}
@Override
@@ -45,7 +45,7 @@ public class StillMachineRecipe extends AbstractMachineRecipe {
List result = new ArrayList();
- StillRecipe rec = (StillRecipe) getRecipeForInputs(inputs);
+ VatRecipe rec = (VatRecipe) getRecipeForInputs(inputs);
FluidStack inputFluidStack = rec.getRequiredFluidInput(inputs);
result.add(new MachineRecipeInput(0, inputFluidStack));
@@ -65,7 +65,7 @@ public class StillMachineRecipe extends AbstractMachineRecipe {
if(inputs == null || inputs.length <= 0) {
return new ResultStack[0];
}
- StillRecipe recipe = (StillRecipe) getRecipeForInputs(inputs);
+ VatRecipe recipe = (VatRecipe) getRecipeForInputs(inputs);
if(recipe == null || !recipe.isValid()) {
return new ResultStack[0];
}
@@ -75,7 +75,7 @@ public class StillMachineRecipe extends AbstractMachineRecipe {
@Override
public List getAllRecipes() {
List result = new ArrayList();
- List recipes = StillRecipeManager.getInstance().getRecipes();
+ List recipes = VatRecipeManager.getInstance().getRecipes();
for (IRecipe cr : recipes) {
List components = new ArrayList();
for (crazypants.enderio.machine.recipe.RecipeInput ri : cr.getInputs()) {
diff --git a/src/main/java/crazypants/enderio/machine/still/StillRecipe.java b/src/main/java/crazypants/enderio/machine/still/VatRecipe.java
similarity index 98%
rename from src/main/java/crazypants/enderio/machine/still/StillRecipe.java
rename to src/main/java/crazypants/enderio/machine/still/VatRecipe.java
index 82151562..29098cc5 100644
--- a/src/main/java/crazypants/enderio/machine/still/StillRecipe.java
+++ b/src/main/java/crazypants/enderio/machine/still/VatRecipe.java
@@ -11,7 +11,7 @@ import crazypants.enderio.machine.recipe.IRecipe;
import crazypants.enderio.machine.recipe.RecipeInput;
import crazypants.enderio.machine.recipe.RecipeOutput;
-public class StillRecipe implements IRecipe {
+public class VatRecipe implements IRecipe {
protected final FluidStack inputFluidStack;
protected final List inputStacks;
@@ -21,7 +21,7 @@ public class StillRecipe implements IRecipe {
protected final RecipeOutput[] output;
protected final float energyRequired;
- public StillRecipe(IRecipe recipe) {
+ public VatRecipe(IRecipe recipe) {
List fluids = recipe.getInputFluidStacks();
if(fluids != null && !fluids.isEmpty()) {
inputFluidStack = fluids.get(0).copy();
diff --git a/src/main/java/crazypants/enderio/machine/still/StillRecipeManager.java b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java
similarity index 75%
rename from src/main/java/crazypants/enderio/machine/still/StillRecipeManager.java
rename to src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java
index 687b10f1..7a2204a2 100644
--- a/src/main/java/crazypants/enderio/machine/still/StillRecipeManager.java
+++ b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java
@@ -12,20 +12,20 @@ import crazypants.enderio.machine.recipe.Recipe;
import crazypants.enderio.machine.recipe.RecipeConfig;
import crazypants.enderio.machine.recipe.RecipeConfigParser;
-public class StillRecipeManager {
+public class VatRecipeManager {
- private static final String CORE_FILE_NAME = "StillRecipes_Core.xml";
- private static final String CUSTOM_FILE_NAME = "StillRecipes_User.xml";
+ private static final String CORE_FILE_NAME = "VatRecipes_Core.xml";
+ private static final String CUSTOM_FILE_NAME = "VatRecipes_User.xml";
- static final StillRecipeManager instance = new StillRecipeManager();
+ static final VatRecipeManager instance = new VatRecipeManager();
- public static StillRecipeManager getInstance() {
+ public static VatRecipeManager getInstance() {
return instance;
}
private final List recipes = new ArrayList();
- public StillRecipeManager() {
+ public VatRecipeManager() {
}
public void loadRecipesFromConfig() {
@@ -33,10 +33,10 @@ public class StillRecipeManager {
if(config != null) {
processConfig(config);
} else {
- Log.error("Could not load recipes for SAG Mill.");
+ Log.error("Could not load recipes for Vat.");
}
- MachineRecipeRegistry.instance.registerRecipe(ModObject.blockStill.unlocalisedName, new StillMachineRecipe());
+ MachineRecipeRegistry.instance.registerRecipe(ModObject.blockVat.unlocalisedName, new VatMachineRecipe());
}
@@ -71,19 +71,19 @@ public class StillRecipeManager {
private void processConfig(RecipeConfig config) {
List newRecipes = config.getRecipes(false);
- Log.info("Found " + newRecipes.size() + " valid Still recipes in config.");
+ Log.info("Found " + newRecipes.size() + " valid Vat recipes in config.");
for (Recipe rec : newRecipes) {
addRecipe(rec);
}
- Log.info("Finished processing Still recipes. " + recipes.size() + " recipes avaliable.");
+ Log.info("Finished processing Vat recipes. " + recipes.size() + " recipes avaliable.");
}
public void addRecipe(IRecipe recipe) {
if(recipe == null || !recipe.isValid()) {
- Log.debug("Could not add invalid recipe: " + recipe);
+ Log.debug("Could not add invalid Vat recipe: " + recipe);
return;
}
- recipes.add(new StillRecipe(recipe));
+ recipes.add(new VatRecipe(recipe));
}
public List getRecipes() {