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.
This commit is contained in:
ProfMobius committed 2014-03-23 12:13:58 +01:00
1 parent fd34962ede
commit 7c4568a2eb
6 files changed
+32 -19

No files matched your search

@@ -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();
}
+6 -6
View File
@@ -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));
}
+7 -11
View File
@@ -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);
@@ -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
@@ -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);
}
}
@@ -56,7 +56,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider {
public HashMap<CoordinatesChunk, Integer> overlayData = new HashMap<CoordinatesChunk, Integer>();
public ArrayList<ReducedData> reducedData = new ArrayList<ReducedData>();
public ArrayList<StatsEntity> entStats = new ArrayList<StatsEntity>();
CoordinatesChunk selectedChunk = null;
public CoordinatesChunk selectedChunk = null;
private OverlayEntityPerChunk(){}