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

Fixed a few bugs and reverted name changes of Sulfuric Acid in liquid/gas form. Even though it's not scientifically correct, it fits better with the Mekanism theme and is easier to understand.

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-31 15:23:04 -05:00
parent 750bb2dab7
commit a277b6e266
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/mekanism/client/gui/GuiChemicalInfuser.java
View file

@ -39,8 +39,8 @@ public class GuiChemicalInfuser extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
fontRenderer.drawString(tileEntity.getInvName(), 5, 6, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
@ -181,6 +181,6 @@ public class GuiChemicalInfuser extends GuiMekanism
}
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"));
drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 40, 16, 59);
drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 4, 16, 59);
}
}

4
common/mekanism/client/gui/GuiChemicalOxidizer.java
View file

@ -24,7 +24,7 @@ public class GuiChemicalOxidizer extends GuiMekanism
super(tentity, new ContainerChemicalOxidizer(inventory, tentity));
tileEntity = tentity;
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiOxidationChamber.png")));
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png")));
}
@Override
@ -123,6 +123,6 @@ public class GuiChemicalOxidizer extends GuiMekanism
}
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiOxidationChamber.png"));
drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 40, 16, 59);
drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 4, 16, 59);
}
}

9
common/mekanism/common/tileentity/TileEntityChemicalInfuser.java
View file

@ -91,14 +91,14 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement
leftTank.receive(GasTransmission.removeGas(inventory[0], null, leftTank.getNeeded()), true);
}
if(inventory[2] != null && (rightTank.getGas() == null || rightTank.getStored() < rightTank.getMaxGas()))
if(inventory[1] != null && (rightTank.getGas() == null || rightTank.getStored() < rightTank.getMaxGas()))
{
rightTank.receive(GasTransmission.removeGas(inventory[2], null, rightTank.getNeeded()), true);
rightTank.receive(GasTransmission.removeGas(inventory[1], null, rightTank.getNeeded()), true);
}
if(inventory[1] != null && centerTank.getGas() != null)
if(inventory[2] != null && centerTank.getGas() != null)
{
centerTank.draw(GasTransmission.addGas(inventory[1], centerTank.getGas()), true);
centerTank.draw(GasTransmission.addGas(inventory[2], centerTank.getGas()), true);
}
if(canOperate() && getEnergy() >= ENERGY_USAGE && MekanismUtils.canFunction(this))
@ -278,6 +278,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement
nbtTags.setBoolean("isActive", isActive);
nbtTags.setInteger("controlType", controlType.ordinal());
System.out.println("reading");
nbtTags.setCompoundTag("leftTank", leftTank.write(new NBTTagCompound()));
nbtTags.setCompoundTag("rightTank", rightTank.write(new NBTTagCompound()));
nbtTags.setCompoundTag("centerTank", centerTank.write(new NBTTagCompound()));

6
resources/assets/mekanism/lang/en_US.lang
View file

@ -152,13 +152,13 @@ item.tinIngot.name=Tin Ingot
gas.hydrogen=Hydrogen
gas.oxygen=Oxygen
gas.sulfuricGas=Sulfur Dioxide
gas.sulfuricAcid=Aerosolized Sulfuric Acid
gas.sulfuricAcid=Sulfuric Acid
//Fluids
fluid.hydrogen=Liquid Hydrogen
fluid.oxygen=Liquid Oxygen
fluid.sulfuricGas=Liquid Sulfur Dioxide
fluid.sulfuricAcid=Sulfuric Acid
fluid.sulfuricAcid=Liquid Sulfuric Acid
//Gui text
gui.removeSpeedUpgrade=Remove speed upgrade
@ -195,6 +195,8 @@ gui.on=On
gui.off=Off
gui.filters=Filters
gui.chemicalInfuser.short=C. Infuser
gui.dictionary.noKey=No key.
gui.dictionary.key=Key