aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/gui
diff options
context:
space:
mode:
authorYannickMG <yannickmg@gmail.com>2022-07-01 19:13:43 -0400
committerGitHub <noreply@github.com>2022-07-02 00:13:43 +0100
commite7eaa051f2725501436ac31f880746a9dc2f1465 (patch)
tree7fc74410cc795d855913cf590c75574b2834b222 /src/main/java/gregtech/common/gui
parentf7bdbd14a6f5e8fb4e5af0010b4cfcae3282feee (diff)
downloadGT5-Unofficial-e7eaa051f2725501436ac31f880746a9dc2f1465.tar.gz
GT5-Unofficial-e7eaa051f2725501436ac31f880746a9dc2f1465.tar.bz2
GT5-Unofficial-e7eaa051f2725501436ac31f880746a9dc2f1465.zip
Par, var, begone! (#1104)
* Renamed parameters of ItemBlock subclasses * Renamed damageDropped and getDamageValue method parameters of Block subclasses * Removed trivially superfluous overrides of Block::quantityDropped, Block::isOpaqueCube and Block::renderAsNormalBlock * Removed trivially superfluous overrides of Block::getItemDropped * Cleaned up a few more block subclass method parameters * Cleaned up obsolete Javadoc * par1 -> block in ItemBlock Constructors * Renamed arguments to drawGuiContainerForegroundLayer * Cleaned up redundant casts * Renamed arguments to drawGuiContainerBackgroundLayer * Renamed arguments to Slot subclass constructors * Renamed arguments to World subclass GT_DummyWorld * Renamed parameters of updateProgressBar * Renamed the rest of the par* parameters outside of GT_MinableOreGenerator which should be deleted * Renamed most var1-var10 and a few more in generally non-dead code * Renamed last varSomething variables * Removed 3 fully dead classes used nowhere in the codebase, with obsolete unused code
Diffstat (limited to 'src/main/java/gregtech/common/gui')
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Boiler.java24
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java44
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java16
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Regulator.java28
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Teleporter.java48
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java12
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java10
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java6
18 files changed, 120 insertions, 120 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
index afceed249b..d534c2e8ba 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
@@ -57,30 +57,30 @@ public class GT_Container_Boiler extends GT_ContainerMetaTile_Machine {
this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
for (Object crafter : this.crafters) {
- ICrafting var1 = (ICrafting) crafter;
- var1.sendProgressBarUpdate(this, 100, this.mTemperature);
- var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
- var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
- var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
+ ICrafting player = (ICrafting) crafter;
+ player.sendProgressBarUpdate(this, 100, this.mTemperature);
+ player.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
+ player.sendProgressBarUpdate(this, 102, this.mSteamAmount);
+ player.sendProgressBarUpdate(this, 103, this.mWaterAmount);
}
}
@Override
@SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
+ public void updateProgressBar(int id, int value) {
+ super.updateProgressBar(id, value);
+ switch (id) {
case 100:
- this.mTemperature = par2;
+ this.mTemperature = value;
break;
case 101:
- this.mProcessingEnergy = par2;
+ this.mProcessingEnergy = value;
break;
case 102:
- this.mSteamAmount = par2;
+ this.mSteamAmount = value;
break;
case 103:
- this.mWaterAmount = par2;
+ this.mWaterAmount = value;
}
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
index 96e918e27b..4e88c8088e 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
@@ -119,50 +119,50 @@ public class GT_Container_MicrowaveEnergyTransmitter extends GT_ContainerMetaTil
this.mEgg = (((GT_MetaTileEntity_MicrowaveEnergyTransmitter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0);
for (Object crafter : this.crafters) {
- ICrafting var1 = (ICrafting) crafter;
- var1.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
- var1.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
- var1.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
- var1.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
- var1.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
- var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
- var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
- var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
- var1.sendProgressBarUpdate(this, 108, this.mEgg);
+ ICrafting aPlayer = (ICrafting) crafter;
+ aPlayer.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
+ aPlayer.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
+ aPlayer.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
+ aPlayer.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
+ aPlayer.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
+ aPlayer.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
+ aPlayer.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
+ aPlayer.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
+ aPlayer.sendProgressBarUpdate(this, 108, this.mEgg);
}
}
@Override
@SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
+ public void updateProgressBar(int id, int value) {
+ super.updateProgressBar(id, value);
+ switch (id) {
case 100:
- this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetX = (this.mTargetX & 0xFFFF0000 | value & 0xFFFF);
break;
case 101:
- this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
+ this.mTargetX = (this.mTargetX & 0xFFFF | value << 16);
break;
case 102:
- this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetY = (this.mTargetY & 0xFFFF0000 | value & 0xFFFF);
break;
case 103:
- this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
+ this.mTargetY = (this.mTargetY & 0xFFFF | value << 16);
break;
case 104:
- this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | value & 0xFFFF);
break;
case 105:
- this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
+ this.mTargetZ = (this.mTargetZ & 0xFFFF | value << 16);
break;
case 106:
- this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetD = (this.mTargetD & 0xFFFF0000 | value & 0xFFFF);
break;
case 107:
- this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
+ this.mTargetD = (this.mTargetD & 0xFFFF | value << 16);
break;
case 108:
- this.mEgg = par2;
+ this.mEgg = value;
}
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
index 22098a0350..731db03613 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
@@ -41,22 +41,22 @@ public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine {
}
for (Object crafter : this.crafters) {
- ICrafting var1 = (ICrafting) crafter;
- var1.sendProgressBarUpdate(this, 100, mContent & 65535);
- var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+ ICrafting aPlayer = (ICrafting) crafter;
+ aPlayer.sendProgressBarUpdate(this, 100, mContent & 65535);
+ aPlayer.sendProgressBarUpdate(this, 101, mContent >>> 16);
}
}
@Override
@SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
+ public void updateProgressBar(int id, int value) {
+ super.updateProgressBar(id, value);
+ switch (id) {
case 100:
- mContent = mContent & 0xffff0000 | par2 & 0x0000ffff;
+ mContent = mContent & 0xffff0000 | value & 0x0000ffff;
break;
case 101:
- mContent = mContent & 0x0000ffff | par2 << 16;
+ mContent = mContent & 0x0000ffff | value << 16;
break;
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
index 909e1a04a5..c6a7bdbdec 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
@@ -116,44 +116,44 @@ public class GT_Container_Regulator extends GT_ContainerMetaTile_Machine {
this.mTargetSlots[i] = ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[i];
}
for (Object crafter : this.crafters) {
- ICrafting var1 = (ICrafting) crafter;
+ ICrafting player = (ICrafting) crafter;
for (int i = 0; i < 9; i++) {
- var1.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]);
+ player.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]);
}
}
}
@Override
@SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
+ public void updateProgressBar(int id, int value) {
+ super.updateProgressBar(id, value);
+ switch (id) {
case 100:
- this.mTargetSlots[0] = par2;
+ this.mTargetSlots[0] = value;
break;
case 101:
- this.mTargetSlots[1] = par2;
+ this.mTargetSlots[1] = value;
break;
case 102:
- this.mTargetSlots[2] = par2;
+ this.mTargetSlots[2] = value;
break;
case 103:
- this.mTargetSlots[3] = par2;
+ this.mTargetSlots[3] = value;
break;
case 104:
- this.mTargetSlots[4] = par2;
+ this.mTargetSlots[4] = value;
break;
case 105:
- this.mTargetSlots[5] = par2;
+ this.mTargetSlots[5] = value;
break;
case 106:
- this.mTargetSlots[6] = par2;
+ this.mTargetSlots[6] = value;
break;
case 107:
- this.mTargetSlots[7] = par2;
+ this.mTargetSlots[7] = value;
break;
case 108:
- this.mTargetSlots[8] = par2;
+ this.mTargetSlots[8] = value;
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
index 2b1bc3b584..d5013d9504 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
@@ -120,52 +120,52 @@ public class GT_Container_Teleporter extends GT_ContainerMetaTile_Machine {
this.mTargetD = ((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).mTargetD;
this.mEgg = (((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0);
- Iterator var2 = this.crafters.iterator();
- while (var2.hasNext()) {
- ICrafting var1 = (ICrafting) var2.next();
- var1.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
- var1.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
- var1.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
- var1.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
- var1.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
- var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
- var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
- var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
- var1.sendProgressBarUpdate(this, 108, this.mEgg);
+ Iterator playerIterator = this.crafters.iterator();
+ while (playerIterator.hasNext()) {
+ ICrafting player = (ICrafting) playerIterator.next();
+ player.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
+ player.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
+ player.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
+ player.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
+ player.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
+ player.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
+ player.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
+ player.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
+ player.sendProgressBarUpdate(this, 108, this.mEgg);
}
}
@Override
@SideOnly(Side.CLIENT)
- public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
- switch (par1) {
+ public void updateProgressBar(int id, int value) {
+ super.updateProgressBar(id, value);
+ switch (id) {
case 100:
- this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetX = (this.mTargetX & 0xFFFF0000 | value & 0xFFFF);
break;
case 101:
- this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
+ this.mTargetX = (this.mTargetX & 0xFFFF | value << 16);
break;
case 102:
- this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetY = (this.mTargetY & 0xFFFF0000 | value & 0xFFFF);
break;
case 103:
- this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
+ this.mTargetY = (this.mTargetY & 0xFFFF | value << 16);
break;
case 104:
- this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | value & 0xFFFF);
break;
case 105:
- this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
+ this.mTargetZ = (this.mTargetZ & 0xFFFF | value << 16);
break;
case 106:
- this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
+ this.mTargetD = (this.mTargetD & 0xFFFF0000 | value & 0xFFFF);
break;
case 107:
- this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
+ this.mTargetD = (this.mTargetD & 0xFFFF | value << 16);
break;
case 108:
- this.mEgg = par2;
+ this.mEgg = value;
}
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
index 4af4826f93..879c803702 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
@@ -10,13 +10,13 @@ public class GT_GUIContainer_Boiler extends GT_GUIContainerMetaTile_Machine {
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString("Boiler", 8, 4, 4210752);
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
index a43de53e2f..d60977104e 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
@@ -10,13 +10,13 @@ public class GT_GUIContainer_BronzeBlastFurnace extends GT_GUIContainerMetaTile_
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString("Bronze Blast Furnace", 8, 4, 4210752);
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java
index 149f120771..2f993140ac 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_ChestBuffer extends GT_GUIContainerMetaTile_Machine
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java
index 20a8f59894..2ad3ea3018 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_Filter extends GT_GUIContainerMetaTile_Machine {
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
index 9d597c7f30..d6fd5da3ce 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
@@ -23,15 +23,15 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
fontRendererObj.drawString(mName, 8, -10, 16448255);
if (mContainer != null) {
- if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0)
+ if ((mContainer.mDisplayErrorCode & 64) != 0)
fontRendererObj.drawString("Incomplete Structure.", 10, 8, 16448255);
- if (((GT_Container_MultiMachine) mContainer).mDisplayErrorCode == 0) {
- if (((GT_Container_MultiMachine) mContainer).mActive == 0) {
+ if (mContainer.mDisplayErrorCode == 0) {
+ if (mContainer.mActive == 0) {
fontRendererObj.drawString("Hit with Soft Mallet to (re-)start the Machine if it doesn't start.", -70, 170, 16448255);
} else {
fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
@@ -49,8 +49,8 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java
index ca94379c5a..d4a2484a88 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_ItemDistributor extends GT_GUIContainerMetaTile_Mac
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
index db27fb8016..6d580bad11 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
@@ -13,7 +13,7 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255);
if (this.mContainer != null) {
this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetX), 46, 16, 16448255);
@@ -27,8 +27,8 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
index 0ee4b0fd9f..5e009ef428 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
@@ -31,7 +31,7 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
fontRendererObj.drawString(mName, 8, 6, 4210752);
if (mContainer != null) {
@@ -45,8 +45,8 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
index 08ee0d125c..1a709c8129 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
@@ -17,23 +17,23 @@ public class GT_GUIContainer_PrimitiveBlastFurnace extends GT_GUIContainerMetaTi
GT_GuiIcon.TAB_NORMAL_BRICK,
GT_GuiIcon.TAB_HIGHLIGHT_BRICK,
GT_GuiIcon.TAB_DISABLED_BRICK);
-
+
public GT_GUIContainer_PrimitiveBlastFurnace(InventoryPlayer inventoryPlayer, IGregTechTileEntity tileEntity,
String name, String aNEI) {
- super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity),
+ super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity),
String.format("gregtech:textures/gui/%s.png", name.replace(" ", "")));
this.name = name;
this.mNEI = aNEI;
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString(name, 8, 4, 4210752);
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
index 9f557d43af..e4a98ac14b 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
@@ -18,7 +18,7 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
fontRendererObj.drawString(mName, 8, 6, 4210752);
if (mContainer != null) {
@@ -28,8 +28,8 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
index 9a237a517f..06b1ddb00e 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
@@ -10,7 +10,7 @@ public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine {
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[0]), 120, 9, 16448255);
this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[1]), 137, 9, 16448255);
this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[2]), 155, 9, 16448255);
@@ -23,8 +23,8 @@ public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine {
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java
index f4cb165cf9..e7b7730d75 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_SuperBuffer extends GT_GUIContainerMetaTile_Machine
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
index 8c02897738..786cb6b5b3 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
@@ -13,7 +13,7 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine
}
@Override
- protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255);
if (this.mContainer != null) {
this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetX), 46, 16, 16448255);
@@ -27,8 +27,8 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine
}
@Override
- protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
- super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+ protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+ super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
int x = (this.width - this.xSize) / 2;
int y = (this.height - this.ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);