From a79aefb5924456d0e028018e39d4f747e27084e5 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 31 Mar 2014 20:34:50 +0200 Subject: [PATCH] ChunkManager is now an Enum singleton. Wired all the commands to the buttons in Dimensions tab. Buttons are now JButtonAccess to handle access rights. --- .../commands/server/CommandChunkList.java | 4 ++-- .../opis/data/managers/ChunkManager.java | 22 ++++++++++++++----- .../opis/data/managers/EntityManager.java | 15 +++++++++++++ .../opis/events/OpisServerTickHandler.java | 8 +++---- .../opis/gui/overlay/OverlayLoadedChunks.java | 4 ++-- .../opis/gui/overlay/OverlayMeanTime.java | 20 ++++++++--------- .../opis/network/OpisPacketHandler.java | 2 +- .../opis/network/ServerMessageHandler.java | 18 ++++++++------- mcp/mobius/opis/proxy/ProxyClient.java | 6 ++--- .../opis/swing/panels/PanelDimensions.java | 9 +++++--- .../opis/swing/widgets/JButtonAccess.java | 6 +++++ .../opis/swing/widgets/JTableButton.java | 16 +++++++++----- 12 files changed, 87 insertions(+), 43 deletions(-) diff --git a/mcp/mobius/opis/commands/server/CommandChunkList.java b/mcp/mobius/opis/commands/server/CommandChunkList.java index 0eeaa90..ff0bba5 100644 --- a/mcp/mobius/opis/commands/server/CommandChunkList.java +++ b/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -46,10 +46,10 @@ public class CommandChunkList extends CommandBase implements IOpisCommand { ArrayList chunks = new ArrayList(); if (astring.length == 0) - chunks = ChunkManager.instance().getTopChunks(20); + chunks = ChunkManager.INSTANCE.getTopChunks(20); else try{ - chunks = ChunkManager.instance().getTopChunks(Integer.valueOf(astring.length)); + chunks = ChunkManager.INSTANCE.getTopChunks(Integer.valueOf(astring.length)); }catch (Exception e){return;} icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText("[DIM X Z] Time NTEs")); diff --git a/mcp/mobius/opis/data/managers/ChunkManager.java b/mcp/mobius/opis/data/managers/ChunkManager.java index ad4fb20..eb26ad6 100644 --- a/mcp/mobius/opis/data/managers/ChunkManager.java +++ b/mcp/mobius/opis/data/managers/ChunkManager.java @@ -25,11 +25,8 @@ import net.minecraft.world.gen.ChunkProviderServer; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; -public class ChunkManager implements IMessageHandler{ - - private static ChunkManager _instance = new ChunkManager(); - public static ChunkManager instance(){return _instance;}; - private ChunkManager(){} +public enum ChunkManager implements IMessageHandler{ + INSTANCE; private ArrayList chunksLoad = new ArrayList(); private HashMap chunkMeanTime = new HashMap(); @@ -135,6 +132,21 @@ public class ChunkManager implements IMessageHandler{ } return forcedChunks; } + + public void purgeChunks(int dim){ + WorldServer world = DimensionManager.getWorld(dim); + if (world == null) return; + + int loadedChunksDelta = 100; + + ((ChunkProviderServer)world.getChunkProvider()).unloadAllChunks(); + + while(loadedChunksDelta >= 100){ + int loadedBefore = world.getChunkProvider().getLoadedChunkCount(); + world.getChunkProvider().unloadQueuedChunks(); + loadedChunksDelta = loadedBefore - world.getChunkProvider().getLoadedChunkCount(); + } + } @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { diff --git a/mcp/mobius/opis/data/managers/EntityManager.java b/mcp/mobius/opis/data/managers/EntityManager.java index 47fb593..7676c99 100644 --- a/mcp/mobius/opis/data/managers/EntityManager.java +++ b/mcp/mobius/opis/data/managers/EntityManager.java @@ -13,6 +13,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -336,4 +337,18 @@ public enum EntityManager { return amountEntities; } + public int killAllHostiles(int dim){ + WorldServer world = DimensionManager.getWorld(dim); + if (world == null) return -1; + + int killedEnts = 0; + + for (Entity entity : (ArrayList)world.loadedEntityList){ + if (entity instanceof EntityMob){ + entity.setDead(); + killedEnts += 1; + } + } + return killedEnts; + } } diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 8cc3883..492b265 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -84,8 +84,8 @@ public class OpisServerTickHandler implements ITickHandler { OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(NetworkProfiler.INSTANCE.dataSizeOut))); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(NetworkProfiler.INSTANCE.dataSizeIn))); - OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.instance().getForcedChunkAmount()))); - OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.instance().getLoadedChunkAmount()))); + OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.INSTANCE.getForcedChunkAmount()))); + OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.INSTANCE.getLoadedChunkAmount()))); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_TIMING_TICK, TickProfiler.instance().stats)); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.getAmountTileEntities()))); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.INSTANCE.getAmountEntities()))); @@ -171,11 +171,11 @@ public class OpisServerTickHandler implements ITickHandler { if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){ OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.LIST_CHUNK_LOADED_CLEAR), player); - OpisPacketHandler.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(PlayerTracker.instance().playerDimension.get(player)), player); + OpisPacketHandler.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player)), player); } if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){ - ArrayList timingChunks = ChunkManager.instance().getTopChunks(100); + ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); //OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player); } diff --git a/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java b/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java index bf6c6e0..bf04a8f 100644 --- a/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java +++ b/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java @@ -122,7 +122,7 @@ public class OverlayLoadedChunks implements IMwDataProvider { public ArrayList getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) { ArrayList overlays = new ArrayList(); - for (CoordinatesChunk chunk : ChunkManager.instance().getLoadedChunks()){ + for (CoordinatesChunk chunk : ChunkManager.INSTANCE.getLoadedChunks()){ overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, chunk.metadata == 0 ? false : true)); } return overlays; @@ -133,7 +133,7 @@ public class OverlayLoadedChunks implements IMwDataProvider { int xChunk = bX >> 4; int zChunk = bZ >> 4; - for (CoordinatesChunk chunk : ChunkManager.instance().getLoadedChunks()){ + for (CoordinatesChunk chunk : ChunkManager.INSTANCE.getLoadedChunks()){ if (chunk.chunkX == xChunk && chunk.chunkZ == zChunk && chunk.metadata == 0) return ", Game loaded"; diff --git a/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java b/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java index abf67a7..445aee0 100644 --- a/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java +++ b/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java @@ -146,16 +146,16 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ double minTime = 9999; double maxTime = 0; - for (CoordinatesChunk chunk : ChunkManager.instance().getChunkMeanTime().keySet()){ - minTime = Math.min(minTime, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum()); - maxTime = Math.max(maxTime, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum()); + for (CoordinatesChunk chunk : ChunkManager.INSTANCE.getChunkMeanTime().keySet()){ + minTime = Math.min(minTime, ChunkManager.INSTANCE.getChunkMeanTime().get(chunk).getDataSum()); + maxTime = Math.max(maxTime, ChunkManager.INSTANCE.getChunkMeanTime().get(chunk).getDataSum()); } - for (CoordinatesChunk chunk : ChunkManager.instance().getChunkMeanTime().keySet()){ + for (CoordinatesChunk chunk : ChunkManager.INSTANCE.getChunkMeanTime().keySet()){ if (this.selectedChunk != null) - overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.instance().getChunkMeanTime().get(chunk).tileEntities, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, chunk.equals(this.selectedChunk))); + overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.INSTANCE.getChunkMeanTime().get(chunk).tileEntities, ChunkManager.INSTANCE.getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, chunk.equals(this.selectedChunk))); else - overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.instance().getChunkMeanTime().get(chunk).tileEntities, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, false)); + overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.INSTANCE.getChunkMeanTime().get(chunk).tileEntities, ChunkManager.INSTANCE.getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, false)); } return overlays; } @@ -166,11 +166,11 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ int zChunk = bZ >> 4; CoordinatesChunk chunkCoord = new CoordinatesChunk(dim, xChunk, zChunk); - if (ChunkManager.instance().getChunkMeanTime().containsKey(chunkCoord)) + if (ChunkManager.INSTANCE.getChunkMeanTime().containsKey(chunkCoord)) if (modOpis.microseconds) - return String.format("%.3f \u00B5s", ChunkManager.instance().getChunkMeanTime().get(chunkCoord).getDataSum()); + return String.format("%.3f \u00B5s", ChunkManager.INSTANCE.getChunkMeanTime().get(chunkCoord).getDataSum()); else - return String.format(", %.5f ms", ChunkManager.instance().getChunkMeanTime().get(chunkCoord).getDataSum()/1000.0); + return String.format(", %.5f ms", ChunkManager.INSTANCE.getChunkMeanTime().get(chunkCoord).getDataSum()/1000.0); else return ""; @@ -184,7 +184,7 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{ int chunkZ = bZ >> 4; CoordinatesChunk clickedChunk = new CoordinatesChunk(dim, chunkX, chunkZ); - if (ChunkManager.instance().getChunkMeanTime().containsKey(clickedChunk)){ + if (ChunkManager.INSTANCE.getChunkMeanTime().containsKey(clickedChunk)){ if (this.selectedChunk == null) this.selectedChunk = clickedChunk; else if (this.selectedChunk.equals(clickedChunk)) diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index fcc472a..8854a97 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -200,7 +200,7 @@ public class OpisPacketHandler implements IPacketHandler { ArrayList timingHandlers = TickHandlerManager.getCumulatedStats(); ArrayList timingEntities = EntityManager.INSTANCE.getTopEntities(100); ArrayList timingTileEnts = TileEntityManager.getTopEntities(100); - ArrayList timingChunks = ChunkManager.instance().getTopChunks(100); + ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); SerialDouble totalTimeTE = new SerialDouble(TileEntityManager.getTotalUpdateTime()); SerialDouble totalTimeEnt = new SerialDouble(EntityManager.INSTANCE.getTotalUpdateTime()); SerialDouble totalTimeHandler = new SerialDouble(TickHandlerManager.getTotalUpdateTime()); diff --git a/mcp/mobius/opis/network/ServerMessageHandler.java b/mcp/mobius/opis/network/ServerMessageHandler.java index 0f0e359..0e24be1 100644 --- a/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/mcp/mobius/opis/network/ServerMessageHandler.java @@ -63,7 +63,7 @@ public class ServerMessageHandler { } else if (maintype == Message.OVERLAY_CHUNK_TIMING){ - ArrayList timingChunks = ChunkManager.instance().getTopChunks(100); + ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player); } @@ -79,11 +79,11 @@ public class ServerMessageHandler { PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS); PlayerTracker.instance().playerDimension.put(player, ((SerialInt)param1).value); OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.LIST_CHUNK_LOADED_CLEAR), player); - OpisPacketHandler.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(((SerialInt)param1).value), player); + OpisPacketHandler.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(((SerialInt)param1).value), player); } else if (maintype == Message.LIST_CHUNK_TICKETS){ - PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.instance().getTickets()), player); + PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.INSTANCE.getTickets()), player); } else if (maintype == Message.LIST_TIMING_TILEENTS){ @@ -108,7 +108,7 @@ public class ServerMessageHandler { } else if (maintype == Message.LIST_TIMING_CHUNK){ - ArrayList timingChunks = ChunkManager.instance().getTopChunks(100); + ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player); } @@ -187,19 +187,21 @@ public class ServerMessageHandler { } else if(maintype == Message.COMMAND_KILL_HOSTILE_ALL){ - + for (int dim : DimensionManager.getIDs()) + EntityManager.INSTANCE.killAllHostiles(dim); } else if(maintype == Message.COMMAND_KILL_HOSTILE_DIM){ - + EntityManager.INSTANCE.killAllHostiles(((SerialInt)param1).value); } else if(maintype == Message.COMMAND_PURGE_CHUNKS_ALL){ - + for (int dim : DimensionManager.getIDs()) + ChunkManager.INSTANCE.purgeChunks(dim); } else if(maintype == Message.COMMAND_PURGE_CHUNKS_DIM){ - + ChunkManager.INSTANCE.purgeChunks(((SerialInt)param1).value); } else{ diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index bf0bcc1..4a08e62 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -131,9 +131,9 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.instance()); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.instance()); - MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.instance()); - MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.instance()); - MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED_CLEAR, ChunkManager.instance()); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.INSTANCE); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED_CLEAR, ChunkManager.INSTANCE); } @Override diff --git a/mcp/mobius/opis/swing/panels/PanelDimensions.java b/mcp/mobius/opis/swing/panels/PanelDimensions.java index d136f28..e8f0ba7 100644 --- a/mcp/mobius/opis/swing/panels/PanelDimensions.java +++ b/mcp/mobius/opis/swing/panels/PanelDimensions.java @@ -5,9 +5,11 @@ import javax.swing.JPanel; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.DimensionData; +import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataRaw; import mcp.mobius.opis.swing.actions.ActionDimensions; +import mcp.mobius.opis.swing.widgets.JButtonAccess; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableButton; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -22,13 +24,14 @@ import javax.swing.table.DefaultTableModel; import javax.swing.JButton; public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler, ITabPanel { - private JButton btnPurgeAll; + private JButtonAccess btnPurgeAll; public PanelDimensions() { setLayout(new MigLayout("", "[grow]", "[][grow]")); - btnPurgeAll = new JButton("Purge All"); + btnPurgeAll = new JButtonAccess("Purge All", AccessLevel.PRIVILEGED); add(btnPurgeAll, "cell 0 0"); + btnPurgeAll.addActionListener(new ActionDimensions()); JScrollPane scrollPane = new JScrollPane(); add(scrollPane, "cell 0 1,grow"); @@ -66,7 +69,7 @@ public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler for (int i = 0; i < table.getColumnCount(); i++) table.getColumnModel().getColumn(i).setCellRenderer(centerRenderer); - JTableButton buttonColumn = new JTableButton(table, new ActionDimensions(), 9); + JTableButton buttonColumn = new JTableButton(table, new ActionDimensions(), 9, AccessLevel.PRIVILEGED); } diff --git a/mcp/mobius/opis/swing/widgets/JButtonAccess.java b/mcp/mobius/opis/swing/widgets/JButtonAccess.java index 47075d4..4e0501f 100644 --- a/mcp/mobius/opis/swing/widgets/JButtonAccess.java +++ b/mcp/mobius/opis/swing/widgets/JButtonAccess.java @@ -7,6 +7,12 @@ import mcp.mobius.opis.swing.SwingUI; public class JButtonAccess extends JButton { private AccessLevel al = AccessLevel.NONE; + + public JButtonAccess(AccessLevel level){ + super(); + this.al = level; + SwingUI.registeredButtons.add(this); + } public JButtonAccess(String label){ super(label); diff --git a/mcp/mobius/opis/swing/widgets/JTableButton.java b/mcp/mobius/opis/swing/widgets/JTableButton.java index b8b8bdf..08b7aed 100644 --- a/mcp/mobius/opis/swing/widgets/JTableButton.java +++ b/mcp/mobius/opis/swing/widgets/JTableButton.java @@ -2,10 +2,13 @@ package mcp.mobius.opis.swing.widgets; import java.awt.*; import java.awt.event.*; + import javax.swing.*; import javax.swing.border.*; import javax.swing.table.*; +import mcp.mobius.opis.network.enums.AccessLevel; + /** @@ -30,11 +33,13 @@ public class JTableButton extends AbstractCellEditor private Border originalBorder; private Border focusBorder; - private JButton renderButton; - private JButton editButton; + private JButtonAccess renderButton; + private JButtonAccess editButton; private Object editorValue; private boolean isButtonColumnEditor; + private AccessLevel level; + /** * Create the ButtonColumn to be used as a renderer and editor. The * renderer and editor will automatically be installed on the TableColumn @@ -44,13 +49,14 @@ public class JTableButton extends AbstractCellEditor * @param action the Action to be invoked when the button is invoked * @param column the column to which the button renderer/editor is added */ - public JTableButton(JTable table, ActionListener action, int column) + public JTableButton(JTable table, ActionListener action, int column, AccessLevel level) { this.table = table; this.action = action; + this.level = level; - renderButton = new JButton(); - editButton = new JButton(); + renderButton = new JButtonAccess(level); + editButton = new JButtonAccess(level); editButton.setFocusPainted( false ); editButton.addActionListener( this ); originalBorder = editButton.getBorder();