From 457d465165bd035ad9dc691cafffd5ab1d5d251d Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 24 Feb 2015 11:08:04 -0500 Subject: [PATCH] Fix a few renames --- src/main/java/mekanism/client/ClientProxy.java | 4 ++-- ...oller.java => GuiSolarEvaporationController.java} | 10 +++++----- .../java/mekanism/client/nei/NEIMekanismConfig.java | 4 ++-- .../nei/SalinationControllerRecipeHandler.java | 4 ++-- src/main/java/mekanism/common/CommonProxy.java | 4 ++-- src/main/java/mekanism/common/block/BlockBasic.java | 6 +++--- ...java => ContainerSolarEvaporationController.java} | 4 ++-- .../java/mekanism/common/item/ItemBlockBasic.java | 12 ++++++------ .../common/tile/TileEntitySolarEvaporationBlock.java | 2 +- .../tile/TileEntitySolarEvaporationController.java | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) rename src/main/java/mekanism/client/gui/{GuiSalinationController.java => GuiSolarEvaporationController.java} (93%) rename src/main/java/mekanism/common/inventory/container/{ContainerSalinationController.java => ContainerSolarEvaporationController.java} (94%) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 9d4c4da68..64dd907c0 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -48,7 +48,7 @@ import mekanism.client.gui.GuiRobitMain; import mekanism.client.gui.GuiRobitRepair; import mekanism.client.gui.GuiRobitSmelting; import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiSalinationController; +import mekanism.client.gui.GuiSolarEvaporationController; import mekanism.client.gui.GuiSeismicReader; import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiTeleporter; @@ -451,7 +451,7 @@ public class ClientProxy extends CommonProxy case 32: return new GuiElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity); case 33: - return new GuiSalinationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity); + return new GuiSolarEvaporationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity); case 34: return new GuiPrecisionSawmill(player.inventory, (TileEntityPrecisionSawmill)tileEntity); case 35: diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java similarity index 93% rename from src/main/java/mekanism/client/gui/GuiSalinationController.java rename to src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java index 17f7564db..81a5ab5d1 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; -import mekanism.common.inventory.container.ContainerSalinationController; +import mekanism.common.inventory.container.ContainerSolarEvaporationController; import mekanism.common.tile.TileEntitySolarEvaporationController; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -16,13 +16,13 @@ import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiSalinationController extends GuiMekanism +public class GuiSolarEvaporationController extends GuiMekanism { public TileEntitySolarEvaporationController tileEntity; - public GuiSalinationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity) + public GuiSolarEvaporationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity) { - super(tentity, new ContainerSalinationController(inventory, tentity)); + super(tentity, new ContainerSolarEvaporationController(inventory, tentity)); tileEntity = tentity; } @@ -33,7 +33,7 @@ public class GuiSalinationController extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); - fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); fontRendererObj.drawString(getStruct(), 50, 21, 0x00CD00); fontRendererObj.drawString("Height: " + tileEntity.height, 50, 30, 0x00CD00); diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index 612f15b78..cd85f096d 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -16,7 +16,7 @@ import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiSalinationController; +import mekanism.client.gui.GuiSolarEvaporationController; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; @@ -97,7 +97,7 @@ public class NEIMekanismConfig implements IConfigureNEI API.setGuiOffset(GuiRotaryCondensentrator.class, RotaryCondensentratorRecipeHandler.xOffset, RotaryCondensentratorRecipeHandler.yOffset); API.setGuiOffset(GuiElectrolyticSeparator.class, ElectrolyticSeparatorRecipeHandler.xOffset, ElectrolyticSeparatorRecipeHandler.yOffset); API.setGuiOffset(GuiPrecisionSawmill.class, 16, 6); - API.setGuiOffset(GuiSalinationController.class, SalinationControllerRecipeHandler.xOffset, SalinationControllerRecipeHandler.yOffset); + API.setGuiOffset(GuiSolarEvaporationController.class, SalinationControllerRecipeHandler.xOffset, SalinationControllerRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalDissolutionChamber.class, ChemicalDissolutionChamberRecipeHandler.xOffset, ChemicalDissolutionChamberRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset); diff --git a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java index dfdc4a3d3..7bac1c031 100644 --- a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.client.gui.GuiSalinationController; +import mekanism.client.gui.GuiSolarEvaporationController; import mekanism.common.ObfuscatedNames; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -65,7 +65,7 @@ public class SalinationControllerRecipeHandler extends BaseRecipeHandler @Override public Class getGuiClass() { - return GuiSalinationController.class; + return GuiSolarEvaporationController.class; } public String getRecipeId() diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index a25040b38..a21778202 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -40,7 +40,7 @@ import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; -import mekanism.common.inventory.container.ContainerSalinationController; +import mekanism.common.inventory.container.ContainerSolarEvaporationController; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.inventory.container.ContainerUpgradeManagement; @@ -405,7 +405,7 @@ public class CommonProxy case 32: return new ContainerElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity); case 33: - return new ContainerSalinationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity); + return new ContainerSolarEvaporationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity); case 34: return new ContainerChanceMachine(player.inventory, (TileEntityChanceMachine)tileEntity); case 35: diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 26d152ccc..31688cd80 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -70,9 +70,9 @@ import cpw.mods.fml.relauncher.SideOnly; * 0:11: Dynamic Valve * 0:12: Copper Block * 0:13: Tin Block - * 0:14: Solar Neutron Controller - * 0:15: Solar Neutron Valve - * 1:0: Solar Neutron Block + * 0:14: Solar Evaporation Controller + * 0:15: Solar Evaporation Valve + * 1:0: Solar Evaporation Block * 1:1: Steam Boiler * 1:2: Boiler Valve * @author AidanBrady diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java similarity index 94% rename from src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java rename to src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java index 825f7127f..614004725 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java @@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; -public class ContainerSalinationController extends Container +public class ContainerSolarEvaporationController extends Container { private TileEntitySolarEvaporationController tileEntity; - public ContainerSalinationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity) + public ContainerSolarEvaporationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity) { tileEntity = tentity; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 84624fef8..4181ab180 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -32,9 +32,9 @@ import cpw.mods.fml.relauncher.SideOnly; * 0:11: Dynamic Valve * 0:12: Copper Block * 0:13: Tin Block - * 0:14: Salination Controller - * 0:15: Salination Valve - * 1:0: Salination Block + * 0:14: Solar Evaporation Controller + * 0:15: Solar Evaporation Valve + * 1:0: Solar Evaporation Block * @author AidanBrady * */ @@ -215,10 +215,10 @@ public class ItemBlockBasic extends ItemBlock name = "TinBlock"; break; case 14: - name = "SalinationController"; + name = "SolarEvaporationController"; break; case 15: - name = "SalinationValve"; + name = "SolarEvaporationValve"; break; default: name = "Unknown"; @@ -230,7 +230,7 @@ public class ItemBlockBasic extends ItemBlock switch(itemstack.getItemDamage()) { case 0: - name = "SalinationBlock"; + name = "SolarEvaporationBlock"; break; } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java index 838456dcd..8576fccff 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java @@ -17,7 +17,7 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock public TileEntitySolarEvaporationBlock() { - super("SalinationTank"); + super("SolarEvaporationBlock"); inventory = new ItemStack[0]; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java index a2a1e4661..be3b45e47 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java @@ -64,7 +64,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public TileEntitySolarEvaporationController() { - super("SalinationController"); + super("SolarEvaporationController"); inventory = new ItemStack[4]; }