This commit is contained in:
ProfMobius committed 2014-05-10 18:12:41 +02:00
1 parent ebf4635e99
commit 7986b49ef5
15 files changed
+71 -99

No files matched your search

@@ -12,7 +12,7 @@ import javax.swing.event.ChangeListener;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
@@ -58,7 +58,7 @@ public enum TabPanelRegistrar implements ChangeListener{
if (source instanceof ITabPanel){
ITabPanel panel = (ITabPanel)source;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.SWING_TAB_CHANGED, new SerialInt(panel.getSelectedTab().ordinal())));
PacketManager.sendToServer(new PacketReqData(Message.SWING_TAB_CHANGED, new SerialInt(panel.getSelectedTab().ordinal())));
}
}
@@ -2,6 +2,8 @@ package mcp.mobius.opis.data.managers;
import java.util.ArrayList;
import net.minecraft.entity.player.EntityPlayerMP;
import com.google.common.collect.HashBiMap;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -56,7 +58,7 @@ public enum StringCache implements IMessageHandler {
}
}
public void syncCache(Player player){
public void syncCache(EntityPlayerMP player){
int i = 0;
@@ -6,8 +6,14 @@ import java.util.HashSet;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
import mcp.mobius.opis.data.managers.StringCache;
import mcp.mobius.opis.gui.overlay.OverlayStatus;
import mcp.mobius.opis.network.MemoryConnection;
import mcp.mobius.opis.network.OpisPacketHandler_OLD;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataValue_OLD;
import mcp.mobius.opis.swing.SelectedTab;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -94,6 +100,17 @@ public enum PlayerTracker{
this.playersSwing.remove(event.player);
}
@SubscribeEvent
public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event){
OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), event.player);
if (manager instanceof MemoryConnection){
System.out.printf("Adding SSP player to list of privileged users\n");
PlayerTracker.INSTANCE.addPrivilegedPlayer(((EntityPlayer)event.player).getDisplayName(), false);
}
StringCache.INSTANCE.syncCache(event.player);
}
/*
@Override
public void onPlayerLogin(EntityPlayer player) {
@@ -48,7 +48,6 @@ import mcp.mobius.opis.events.OpisServerEventHandler;
import mcp.mobius.opis.events.OpisServerTickHandler;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.helpers.ModIdentification;
import mcp.mobius.opis.network.OpisConnectionHandler;
import mcp.mobius.opis.network.OpisPacketHandler_OLD;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
@@ -1,46 +0,0 @@
package mcp.mobius.opis.network;
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
import mcp.mobius.opis.data.managers.StringCache;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataValue_OLD;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
public class OpisConnectionHandler implements IConnectionHandler {
@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) {
OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.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);
}
StringCache.INSTANCE.syncCache(player);
}
@Override
public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) {
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) {
}
@Override
public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) {
}
@Override
public void connectionClosed(INetworkManager manager) {
}
@Override
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) {
}
}
@@ -23,15 +23,15 @@ import javax.swing.SwingConstants;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiChat;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.api.IMessageHandler;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD;
import mcp.mobius.opis.swing.panels.PanelSummary;
import mcp.mobius.opis.swing.panels.timingserver.PanelTimingChunks;
@@ -96,7 +96,7 @@ public class SwingUI extends JFrame implements WindowListener, ChangeListener, I
@Override
public void windowClosed(WindowEvent arg0) {
modOpis.swingOpen = false;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_UNREGISTER_SWING));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_UNREGISTER_SWING));
}
@Override
@@ -142,7 +142,7 @@ public class SwingUI extends JFrame implements WindowListener, ChangeListener, I
modOpis.swingOpen = true;
this.showUI();
Minecraft.getMinecraft().displayGuiScreen(new GuiChat());
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.SWING_TAB_CHANGED, new SerialInt(SelectedTab.SUMMARY.ordinal())));
PacketManager.sendToServer(new PacketReqData(Message.SWING_TAB_CHANGED, new SerialInt(SelectedTab.SUMMARY.ordinal())));
break;
}
default:
@@ -158,13 +158,13 @@ public class SwingUI extends JFrame implements WindowListener, ChangeListener, I
if (source instanceof ITabPanel){
ITabPanel panel = (ITabPanel)source;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.SWING_TAB_CHANGED, new SerialInt(panel.getSelectedTab().ordinal())));
PacketManager.sendToServer(new PacketReqData(Message.SWING_TAB_CHANGED, new SerialInt(panel.getSelectedTab().ordinal())));
}
if (source instanceof JTabbedPane){
JTabbedPane pane = (JTabbedPane)source;
ITabPanel panel = (ITabPanel)pane.getSelectedComponent();
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.SWING_TAB_CHANGED, new SerialInt(panel.getSelectedTab().ordinal())));
PacketManager.sendToServer(new PacketReqData(Message.SWING_TAB_CHANGED, new SerialInt(panel.getSelectedTab().ordinal())));
}
}
}
@@ -5,8 +5,9 @@ import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.tracking.PanelAmountEntities;
@@ -14,7 +15,6 @@ import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
@@ -36,12 +36,12 @@ public class ActionAmountEntities implements ActionListener, ItemListener {
AmountHolder data = (AmountHolder)table.getTableData().get(indexData);
if (e.getSource() == panel.getBtnKillAll()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILLALL, new SerialString(data.key)));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_KILLALL, new SerialString(data.key)));
PacketManager.sendToServer(new PacketReqData(Message.LIST_AMOUNT_ENTITIES));
}
if (e.getSource() == panel.getBtnRefresh()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.LIST_AMOUNT_ENTITIES));
}
}
@@ -49,12 +49,12 @@ public class ActionAmountEntities implements ActionListener, ItemListener {
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_FILTERING_TRUE));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_FILTERING_TRUE));
}
else if (e.getStateChange() == ItemEvent.DESELECTED){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_FILTERING_FALSE));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_FILTERING_FALSE));
}
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.LIST_AMOUNT_ENTITIES));
}
}
@@ -5,8 +5,9 @@ import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.tracking.PanelAmountEntities;
@@ -15,7 +16,6 @@ import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
@@ -39,7 +39,7 @@ public class ActionAmountTileEnts implements ActionListener{
*/
if (e.getSource() == panel.getBtnRefresh()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_TILEENTS));
PacketManager.sendToServer(new PacketReqData(Message.LIST_AMOUNT_TILEENTS));
}
}
@@ -5,12 +5,12 @@ import java.awt.event.ActionListener;
import javax.swing.JOptionPane;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.data.holders.newtypes.DataDimension;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.panels.tracking.PanelDimensions;
import mcp.mobius.opis.swing.widgets.JTableStats;
@@ -23,11 +23,11 @@ public class ActionDimensions implements ActionListener {
if (e.getSource() == panel.getBtnPurgeAll()){
if (JOptionPane.showConfirmDialog (null, "Do you want to kill all hostiles in game ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILL_HOSTILES_ALL));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_KILL_HOSTILES_ALL));
if (JOptionPane.showConfirmDialog (null, "Do you want to remove all the dropped items ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILL_STACKS_ALL));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_KILL_STACKS_ALL));
if (JOptionPane.showConfirmDialog (null, "Do you want to purge chunks ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_PURGE_CHUNKS_ALL));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_PURGE_CHUNKS_ALL));
} else {
JTableStats table = panel.getTable();
@@ -36,11 +36,11 @@ public class ActionDimensions implements ActionListener {
DataDimension data = (DataDimension)table.getTableData().get(indexData);
if (JOptionPane.showConfirmDialog (null, "Do you want to kill all hostiles ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILL_HOSTILES_DIM, new SerialInt(data.dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_KILL_HOSTILES_DIM, new SerialInt(data.dim)));
if (JOptionPane.showConfirmDialog (null, "Do you want to remove all the dropped items ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_KILL_STACKS_DIM, new SerialInt(data.dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_KILL_STACKS_DIM, new SerialInt(data.dim)));
if (JOptionPane.showConfirmDialog (null, "Do you want to purge chunks ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_PURGE_CHUNKS_DIM, new SerialInt(data.dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_PURGE_CHUNKS_DIM, new SerialInt(data.dim)));
}
@@ -3,10 +3,10 @@ package mcp.mobius.opis.swing.actions;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.panels.debug.PanelOrphanTileEntities;
import mcp.mobius.opis.swing.widgets.JTableStats;
@@ -18,7 +18,7 @@ public class ActionOrphanTileEntities implements ActionListener {
PanelOrphanTileEntities panel = (PanelOrphanTileEntities)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.ORPHANTES);
if (e.getSource() == panel.getBtnRefresh()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_ORPHAN_TILEENTS));
PacketManager.sendToServer(new PacketReqData(Message.LIST_ORPHAN_TILEENTS));
}
}
@@ -8,8 +8,9 @@ import java.awt.event.ItemListener;
import mapwriter.Mw;
import mapwriter.api.MwAPI;
import mapwriter.gui.MwGui;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.tracking.PanelPlayers;
@@ -17,7 +18,6 @@ import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
@@ -41,8 +41,8 @@ public class ActionPlayers implements ActionListener {
if (e.getSource() == panel.getBtnCenter()){
CoordinatesBlock coord = data.pos;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk();
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance());
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
@@ -51,14 +51,14 @@ public class ActionPlayers implements ActionListener {
if (e.getSource() == panel.getBtnTeleport()){
int eid = data.eid;
int dim = data.pos.dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
Minecraft.getMinecraft().setIngameFocus();
}
if (e.getSource() == panel.getBtnPull()){
int eid = data.eid;
int dim = data.pos.dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
}
}
@@ -3,14 +3,14 @@ package mcp.mobius.opis.swing.actions;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.network.packets.client.PacketReqData;
public class ActionRunOpis implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_START));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_START));
}
}
@@ -8,8 +8,9 @@ import java.awt.event.ItemListener;
import mapwriter.Mw;
import mapwriter.api.MwAPI;
import mapwriter.gui.MwGui;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.timingserver.PanelTimingChunks;
@@ -17,7 +18,6 @@ import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
@@ -45,7 +45,7 @@ public class ActionTimingChunks implements ActionListener {
}
if (e.getSource() == panel.getBtnTeleport()){
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_CHUNK, data.getChunk()));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_CHUNK, data.getChunk()));
}
}
}
@@ -8,8 +8,9 @@ import java.awt.event.ItemListener;
import mapwriter.Mw;
import mapwriter.api.MwAPI;
import mapwriter.gui.MwGui;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.timingserver.PanelTimingEntities;
@@ -17,7 +18,6 @@ import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
@@ -41,8 +41,8 @@ public class ActionTimingEntities implements ActionListener {
if (e.getSource() == panel.getBtnCenter()){
CoordinatesBlock coord = data.pos;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance());
OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk();
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
@@ -51,14 +51,14 @@ public class ActionTimingEntities implements ActionListener {
if (e.getSource() == panel.getBtnTeleport()){
int eid = data.eid;
int dim = data.pos.dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
Minecraft.getMinecraft().setIngameFocus();
}
if (e.getSource() == panel.getBtnPull()){
int eid = data.eid;
int dim = data.pos.dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
}
}
@@ -9,8 +9,9 @@ import mapwriter.Mw;
import mapwriter.api.MwAPI;
import mapwriter.gui.MwGui;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.SwingUI;
import mcp.mobius.opis.swing.panels.timingserver.PanelTimingTileEnts;
@@ -18,7 +19,6 @@ import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JButton;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.api.TabPanelRegistrar;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity;
@@ -48,7 +48,7 @@ public class ActionTimingTileEnts implements ActionListener {
if (e.getSource() == panel.getBtnTeleport()){
CoordinatesBlock coord = data.pos;
modOpis.selectedBlock = coord;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, coord));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_BLOCK, coord));
Minecraft.getMinecraft().setIngameFocus();
}