aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api/gui
diff options
context:
space:
mode:
authordraknyte1 <draknyte1@hotmail.com>2016-11-04 15:23:26 +1000
committerdraknyte1 <draknyte1@hotmail.com>2016-11-04 15:23:26 +1000
commit0669f5eb9d5029a8b94ec552171b0837605f7747 (patch)
tree6b40e64c04d51b7a33cf2f0b35f7232cf37c4247 /src/Java/gtPlusPlus/xmod/gregtech/api/gui
parent3654052fb63a571c5eaca7f20714b87c17f7e966 (diff)
downloadGT5-Unofficial-0669f5eb9d5029a8b94ec552171b0837605f7747.tar.gz
GT5-Unofficial-0669f5eb9d5029a8b94ec552171b0837605f7747.tar.bz2
GT5-Unofficial-0669f5eb9d5029a8b94ec552171b0837605f7747.zip
$ Cleaned up the entire project.
> Much neat, very nices.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/gui')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java98
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java50
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java36
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java44
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java36
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java173
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java130
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java163
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java48
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java96
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java43
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java110
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java96
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java86
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java67
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java89
16 files changed, 710 insertions, 655 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
index e286cd9cd6..fc9e9ffcbe 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
@@ -18,57 +18,61 @@ import net.minecraft.inventory.Slot;
*/
public class CONTAINER_DeluxeTank extends GT_Container_BasicTank {
- public int mContent = 0;
+ public int mContent = 0;
- public CONTAINER_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
- super(aInventoryPlayer, aTileEntity);
- }
+ public CONTAINER_DeluxeTank(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+ super(aInventoryPlayer, aTileEntity);
+ }
- @Override
- public void addSlots(InventoryPlayer aInventoryPlayer) {
- addSlotToContainer(new Slot(mTileEntity, 0, 80, 17));
- addSlotToContainer(new GT_Slot_Output(mTileEntity, 1, 80, 53));
- addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 41, 42));
- addSlotToContainer(new GT_Slot_Render(mTileEntity, 3, 59, 42));
- }
+ @Override
+ public void addSlots(final InventoryPlayer aInventoryPlayer) {
+ this.addSlotToContainer(new Slot(this.mTileEntity, 0, 80, 17));
+ this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 1, 80, 53));
+ this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 2, 41, 42));
+ this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 3, 59, 42));
+ }
- @Override
- public void detectAndSendChanges() {
- super.detectAndSendChanges();
- if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
- if (((GT_MetaTileEntity_DeluxeTank) mTileEntity.getMetaTileEntity()).mFluid != null)
- mContent = ((GT_MetaTileEntity_DeluxeTank) mTileEntity.getMetaTileEntity()).mFluid.amount;
- else
- mContent = 0;
- Iterator var2 = this.crafters.iterator();
- while (var2.hasNext()) {
- ICrafting var1 = (ICrafting) var2.next();
- var1.sendProgressBarUpdate(this, 100, mContent & 65535);
- var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
- }
- }
+ @Override
+ public void detectAndSendChanges() {
+ super.detectAndSendChanges();
+ if (this.mTileEntity.isClientSide() || this.mTileEntity.getMetaTileEntity() == null) {
+ return;
+ }
+ if (((GT_MetaTileEntity_DeluxeTank) this.mTileEntity.getMetaTileEntity()).mFluid != null) {
+ this.mContent = ((GT_MetaTileEntity_DeluxeTank) this.mTileEntity.getMetaTileEntity()).mFluid.amount;
+ }
+ else {
+ this.mContent = 0;
+ }
+ final Iterator var2 = this.crafters.iterator();
+ while (var2.hasNext()) {
+ final ICrafting var1 = (ICrafting) var2.next();
+ var1.sendProgressBarUpdate(this, 100, this.mContent & 65535);
+ var1.sendProgressBarUpdate(this, 101, this.mContent >>> 16);
+ }
+ }
- @Override
- @SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
- case 100:
- mContent = mContent & -65536 | par2;
- break;
- case 101:
- mContent = mContent & 65535 | par2 << 16;
- break;
- }
- }
+ @Override
+ public int getShiftClickSlotCount() {
+ return 1;
+ }
- @Override
- public int getSlotCount() {
- return 2;
- }
+ @Override
+ public int getSlotCount() {
+ return 2;
+ }
- @Override
- public int getShiftClickSlotCount() {
- return 1;
- }
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void updateProgressBar(final int par1, final int par2) {
+ super.updateProgressBar(par1, par2);
+ switch (par1) {
+ case 100:
+ this.mContent = this.mContent & -65536 | par2;
+ break;
+ case 101:
+ this.mContent = this.mContent & 65535 | par2 << 16;
+ break;
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
index 4083875fdb..24a970d360 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
@@ -11,28 +11,30 @@ import net.minecraft.inventory.Slot;
* The Container I use for all my Basic Machines
*/
public class CONTAINER_IndustrialCentrifuge extends GT_ContainerMetaTile_Machine {
-
- public CONTAINER_IndustrialCentrifuge(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
-
- super(aInventoryPlayer, aTileEntity);
- }
-
- public CONTAINER_IndustrialCentrifuge(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) {
- super(aInventoryPlayer, aTileEntity, bindInventory);
- }
-
- @Override
- public void addSlots(InventoryPlayer aInventoryPlayer) {
- addSlotToContainer(new Slot(mTileEntity, 1, 154, 42));
- }
-
- @Override
- public int getSlotCount() {
- return 1;
- }
-
- @Override
- public int getShiftClickSlotCount() {
- return 1;
- }
+
+ public CONTAINER_IndustrialCentrifuge(final InventoryPlayer aInventoryPlayer,
+ final IGregTechTileEntity aTileEntity) {
+
+ super(aInventoryPlayer, aTileEntity);
+ }
+
+ public CONTAINER_IndustrialCentrifuge(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final boolean bindInventory) {
+ super(aInventoryPlayer, aTileEntity, bindInventory);
+ }
+
+ @Override
+ public void addSlots(final InventoryPlayer aInventoryPlayer) {
+ this.addSlotToContainer(new Slot(this.mTileEntity, 1, 154, 42));
+ }
+
+ @Override
+ public int getShiftClickSlotCount() {
+ return 1;
+ }
+
+ @Override
+ public int getSlotCount() {
+ return 1;
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
index 0a19c62d0c..350b4f00f1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
@@ -7,25 +7,25 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
public class CONTAINER_IronBlastFurnace extends GT_ContainerMetaTile_Machine {
- public CONTAINER_IronBlastFurnace(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
- super(aInventoryPlayer, aTileEntity);
- }
+ public CONTAINER_IronBlastFurnace(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+ super(aInventoryPlayer, aTileEntity);
+ }
- @Override
- public void addSlots(InventoryPlayer aInventoryPlayer) {
- addSlotToContainer(new Slot(this.mTileEntity, 0, 34, 16));
- addSlotToContainer(new Slot(this.mTileEntity, 1, 34, 34));
- addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 2, 86, 25));
- addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 3, 104, 25));
- }
+ @Override
+ public void addSlots(final InventoryPlayer aInventoryPlayer) {
+ this.addSlotToContainer(new Slot(this.mTileEntity, 0, 34, 16));
+ this.addSlotToContainer(new Slot(this.mTileEntity, 1, 34, 34));
+ this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 2, 86, 25));
+ this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 3, 104, 25));
+ }
- @Override
- public int getSlotCount() {
- return 4;
- }
-
- @Override
+ @Override
public int getShiftClickSlotCount() {
- return 2;
- }
+ return 2;
+ }
+
+ @Override
+ public int getSlotCount() {
+ return 4;
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
index 1c94298e09..56906c96f0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
@@ -11,31 +11,27 @@ import net.minecraft.entity.player.InventoryPlayer;
* The Container I use for all my Basic Machines
*/
public class CONTAINER_MatterFab extends GT_ContainerMetaTile_Machine {
-
- public int mUUA_USED = ((GregtechMetaTileEntity_MassFabricator)this.mTileEntity.getMetaTileEntity()).getAmplifierUsed();
- public int mUUM_MADE = ((GregtechMetaTileEntity_MassFabricator)this.mTileEntity.getMetaTileEntity()).getMatterProduced();
-
- public CONTAINER_MatterFab(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
- super(aInventoryPlayer, aTileEntity);
- }
- public CONTAINER_MatterFab(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) {
- super(aInventoryPlayer, aTileEntity, bindInventory);
- }
-}
+ public int mUUA_USED = ((GregtechMetaTileEntity_MassFabricator) this.mTileEntity.getMetaTileEntity())
+ .getAmplifierUsed();
+ public int mUUM_MADE = ((GregtechMetaTileEntity_MassFabricator) this.mTileEntity.getMetaTileEntity())
+ .getMatterProduced();
- /*@Override
- public void addSlots(InventoryPlayer aInventoryPlayer) {
- addSlotToContainer(new Slot(mTileEntity, 1, 152, 5));
- }
+ public CONTAINER_MatterFab(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+ super(aInventoryPlayer, aTileEntity);
+ }
- @Override
- public int getSlotCount() {
- return 1;
- }
+ public CONTAINER_MatterFab(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final boolean bindInventory) {
+ super(aInventoryPlayer, aTileEntity, bindInventory);
+ }
+}
- @Override
- public int getShiftClickSlotCount() {
- return 0;
- }
-}*/
+/*
+ * @Override public void addSlots(InventoryPlayer aInventoryPlayer) {
+ * addSlotToContainer(new Slot(mTileEntity, 1, 152, 5)); }
+ *
+ * @Override public int getSlotCount() { return 1; }
+ *
+ * @Override public int getShiftClickSlotCount() { return 0; } }
+ */
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
index 9e0a7869e5..ce43c02a69 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
@@ -10,27 +10,21 @@ import net.minecraft.entity.player.InventoryPlayer;
* The Container I use for all my Basic Machines
*/
public class CONTAINER_MultiMachine extends GT_ContainerMetaTile_Machine {
- public CONTAINER_MultiMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
- super(aInventoryPlayer, aTileEntity);
- }
+ public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+ super(aInventoryPlayer, aTileEntity);
+ }
- public CONTAINER_MultiMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) {
- super(aInventoryPlayer, aTileEntity, bindInventory);
- }
+ public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final boolean bindInventory) {
+ super(aInventoryPlayer, aTileEntity, bindInventory);
+ }
}
- /*@Override
- public void addSlots(InventoryPlayer aInventoryPlayer) {
- addSlotToContainer(new Slot(mTileEntity, 1, 152, 5));
- }
-
- @Override
- public int getSlotCount() {
- return 1;
- }
-
- @Override
- public int getShiftClickSlotCount() {
- return 0;
- }
-}*/
+/*
+ * @Override public void addSlots(InventoryPlayer aInventoryPlayer) {
+ * addSlotToContainer(new Slot(mTileEntity, 1, 152, 5)); }
+ *
+ * @Override public int getSlotCount() { return 1; }
+ *
+ * @Override public int getShiftClickSlotCount() { return 0; } }
+ */
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
index e07e080f0b..0ea825c9c4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
@@ -12,111 +12,126 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
-public class CONTAINER_SafeBlock
-extends GT_ContainerMetaTile_Machine {
- public CONTAINER_SafeBlock(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+public class CONTAINER_SafeBlock extends GT_ContainerMetaTile_Machine {
+ // public String UUID =
+ // ((BaseMetaTileEntity)mTileEntity).getMetaTileEntity().getBaseMetaTileEntity().getOwnerName();
+ public UUID ownerUUID = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).ownerUUID;
+
+ public String tempPlayer = PlayerCache.lookupPlayerByUUID(this.ownerUUID);
+ public boolean blockStatus = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable;
+ public CONTAINER_SafeBlock(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
super(aInventoryPlayer, aTileEntity);
}
- //public String UUID = ((BaseMetaTileEntity)mTileEntity).getMetaTileEntity().getBaseMetaTileEntity().getOwnerName();
- public UUID ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID;
- public String tempPlayer = PlayerCache.lookupPlayerByUUID(ownerUUID);
- public boolean blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable;
-
@Override
- public void addSlots(InventoryPlayer aInventoryPlayer) {
+ public void addSlots(final InventoryPlayer aInventoryPlayer) {
for (int y = 0; y < 3; y++) {
for (int x = 0; x < 9; x++) {
- addSlotToContainer(new Slot(this.mTileEntity, x + y * 9, 8 + x * 18, 5 + y * 18));
+ this.addSlotToContainer(new Slot(this.mTileEntity, x + y * 9, 8 + x * 18, 5 + y * 18));
}
}
- addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 8, 63, false, true, 1));
- addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 26, 63, false, true, 1));
- addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 44, 63, false, true, 1));
+ this.addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 8, 63, false, true, 1));
+ this.addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 26, 63, false, true, 1));
+ this.addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 27, 44, 63, false, true, 1));
+ }
+
+ @Override
+ public int getShiftClickSlotCount() {
+ return 27;
}
@Override
- public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
- int runs = 0;
+ public int getSlotCount() {
+ return 27;
+ }
+
+ @Override
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
+ final int runs = 0;
if (aSlotIndex < 27) {
return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
}
- Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex);
+ final Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex);
if (tSlot != null) {
if (this.mTileEntity.getMetaTileEntity() == null) {
return null;
}
- if (aSlotIndex == 27) {
-
-
- /*((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput);
- if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput) {
- if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bOutput != false)) {
-
- Utils.LOG_INFO(String.valueOf(Sys.is64Bit()));
- Utils.messagePlayer(aPlayer, "Salmon");
- }
-
- GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
- } else {
- GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
- }
- return null;*/
-
-
- }
- if (aSlotIndex == 28) {}
- /* ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
- if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
- GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");
- } else {
- GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");
- }
- return null;
- }*/
- if (aSlotIndex == 29) /*{
- if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable) {
- if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable) {
- makeIndestructible(aPlayer);
- }
- else {
+ if (aSlotIndex == 27) {
- }
- } else {
- makeIndestructible(aPlayer);
- }
- return null;
- }*/
+ /*
+ * ((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).bOutput =
+ * (!((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).bOutput); if
+ * (((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).bOutput) { if (aPlayer
+ * != null && aPlayer instanceof EntityPlayerMP &&
+ * (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()
+ * ).bOutput != false)) {
+ *
+ * Utils.LOG_INFO(String.valueOf(Sys.is64Bit()));
+ * Utils.messagePlayer(aPlayer, "Salmon"); }
+ *
+ * GT_Utility.sendChatToPlayer(aPlayer,
+ * "Emit Energy to Outputside"); } else {
+ * GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy"); }
+ * return null;
+ */
+
+ }
+ if (aSlotIndex == 28) {
+ }
+ /*
+ * ((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull =
+ * (!((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull); if
+ * (((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
+ * GT_Utility.sendChatToPlayer(aPlayer,
+ * "Emit Redstone if no Slot is free"); } else {
+ * GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone"); }
+ * return null; }
+ */
+ if (aSlotIndex == 29) /*
+ * { if (((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).
+ * bUnbreakable) { if
+ * (((GregtechMetaSafeBlock)
+ * this.mTileEntity.getMetaTileEntity()).
+ * bUnbreakable) {
+ * makeIndestructible(aPlayer); } else {
+ *
+ * } } else { makeIndestructible(aPlayer); }
+ * return null; }
+ */
{
- ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable);
- blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable;
- ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID;
- //Utils.messagePlayer(aPlayer, "Is the safe locked? "+String.valueOf(((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable).toUpperCase());
- /*if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable != false)) {
- UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
- Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer);
- }
- else {
- UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
- Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer);
- }*/
+ ((GregtechMetaSafeBlock) this.mTileEntity
+ .getMetaTileEntity()).bUnbreakable = !((GregtechMetaSafeBlock) this.mTileEntity
+ .getMetaTileEntity()).bUnbreakable;
+ this.blockStatus = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable;
+ this.ownerUUID = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).ownerUUID;
+ // Utils.messagePlayer(aPlayer, "Is the safe locked?
+ // "+String.valueOf(((GregtechMetaSafeBlock)
+ // this.mTileEntity.getMetaTileEntity()).bUnbreakable).toUpperCase());
+ /*
+ * if (aPlayer != null && aPlayer instanceof EntityPlayerMP &&
+ * (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()
+ * ).bUnbreakable != false)) { UnbreakableBlockManager Xasda =
+ * new UnbreakableBlockManager();
+ * Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity,
+ * aPlayer); } else { UnbreakableBlockManager Xasda = new
+ * UnbreakableBlockManager();
+ * Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity,
+ * aPlayer); }
+ */
return null;
}
-
}
return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
}
- @Override
- public int getSlotCount() {
- return 27;
- }
-
- @Override
- public int getShiftClickSlotCount() {
- return 27;
- }
-
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
index 6330249fe4..b70efd4930 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
@@ -10,70 +10,80 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileE
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
-public class CONTAINER_SolarGenerator
- extends GT_ContainerMetaTile_Machine {
- private final int mSteamCapacity;
- public int mWaterAmount = 0;
- public int mSteamAmount = 0;
- public int mProcessingEnergy = 0;
- public int mTemperature = 2;
- public CONTAINER_SolarGenerator(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, int aSteamCapacity) {
- super(aInventoryPlayer, aTileEntity);
- this.mSteamCapacity = aSteamCapacity;
- }
+public class CONTAINER_SolarGenerator extends GT_ContainerMetaTile_Machine {
+ private final int mSteamCapacity;
+ public int mWaterAmount = 0;
+ public int mSteamAmount = 0;
+ public int mProcessingEnergy = 0;
+ public int mTemperature = 2;
- public void addSlots(InventoryPlayer aInventoryPlayer) {
- //addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
- //addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
- //addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));
- //addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
- }
+ public CONTAINER_SolarGenerator(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final int aSteamCapacity) {
+ super(aInventoryPlayer, aTileEntity);
+ this.mSteamCapacity = aSteamCapacity;
+ }
- public int getSlotCount() {
- return 0;
- }
+ @Override
+ public void addSlots(final InventoryPlayer aInventoryPlayer) {
+ // addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
+ // addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
+ // addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));
+ // addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
+ }
- public int getShiftClickSlotCount() {
- return 0;
- }
+ @Override
+ public void detectAndSendChanges() {
+ super.detectAndSendChanges();
+ if (this.mTileEntity.isClientSide() || this.mTileEntity.getMetaTileEntity() == null) {
+ return;
+ }
+ this.mTemperature = ((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).mSolarCharge;
+ this.mProcessingEnergy = ((GregtechMetaTileEntitySolarGenerator) this.mTileEntity
+ .getMetaTileEntity()).mProcessingEnergy;
- public void detectAndSendChanges() {
- super.detectAndSendChanges();
- if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
- return;
- }
- this.mTemperature = ((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).mSolarCharge;
- this.mProcessingEnergy = ((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
-
- this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
- this.mEnergy = (int) Math.min(Integer.MAX_VALUE, mTileEntity.getStoredEU());
- this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
+ this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54
+ / (((GregtechMetaTileEntitySolarGenerator) this.mTileEntity.getMetaTileEntity()).maxProgresstime()
+ - 10)));
+ this.mEnergy = (int) Math.min(Integer.MAX_VALUE, this.mTileEntity.getStoredEU());
+ this.mProcessingEnergy = Math.min(14,
+ Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
- Iterator var2 = this.crafters.iterator();
- while (var2.hasNext()) {
- ICrafting var1 = (ICrafting) var2.next();
- var1.sendProgressBarUpdate(this, 100, this.mTemperature);
- var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
- var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
- var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
- }
- }
+ final Iterator var2 = this.crafters.iterator();
+ while (var2.hasNext()) {
+ final ICrafting var1 = (ICrafting) var2.next();
+ var1.sendProgressBarUpdate(this, 100, this.mTemperature);
+ var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
+ var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
+ var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
+ }
+ }
- @SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
- case 100:
- this.mTemperature = par2;
- break;
- case 101:
- this.mProcessingEnergy = par2;
- break;
- case 102:
- this.mSteamAmount = par2;
- break;
- case 103:
- this.mWaterAmount = par2;
- }
- }
+ @Override
+ public int getShiftClickSlotCount() {
+ return 0;
+ }
+
+ @Override
+ public int getSlotCount() {
+ return 0;
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void updateProgressBar(final int par1, final int par2) {
+ super.updateProgressBar(par1, par2);
+ switch (par1) {
+ case 100:
+ this.mTemperature = par2;
+ break;
+ case 101:
+ this.mProcessingEnergy = par2;
+ break;
+ case 102:
+ this.mSteamAmount = par2;
+ break;
+ case 103:
+ this.mWaterAmount = par2;
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
index 39c32c6b9b..82710a799e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -11,86 +11,85 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
-public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
-{
- public CONTAINER_SteamCondenser(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, int aSteamCapacity)
- {
- super(aInventoryPlayer, aTileEntity);
- this.mSteamCapacity = aSteamCapacity;
- }
-
- @Override
-public void addSlots(InventoryPlayer aInventoryPlayer)
- {
- addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
- addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
- addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));
- addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
- }
-
- @Override
-public int getSlotCount()
- {
- return 4;
- }
-
- @Override
-public int getShiftClickSlotCount()
- {
- return 1;
- }
-
- public int mWaterAmount = 0;
- public int mSteamAmount = 0;
- public int mProcessingEnergy = 0;
- public int mTemperature = 2;
- private final int mSteamCapacity;
- public long mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
-
- @Override
-public void detectAndSendChanges()
- {
- super.detectAndSendChanges();
- if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
- return;
- }
- this.mTemperature = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mTemperature;
- this.mProcessingEnergy = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
- this.mSteamAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam.amount);
- this.mWaterAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid.amount);
- this.mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
-
- this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
- this.mSteamAmount = Math.min(54, Math.max(0, this.mSteamAmount * 54 / (this.mSteamCapacity - 100)));
- this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / 15900));
- this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
-
- Iterator var2 = this.crafters.iterator();
- while (var2.hasNext())
- {
- ICrafting var1 = (ICrafting)var2.next();
- var1.sendProgressBarUpdate(this, 100, this.mTemperature);
- var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
- var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
- var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
- }
- }
-
- @Override
-@SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2)
- {
- super.updateProgressBar(par1, par2);
- switch (par1)
- {
- case 100:
- this.mTemperature = par2; break;
- case 101:
- this.mProcessingEnergy = par2; break;
- case 102:
- this.mSteamAmount = par2; break;
- case 103:
- this.mWaterAmount = par2;
- }
- }
+public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine {
+ public int mWaterAmount = 0;
+
+ public int mSteamAmount = 0;
+
+ public int mProcessingEnergy = 0;
+
+ public int mTemperature = 2;
+
+ private final int mSteamCapacity;
+ public long mTickingTime = ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).RI;
+ public CONTAINER_SteamCondenser(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final int aSteamCapacity) {
+ super(aInventoryPlayer, aTileEntity);
+ this.mSteamCapacity = aSteamCapacity;
+ }
+ @Override
+ public void addSlots(final InventoryPlayer aInventoryPlayer) {
+ this.addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
+ this.addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
+ this.addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));
+ this.addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
+ }
+ @Override
+ public void detectAndSendChanges() {
+ super.detectAndSendChanges();
+ if (this.mTileEntity.isClientSide() || this.mTileEntity.getMetaTileEntity() == null) {
+ return;
+ }
+ this.mTemperature = ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).mTemperature;
+ this.mProcessingEnergy = ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
+ this.mSteamAmount = ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0
+ : ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).mSteam.amount;
+ this.mWaterAmount = ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0
+ : ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).mFluid.amount;
+ this.mTickingTime = ((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).RI;
+
+ this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54
+ / (((GregtechMetaBoilerBase) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
+ this.mSteamAmount = Math.min(54, Math.max(0, this.mSteamAmount * 54 / (this.mSteamCapacity - 100)));
+ this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / 15900));
+ this.mProcessingEnergy = Math.min(14,
+ Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
+
+ final Iterator var2 = this.crafters.iterator();
+ while (var2.hasNext()) {
+ final ICrafting var1 = (ICrafting) var2.next();
+ var1.sendProgressBarUpdate(this, 100, this.mTemperature);
+ var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
+ var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
+ var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
+ }
+ }
+ @Override
+ public int getShiftClickSlotCount() {
+ return 1;
+ }
+
+ @Override
+ public int getSlotCount() {
+ return 4;
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void updateProgressBar(final int par1, final int par2) {
+ super.updateProgressBar(par1, par2);
+ switch (par1) {
+ case 100:
+ this.mTemperature = par2;
+ break;
+ case 101:
+ this.mProcessingEnergy = par2;
+ break;
+ case 102:
+ this.mSteamAmount = par2;
+ break;
+ case 103:
+ this.mWaterAmount = par2;
+ }
+ }
} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
index 8b9a12019a..e3311119da 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java
@@ -1,7 +1,6 @@
package gtPlusPlus.xmod.gregtech.api.gui;
-import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
-
+import gregtech.api.enums.GT_Values;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.entity.player.InventoryPlayer;
@@ -9,28 +8,31 @@ import net.minecraft.util.StatCollector;
public class GUI_DeluxeTank extends GT_GUIContainerMetaTile_Machine {
- private final String mName;
+ private final String mName;
- public GUI_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
- super(new CONTAINER_DeluxeTank(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png");
- mName = aName;
- }
+ public GUI_DeluxeTank(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final String aName) {
+ super(new CONTAINER_DeluxeTank(aInventoryPlayer, aTileEntity), GT_Values.RES_PATH_GUI + "BasicTank.png");
+ this.mName = aName;
+ }
- @Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
- fontRendererObj.drawString(mName, 8, 6, 4210752);
- if (mContainer != null) {
- fontRendererObj.drawString("Fuel | A | B |", 10, 20, 16448255);
- //fontRendererObj.drawString(GT_Utility.parseNumberToString(((CONTAINER_DeluxeTank) mContainer).mContent), 10, 30, 16448255);
- }
- }
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ }
- @Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (width - xSize) / 2;
- int y = (height - ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
- }
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2,
+ 4210752);
+ this.fontRendererObj.drawString(this.mName, 8, 6, 4210752);
+ if (this.mContainer != null) {
+ this.fontRendererObj.drawString("Fuel | A | B |", 10, 20, 16448255);
+ // fontRendererObj.drawString(GT_Utility.parseNumberToString(((CONTAINER_DeluxeTank)
+ // mContainer).mContent), 10, 30, 16448255);
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
index 38726f12d8..4dd1a17c91 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
@@ -1,65 +1,73 @@
package gtPlusPlus.xmod.gregtech.api.gui;
-
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.InventoryPlayer;
-
public class GUI_IndustrialCentrifuge extends GT_GUIContainerMetaTile_Machine {
- String mName = "";
- private short counter = 0;
+ String mName = "";
+ private short counter = 0;
- public GUI_IndustrialCentrifuge(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
- super(new CONTAINER_IndustrialCentrifuge(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
- mName = aName;
+ public GUI_IndustrialCentrifuge(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final String aName, final String aTextureFile) {
+ super(new CONTAINER_IndustrialCentrifuge(aInventoryPlayer, aTileEntity),
+ CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+ this.mName = aName;
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- fontRendererObj.drawString(mName, 10, 8, 16448255);
- if (counter >= 100){
- counter = 0;
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ }
+
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
+ if (this.counter >= 100) {
+ this.counter = 0;
}
else {
- counter++;
+ this.counter++;
}
- if (mContainer != null) {
- if ((((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode & 1) != 0)
- fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
- if ((((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode & 2) != 0)
- fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
- if ((((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode & 4) != 0)
- fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
- if ((((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode & 8) != 0)
- fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
- if ((((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode & 32) != 0)
- fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
- if ((((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode & 64) != 0)
- fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+ if (this.mContainer != null) {
+ if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 1) != 0) {
+ this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+ }
+ if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 2) != 0) {
+ this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+ }
+ if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 4) != 0) {
+ this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+ }
+ if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 8) != 0) {
+ this.fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+ }
+ if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 32) != 0) {
+ this.fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+ }
+ if ((((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode & 64) != 0) {
+ this.fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+ }
- if (((CONTAINER_IndustrialCentrifuge) mContainer).mDisplayErrorCode == 0) {
- if (((CONTAINER_IndustrialCentrifuge) mContainer).mActive == 0) {
- fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
- fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
- fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
- } else {
- fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
- /*if (CORE.DEBUG){
- fontRendererObj.drawString("Debug Counter: "+counter, 10, 56, 16448255);
- }*/
+ if (((CONTAINER_IndustrialCentrifuge) this.mContainer).mDisplayErrorCode == 0) {
+ if (((CONTAINER_IndustrialCentrifuge) this.mContainer).mActive == 0) {
+ this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
+ this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
+ this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+ }
+ else {
+ this.fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+ /*
+ * if (CORE.DEBUG){ fontRendererObj.drawString(
+ * "Debug Counter: "+counter, 10, 56, 16448255); }
+ */
}
}
- }
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (width - xSize) / 2;
- int y = (height - ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+ }
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
index 1ce7bdea68..c018ca7807 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -5,26 +5,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.InventoryPlayer;
-public class GUI_IronBlastFurnace
- extends GT_GUIContainerMetaTile_Machine {
- public GUI_IronBlastFurnace(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
- super(new CONTAINER_IronBlastFurnace(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI+"IronBlastFurnace.png");
- }
+public class GUI_IronBlastFurnace extends GT_GUIContainerMetaTile_Machine {
+ public GUI_IronBlastFurnace(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+ super(new CONTAINER_IronBlastFurnace(aInventoryPlayer, aTileEntity),
+ CORE.RES_PATH_GUI + "IronBlastFurnace.png");
+ }
- @Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- this.fontRendererObj.drawString("Iron Blast Furnace", 8, 4, 4210752);
- }
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ if (this.mContainer != null && this.mContainer.mProgressTime > 0) {
+ this.drawTexturedModalRect(x + 58, y + 28, 176, 0,
+ Math.max(0, Math.min(20,
+ (this.mContainer.mProgressTime > 0 ? 1 : 0) + this.mContainer.mProgressTime * 20
+ / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime))),
+ 11);
+ }
+ }
- @Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (this.width - this.xSize) / 2;
- int y = (this.height - this.ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
- if ((this.mContainer != null) &&
- (this.mContainer.mProgressTime > 0)) {
- drawTexturedModalRect(x + 58, y + 28, 176, 0, Math.max(0, Math.min(20, (this.mContainer.mProgressTime > 0 ? 1 : 0) + this.mContainer.mProgressTime * 20 / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime))), 11);
- }
- }
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString("Iron Blast Furnace", 8, 4, 4210752);
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
index f7101e5ae4..82baddc05c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.gregtech.api.gui;
-
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.core.lib.CORE;
@@ -11,62 +10,71 @@ import net.minecraft.entity.player.InventoryPlayer;
* <p/>
* The GUI-Container I use for all my Basic Machines
* <p/>
- * As the NEI-RecipeTransferRect Handler can't handle one GUI-Class for all GUIs I needed to produce some dummy-classes which extend this class
+ * As the NEI-RecipeTransferRect Handler can't handle one GUI-Class for all GUIs
+ * I needed to produce some dummy-classes which extend this class
*/
public class GUI_MatterFab extends GT_GUIContainerMetaTile_Machine {
- String mName = "";
- int uuaUsed = 0;
- int uumMade = 0;
+ String mName = "";
+ int uuaUsed = 0;
+ int uumMade = 0;
- public GUI_MatterFab(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
- super(new CONTAINER_MatterFab(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
- mName = aName;
- }
+ public GUI_MatterFab(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final String aName, final String aTextureFile) {
+ super(new CONTAINER_MatterFab(aInventoryPlayer, aTileEntity),
+ CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+ this.mName = aName;
+ }
- @Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- fontRendererObj.drawString(mName, 10, 8, 16448255);
-
-
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ }
- if (mContainer != null) {
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 1) != 0)
- fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 2) != 0)
- fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 4) != 0)
- fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 8) != 0)
- fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 16) != 0)
- fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 32) != 0)
- fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
- if ((((CONTAINER_MatterFab) mContainer).mDisplayErrorCode & 64) != 0)
- fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
- if (((CONTAINER_MatterFab) mContainer).mDisplayErrorCode == 0) {
- if (((CONTAINER_MatterFab) mContainer).mActive == 0) {
- fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
- fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
- fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
- } else {
- uuaUsed = ((CONTAINER_MatterFab) mContainer).mUUA_USED;
- uumMade = ((CONTAINER_MatterFab) mContainer).mUUM_MADE;
- fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
- fontRendererObj.drawString("UU-Amplifier Used: "+uuaUsed, 10, 24, 16448255);
- fontRendererObj.drawString("UU-Matter Fabricated: "+uumMade, 10, 32, 16448255);
- }
- }
- }
- }
+ if (this.mContainer != null) {
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 1) != 0) {
+ this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+ }
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 2) != 0) {
+ this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+ }
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 4) != 0) {
+ this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+ }
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 8) != 0) {
+ this.fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+ }
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 16) != 0) {
+ this.fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
+ }
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 32) != 0) {
+ this.fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+ }
+ if ((((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode & 64) != 0) {
+ this.fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+ }
- @Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (width - xSize) / 2;
- int y = (height - ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
- }
+ if (((CONTAINER_MatterFab) this.mContainer).mDisplayErrorCode == 0) {
+ if (((CONTAINER_MatterFab) this.mContainer).mActive == 0) {
+ this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
+ this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
+ this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+ }
+ else {
+ this.uuaUsed = ((CONTAINER_MatterFab) this.mContainer).mUUA_USED;
+ this.uumMade = ((CONTAINER_MatterFab) this.mContainer).mUUM_MADE;
+ this.fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+ this.fontRendererObj.drawString("UU-Amplifier Used: " + this.uuaUsed, 10, 24, 16448255);
+ this.fontRendererObj.drawString("UU-Matter Fabricated: " + this.uumMade, 10, 32, 16448255);
+ }
+ }
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
index c4114e70e1..a3e17e0198 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.gregtech.api.gui;
-
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.core.lib.CORE;
@@ -11,54 +10,65 @@ import net.minecraft.entity.player.InventoryPlayer;
* <p/>
* The GUI-Container I use for all my Basic Machines
* <p/>
- * As the NEI-RecipeTransferRect Handler can't handle one GUI-Class for all GUIs I needed to produce some dummy-classes which extend this class
+ * As the NEI-RecipeTransferRect Handler can't handle one GUI-Class for all GUIs
+ * I needed to produce some dummy-classes which extend this class
*/
public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
- String mName = "";
+ String mName = "";
- public GUI_MultiMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
- super(new CONTAINER_MultiMachine(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
- mName = aName;
- }
+ public GUI_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final String aName, final String aTextureFile) {
+ super(new CONTAINER_MultiMachine(aInventoryPlayer, aTileEntity),
+ CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+ this.mName = aName;
+ }
- @Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- fontRendererObj.drawString(mName, 10, 8, 16448255);
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ }
- if (mContainer != null) {
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 1) != 0)
- fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 2) != 0)
- fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 4) != 0)
- fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 8) != 0)
- fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 16) != 0)
- fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 32) != 0)
- fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
- if ((((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0)
- fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
- if (((CONTAINER_MultiMachine) mContainer).mDisplayErrorCode == 0) {
- if (((CONTAINER_MultiMachine) mContainer).mActive == 0) {
- fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
- fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
- fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
- } else {
- fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
- }
- }
- }
- }
+ if (this.mContainer != null) {
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 1) != 0) {
+ this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+ }
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0) {
+ this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+ }
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0) {
+ this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+ }
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 8) != 0) {
+ this.fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+ }
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 16) != 0) {
+ this.fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
+ }
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0) {
+ this.fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+ }
+ if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 64) != 0) {
+ this.fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+ }
- @Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (width - xSize) / 2;
- int y = (height - ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
- }
+ if (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode == 0) {
+ if (((CONTAINER_MultiMachine) this.mContainer).mActive == 0) {
+ this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
+ this.fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
+ this.fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+ }
+ else {
+ this.fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+ }
+ }
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
index d5f970870b..f422829798 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
@@ -5,45 +5,49 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.InventoryPlayer;
-public class GUI_SafeBlock
- extends GT_GUIContainerMetaTile_Machine {
- public GUI_SafeBlock(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
- super(new CONTAINER_SafeBlock(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "SafeBlock.png");
- }
-
- //String UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID.toString();
- boolean blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
- //String tempPlayer;
-
- private void updateVars(){
- //UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID;
- blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
- // tempPlayer = PlayerCache.lookupPlayerByUUID(UUID);
- }
-
- @Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2)
- {
- updateVars();
- //this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72, 4210752);
- //this.fontRendererObj.drawString(": "+ UUID.toLowerCase(), 44, 82, 4210752);
- this.fontRendererObj.drawString("Safe Status", 76, 61, 4210752);
- if (blockStatus){
- this.fontRendererObj.drawString("Locked", 88, 73, 4210752);
- }
- else {
- this.fontRendererObj.drawString("Unlocked", 82, 73, 4210752);
- }
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (this.width - this.xSize) / 2;
- int y = (this.height - this.ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
- /*String UUID = ((CONTAINER_SafeBlock)this.mContainer).UUID;
- this.fontRendererObj.drawString("Owner UUID: "+ UUID, 8, 12, 4210752);*/
-
- }
+public class GUI_SafeBlock extends GT_GUIContainerMetaTile_Machine {
+ // String UUID =
+ // ((CONTAINER_SafeBlock)this.mContainer).ownerUUID.toString();
+ boolean blockStatus = ((CONTAINER_SafeBlock) this.mContainer).blockStatus;
+ // String tempPlayer;
+
+ public GUI_SafeBlock(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+ super(new CONTAINER_SafeBlock(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + "SafeBlock.png");
+ }
+
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ /*
+ * String UUID = ((CONTAINER_SafeBlock)this.mContainer).UUID;
+ * this.fontRendererObj.drawString("Owner UUID: "+ UUID, 8, 12,
+ * 4210752);
+ */
+
+ }
+
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.updateVars();
+ // this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72,
+ // 4210752);
+ // this.fontRendererObj.drawString(": "+ UUID.toLowerCase(), 44, 82,
+ // 4210752);
+ this.fontRendererObj.drawString("Safe Status", 76, 61, 4210752);
+ if (this.blockStatus) {
+ this.fontRendererObj.drawString("Locked", 88, 73, 4210752);
+ }
+ else {
+ this.fontRendererObj.drawString("Unlocked", 82, 73, 4210752);
+ }
+ }
+
+ private void updateVars() {
+ // UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID;
+ this.blockStatus = ((CONTAINER_SafeBlock) this.mContainer).blockStatus;
+ // tempPlayer = PlayerCache.lookupPlayerByUUID(UUID);
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
index 7c185ebb94..3acc299ce1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
@@ -4,38 +4,41 @@ import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.entity.player.InventoryPlayer;
-public class GUI_SolarGenerator
- extends GT_GUIContainerMetaTile_Machine {
- public GUI_SolarGenerator(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName, int aSteamCapacity) {
- super(new CONTAINER_SolarGenerator(aInventoryPlayer, aTileEntity, aSteamCapacity), "gregtech:textures/gui/" + aTextureName);
- }
+public class GUI_SolarGenerator extends GT_GUIContainerMetaTile_Machine {
+ public GUI_SolarGenerator(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final String aTextureName, final int aSteamCapacity) {
+ super(new CONTAINER_SolarGenerator(aInventoryPlayer, aTileEntity, aSteamCapacity),
+ "gregtech:textures/gui/" + aTextureName);
+ }
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- this.fontRendererObj.drawString("Solar Generator", 8, 4, 4210752);
- }
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ if (this.mContainer != null) {
+ int tScale = ((CONTAINER_SolarGenerator) this.mContainer).mProcessingEnergy;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 70, y + 25 + 54 - tScale, 194, 54 - tScale, 10, tScale);
+ }
+ tScale = ((CONTAINER_SolarGenerator) this.mContainer).mEnergy;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 83, y + 25 + 54 - tScale, 204, 54 - tScale, 10, tScale);
+ }
+ tScale = ((CONTAINER_SolarGenerator) this.mContainer).mTemperature;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 96, y + 25 + 54 - tScale, 214, 54 - tScale, 10, tScale);
+ }
+ tScale = ((CONTAINER_SolarGenerator) this.mContainer).mProcessingEnergy;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 117, y + 44 + 14 - tScale, 177, 14 - tScale, 15, tScale + 1);
+ }
+ }
+ }
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (this.width - this.xSize) / 2;
- int y = (this.height - this.ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
- if (this.mContainer != null) {
- int tScale = ((CONTAINER_SolarGenerator) this.mContainer).mProcessingEnergy;
- if (tScale > 0) {
- drawTexturedModalRect(x + 70, y + 25 + 54 - tScale, 194, 54 - tScale, 10, tScale);
- }
- tScale = ((CONTAINER_SolarGenerator) this.mContainer).mEnergy;
- if (tScale > 0) {
- drawTexturedModalRect(x + 83, y + 25 + 54 - tScale, 204, 54 - tScale, 10, tScale);
- }
- tScale = ((CONTAINER_SolarGenerator) this.mContainer).mTemperature;
- if (tScale > 0) {
- drawTexturedModalRect(x + 96, y + 25 + 54 - tScale, 214, 54 - tScale, 10, tScale);
- }
- tScale = ((CONTAINER_SolarGenerator) this.mContainer).mProcessingEnergy;
- if (tScale > 0) {
- drawTexturedModalRect(x + 117, y + 44 + 14 - tScale, 177, 14 - tScale, 15, tScale + 1);
- }
- }
- }
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString("Solar Generator", 8, 4, 4210752);
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
index 9c4e14f0dc..91fdad5742 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
@@ -5,51 +5,48 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.InventoryPlayer;
-public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
-{
+public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine {
long tickTime = 0;
-
- public GUI_SteamCondenser(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName, int aSteamCapacity)
- {
- super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), CORE.RES_PATH_GUI + aTextureName);
- }
-
- @Override
-protected void drawGuiContainerForegroundLayer(int par1, int par2)
- {
- this.fontRendererObj.drawString("Condenser", 8, 4, 4210752);
- if (CORE.DEBUG){
- tickTime = ((CONTAINER_SteamCondenser)this.mContainer).mTickingTime;
- this.fontRendererObj.drawString("Tick Time: "+tickTime, 8, 12, 4210752);
- }
- }
-
- @Override
-protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
- {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
- int x = (this.width - this.xSize) / 2;
- int y = (this.height - this.ySize) / 2;
- drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
- if (this.mContainer != null)
- {
-
- int tScale = ((CONTAINER_SteamCondenser)this.mContainer).mSteamAmount;
- if (tScale > 0) {
- drawTexturedModalRect(x + 70, y + 25 + 54 - tScale, 194, 54 - tScale, 10, tScale);
- }
- tScale = ((CONTAINER_SteamCondenser)this.mContainer).mWaterAmount;
- if (tScale > 0) {
- drawTexturedModalRect(x + 83, y + 25 + 54 - tScale, 204, 54 - tScale, 10, tScale);
- }
- tScale = ((CONTAINER_SteamCondenser)this.mContainer).mTemperature;
- if (tScale > 0) {
- drawTexturedModalRect(x + 96, y + 25 + 54 - tScale, 214, 54 - tScale, 10, tScale);
- }
- tScale = ((CONTAINER_SteamCondenser)this.mContainer).mProcessingEnergy;
- if (tScale > 0) {
- drawTexturedModalRect(x + 115, y + 44 + 2/* - tScale*/, 177, 14 - tScale, 15, 1+tScale);
- }
- }
- }
+
+ public GUI_SteamCondenser(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
+ final String aTextureName, final int aSteamCapacity) {
+ super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity),
+ CORE.RES_PATH_GUI + aTextureName);
+ }
+
+ @Override
+ protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+ super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ final int x = (this.width - this.xSize) / 2;
+ final int y = (this.height - this.ySize) / 2;
+ this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+ if (this.mContainer != null) {
+
+ int tScale = ((CONTAINER_SteamCondenser) this.mContainer).mSteamAmount;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 70, y + 25 + 54 - tScale, 194, 54 - tScale, 10, tScale);
+ }
+ tScale = ((CONTAINER_SteamCondenser) this.mContainer).mWaterAmount;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 83, y + 25 + 54 - tScale, 204, 54 - tScale, 10, tScale);
+ }
+ tScale = ((CONTAINER_SteamCondenser) this.mContainer).mTemperature;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 96, y + 25 + 54 - tScale, 214, 54 - tScale, 10, tScale);
+ }
+ tScale = ((CONTAINER_SteamCondenser) this.mContainer).mProcessingEnergy;
+ if (tScale > 0) {
+ this.drawTexturedModalRect(x + 115, y + 44 + 2/* - tScale */, 177, 14 - tScale, 15, 1 + tScale);
+ }
+ }
+ }
+
+ @Override
+ protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+ this.fontRendererObj.drawString("Condenser", 8, 4, 4210752);
+ if (CORE.DEBUG) {
+ this.tickTime = ((CONTAINER_SteamCondenser) this.mContainer).mTickingTime;
+ this.fontRendererObj.drawString("Tick Time: " + this.tickTime, 8, 12, 4210752);
+ }
+ }
} \ No newline at end of file