From 7c4568a2eb2d110e804b6f3be5d0260bbdd6bf69 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Sun, 23 Mar 2014 12:13:58 +0100 Subject: [PATCH] Using username instead of getDisplayName for registrations. Fake buttons are now normal buttons so they are not automatically activated. Moved the profiler registration out of a if statement (so they register client side too). SSP players have an automatic PRIVILEGED elevation. Fixed Center On Map for Entities not selecting the chunk. --- .../opis/data/holders/stats/StatsPlayer.java | 2 +- mcp/mobius/opis/gui/swing/SwingUI.java | 12 ++++++------ mcp/mobius/opis/modOpis.java | 18 +++++++----------- .../opis/network/OpisConnectionHandler.java | 8 ++++++++ mcp/mobius/opis/network/OpisPacketHandler.java | 9 +++++++++ .../entperchunk/OverlayEntityPerChunk.java | 2 +- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/mcp/mobius/opis/data/holders/stats/StatsPlayer.java b/mcp/mobius/opis/data/holders/stats/StatsPlayer.java index 1081fca..f45f223 100644 --- a/mcp/mobius/opis/data/holders/stats/StatsPlayer.java +++ b/mcp/mobius/opis/data/holders/stats/StatsPlayer.java @@ -14,7 +14,7 @@ public class StatsPlayer extends StatAbstract { public StatsPlayer(EntityPlayer player){ this.eid = player.entityId; - this.name = player.getDisplayName(); + this.name = player.username; this.coord = new CoordinatesBlock(player.worldObj.provider.dimensionId, player.posX, player.posY, player.posZ); this.chunk = this.coord.asCoordinatesChunk(); } diff --git a/mcp/mobius/opis/gui/swing/SwingUI.java b/mcp/mobius/opis/gui/swing/SwingUI.java index 16d35f2..d294454 100644 --- a/mcp/mobius/opis/gui/swing/SwingUI.java +++ b/mcp/mobius/opis/gui/swing/SwingUI.java @@ -150,8 +150,8 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi private JButtonAccess btnPlayersPull; private JScrollPane scrollPanePlayers; private JTable tablePlayers; - private JButtonAccess btnPlayers_Dummy1; - private JButtonAccess btnPlayers_Dummy2; + private JButton btnPlayers_Dummy1; + private JButton btnPlayers_Dummy2; private JLabel lblSummaryTimeStampLastRun; public void showUI(){ @@ -478,11 +478,11 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi btnPlayersPull.addActionListener(this); panelPlayers.add(btnPlayersPull, "cell 2 0,alignx left"); - btnPlayers_Dummy1 = new JButtonAccess("Kill", AccessLevel.PRIVILEGED); + btnPlayers_Dummy1 = new JButton("Kill"); btnPlayers_Dummy1.setEnabled(false); panelPlayers.add(btnPlayers_Dummy1, "cell 3 0"); - btnPlayers_Dummy2 = new JButtonAccess("Morph", AccessLevel.PRIVILEGED); + btnPlayers_Dummy2 = new JButton("Morph"); btnPlayers_Dummy2.setEnabled(false); panelPlayers.add(btnPlayers_Dummy2, "cell 4 0"); @@ -877,8 +877,8 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi CoordinatesBlock coord = data.getCoordinates(); PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.OVERLAY_CHUNK_ENTITIES)); PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST_CHUNK_ENTITIES, data.getChunk())); - OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4); MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance()); + OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk(); Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z)); } @@ -934,7 +934,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi CoordinatesBlock coord = data.getCoordinates(); PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.OVERLAY_CHUNK_ENTITIES)); PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST_CHUNK_ENTITIES, data.getChunk())); - OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4); + OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk(); MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance()); Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z)); } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 6f578e1..288e6d3 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -128,17 +128,13 @@ public class modOpis { TickRegistry.registerTickHandler(new OpisServerTickHandler(), Side.SERVER); TickRegistry.registerTickHandler(new OpisClientTickHandler(), Side.CLIENT); - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){ - //ProfilerRegistrar.registerProfilerTick(new TickHandlerClientProfiler()); - } else { - ProfilerRegistrar.registerProfilerTileEntity(new TileEntityProfiler()); - ProfilerRegistrar.registerProfilerEntity(new EntityProfiler()); - ProfilerRegistrar.registerProfilerHandler(new HandlerProfiler()); - ProfilerRegistrar.registerProfilerWorldTick(new WorldTickProfiler()); - ProfilerRegistrar.registerProfilerTick(TickProfiler.instance()); - ProfilerRegistrar.registerProfilerEntUpdate(new EntUpdateProfiler()); - ProfilerRegistrar.registerProfilerPacket(PacketProfiler.instance()); - } + ProfilerRegistrar.registerProfilerTileEntity(new TileEntityProfiler()); + ProfilerRegistrar.registerProfilerEntity(new EntityProfiler()); + ProfilerRegistrar.registerProfilerHandler(new HandlerProfiler()); + ProfilerRegistrar.registerProfilerWorldTick(new WorldTickProfiler()); + ProfilerRegistrar.registerProfilerTick(TickProfiler.instance()); + ProfilerRegistrar.registerProfilerEntUpdate(new EntUpdateProfiler()); + ProfilerRegistrar.registerProfilerPacket(PacketProfiler.instance()); if (lagGenID != -1){ Block blockDemo = new BlockLag(lagGenID, Material.wood); diff --git a/mcp/mobius/opis/network/OpisConnectionHandler.java b/mcp/mobius/opis/network/OpisConnectionHandler.java index 53b9db3..891ba00 100644 --- a/mcp/mobius/opis/network/OpisConnectionHandler.java +++ b/mcp/mobius/opis/network/OpisConnectionHandler.java @@ -1,9 +1,12 @@ package mcp.mobius.opis.network; import mcp.mobius.opis.data.holders.basetypes.SerialLong; +import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataValue; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager; +import net.minecraft.network.MemoryConnection; import net.minecraft.network.NetLoginHandler; import net.minecraft.network.packet.NetHandler; import net.minecraft.network.packet.Packet1Login; @@ -16,6 +19,11 @@ public class OpisConnectionHandler implements IConnectionHandler { @Override public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) { OpisPacketHandler.validateAndSend(Packet_DataValue.create(DataReq.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), player); + + if (manager instanceof MemoryConnection){ + System.out.printf("Adding SSP player to list of privileged users\n"); + PlayerTracker.instance().addPrivilegedPlayer(((EntityPlayer)player).username, false); + } } @Override diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 6ec3341..ecb6ffd 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.logging.Level; import mapwriter.Mw; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; @@ -282,9 +283,17 @@ public class OpisPacketHandler implements IPacketHandler { else if (header == Packets.REQ_DATA){ Packet_ReqData castedPacket = new Packet_ReqData(packet); + + String logmsg = String.format("Received request %s from player %s ... ", castedPacket.dataReq, ((EntityPlayer)player).username); + if (castedPacket.dataReq.canPlayerUseCommand(player)){ + logmsg += "Accepted"; DataReqHandler.instance().handle(castedPacket.dataReq, castedPacket.param1, castedPacket.param2, player); + } else { + logmsg += "Rejected"; } + + modOpis.log.log(Level.INFO, logmsg); } } diff --git a/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java b/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java index 540ec0e..59db9ca 100644 --- a/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java +++ b/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java @@ -56,7 +56,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider { public HashMap overlayData = new HashMap(); public ArrayList reducedData = new ArrayList(); public ArrayList entStats = new ArrayList(); - CoordinatesChunk selectedChunk = null; + public CoordinatesChunk selectedChunk = null; private OverlayEntityPerChunk(){}