diff options
9 files changed, 103 insertions, 85 deletions
diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java index 088cbd8c82..5bd3ff59a9 100644 --- a/src/main/java/com/github/technus/tectech/Util.java +++ b/src/main/java/com/github/technus/tectech/Util.java @@ -1452,6 +1452,7 @@ public final class Util { return previousValue; } + @Deprecated public static double receiveDouble(double previousValue, int startIndex, int index, int value){ return Double.longBitsToDouble(receiveLong(Double.doubleToLongBits(previousValue),startIndex,index,value)); } @@ -1497,6 +1498,7 @@ public final class Util { crafter.sendProgressBarUpdate(container, startIndex, (int)((value & 0xFFFF000000000000L)>>>48)); } + @Deprecated public static float receiveFloat(float previousValue, int startIndex, int index, int value){ return Float.intBitsToFloat(receiveInteger(Float.floatToIntBits(previousValue),startIndex,index,value)); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java index f9c53090ff..cb189538d8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java @@ -16,10 +16,14 @@ import net.minecraft.item.ItemStack; public class GT_Container_Param extends GT_ContainerMetaTile_Machine { public int param = 0; - public double value0f = 0; - public double value1f = 0; - public double input0f = 0; - public double input1f = 0; + public double value0d = 0; + public double value1d = 0; + public double input0d = 0; + public double input1d = 0; + public long value0l = 0; + public long value1l = 0; + public long input0l = 0; + public long input1l = 0; public GT_Container_Param(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { super(aInventoryPlayer, aTileEntity); @@ -133,18 +137,18 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine { return; } param = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).param; - value0f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value0D; - value1f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value1D; - input0f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input0D; - input1f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input1D; + value0d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value0D; + value1d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value1D; + input0d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input0D; + input1d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input1D; for (Object crafter : crafters) { ICrafting var1 = (ICrafting) crafter; Util.sendInteger(param,this,var1,100); - Util.sendDouble(value0f,this,var1,102); - Util.sendDouble(value1f,this,var1, 106); - Util.sendDouble(input0f,this,var1, 110); - Util.sendDouble(input1f,this,var1, 114); + Util.sendDouble(value0d,this,var1,102); + Util.sendDouble(value1d,this,var1, 106); + Util.sendDouble(input0d,this,var1, 110); + Util.sendDouble(input1d,this,var1, 114); } } @@ -161,25 +165,25 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine { case 103: case 104: case 105: - value0f=Util.receiveDouble(value0f,102,par1,par2); + value0d =Double.longBitsToDouble(value0l=Util.receiveLong(value0l,102,par1,par2)); return; case 106: case 107: case 108: case 109: - value1f=Util.receiveDouble(value1f,106,par1,par2); + value1d =Double.longBitsToDouble(value1l=Util.receiveLong(value1l,106,par1,par2)); return; case 110: case 111: case 112: case 113: - input0f=Util.receiveDouble(input0f,110,par1,par2); + input0d =Double.longBitsToDouble(input0l=Util.receiveLong(input0l,110,par1,par2)); return; case 114: case 115: case 116: case 117: - input1f=Util.receiveDouble(input1f,114,par1,par2); + input1d =Double.longBitsToDouble(input1l=Util.receiveLong(input1l,114,par1,par2)); return; default: } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java index e925ed91e8..b3b720732d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java @@ -17,10 +17,14 @@ import net.minecraft.item.ItemStack; public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { public int pointer=0; public int param = 0; - public double value1f = 0; - public double value0f = 0; - public double input0f = 0; - public double input1f = 0; + public double value1d = 0; + public double value0d = 0; + public double input0d = 0; + public double input1d = 0; + public long value0l = 0; + public long value1l = 0; + public long input0l = 0; + public long input1l = 0; public GT_Container_ParamAdv(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { super(aInventoryPlayer, aTileEntity); @@ -219,19 +223,19 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { return; } param = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).param; - value0f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value0D; - value1f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value1D; - input0f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input0D; - input1f = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input1D; + value0d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value0D; + value1d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).value1D; + input0d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input0D; + input1d = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).input1D; pointer = ((GT_MetaTileEntity_Hatch_Param) mTileEntity.getMetaTileEntity()).pointer; for (Object crafter : crafters) { ICrafting var1 = (ICrafting) crafter; Util.sendInteger(param,this,var1,100); - Util.sendDouble(value0f,this,var1,102); - Util.sendDouble(value1f,this,var1, 106); - Util.sendDouble(input0f,this,var1, 110); - Util.sendDouble(input1f,this,var1, 114); + Util.sendDouble(value0d,this,var1,102); + Util.sendDouble(value1d,this,var1, 106); + Util.sendDouble(input0d,this,var1, 110); + Util.sendDouble(input1d,this,var1, 114); Util.sendInteger(pointer,this,var1,118); } } @@ -249,25 +253,25 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { case 103: case 104: case 105: - value0f=Util.receiveDouble(value0f,102,par1,par2); + value0d =Double.longBitsToDouble(value0l=Util.receiveLong(value0l,102,par1,par2)); return; case 106: case 107: case 108: case 109: - value1f=Util.receiveDouble(value1f,106,par1,par2); + value1d =Double.longBitsToDouble(value1l=Util.receiveLong(value1l,106,par1,par2)); return; case 110: case 111: case 112: case 113: - input0f=Util.receiveDouble(input0f,110,par1,par2); + input0d =Double.longBitsToDouble(input0l=Util.receiveLong(input0l,110,par1,par2)); return; case 114: case 115: case 116: case 117: - input1f=Util.receiveDouble(input1f,114,par1,par2); + input1d =Double.longBitsToDouble(input1l=Util.receiveLong(input1l,114,par1,par2)); return; case 118: case 119: diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java index 43eea1a123..7b6f97981f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java @@ -21,10 +21,14 @@ import java.util.Objects; public class GT_Container_ParamText extends GT_ContainerMetaTile_Machine { public int param = 0; - public double value0f = 0; - public double value1f = 0; - public double input0f = 0; - public double input1f = 0; + public double value0d = 0; + public double value1d = 0; + public double input0d = 0; + public double input1d = 0; + public long value0l = 0; + public long value1l = 0; + public long input0l = 0; + public long input1l = 0; public String value0s=""; public String value1s=""; @@ -85,17 +89,17 @@ public class GT_Container_ParamText extends GT_ContainerMetaTile_Machine { return; } param = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).param; - value0f = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value0D; - value1f = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value1D; - input0f = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).input0D; - input1f = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).input1D; + value0d = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value0D; + value1d = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value1D; + input0d = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).input0D; + input1d = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).input1D; for (Object crafter : crafters) { ICrafting var1 = (ICrafting) crafter; Util.sendInteger(param,this,var1,100); - Util.sendDouble(value0f,this,var1,102); - Util.sendDouble(value1f,this,var1, 106); - Util.sendDouble(input0f,this,var1, 110); - Util.sendDouble(input1f,this,var1, 114); + Util.sendDouble(value0d,this,var1,102); + Util.sendDouble(value1d,this,var1, 106); + Util.sendDouble(input0d,this,var1, 110); + Util.sendDouble(input1d,this,var1, 114); } if(!Objects.equals(value0s,((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value0s) || !Objects.equals(value0s,((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value0s)){ @@ -125,25 +129,25 @@ public class GT_Container_ParamText extends GT_ContainerMetaTile_Machine { case 103: case 104: case 105: - value0f=Util.receiveDouble(value0f,102,par1,par2); + value0d =Double.longBitsToDouble(value0l=Util.receiveLong(value0l,102,par1,par2)); return; case 106: case 107: case 108: case 109: - value1f=Util.receiveDouble(value1f,106,par1,par2); + value1d =Double.longBitsToDouble(value1l=Util.receiveLong(value1l,106,par1,par2)); return; case 110: case 111: case 112: case 113: - input0f=Util.receiveDouble(input0f,110,par1,par2); + input0d =Double.longBitsToDouble(input0l=Util.receiveLong(input0l,110,par1,par2)); return; case 114: case 115: case 116: case 117: - input1f=Util.receiveDouble(input1f,114,par1,par2); + input1d =Double.longBitsToDouble(input1l=Util.receiveLong(input1l,114,par1,par2)); return; default: } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java index bf63eaa24f..52f0832cb2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java @@ -21,14 +21,14 @@ public class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine { if (mContainer != null) { TecTechFontRender.INSTANCE.drawSplitString("Parameters: " + ((GT_Container_Param) mContainer).param, 46, 7, 167, 0xffffff); Locale locale= Locale.getDefault(); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).input0f), 46, 16, 167, 0x22ddff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).input1f), 46, 24, 167, 0x00ffff); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).value0f), 46, 33, 167, 0x00bbff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).value1f), 46, 41, 167, 0x0077ff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).input0d), 46, 16, 167, 0x22ddff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).input1d), 46, 24, 167, 0x00ffff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).value0d), 46, 33, 167, 0x00bbff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).value1d), 46, 41, 167, 0x0077ff); GL11.glPushMatrix(); GL11.glScalef(.5f,.5f,.5f); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value0f)), 92, 100, 334, 0x00bbff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value1f)), 92, 116, 334, 0x0077ff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value0d)), 92, 100, 334, 0x00bbff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value1d)), 92, 116, 334, 0x0077ff); GL11.glPopMatrix(); } else { TecTechFontRender.INSTANCE.drawSplitString("Parameters", 46, 7, 167, 0xffffff); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java index a682323f8c..ca92f0496e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java @@ -21,14 +21,14 @@ public class GT_GUIContainer_ParamAdv extends GT_GUIContainerMetaTile_Machine { if (mContainer != null) { TecTechFontRender.INSTANCE.drawSplitString("Parameters X: " + ((GT_Container_ParamAdv) mContainer).param, 46, 7, 167, 0xffffff); Locale locale = Locale.getDefault(); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).input0f)), 46, 16, 167, 0x22ddff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).input1f)), 46, 24, 167, 0x00ffff); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).value0f)), 46, 33, 167, 0x00bbff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).value1f)), 46, 41, 167, 0x0077ff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).input0d)), 46, 16, 167, 0x22ddff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).input1d)), 46, 24, 167, 0x00ffff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).value0d)), 46, 33, 167, 0x00bbff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).value1d)), 46, 41, 167, 0x0077ff); GL11.glPushMatrix(); GL11.glScalef(.5f,.5f,.5f); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value0f)), 92, 100, 334, 0x00bbff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value1f)), 92, 116, 334, 0x0077ff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value0d)), 92, 100, 334, 0x00bbff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value1d)), 92, 116, 334, 0x0077ff); GL11.glPopMatrix(); TecTechFontRender.INSTANCE.drawSplitString("Pointer " + Integer.toHexString(((GT_Container_ParamAdv) mContainer).pointer | 0x10000).substring(1), 46, 66, 167, 0x0033ff); } else { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java index ed1f1acdee..2b17563db0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java @@ -17,7 +17,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI; public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { private GuiTextField value0tb; - private GuiTextField valie1tb; + private GuiTextField value1tb; public GT_GUIContainer_ParamText(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { super(new GT_Container_ParamText(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "ParametrizerText.png"); @@ -28,8 +28,8 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { super.initGui(); value0tb = new GuiTextField(TecTechFontRender.INSTANCE, (this.width - 176) / 2 + 12 + 14, (this.height - 166) / 2 + 26, 156 - 18, 12); value0tb.setMaxStringLength(80); - valie1tb = new GuiTextField(TecTechFontRender.INSTANCE, (this.width - 176) / 2 + 12 + 14, (this.height - 166) / 2 + 41, 156 - 18, 12); - valie1tb.setMaxStringLength(80); + value1tb = new GuiTextField(TecTechFontRender.INSTANCE, (this.width - 176) / 2 + 12 + 14, (this.height - 166) / 2 + 41, 156 - 18, 12); + value1tb.setMaxStringLength(80); updateValues(); } @@ -37,15 +37,15 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { public void onGuiClosed() { super.onGuiClosed(); value0tb.setFocused(false); - valie1tb.setFocused(false); + value1tb.setFocused(false); updateValues(); } @Override protected void keyTyped(char p_73869_1_, int p_73869_2_) { value0tb.textboxKeyTyped(p_73869_1_, p_73869_2_); - valie1tb.textboxKeyTyped(p_73869_1_, p_73869_2_); - if ((p_73869_2_ != 1 && p_73869_2_ != this.mc.gameSettings.keyBindInventory.getKeyCode()) || (!value0tb.isFocused() && !valie1tb.isFocused())) { + value1tb.textboxKeyTyped(p_73869_1_, p_73869_2_); + if ((p_73869_2_ != 1 && p_73869_2_ != this.mc.gameSettings.keyBindInventory.getKeyCode()) || (!value0tb.isFocused() && !value1tb.isFocused())) { super.keyTyped(p_73869_1_, p_73869_2_); } updateValues(); @@ -55,21 +55,21 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { public void updateScreen() { super.updateScreen(); value0tb.updateCursorCounter(); - valie1tb.updateCursorCounter(); + value1tb.updateCursorCounter(); } @Override public void drawScreen(int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); value0tb.drawTextBox(); - valie1tb.drawTextBox(); + value1tb.drawTextBox(); } @Override protected void mouseClicked(int p_73864_1_, int p_73864_2_, int p_73864_3_) { super.mouseClicked(p_73864_1_, p_73864_2_, p_73864_3_); value0tb.mouseClicked(p_73864_1_, p_73864_2_, p_73864_3_); - valie1tb.mouseClicked(p_73864_1_, p_73864_2_, p_73864_3_); + value1tb.mouseClicked(p_73864_1_, p_73864_2_, p_73864_3_); updateValues(); } @@ -80,8 +80,8 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { Locale locale = Locale.getDefault(); TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06", 10, 29, 16, 0x00bbff); TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06", 10, 44, 16, 0x0077ff); - TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamText) mContainer).input0f)), 10, 56, 167, 0x22ddff); - TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamText) mContainer).input1f)), 10, 65, 167, 0x00ffff); + TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamText) mContainer).input0d)), 10, 56, 167, 0x22ddff); + TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamText) mContainer).input1d)), 10, 65, 167, 0x00ffff); } else { TecTechFontRender.INSTANCE.drawSplitString("Parameters tXt", 46, 7, 167, 0xffffff); } @@ -116,7 +116,7 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { } if (!Objects.equals(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value0s, value0tb.getText())) { ((GT_Container_ParamText) mContainer).value0s = value0tb.getText(); - ((GT_Container_ParamText) mContainer).value0f = val; + ((GT_Container_ParamText) mContainer).value0d = val; ((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value0s = value0tb.getText(); NetworkDispatcher.INSTANCE.sendToServer(new TextParametersMessage.ParametersTextUpdate( @@ -129,8 +129,8 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { } private void updateIn1() { - if (!valie1tb.isFocused()) { - String str = valie1tb.getText().toLowerCase(); + if (!value1tb.isFocused()) { + String str = value1tb.getText().toLowerCase(); double val; try { if (str.contains("b")) { @@ -142,16 +142,16 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { } else { val = Util.stringToDouble(str); } - if (!Objects.equals(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s, valie1tb.getText())) { - ((GT_Container_ParamText) mContainer).value1s = valie1tb.getText(); - ((GT_Container_ParamText) mContainer).value1f = val; - ((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s = valie1tb.getText(); + if (!Objects.equals(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s, value1tb.getText())) { + ((GT_Container_ParamText) mContainer).value1s = value1tb.getText(); + ((GT_Container_ParamText) mContainer).value1d = val; + ((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s = value1tb.getText(); NetworkDispatcher.INSTANCE.sendToServer(new TextParametersMessage.ParametersTextUpdate( (GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity())); } } catch (Exception e) { - valie1tb.setText(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s); + value1tb.setText(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s); } } } @@ -163,6 +163,6 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine { public void setTextIn1(String in1) { ((GT_Container_ParamText) mContainer).value1s = in1; - this.valie1tb.setText(in1); + this.value1tb.setText(in1); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java index dd2eb0a7be..c42c15bd8d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java @@ -15,7 +15,9 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { public LedStatus[] eParamsInStatus = LedStatus.makeArray(20,LedStatus.STATUS_UNDEFINED); public LedStatus[] eParamsOutStatus = LedStatus.makeArray(20,LedStatus.STATUS_UNDEFINED); public double[] eParamsIn = new double[20];//number I from parametrizers + public long[] eParamsInl = new long[20]; public double[] eParamsOut = new double[20];//number O to parametrizers + public long[] eParamsOutl = new long[20]; public byte eCertainMode = 5, eCertainStatus = 127; public boolean ePowerPass = false, eSafeVoid = false, allowedToWork = false; public final boolean ePowerPassButton, eSafeVoidButton, allowedToWorkButton; @@ -151,10 +153,10 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { allowedToWork = (par2 & 4) == 4; } else if(par1>=128 && par1<208){ int pos=(par1-128)>>2; - eParamsOut[pos]=Util.receiveDouble(eParamsOut[pos],par1&0xFFFFFFFC,par1,par2); + eParamsOut[pos]=Double.longBitsToDouble(eParamsOutl[pos]=Util.receiveLong(eParamsOutl[pos],par1&0xFFFFFFFC,par1,par2)); }else if(par1>=208 && par1<288){ int pos=(par1-208)>>2; - eParamsIn[pos]=Util.receiveDouble(eParamsIn[pos],par1&0xFFFFFFFC,par1,par2); + eParamsIn[pos]=Double.longBitsToDouble(eParamsInl[pos]=Util.receiveLong(eParamsInl[pos],par1&0xFFFFFFFC,par1,par2)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java index 3374d874d4..ebeb266c64 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java @@ -15,8 +15,9 @@ import net.minecraft.item.ItemStack; public class GT_Container_DebugPollutor extends GT_ContainerMetaTile_Machine { - public int pollution =0; - public float anomaly =0; + public int pollution; + public float anomaly; + private int anomalyInt; public GT_Container_DebugPollutor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { super(aInventoryPlayer, aTileEntity); @@ -124,6 +125,7 @@ public class GT_Container_DebugPollutor GT_MetaTileEntity_DebugPollutor dpg = (GT_MetaTileEntity_DebugPollutor) mTileEntity.getMetaTileEntity(); pollution =dpg.pollution; anomaly =dpg.anomaly; + anomalyInt=Float.floatToIntBits(anomaly); for (Object crafter : crafters) { ICrafting var1 = (ICrafting) crafter; @@ -143,7 +145,7 @@ public class GT_Container_DebugPollutor break; case 102: case 103: - anomaly = Util.receiveFloat(anomaly,102,par1,par2); + anomaly = Float.intBitsToFloat(anomalyInt=Util.receiveInteger(anomalyInt,102,par1,par2)); break; } } |