Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Bob 2022-02-24 19:15:44 +01:00
parent 72fad8d2de
commit b055bcd703

View File

@ -52,7 +52,7 @@ public class GUIReactorControl extends GuiInfoContainer {
super.initGui();
Keyboard.enableRepeatEvents(true);
//rod extraction fields
// rod extraction fields
for(byte i = 0; i < 2; i++) {
this.fields[i] = new GuiTextField(this.fontRendererObj, guiLeft + 35 + 30 * i, guiTop + 38, 26, 7);
this.fields[i].setTextColor(0x08FF00);
@ -62,7 +62,7 @@ public class GUIReactorControl extends GuiInfoContainer {
this.fields[i].setMaxStringLength(3);
}
//heat fields
// heat fields
for(byte i = 0; i < 2; i++) {
this.fields[i + 2] = new GuiTextField(this.fontRendererObj, guiLeft + 35 + 30 * i, guiTop + 49, 26, 7);
this.fields[i + 2].setTextColor(0x08FF00);
@ -72,24 +72,21 @@ public class GUIReactorControl extends GuiInfoContainer {
this.fields[i + 2].setMaxStringLength(4);
}
this.fields[0].setText(String.valueOf((int)control.levelUpper));
this.fields[1].setText(String.valueOf((int)control.levelLower));
this.fields[2].setText(String.valueOf((int)control.heatUpper / 50));
this.fields[3].setText(String.valueOf((int)control.heatLower / 50));
this.fields[0].setText(String.valueOf((int) control.levelUpper));
this.fields[1].setText(String.valueOf((int) control.levelLower));
this.fields[2].setText(String.valueOf((int) control.heatUpper / 50));
this.fields[3].setText(String.valueOf((int) control.heatLower / 50));
}
@Override
public void drawScreen(int mouseX, int mouseY, float f) {
super.drawScreen(mouseX, mouseY, f);
}
protected void mouseClicked(int x, int y, int i) {
super.mouseClicked(x, y, i);
super.mouseClicked(x, y, i);
for(int j = 0; j < 4; j++) {
for(int j = 0; j < 4; j++) {
this.fields[j].mouseClicked(x, y, i);
}
@ -98,7 +95,7 @@ public class GUIReactorControl extends GuiInfoContainer {
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
NBTTagCompound data = new NBTTagCompound();
double[] vals = new double[] {0D ,0D, 0D, 0D};
double[] vals = new double[] { 0D, 0D, 0D, 0D };
for(int k = 0; k < 4; k++) {
@ -106,7 +103,7 @@ public class GUIReactorControl extends GuiInfoContainer {
int mod = k < 2 ? 1 : 50;
if(NumberUtils.isDigits(fields[k].getText())) {
int j = (int)MathHelper.clamp_double(Double.parseDouble(fields[k].getText()), 0, clamp);
int j = (int) MathHelper.clamp_double(Double.parseDouble(fields[k].getText()), 0, clamp);
fields[k].setText(j + "");
vals[k] = j * mod;
} else {
@ -131,7 +128,7 @@ public class GUIReactorControl extends GuiInfoContainer {
PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(data, control.xCoord, control.yCoord, control.zCoord));
}
}
}
}
@Override
protected void drawGuiContainerForegroundLayer(int i, int j) {
@ -147,7 +144,7 @@ public class GUIReactorControl extends GuiInfoContainer {
Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
GL11.glPushMatrix();
GL11.glPushMatrix();
Tessellator tess = Tessellator.instance;
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glLineWidth(3F);