From cd21dcd694fbe2af217781a14eef3814d1ea3570 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Fri, 28 Mar 2014 01:03:18 +0100 Subject: [PATCH] Almost all buttons redone --- .../swing/actions/ActionAmountEntities.java | 13 ++++++- .../opis/swing/actions/ActionPlayers.java | 34 +++++++++++++++++-- .../swing/actions/ActionTimingChunks.java | 19 ++++++++++- .../swing/actions/ActionTimingEntities.java | 31 ++++++++++++++++- .../swing/actions/ActionTimingTileEnts.java | 26 ++++++++++++-- 5 files changed, 114 insertions(+), 9 deletions(-) diff --git a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java index 9b0d4fd..88eb82b 100644 --- a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java @@ -7,6 +7,7 @@ import java.awt.event.ItemListener; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; @@ -14,6 +15,7 @@ import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.basetypes.SerialString; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -22,11 +24,20 @@ public class ActionAmountEntities implements ActionListener, ItemListener { @Override public void actionPerformed(ActionEvent e) { - JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + JTableStats table = SwingUI.instance().getPanelAmountEntities().getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); AmountHolder data = (AmountHolder)table.getStatistics().get(indexData); + if (e.getSource() == SwingUI.instance().getPanelAmountEntities().getBtnKillAll()){ + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILLALL, new SerialString(data.key))); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES)); + } + + if (e.getSource() == SwingUI.instance().getPanelAmountEntities().getBtnRefresh()){ + + } + } @Override diff --git a/mcp/mobius/opis/swing/actions/ActionPlayers.java b/mcp/mobius/opis/swing/actions/ActionPlayers.java index 9b287c7..94cdcb9 100644 --- a/mcp/mobius/opis/swing/actions/ActionPlayers.java +++ b/mcp/mobius/opis/swing/actions/ActionPlayers.java @@ -5,28 +5,56 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import mapwriter.Mw; +import mapwriter.api.MwAPI; +import mapwriter.gui.MwGui; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.basetypes.TargetEntity; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsPlayer; +import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; +import net.minecraft.client.Minecraft; public class ActionPlayers implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + JTableStats table = SwingUI.instance().getPanelPlayers().getTable(); if (table == null || table.getSelectedRow() == -1) return; - int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatsPlayer data = (StatsPlayer)table.getStatistics().get(indexData); + int indexData = table.convertRowIndexToModel(table.getSelectedRow()); + StatsPlayer data = (StatsPlayer)table.getStatistics().get(indexData); + if (e.getSource() == SwingUI.instance().getPanelPlayers().getBtnCenter()){ + CoordinatesBlock coord = data.getCoordinates(); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.getChunk())); + OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk(); + MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance()); + Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z)); + } + + if (e.getSource() == SwingUI.instance().getPanelPlayers().getBtnTeleport()){ + int eid = data.getEID(); + int dim = data.getCoordinates().dim; + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim))); + Minecraft.getMinecraft().setIngameFocus(); + } + + if (e.getSource() == SwingUI.instance().getPanelPlayers().getBtnPull()){ + int eid = data.getEID(); + int dim = data.getCoordinates().dim; + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim))); + } } } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java index ca1365b..58c7933 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java @@ -5,8 +5,12 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import mapwriter.Mw; +import mapwriter.api.MwAPI; +import mapwriter.gui.MwGui; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; @@ -15,18 +19,31 @@ import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsChunk; +import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; +import net.minecraft.client.Minecraft; public class ActionTimingChunks implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + JTableStats table = SwingUI.instance().getPanelTimingChunks().getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); StatsChunk data = (StatsChunk)table.getStatistics().get(indexData); + if (e.getSource() == SwingUI.instance().getPanelTimingChunks().getBtnCenter()){ + OverlayMeanTime.instance().setSelectedChunk(data.getChunk().dim, data.getChunk().chunkX, data.getChunk().chunkZ); + MwAPI.setCurrentDataProvider(OverlayMeanTime.instance()); + Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, data.getChunk().dim, data.getChunk().x + 8, data.getChunk().z + 8)); + } + + 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/ActionTimingEntities.java b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java index bc1daa9..05cfde2 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java @@ -5,28 +5,57 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import mapwriter.Mw; +import mapwriter.api.MwAPI; +import mapwriter.gui.MwGui; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; +import mcp.mobius.opis.data.holders.basetypes.TargetEntity; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsEntity; +import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; +import net.minecraft.client.Minecraft; public class ActionTimingEntities implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + JTableStats table = SwingUI.instance().getPanelTimingEntities().getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); StatsEntity data = (StatsEntity)table.getStatistics().get(indexData); + if (e.getSource() == SwingUI.instance().getPanelTimingEntities().getBtnCenter()){ + CoordinatesBlock coord = data.getCoordinates(); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.getChunk())); + MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance()); + OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk(); + Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z)); + } + + if (e.getSource() == SwingUI.instance().getPanelTimingEntities().getBtnTeleport()){ + int eid = data.getID(); + int dim = data.getCoordinates().dim; + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim))); + Minecraft.getMinecraft().setIngameFocus(); + } + + if (e.getSource() == SwingUI.instance().getPanelTimingEntities().getBtnPull()){ + int eid = data.getID(); + int dim = data.getCoordinates().dim; + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim))); + } + } } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java index 72cf62f..11d7955 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java @@ -5,8 +5,13 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import mapwriter.Mw; +import mapwriter.api.MwAPI; +import mapwriter.gui.MwGui; +import mcp.mobius.opis.modOpis; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; @@ -15,18 +20,33 @@ import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; +import mcp.mobius.opis.gui.overlay.OverlayMeanTime; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; +import net.minecraft.client.Minecraft; public class ActionTimingTileEnts implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); + JTableStats table = SwingUI.instance().getPanelTimingTileEnts().getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatsTileEntity data = (StatsTileEntity)table.getStatistics().get(indexData); - + StatsTileEntity data = (StatsTileEntity)table.getStatistics().get(indexData); + + if (e.getSource() == SwingUI.instance().getPanelTimingTileEnts().getBtnCenter()){ + CoordinatesBlock coord = data.getCoordinates(); + OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4); + MwAPI.setCurrentDataProvider(OverlayMeanTime.instance()); + Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z)); + } + + if (e.getSource() == SwingUI.instance().getPanelTimingTileEnts().getBtnTeleport()){ + CoordinatesBlock coord = data.getCoordinates(); + modOpis.selectedBlock = coord; + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, coord)); + Minecraft.getMinecraft().setIngameFocus(); + } } }