From b39f3056870aae843443ce068516877e2d5213a5 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Tue, 30 Sep 2014 23:53:48 +0200 Subject: [PATCH] Fixed usage of EntityPlayer.getDisplayName() & EntityPlayer.getGameProfile().getName() Fix for #77 --- build.gradle | 2 +- .../mcp/mobius/opis/commands/server/CommandAddPrivileged.java | 2 +- .../mcp/mobius/opis/commands/server/CommandEntityCreate.java | 2 +- .../mcp/mobius/opis/commands/server/CommandFrequency.java | 2 +- .../java/mcp/mobius/opis/commands/server/CommandKill.java | 2 +- .../java/mcp/mobius/opis/commands/server/CommandKillAll.java | 2 +- .../java/mcp/mobius/opis/commands/server/CommandReset.java | 2 +- .../mcp/mobius/opis/commands/server/CommandRmPrivileged.java | 2 +- .../java/mcp/mobius/opis/commands/server/CommandStop.java | 2 +- .../java/mcp/mobius/opis/commands/server/CommandTicks.java | 2 +- .../java/mcp/mobius/opis/data/managers/EntityManager.java | 2 +- src/main/java/mcp/mobius/opis/events/PlayerTracker.java | 4 ++-- src/main/java/mcp/mobius/opis/modOpis.java | 2 +- src/main/java/mcp/mobius/opis/network/PacketManager.java | 2 +- .../java/mcp/mobius/opis/network/ServerMessageHandler.java | 2 +- .../mcp/mobius/opis/network/packets/client/PacketReqData.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 9914dc7..63d4dec 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { shade 'org.jfree:jfreechart:1.0.17' shade 'com.miglayout:miglayout-swing:4.2' shade 'net.sf.opencsv:opencsv:2.3' - compile "mcp.mobius.mobiuscore:MobiusCore:1.2.2_1.7.10:dev" + compile "mcp.mobius.mobiuscore:MobiusCore:1.2.4_1.7.10:dev" deployerJars "org.apache.maven.wagon:wagon-ssh:2.2" } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java b/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java index 3f6f9c6..f210e89 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java @@ -39,7 +39,7 @@ public class CommandAddPrivileged extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java b/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java index c3d9321..bf172ba 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java @@ -48,7 +48,7 @@ public class CommandEntityCreate extends CommandBase { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java b/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java index 4b8e0e6..4cc954d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java @@ -50,7 +50,7 @@ public class CommandFrequency extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java b/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java index 94b6adc..d7d7ca5 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java @@ -64,7 +64,7 @@ public class CommandKill extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java b/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java index 437b0e9..143424b 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -87,7 +87,7 @@ public class CommandKillAll extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java index 645b8f5..300db24 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java @@ -58,7 +58,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java b/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java index 7b0de62..6ef3dfc 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java @@ -42,7 +42,7 @@ public class CommandRmPrivileged extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java b/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java index ac3962d..9d3432d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java @@ -50,7 +50,7 @@ public class CommandStop extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java b/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java index 83a8037..95ca9c8 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java @@ -50,7 +50,7 @@ public class CommandTicks extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); + return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); } @Override diff --git a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java index 9f39c39..d37829b 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java @@ -227,7 +227,7 @@ public enum EntityManager { if (ent instanceof EntityPlayerMP && filtered) return "Player"; else if (ent instanceof EntityPlayerMP && !filtered) - return "[ Player ] " + ((EntityPlayerMP)ent).getDisplayName(); + return "[ Player ] " + ((EntityPlayerMP)ent).getGameProfile().getName(); String name = ent.getCommandSenderName(); diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index 152564b..e62728d 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -38,7 +38,7 @@ public enum PlayerTracker{ } public AccessLevel getPlayerAccessLevel(EntityPlayerMP player){ - return this.getPlayerAccessLevel(player.getDisplayName()); + return this.getPlayerAccessLevel(player.getGameProfile().getName()); } public AccessLevel getPlayerAccessLevel(String name){ @@ -109,7 +109,7 @@ public enum PlayerTracker{ /* if (manager instanceof MemoryConnection){ System.out.printf("Adding SSP player to list of privileged users\n"); - PlayerTracker.INSTANCE.addPrivilegedPlayer(((EntityPlayer)event.player).getDisplayName(), false); + PlayerTracker.INSTANCE.addPrivilegedPlayer(((EntityPlayer)event.player).getGameProfile().getName(), false); } */ diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index a8c2612..74daf50 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -62,7 +62,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; -@Mod(modid="Opis", name="Opis", version="1.2.3a", dependencies="required-after:MobiusCore@[1.2.3]", acceptableRemoteVersions="*") +@Mod(modid="Opis", name="Opis", version="1.2.3a", dependencies="required-after:MobiusCore@[1.2.4]", acceptableRemoteVersions="*") //@Mod(modid="Opis", name="Opis", version="1.2.2") public class modOpis { diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index 50a9663..9b8e2bf 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -340,7 +340,7 @@ public class PacketManager PacketManager.validateAndSend(new NetDataValue(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal())), player); // This portion is to get the proper filtered amounts depending on the player preferences. - String name = player.getDisplayName(); + String name = player.getGameProfile().getName(); boolean filtered = false; if (PlayerTracker.INSTANCE.filteredAmount.containsKey(name)) filtered = PlayerTracker.INSTANCE.filteredAmount.get(name); diff --git a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index 32aa436..060528a 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -51,7 +51,7 @@ public class ServerMessageHandler { } public void handle(Message maintype, ISerializable param1, ISerializable param2, EntityPlayerMP player){ - String name = player.getDisplayName(); + String name = player.getGameProfile().getName(); if (maintype == Message.OVERLAY_CHUNK_ENTITIES){ this.handleOverlayChunkEntities((CoordinatesChunk)param1, player); diff --git a/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java b/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java index fbec4b5..217a023 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java +++ b/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java @@ -71,7 +71,7 @@ public class PacketReqData extends PacketBase{ @Override public void actionServer(World world, EntityPlayerMP player) { - String logmsg = String.format("Received request %s from player %s ... ", this.dataReq, player.getDisplayName()); + String logmsg = String.format("Received request %s from player %s ... ", this.dataReq, player.getGameProfile().getName()); if (this.dataReq.canPlayerUseCommand(player)){ logmsg += "Accepted";