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

Fix a few renames

Browse source
This commit is contained in:
Aidan C. Brady 2015-02-24 11:08:04 -05:00
parent 888d1bdad8
commit 457d465165
10 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/client/ClientProxy.java
View file

@ -48,7 +48,7 @@ import mekanism.client.gui.GuiRobitMain;
import mekanism.client.gui.GuiRobitRepair; import mekanism.client.gui.GuiRobitRepair;
import mekanism.client.gui.GuiRobitSmelting; import mekanism.client.gui.GuiRobitSmelting;
import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiRotaryCondensentrator;
import mekanism.client.gui.GuiSalinationController; import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.client.gui.GuiSeismicReader; import mekanism.client.gui.GuiSeismicReader;
import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiSeismicVibrator;
import mekanism.client.gui.GuiTeleporter; import mekanism.client.gui.GuiTeleporter;
@ -451,7 +451,7 @@ public class ClientProxy extends CommonProxy
case 32: case 32:
return new GuiElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity); return new GuiElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
case 33: case 33:
return new GuiSalinationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity); return new GuiSolarEvaporationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity);
case 34: case 34:
return new GuiPrecisionSawmill(player.inventory, (TileEntityPrecisionSawmill)tileEntity); return new GuiPrecisionSawmill(player.inventory, (TileEntityPrecisionSawmill)tileEntity);
case 35: case 35:

10
src/main/java/mekanism/client/gui/GuiSalinationController.java → src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import mekanism.api.gas.GasStack; import mekanism.api.gas.GasStack;
import mekanism.client.render.MekanismRenderer; 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.tile.TileEntitySolarEvaporationController;
import mekanism.common.util.LangUtils; import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
@ -16,13 +16,13 @@ import cpw.mods.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiSalinationController extends GuiMekanism public class GuiSolarEvaporationController extends GuiMekanism
{ {
public TileEntitySolarEvaporationController tileEntity; 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; tileEntity = tentity;
} }
@ -33,7 +33,7 @@ public class GuiSalinationController extends GuiMekanism
int yAxis = (mouseY - (height - ySize) / 2); int yAxis = (mouseY - (height - ySize) / 2);
fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); 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(getStruct(), 50, 21, 0x00CD00);
fontRendererObj.drawString("Height: " + tileEntity.height, 50, 30, 0x00CD00); fontRendererObj.drawString("Height: " + tileEntity.height, 50, 30, 0x00CD00);

4
src/main/java/mekanism/client/nei/NEIMekanismConfig.java
View file

@ -16,7 +16,7 @@ import mekanism.client.gui.GuiPRC;
import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPrecisionSawmill;
import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiPurificationChamber;
import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiRotaryCondensentrator;
import mekanism.client.gui.GuiSalinationController; import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.common.MekanismBlocks; import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems; import mekanism.common.MekanismItems;
@ -97,7 +97,7 @@ public class NEIMekanismConfig implements IConfigureNEI
API.setGuiOffset(GuiRotaryCondensentrator.class, RotaryCondensentratorRecipeHandler.xOffset, RotaryCondensentratorRecipeHandler.yOffset); API.setGuiOffset(GuiRotaryCondensentrator.class, RotaryCondensentratorRecipeHandler.xOffset, RotaryCondensentratorRecipeHandler.yOffset);
API.setGuiOffset(GuiElectrolyticSeparator.class, ElectrolyticSeparatorRecipeHandler.xOffset, ElectrolyticSeparatorRecipeHandler.yOffset); API.setGuiOffset(GuiElectrolyticSeparator.class, ElectrolyticSeparatorRecipeHandler.xOffset, ElectrolyticSeparatorRecipeHandler.yOffset);
API.setGuiOffset(GuiPrecisionSawmill.class, 16, 6); 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(GuiChemicalDissolutionChamber.class, ChemicalDissolutionChamberRecipeHandler.xOffset, ChemicalDissolutionChamberRecipeHandler.yOffset);
API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset);
API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset);

4
src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java
View file

