From 57eda603dbf97d975c56d45608fa6796a8149dd9 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Sat, 23 Jul 2022 18:51:04 +0200 Subject: Added casts to long to fix overflow when doing the bit-manpulation --- .../hatch/GT_MetaTileEntity_Hatch_Param.java | 20 ++++++++++---------- .../hatch/gui/GT_Container_ParamAdv.java | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index d53e0683cd..150bbb1782 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -138,12 +138,12 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch { @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - aNBT.setInteger("ePointer", pointer); + aNBT.setLong("ePointer", pointer); aNBT.setDouble("eValue0D", value0D); aNBT.setDouble("eValue1D", value1D); aNBT.setDouble("eInput0D", input0D); aNBT.setDouble("eInput1D", input1D); - aNBT.setInteger("eParam", param); + aNBT.setLong("eParam", param); } @Override @@ -157,15 +157,15 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch { aNBT.hasKey("eInput1i")){ boolean usesFloat = aNBT.getBoolean("eFloats"); if(usesFloat){ - value0D=Float.intBitsToFloat(aNBT.getInteger("eValue0i")); - value1D=Float.intBitsToFloat(aNBT.getInteger("eValue1i")); - input0D=Float.intBitsToFloat(aNBT.getInteger("eInput0i")); - input1D=Float.intBitsToFloat(aNBT.getInteger("eInput1i")); + value0D=Double.longBitsToDouble(aNBT.getLong("eValue0i")); + value1D=Double.longBitsToDouble(aNBT.getLong("eValue1i")); + input0D=Double.longBitsToDouble(aNBT.getLong("eInput0i")); + input1D=Double.longBitsToDouble(aNBT.getLong("eInput1i")); }else { - value0D=aNBT.getInteger("eValue0i"); - value1D=aNBT.getInteger("eValue1i"); - input0D=aNBT.getInteger("eInput0i"); - input1D=aNBT.getInteger("eInput1i"); + value0D=aNBT.getLong("eValue0i"); + value1D=aNBT.getLong("eValue1i"); + input0D=aNBT.getLong("eInput0i"); + input1D=aNBT.getLong("eInput1i"); } }else{ value0D=aNBT.getDouble("eValue0D"); 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 44608ec204..9d6a93b026 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 @@ -92,11 +92,11 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { } else { if (secondRow) { long temp=Double.doubleToLongBits(paramH.value1D); - temp |= 1 << columnPointer; + temp |= 1L << (long)columnPointer; paramH.value1D=Double.longBitsToDouble(temp); } else { long temp=Double.doubleToLongBits(paramH.value0D); - temp |= 1 << columnPointer; + temp |= 1L << (long)columnPointer; paramH.value0D=Double.longBitsToDouble(temp); } } @@ -128,11 +128,11 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { } else { if (secondRow) { long temp=Double.doubleToLongBits(paramH.value1D); - temp &= ~(1 << columnPointer); + temp &= ~(1L << (long)columnPointer); paramH.value1D=Double.longBitsToDouble(temp); } else { long temp=Double.doubleToLongBits(paramH.value0D); - temp &= ~(1 << columnPointer); + temp &= ~(1L << (long)columnPointer); paramH.value0D=Double.longBitsToDouble(temp); } } @@ -185,11 +185,11 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { } else { if (secondRow) { long temp=Double.doubleToLongBits(paramH.value1D); - temp ^= 1 << columnPointer; + temp ^= 1L << (long)columnPointer; paramH.value1D=Double.longBitsToDouble(temp); } else { long temp=Double.doubleToLongBits(paramH.value0D); - temp ^= 1 << columnPointer; + temp ^= 1L << (long)columnPointer; paramH.value0D=Double.longBitsToDouble(temp); } } @@ -243,7 +243,7 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { @Override @SideOnly(Side.CLIENT) public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); + super.updateProgressBar(par1, par2); switch (par1) { case 100: case 101: -- cgit From 9b6e6d5a2ed37a1e033b1160feb23262da40d0d7 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Sat, 23 Jul 2022 18:59:43 +0200 Subject: Long changes here were unnecessary, so reverted them to int --- .../thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index 150bbb1782..60d2d8738a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -138,12 +138,12 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch { @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - aNBT.setLong("ePointer", pointer); + aNBT.setInteger("ePointer", pointer); aNBT.setDouble("eValue0D", value0D); aNBT.setDouble("eValue1D", value1D); aNBT.setDouble("eInput0D", input0D); aNBT.setDouble("eInput1D", input1D); - aNBT.setLong("eParam", param); + aNBT.setInteger("eParam", param); } @Override -- cgit From d972393f858cfc079ab8e3266a7f1bca8e54b782 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Sat, 23 Jul 2022 19:02:01 +0200 Subject: Reverted accidental format change --- .../tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') 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 9d6a93b026..0ed9c2d3b6 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 @@ -243,7 +243,7 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine { @Override @SideOnly(Side.CLIENT) public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); + super.updateProgressBar(par1, par2); switch (par1) { case 100: case 101: -- cgit From c888442798ecea1a6a1d274474045b6a6002bbeb Mon Sep 17 00:00:00 2001 From: Alexandre Tardif Date: Tue, 26 Jul 2022 14:45:40 -0400 Subject: Fix Power Pass cover --- .../tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java index c9bb6da14f..a2221af398 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java @@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.cover; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_CoverBehavior; import net.minecraft.item.ItemStack; @@ -11,8 +11,9 @@ public class GT_Cover_TM_PowerPassUpgrade extends GT_CoverBehavior { public GT_Cover_TM_PowerPassUpgrade() { } - public boolean isCoverPlaceable(byte aSide, GT_ItemStack aStack, ICoverable aTileEntity) { - IGregTechTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0); + @Override + public boolean isCoverPlaceable(byte aSide, ItemStack aStack, ICoverable aTileEntity) { + IMetaTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0).getMetaTileEntity(); if (iGregTechTileEntityOffset instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM multi = (GT_MetaTileEntity_MultiblockBase_EM) iGregTechTileEntityOffset; return !multi.ePowerPassCover; @@ -22,7 +23,7 @@ public class GT_Cover_TM_PowerPassUpgrade extends GT_CoverBehavior { @Override public void placeCover(byte aSide, ItemStack aCover, ICoverable aTileEntity) { - IGregTechTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0); + IMetaTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0).getMetaTileEntity(); if (iGregTechTileEntityOffset instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM multi = (GT_MetaTileEntity_MultiblockBase_EM) iGregTechTileEntityOffset; multi.ePowerPassCover = true; @@ -33,7 +34,7 @@ public class GT_Cover_TM_PowerPassUpgrade extends GT_CoverBehavior { @Override public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, boolean aForced) { - IGregTechTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0); + IMetaTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0).getMetaTileEntity(); if (iGregTechTileEntityOffset instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM multi = (GT_MetaTileEntity_MultiblockBase_EM) iGregTechTileEntityOffset; multi.ePowerPassCover = false; -- cgit From 441931bc25a34041e99d267d703d7192d1b60169 Mon Sep 17 00:00:00 2001 From: Alexandre Tardif Date: Wed, 27 Jul 2022 09:08:10 -0400 Subject: Make ender link cover private channel work --- .../tectech/mechanics/enderStorage/EnderLinkCoverMessage.java | 2 +- .../technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java index 081ce3b309..64bd1d940b 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java @@ -98,7 +98,7 @@ public class EnderLinkCoverMessage implements IMessage { bindEnderLinkTag(handler, tag); } else if (handler instanceof BaseMetaTileEntity) { BaseMetaTileEntity baseTile = (BaseMetaTileEntity) handler; - if (tag.getUUID() == baseTile.getOwnerUuid()){ + if (tag.getUUID().equals(baseTile.getOwnerUuid())){ bindEnderLinkTag(handler, tag); } } diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java index 315c5e5fff..92855499d9 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java @@ -12,7 +12,6 @@ import gregtech.api.gui.widgets.GT_GuiIconButton; import gregtech.api.gui.widgets.GT_GuiIntegerTextBox; import gregtech.api.interfaces.IGuiScreen; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.net.GT_Packet_TileEntityCover; import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_Utility; @@ -28,6 +27,7 @@ import java.util.UUID; import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderFluidContainer; import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderLinkTag; +import static gregtech.GT_Mod.gregtechproxy; public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { private static final int L_PER_TICK = 8000; @@ -270,10 +270,7 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { private void switchPrivatePublic(int coverVar) { UUID ownerUUID = tag.getUUID(); if (testBit(coverVar, PUBLIC_PRIVATE_MASK)){ - if (tile instanceof BaseMetaTileEntity){ - BaseMetaTileEntity mte = (BaseMetaTileEntity) tile; - ownerUUID = mte.getOwnerUuid(); - } + ownerUUID = gregtechproxy.getThePlayer().getUniqueID(); } else { ownerUUID = null; } -- cgit