From 985a6c94cae0cb895a09ef06c85ec7759132a06c Mon Sep 17 00:00:00 2001 From: BlueWeabo Date: Sat, 17 Feb 2024 00:12:40 +0200 Subject: Change over wireless teams to use SP teams (#2493) * Change over wireless teams to use SP teams * spotless * null checks * fix unit test being wrong * update * add tab autocomplete * spotless * make sure teams are transfered over correctly * spotless * do not delete space teams data when two world saves put something into it * spotless * go away from a stream * make wireless networks load later --------- Co-authored-by: Martin Robertz --- .../implementations/GT_MetaTileEntity_Wireless_Dynamo.java | 11 +++++------ .../implementations/GT_MetaTileEntity_Wireless_Hatch.java | 14 ++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java index 4b73210afd..a04f5cd986 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java @@ -5,6 +5,8 @@ import static gregtech.api.enums.GT_Values.V; import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap; import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser; +import java.util.UUID; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -19,8 +21,7 @@ import gregtech.api.metatileentity.MetaTileEntity; public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_Dynamo implements IWirelessEnergyHatchInformation { - private String owner_uuid; - private String owner_name; + private UUID owner_uuid; public GT_MetaTileEntity_Wireless_Dynamo(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) { @@ -130,11 +131,9 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D if (aTick == 1) { // UUID and username of the owner. - owner_uuid = aBaseMetaTileEntity.getOwnerUuid() - .toString(); - owner_name = aBaseMetaTileEntity.getOwnerName(); + owner_uuid = aBaseMetaTileEntity.getOwnerUuid(); - strongCheckOrAddUser(owner_uuid, owner_name); + strongCheckOrAddUser(owner_uuid); } // Every ticks_between_energy_addition ticks change the energy content of the machine. diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java index 251a9dfcec..bf624eadd7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java @@ -3,10 +3,10 @@ package gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.enums.GT_Values.V; import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap; -import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser; import static java.lang.Long.min; import java.math.BigInteger; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -18,6 +18,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation; import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.common.misc.spaceprojects.SpaceProjectManager; public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_Energy implements IWirelessEnergyHatchInformation { @@ -26,8 +27,7 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En .valueOf(2 * V[mTier] * ticks_between_energy_addition); private final long eu_transferred_per_operation_long = eu_transferred_per_operation.longValue(); - private String owner_uuid; - private String owner_name; + private UUID owner_uuid; public GT_MetaTileEntity_Wireless_Hatch(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); @@ -132,12 +132,10 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En if (!aBaseMetaTileEntity.isServerSide()) return; - // UUID and username of the owner. - owner_uuid = aBaseMetaTileEntity.getOwnerUuid() - .toString(); - owner_name = aBaseMetaTileEntity.getOwnerName(); + // UUID of the owner. + owner_uuid = aBaseMetaTileEntity.getOwnerUuid(); - strongCheckOrAddUser(owner_uuid, owner_name); + SpaceProjectManager.checkOrCreateTeam(owner_uuid);; tryFetchingEnergy(); } -- cgit