@ -7,7 +7,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import mekanism.client.gui.GuiSalinationController; import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.common.ObfuscatedNames; import mekanism.common.ObfuscatedNames;
import mekanism.common.util.LangUtils; import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
@ -65,7 +65,7 @@ public class SalinationControllerRecipeHandler extends BaseRecipeHandler
@Override @Override
public Class getGuiClass() public Class getGuiClass()
{ {
return GuiSalinationController.class; return GuiSolarEvaporationController.class;
} }
public String getRecipeId() public String getRecipeId()

4
src/main/java/mekanism/common/CommonProxy.java
View file

@ -40,7 +40,7 @@ import mekanism.common.inventory.container.ContainerRobitMain;
import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitRepair;
import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRobitSmelting;
import mekanism.common.inventory.container.ContainerRotaryCondensentrator; 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.ContainerSeismicVibrator;
import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.inventory.container.ContainerUpgradeManagement;
@ -405,7 +405,7 @@ public class CommonProxy
case 32: case 32:
return new ContainerElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity); return new ContainerElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
case 33: case 33:
return new ContainerSalinationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity); return new ContainerSolarEvaporationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity);
case 34: case 34:
return new ContainerChanceMachine(player.inventory, (TileEntityChanceMachine)tileEntity); return new ContainerChanceMachine(player.inventory, (TileEntityChanceMachine)tileEntity);
case 35: case 35:

6
src/main/java/mekanism/common/block/BlockBasic.java
View file

@ -70,9 +70,9 @@ import cpw.mods.fml.relauncher.SideOnly;
* 0:11: Dynamic Valve * 0:11: Dynamic Valve
* 0:12: Copper Block * 0:12: Copper Block
* 0:13: Tin Block * 0:13: Tin Block
* 0:14: Solar Neutron Controller * 0:14: Solar Evaporation Controller
* 0:15: Solar Neutron Valve * 0:15: Solar Evaporation Valve
* 1:0: Solar Neutron Block * 1:0: Solar Evaporation Block
* 1:1: Steam Boiler * 1:1: Steam Boiler
* 1:2: Boiler Valve * 1:2: Boiler Valve
* @author AidanBrady * @author AidanBrady

4
src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java → src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java
View file

@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
public class ContainerSalinationController extends Container public class ContainerSolarEvaporationController extends Container
{ {
private TileEntitySolarEvaporationController tileEntity; private TileEntitySolarEvaporationController tileEntity;
public ContainerSalinationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity) public ContainerSolarEvaporationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity)
{ {
tileEntity = tentity; tileEntity = tentity;

12
src/main/java/mekanism/common/item/ItemBlockBasic.java
View file

@ -32,9 +32,9 @@ import cpw.mods.fml.relauncher.SideOnly;
* 0:11: Dynamic Valve * 0:11: Dynamic Valve
* 0:12: Copper Block * 0:12: Copper Block
* 0:13: Tin Block * 0:13: Tin Block
* 0:14: Salination Controller * 0:14: Solar Evaporation Controller
* 0:15: Salination Valve * 0:15: Solar Evaporation Valve
* 1:0: Salination Block * 1:0: Solar Evaporation Block
* @author AidanBrady * @author AidanBrady
* *
*/ */
@ -215,10 +215,10 @@ public class ItemBlockBasic extends ItemBlock
name = "TinBlock"; name = "TinBlock";
break; break;
case 14: case 14:
name = "SalinationController"; name = "SolarEvaporationController";
break; break;
case 15: case 15:
name = "SalinationValve"; name = "SolarEvaporationValve";
break; break;
default: default:
name = "Unknown"; name = "Unknown";
@ -230,7 +230,7 @@ public class ItemBlockBasic extends ItemBlock
switch(itemstack.getItemDamage()) switch(itemstack.getItemDamage())
{ {
case 0: case 0:
name = "SalinationBlock"; name = "SolarEvaporationBlock";
break; break;
} }
} }

2
src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java
View file

@ -17,7 +17,7 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
public TileEntitySolarEvaporationBlock() public TileEntitySolarEvaporationBlock()
{ {
super("SalinationTank"); super("SolarEvaporationBlock");
inventory = new ItemStack[0]; inventory = new ItemStack[0];
} }

2
src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java
View file

@ -64,7 +64,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
public TileEntitySolarEvaporationController() public TileEntitySolarEvaporationController()
{ {
super("SalinationController"); super("SolarEvaporationController");
inventory = new ItemStack[4]; inventory = new ItemStack[4];
} }