diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index c7ea2e633..2a42b9b5c 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -12,6 +12,6 @@ public class ClientPlayerTracker { @SubscribeEvent public void onPlayerChangedDimension(PlayerChangedDimensionEvent event) { Mekanism.playerState.clearPlayer(event.player); - Mekanism.freeRunnerOn.remove(event.player.getName()); + Mekanism.freeRunnerOn.remove(event.player.getUniqueID()); } } diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index b56c93d9e..d7ff4e5bc 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -120,7 +120,7 @@ public class ClientTickHandler { public static boolean isFreeRunnerOn(EntityPlayer player) { if (player != mc.player) { - return Mekanism.freeRunnerOn.contains(player.getName()); + return Mekanism.freeRunnerOn.contains(player.getUniqueID()); } ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); @@ -129,8 +129,7 @@ public class ClientTickHandler { ItemFreeRunners freeRunners = (ItemFreeRunners) stack.getItem(); /*freeRunners.getEnergy(stack) > 0 && */ - return freeRunners.getMode(stack) - == ItemFreeRunners.FreeRunnerMode.NORMAL; + return freeRunners.getMode(stack) == ItemFreeRunners.FreeRunnerMode.NORMAL; } return false; @@ -204,16 +203,16 @@ public class ClientTickHandler { initHoliday = true; } - if (Mekanism.freeRunnerOn.contains(mc.player.getName()) != isFreeRunnerOn(mc.player)) { + if (Mekanism.freeRunnerOn.contains(mc.player.getUniqueID()) != isFreeRunnerOn(mc.player)) { if (isFreeRunnerOn(mc.player) && mc.currentScreen == null) { - Mekanism.freeRunnerOn.add(mc.player.getName()); + Mekanism.freeRunnerOn.add(mc.player.getUniqueID()); } else { - Mekanism.freeRunnerOn.remove(mc.player.getName()); + Mekanism.freeRunnerOn.remove(mc.player.getUniqueID()); } Mekanism.packetHandler.sendToServer( new PacketFreeRunnerData.FreeRunnerDataMessage(PacketFreeRunnerData.FreeRunnerPacket.UPDATE, - mc.player.getName(), isFreeRunnerOn(mc.player))); + mc.player.getUniqueID(), isFreeRunnerOn(mc.player))); } ItemStack bootStack = mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET); @@ -228,9 +227,9 @@ public class ClientTickHandler { // Update player's state for various items; this also automatically notifies server if something changed and // kicks off sounds as necessary - Mekanism.playerState.setJetpackState(mc.player.getName(), isJetpackActive(mc.player), true); - Mekanism.playerState.setGasmaskState(mc.player.getName(), isGasMaskOn(mc.player), true); - Mekanism.playerState.setFlamethrowerState(mc.player.getName(), isFlamethrowerOn(mc.player), true); + Mekanism.playerState.setJetpackState(mc.player.getUniqueID(), isJetpackActive(mc.player), true); + Mekanism.playerState.setGasmaskState(mc.player.getUniqueID(), isGasMaskOn(mc.player), true); + Mekanism.playerState.setFlamethrowerState(mc.player.getUniqueID(), isFlamethrowerOn(mc.player), true); for (Iterator> iter = portableTeleports.entrySet().iterator(); iter.hasNext(); ) { diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 85413cba7..e228094dc 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -1,6 +1,7 @@ package mekanism.client.render; import java.util.Random; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; @@ -121,8 +122,8 @@ public class RenderTickHandler { // Traverse a copy of jetpack state and do animations // TODO: This means we're making a full copy of the state per render....might need to revisit - for (String s : Mekanism.playerState.getActiveJetpacks()) { - EntityPlayer p = mc.world.getPlayerEntityByName(s); + for (UUID uuid : Mekanism.playerState.getActiveJetpacks()) { + EntityPlayer p = mc.world.getPlayerEntityByUUID(uuid); if (p == null) { continue; @@ -168,8 +169,8 @@ public class RenderTickHandler { // Traverse a copy of gasmask state and do animations // TODO: This means we're making a full copy of the state per render....might need to revisit if (world.getWorldTime() % 4 == 0) { - for (String s : Mekanism.playerState.getActiveGasmasks()) { - EntityPlayer p = mc.world.getPlayerEntityByName(s); + for (UUID uuid : Mekanism.playerState.getActiveGasmasks()) { + EntityPlayer p = mc.world.getPlayerEntityByUUID(uuid); if (p == null || !p.isInWater()) { continue; diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 88764bf9e..e9aedc132 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -43,13 +43,13 @@ public class CommonPlayerTracker { @SubscribeEvent public void onPlayerLogoutEvent(PlayerLoggedOutEvent event) { Mekanism.playerState.clearPlayer(event.player); - Mekanism.freeRunnerOn.remove(event.player.getName()); + Mekanism.freeRunnerOn.remove(event.player.getUniqueID()); } @SubscribeEvent public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event) { Mekanism.playerState.clearPlayer(event.player); - Mekanism.freeRunnerOn.remove(event.player.getName()); + Mekanism.freeRunnerOn.remove(event.player.getUniqueID()); if (!event.player.world.isRemote) { Mekanism.packetHandler.sendTo(JetpackDataMessage.FULL(Mekanism.playerState.getActiveJetpacks()), diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 63fe3d61c..d7c937ada 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -199,7 +199,7 @@ public class Mekanism { public static final String MOD_NAME = "Mekanism"; public static final String LOG_TAG = '[' + MOD_NAME + ']'; public static final PlayerState playerState = new PlayerState(); - public static final Set freeRunnerOn = new HashSet<>(); + public static final Set freeRunnerOn = new HashSet<>(); /** * Mekanism Packet Pipeline */ diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index afd6eb7cc..6c4f61d78 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -3,6 +3,8 @@ package mekanism.common; import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.Arrays; +import java.util.UUID; +import javax.annotation.Nonnull; import mekanism.api.Range4D; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketBoxBlacklist; @@ -313,4 +315,14 @@ public class PacketHandler { } } } + + @Nonnull + public static UUID readUUID(ByteBuf dataStream) { + return new UUID(dataStream.readLong(), dataStream.readLong()); + } + + public static void writeUUID(ByteBuf dataStream, UUID uuid) { + dataStream.writeLong(uuid.getMostSignificantBits()); + dataStream.writeLong(uuid.getLeastSignificantBits()); + } } diff --git a/src/main/java/mekanism/common/PlayerState.java b/src/main/java/mekanism/common/PlayerState.java index 1609c4c9a..542a74c99 100644 --- a/src/main/java/mekanism/common/PlayerState.java +++ b/src/main/java/mekanism/common/PlayerState.java @@ -2,6 +2,7 @@ package mekanism.common; import java.util.HashSet; import java.util.Set; +import java.util.UUID; import mekanism.client.sound.SoundHandler; import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; @@ -13,9 +14,9 @@ import net.minecraft.world.World; public class PlayerState { - private Set activeJetpacks = new HashSet<>(); - private Set activeGasmasks = new HashSet<>(); - private Set activeFlamethrowers = new HashSet<>(); + private Set activeJetpacks = new HashSet<>(); + private Set activeGasmasks = new HashSet<>(); + private Set activeFlamethrowers = new HashSet<>(); private World world; @@ -26,9 +27,9 @@ public class PlayerState { } public void clearPlayer(EntityPlayer p) { - activeJetpacks.remove(p.getName()); - activeGasmasks.remove(p.getName()); - activeFlamethrowers.remove(p.getName()); + activeJetpacks.remove(p.getUniqueID()); + activeGasmasks.remove(p.getUniqueID()); + activeFlamethrowers.remove(p.getUniqueID()); } public void init(World world) { @@ -41,28 +42,28 @@ public class PlayerState { // // ---------------------- - public void setJetpackState(String playerId, boolean isActive, boolean isLocal) { - boolean alreadyActive = activeJetpacks.contains(playerId); + public void setJetpackState(UUID uuid, boolean isActive, boolean isLocal) { + boolean alreadyActive = activeJetpacks.contains(uuid); boolean changed = (alreadyActive != isActive); if (alreadyActive && !isActive) { // On -> off - activeJetpacks.remove(playerId); + activeJetpacks.remove(uuid); } else if (!alreadyActive && isActive) { // Off -> on - activeJetpacks.add(playerId); + activeJetpacks.add(uuid); } // If something changed and we're in a remote world, take appropriate action if (changed && world.isRemote) { // If the player is the "local" player, we need to tell the server the state has changed if (isLocal) { - Mekanism.packetHandler.sendToServer(PacketJetpackData.JetpackDataMessage.UPDATE(playerId, isActive)); + Mekanism.packetHandler.sendToServer(PacketJetpackData.JetpackDataMessage.UPDATE(uuid, isActive)); } // Start a sound playing if the person is now flying if (isActive && MekanismConfig.client.enablePlayerSounds) { - SoundHandler.startSound(world.getPlayerEntityByName(playerId), "jetpack"); + SoundHandler.startSound(world.getPlayerEntityByUUID(uuid), "jetpack"); } } } @@ -71,12 +72,12 @@ public class PlayerState { return activeJetpacks.contains(p.getName()); } - public Set getActiveJetpacks() { + public Set getActiveJetpacks() { return activeJetpacks; } - public void setActiveJetpacks(Set newActiveJetpacks) { - for (String activeUser : newActiveJetpacks) { + public void setActiveJetpacks(Set newActiveJetpacks) { + for (UUID activeUser : newActiveJetpacks) { setJetpackState(activeUser, true, false); } } @@ -87,14 +88,14 @@ public class PlayerState { // // ---------------------- - public void setGasmaskState(String playerId, boolean isActive, boolean isLocal) { - boolean alreadyActive = activeGasmasks.contains(playerId); + public void setGasmaskState(UUID uuid, boolean isActive, boolean isLocal) { + boolean alreadyActive = activeGasmasks.contains(uuid); boolean changed = (alreadyActive != isActive); if (alreadyActive && !isActive) { - activeGasmasks.remove(playerId); // On -> off + activeGasmasks.remove(uuid); // On -> off } else if (!alreadyActive && isActive) { - activeGasmasks.add(playerId); // Off -> on + activeGasmasks.add(uuid); // Off -> on } // If something changed and we're in a remote world, take appropriate action @@ -102,26 +103,26 @@ public class PlayerState { // If the player is the "local" player, we need to tell the server the state has changed if (isLocal) { Mekanism.packetHandler - .sendToServer(PacketScubaTankData.ScubaTankDataMessage.UPDATE(playerId, isActive)); + .sendToServer(PacketScubaTankData.ScubaTankDataMessage.UPDATE(uuid, isActive)); } // Start a sound playing if the person is now using a gasmask if (isActive && MekanismConfig.client.enablePlayerSounds) { - SoundHandler.startSound(world.getPlayerEntityByName(playerId), "gasmask"); + SoundHandler.startSound(world.getPlayerEntityByUUID(uuid), "gasmask"); } } } public boolean isGasmaskOn(EntityPlayer p) { - return activeGasmasks.contains(p.getName()); + return activeGasmasks.contains(p.getUniqueID()); } - public Set getActiveGasmasks() { + public Set getActiveGasmasks() { return activeGasmasks; } - public void setActiveGasmasks(Set newActiveGasmasks) { - for (String activeUser : newActiveGasmasks) { + public void setActiveGasmasks(Set newActiveGasmasks) { + for (UUID activeUser : newActiveGasmasks) { setGasmaskState(activeUser, true, false); } } @@ -132,14 +133,14 @@ public class PlayerState { // // ---------------------- - public void setFlamethrowerState(String playerId, boolean isActive, boolean isLocal) { - boolean alreadyActive = activeFlamethrowers.contains(playerId); + public void setFlamethrowerState(UUID uuid, boolean isActive, boolean isLocal) { + boolean alreadyActive = activeFlamethrowers.contains(uuid); boolean changed = (alreadyActive != isActive); if (alreadyActive && !isActive) { - activeFlamethrowers.remove(playerId); // On -> off + activeFlamethrowers.remove(uuid); // On -> off } else if (!alreadyActive && isActive) { - activeFlamethrowers.add(playerId); // Off -> on + activeFlamethrowers.add(uuid); // Off -> on } // If something changed and we're in a remote world, take appropriate action @@ -147,18 +148,18 @@ public class PlayerState { // If the player is the "local" player, we need to tell the server the state has changed if (isLocal) { Mekanism.packetHandler.sendToServer(new FlamethrowerDataMessage(FlamethrowerPacket.UPDATE, null, - playerId, isActive)); + uuid, isActive)); } // Start a sound playing if the person is now using a flamethrower if (isActive && MekanismConfig.client.enablePlayerSounds) { - SoundHandler.startSound(world.getPlayerEntityByName(playerId), "flamethrower"); + SoundHandler.startSound(world.getPlayerEntityByUUID(uuid), "flamethrower"); } } } public boolean isFlamethrowerOn(EntityPlayer p) { - return activeFlamethrowers.contains(p.getName()); + return activeFlamethrowers.contains(p.getUniqueID()); } } diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java index ad8ef4b1a..05d815d49 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java @@ -1,6 +1,7 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; +import java.util.UUID; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemFlamethrower; @@ -18,10 +19,9 @@ public class PacketFlamethrowerData implements IMessageHandler { + PacketHandler.handlePacket(() -> { if (message.packetType == FlamethrowerPacket.UPDATE) { - Mekanism.playerState.setFlamethrowerState(message.username, message.value, false); + Mekanism.playerState.setFlamethrowerState(message.uuid, message.value, false); // If we got this packet on the server, resend out to all clients in same dimension // TODO: Why is this a dimensional thing?! @@ -49,18 +49,17 @@ public class PacketFlamethrowerData implements IMessageHandler { if (message.packetType == FreeRunnerPacket.UPDATE) { if (message.value) { - Mekanism.freeRunnerOn.add(message.username); + Mekanism.freeRunnerOn.add(message.uuid); } else { - Mekanism.freeRunnerOn.remove(message.username); + Mekanism.freeRunnerOn.remove(message.uuid); } if (!entityPlayer.world.isRemote) { Mekanism.packetHandler.sendToDimension( - new FreeRunnerDataMessage(FreeRunnerPacket.UPDATE, message.username, message.value), + new FreeRunnerDataMessage(FreeRunnerPacket.UPDATE, message.uuid, message.value), entityPlayer.world.provider.getDimension()); } } else if (message.packetType == FreeRunnerPacket.MODE) { @@ -56,18 +57,18 @@ public class PacketFreeRunnerData implements IMessageHandler { + PacketHandler.handlePacket(() -> { if (message.packetType == JetpackPacket.UPDATE) { - Mekanism.playerState.setJetpackState(message.username, message.value, false); + Mekanism.playerState.setJetpackState(message.uuid, message.value, false); // If we got this packet on the server, propagate it out to all players in the same // dimension @@ -61,9 +61,9 @@ public class PacketJetpackData implements IMessageHandler activeJetpacks; + protected Set activeJetpacks; - protected String username; + protected UUID uuid; protected boolean value; public JetpackDataMessage() { @@ -79,14 +79,14 @@ public class PacketJetpackData implements IMessageHandler activeNames) { + public static JetpackDataMessage FULL(Set activeNames) { JetpackDataMessage m = new JetpackDataMessage(JetpackPacket.FULL); m.activeJetpacks = activeNames; return m; @@ -99,12 +99,12 @@ public class PacketJetpackData implements IMessageHandler(); int amount = dataStream.readInt(); for (int i = 0; i < amount; i++) { - activeJetpacks.add(PacketHandler.readString(dataStream)); + activeJetpacks.add(PacketHandler.readUUID(dataStream)); } } } diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index 068ba4832..5ccaf49c3 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -3,6 +3,7 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import java.util.HashSet; import java.util.Set; +import java.util.UUID; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; @@ -20,10 +21,9 @@ public class PacketScubaTankData implements IMessageHandler { + PacketHandler.handlePacket(() -> { if (message.packetType == ScubaTankPacket.UPDATE) { - Mekanism.playerState.setGasmaskState(message.username, message.value, false); + Mekanism.playerState.setGasmaskState(message.uuid, message.value, false); // If we got this on the server, relay out to all players in the same dimension // TODO: Why is this a dimensional thing?! @@ -55,9 +55,9 @@ public class PacketScubaTankData implements IMessageHandler activeGasmasks; + protected Set activeGasmasks; - protected String username; + protected UUID uuid; protected boolean value; public ScubaTankDataMessage() { @@ -73,14 +73,14 @@ public class PacketScubaTankData implements IMessageHandler activeNames) { + public static ScubaTankDataMessage FULL(Set activeNames) { ScubaTankDataMessage m = new ScubaTankDataMessage((ScubaTankPacket.FULL)); m.activeGasmasks = activeNames; return m; @@ -93,12 +93,12 @@ public class PacketScubaTankData implements IMessageHandler(); int amount = dataStream.readInt(); for (int i = 0; i < amount; i++) { - activeGasmasks.add(PacketHandler.readString(dataStream)); + activeGasmasks.add(PacketHandler.readUUID(dataStream)); } } }