diff --git a/mcp/mobius/opis/data/server/DeadManSwitch.java b/mcp/mobius/opis/data/server/DeadManSwitch.java index b66fd1b..f418d8d 100644 --- a/mcp/mobius/opis/data/server/DeadManSwitch.java +++ b/mcp/mobius/opis/data/server/DeadManSwitch.java @@ -31,7 +31,7 @@ public class DeadManSwitch implements Runnable{ int npermits = deadManSwitch.drainPermits(); if (npermits == 0){ - System.out.printf("==== Main thread is staled ! %d ticks last seen ====\n", this.nTickWithoutAccident); + //System.out.printf("==== Main thread is staled ! %d ticks last seen ====\n", this.nTickWithoutAccident); this.nTickWithoutAccident = 0; } else { nTickWithoutAccident += 1; diff --git a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java index 88eb82b..bbe488c 100644 --- a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java @@ -35,14 +35,20 @@ public class ActionAmountEntities implements ActionListener, ItemListener { } if (e.getSource() == SwingUI.instance().getPanelAmountEntities().getBtnRefresh()){ - + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES)); } } @Override - public void itemStateChanged(ItemEvent arg0) { - + public void itemStateChanged(ItemEvent e) { + if (e.getStateChange() == ItemEvent.SELECTED){ + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_FILTERING_TRUE)); + } + else if (e.getStateChange() == ItemEvent.DESELECTED){ + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_FILTERING_FALSE)); + } + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES)); } } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java index 58c7933..070c25c 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java @@ -42,8 +42,5 @@ public class ActionTimingChunks implements ActionListener { if (e.getSource() == SwingUI.instance().getPanelTimingChunks().getBtnTeleport()){ PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_CHUNK, data.getChunk())); } - - } - } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java index 11d7955..cf96379 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java @@ -47,6 +47,10 @@ public class ActionTimingTileEnts implements ActionListener { PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, coord)); Minecraft.getMinecraft().setIngameFocus(); } + + if (e.getSource() == SwingUI.instance().getPanelTimingTileEnts().getBtnReset()){ + modOpis.selectedBlock = null; + } } } diff --git a/mcp/mobius/opis/swing/panels/PanelAmountEntities.java b/mcp/mobius/opis/swing/panels/PanelAmountEntities.java index 5f59723..8d83cda 100644 --- a/mcp/mobius/opis/swing/panels/PanelAmountEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelAmountEntities.java @@ -95,6 +95,8 @@ public class PanelAmountEntities extends JPanelMsgHandler{ public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ case LIST_AMOUNT_ENTITIES:{ + ((JTableStats)this.getTable()).setStatistics(rawdata.array); + DefaultTableModel model = (DefaultTableModel)this.getTable().getModel(); int row = this.updateData(table, model, AmountHolder.class); int totalEntities = 0; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java index b76ba20..6fa7fb4 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java @@ -37,7 +37,7 @@ public class PanelTimingEntities extends JPanelMsgHandler{ * Create the panel. */ public PanelTimingEntities() { - setLayout(new MigLayout("", "[grow][][][grow][]", "[][grow][]")); + setLayout(new MigLayout("", "[][][][grow][]", "[][grow][]")); btnCenter = new JButtonAccess("Center Map", AccessLevel.NONE); add(btnCenter, "cell 0 0"); diff --git a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java index 6be6670..eeac895 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java @@ -102,7 +102,8 @@ public class PanelTimingHandlers extends JPanelMsgHandler{ break; } case VALUE_TIMING_HANDLERS:{ - this.getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)rawdata.value).value)); + this.getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)rawdata.value).value)); + break; } case STATUS_START:{ this.getBtnRun().setText("Running..."); diff --git a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java index 8c70aef..71353ab 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java @@ -155,7 +155,8 @@ public class PanelTimingTileEnts extends JPanelMsgHandler{ } case CLIENT_HIGHLIGHT_BLOCK:{ modOpis.selectedBlock = (CoordinatesBlock)rawdata.value; - this.getBtnReset().setEnabled(true); + this.getBtnReset().setEnabled(true); + break; } default: return false;