Fixed part of the GUI

This commit is contained in:
ProfMobius committed 2014-05-10 16:46:22 +02:00
1 parent 2496d6ab00
commit fcf179d6c4
13 files changed
+160 -197

No files matched your search

@@ -28,19 +28,20 @@ import mcp.mobius.opis.data.profilers.ProfilerEvent;
import mcp.mobius.opis.data.profilers.ProfilerRenderBlock;
import mcp.mobius.opis.data.profilers.ProfilerRenderEntity;
import mcp.mobius.opis.data.profilers.ProfilerRenderTileEntity;
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.timingclient.PanelRenderEntities;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderHandlers;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderTileEnts;
import mcp.mobius.opis.swing.panels.timingclient.PanelEventClient;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public enum OpisClientTickHandler implements ITickHandler {
public enum OpisClientTickHandler{
INSTANCE;
public long profilerUpdateTickCounter = 0;
@@ -51,59 +52,45 @@ public enum OpisClientTickHandler implements ITickHandler {
public EventTimer timer5000 = new EventTimer(5000);
public EventTimer timer10000 = new EventTimer(10000);
@Override
public void tickStart(EnumSet<TickType> type, Object... tickData) {}
@Override
public void tickEnd(EnumSet<TickType> type, Object... tickData) {
if(type.contains(TickType.CLIENT)){
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void tickEnd(TickEvent.ClientTickEvent event) {
// One second timer
if (timer1000.isDone()){
if(modOpis.swingOpen)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.STATUS_PING, new SerialLong(System.nanoTime())));
}
if (modOpis.profilerRunClient){
((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Running...");
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Running...");
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).getBtnRunRender().setText("Running...");
((PanelEventClient)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.CLIENTEVENTS))).getBtnRunRender().setText("Running...");
}
else{
((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Run Render");
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Run Render");
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).getBtnRunRender().setText("Run Render");
((PanelEventClient)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.CLIENTEVENTS))).getBtnRunRender().setText("Run Render");
}
profilerUpdateTickCounter++;
if (profilerRunningTicks < modOpis.profilerMaxTicks && modOpis.profilerRunClient){
profilerRunningTicks++;
}else if (profilerRunningTicks >= modOpis.profilerMaxTicks && modOpis.profilerRunClient){
profilerRunningTicks = 0;
modOpis.profilerRunClient = false;
ProfilerSection.desactivateAll(Side.CLIENT);
System.out.printf("Profiling done\n");
this.updateTabs();
}
// One second timer
if (timer1000.isDone()){
if(modOpis.swingOpen)
PacketManager.sendToServer(new PacketReqData(Message.STATUS_PING, new SerialLong(System.nanoTime())));
}
}
if (modOpis.profilerRunClient){
((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Running...");
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Running...");
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).getBtnRunRender().setText("Running...");
((PanelEventClient)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.CLIENTEVENTS))).getBtnRunRender().setText("Running...");
}
else{
((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Run Render");
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Run Render");
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).getBtnRunRender().setText("Run Render");
((PanelEventClient)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.CLIENTEVENTS))).getBtnRunRender().setText("Run Render");
}
profilerUpdateTickCounter++;
if (profilerRunningTicks < modOpis.profilerMaxTicks && modOpis.profilerRunClient){
profilerRunningTicks++;
}else if (profilerRunningTicks >= modOpis.profilerMaxTicks && modOpis.profilerRunClient){
profilerRunningTicks = 0;
modOpis.profilerRunClient = false;
ProfilerSection.desactivateAll(Side.CLIENT);
System.out.printf("Profiling done\n");
@Override
public EnumSet<TickType> ticks() {
return EnumSet.of(TickType.CLIENT);
}
@Override
public String getLabel() {
return "opis.client.tickhandler";
this.updateTabs();
}
}
private void updateTabs(){
@@ -172,13 +159,15 @@ public enum OpisClientTickHandler implements ITickHandler {
}
}
/*
Collections.sort(blockData);
for (DataBlockRender data : blockData){
ItemStack stack = new ItemStack(data.id, 0, data.meta);
String name = stack.getDisplayName();
System.out.printf("%s %s : %s\n", data.pos, name, data.update);
}
}
*/
}
}
@@ -13,8 +13,6 @@ import com.google.common.collect.Table.Cell;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.packet.Packet3Chat;
import net.minecraft.util.ChatMessageComponent;
import net.minecraftforge.common.DimensionManager;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
@@ -43,14 +41,12 @@ import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD;
import mcp.mobius.opis.network.packets.server.NetDataList_OLD;
import mcp.mobius.opis.network.packets.server.NetDataValue_OLD;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.Side;
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
public enum OpisServerTickHandler implements ITickHandler {
public enum OpisServerTickHandler{
INSTANCE;
public long profilerUpdateTickCounter = 0;
@@ -61,15 +57,10 @@ public enum OpisServerTickHandler implements ITickHandler {
public EventTimer timer5000 = new EventTimer(5000);
public EventTimer timer10000 = new EventTimer(10000);
public HashMap<Player, AccessLevel> cachedAccess = new HashMap<Player, AccessLevel>();
public HashMap<EntityPlayerMP, AccessLevel> cachedAccess = new HashMap<EntityPlayerMP, AccessLevel>();
@Override
public void tickStart(EnumSet<TickType> type, Object... tickData) {
}
@Override
public void tickEnd(EnumSet<TickType> type, Object... tickData) {
if(type.contains(TickType.SERVER)){
@SubscribeEvent
public void tickEnd(TickEvent.ServerTickEvent event) {
/*
if (System.nanoTime() - timer500 > 500000000){
@@ -92,7 +83,7 @@ public enum OpisServerTickHandler implements ITickHandler {
OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.INSTANCE.getAmountTileEntities())));
OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.INSTANCE.getAmountEntities())));
for (Player player : PlayerTracker.instance().playersSwing){
for (EntityPlayerMP player : PlayerTracker.instance().playersSwing){
if (!cachedAccess.containsKey(player) || cachedAccess.get(player) != PlayerTracker.instance().getPlayerAccessLevel(player)){
OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player);
cachedAccess.put(player, PlayerTracker.instance().getPlayerAccessLevel(player));
@@ -158,28 +149,17 @@ public enum OpisServerTickHandler implements ITickHandler {
OpisPacketHandler_OLD.sendPacketToAllSwing(NetDataValue_OLD.create(Message.STATUS_STOP, new SerialInt(modOpis.profilerMaxTicks)));
for (Player player : PlayerTracker.instance().playersSwing){
for (EntityPlayerMP player : PlayerTracker.instance().playersSwing){
OpisPacketHandler_OLD.sendFullUpdate(player);
}
}
}
}
@Override
public EnumSet<TickType> ticks() {
return EnumSet.of(TickType.SERVER);
}
@Override
public String getLabel() {
return "opis.server.tickhandler";
}
private void updatePlayers(){
for (Player player : PlayerTracker.instance().playerOverlayStatus.keySet()){
for (EntityPlayerMP player : PlayerTracker.instance().playerOverlayStatus.keySet()){
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){
OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.LIST_CHUNK_LOADED_CLEAR), player);
@@ -5,11 +5,9 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.util.MathHelper;
import net.minecraft.world.ChunkCoordIntPair;
import mapwriter.Mw;
@@ -31,9 +29,10 @@ import mcp.mobius.opis.gui.widgets.LayoutCanvas;
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqChunks;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
import mcp.mobius.opis.network.packets.client.PacketReqData;
public class OverlayLoadedChunks implements IMwDataProvider {
@@ -65,7 +64,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
MathHelper.ceiling_double_int(this.mapView.getX()) >> 4,
MathHelper.ceiling_double_int(this.mapView.getZ()) >> 4);
} else {
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, new CoordinatesBlock(coord)));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_TELEPORT_BLOCK, new CoordinatesBlock(coord)));
Minecraft.getMinecraft().setIngameFocus();
}
}
@@ -159,9 +158,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
for (int z = -5; z <= 5; z++){
chunks.add(new CoordinatesChunk(dim, chunkX + x, chunkZ + z));
if (chunks.size() >= 1){
Packet250CustomPayload packet = Packet_ReqChunks.create(dim, chunks);
if (packet != null)
PacketDispatcher.sendPacketToServer(packet);
PacketManager.sendToServer(new PacketReqChunks(dim, chunks));
chunks.clear();
}
}
@@ -183,12 +180,12 @@ public class OverlayLoadedChunks implements IMwDataProvider {
*/
if (chunks.size() > 0)
PacketDispatcher.sendPacketToServer(Packet_ReqChunks.create(dim, chunks));
PacketManager.sendToServer(new PacketReqChunks(dim, chunks));
}
@Override
public void onDimensionChanged(int dimension, MapView mapview) {
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_LOADED, new SerialInt(dimension)));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_LOADED, new SerialInt(dimension)));
}
@Override
@@ -202,15 +199,15 @@ public class OverlayLoadedChunks implements IMwDataProvider {
@Override
public void onOverlayActivated(MapView mapview) {
this.selectedChunk = null;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_LOADED, new SerialInt(mapview.getDimension())));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_TICKETS));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_LOADED, new SerialInt(mapview.getDimension())));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_TICKETS));
}
@Override
public void onOverlayDeactivated(MapView mapview) {
this.showList = false;
this.selectedChunk = null;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_UNREGISTER));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_UNREGISTER));
}
@Override
@@ -8,9 +8,7 @@ import org.lwjgl.input.Mouse;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -35,9 +33,10 @@ import mcp.mobius.opis.gui.widgets.LayoutCanvas;
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqChunks;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD;
public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
@@ -71,7 +70,7 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
}
else{
//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();
}
}
@@ -196,7 +195,7 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
}
if (this.selectedChunk != null)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_TILEENTS, this.selectedChunk));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_TILEENTS, this.selectedChunk));
//ArrayList<CoordinatesChunk> chunks = new ArrayList<CoordinatesChunk>();
//for (int x = -5; x <= 5; x++)
@@ -210,12 +209,12 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
this.selectedChunk = new CoordinatesChunk(dim, chunkX, chunkZ);
if (this.selectedChunk != null)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_TILEENTS, this.selectedChunk));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_TILEENTS, this.selectedChunk));
}
@Override
public void onDimensionChanged(int dimension, MapView mapview) {
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_TIMING, new SerialInt(dimension)));
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_TIMING, new SerialInt(dimension)));
}
@Override
@@ -229,14 +228,14 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
@Override
public void onOverlayActivated(MapView mapview) {
this.selectedChunk = null;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_TIMING, new SerialInt(mapview.getDimension())));
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_TIMING, new SerialInt(mapview.getDimension())));
}
@Override
public void onOverlayDeactivated(MapView mapview) {
this.showList = false;
this.selectedChunk = null;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_UNREGISTER));
PacketManager.sendToServer(new PacketReqData(Message.COMMAND_UNREGISTER));
}
@Override
@@ -323,16 +322,14 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
for (int z = -5; z <= 5; z++){
chunks.add(new CoordinatesChunk(dim, chunkX + x, chunkZ + z));
if (chunks.size() >= 1){
Packet250CustomPayload packet = Packet_ReqChunks.create(dim, chunks);
if (packet != null)
PacketDispatcher.sendPacketToServer(packet);
PacketManager.sendToServer(new PacketReqChunks(dim, chunks));
chunks.clear();
}
}
}
if (chunks.size() > 0)
PacketDispatcher.sendPacketToServer(Packet_ReqChunks.create(dim, chunks));
PacketManager.sendToServer(new PacketReqChunks(dim, chunks));
}
@Override
@@ -6,9 +6,7 @@ import java.util.Collections;
import java.util.HashMap;
import net.minecraft.client.Minecraft;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mapwriter.api.IMwChunkOverlay;
@@ -29,9 +27,10 @@ import mcp.mobius.opis.gui.widgets.LayoutCanvas;
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqChunks;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD;
public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
@@ -136,13 +135,13 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
this.showList = true;
if (prevSelected == null && this.selectedChunk != null)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, this.selectedChunk));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, this.selectedChunk));
else if (this.selectedChunk != null && !this.selectedChunk.equals(prevSelected))
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, this.selectedChunk));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, this.selectedChunk));
else if (this.selectedChunk == null)
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_ENTITIES));
}
@Override
@@ -158,7 +157,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
@Override
public void onOverlayActivated(MapView mapview) {
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_ENTITIES));
}
@Override
@@ -276,16 +275,14 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
for (int z = -5; z <= 5; z++){
chunks.add(new CoordinatesChunk(dim, chunkX + x, chunkZ + z));
if (chunks.size() >= 1){
Packet250CustomPayload packet = Packet_ReqChunks.create(dim, chunks);
if (packet != null)
PacketDispatcher.sendPacketToServer(packet);
PacketManager.sendToServer(new PacketReqChunks(dim, chunks));
chunks.clear();
}
}
}
if (chunks.size() > 0)
PacketDispatcher.sendPacketToServer(Packet_ReqChunks.create(dim, chunks));
PacketManager.sendToServer(new PacketReqChunks(dim, chunks));
}
@Override
@@ -1,7 +1,6 @@
package mcp.mobius.opis.gui.overlay.entperchunk;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.network.PacketDispatcher;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
@@ -10,8 +9,9 @@ import mcp.mobius.opis.gui.interfaces.IWidget;
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk.ReducedData;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
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;
public class TableChunks extends ViewTable {
MapView mapView;
@@ -34,7 +34,7 @@ public class TableChunks extends ViewTable {
if (row != null){
CoordinatesBlock coord = ((ReducedData)row.getObject()).chunk.asCoordinatesBlock();
this.overlay.selectedChunk = ((ReducedData)row.getObject()).chunk;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, this.overlay.selectedChunk));
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, this.overlay.selectedChunk));
this.overlay.showList = false;
this.mapView.setDimension(coord.dim);
@@ -1,6 +1,5 @@
package mcp.mobius.opis.gui.overlay.entperchunk;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.client.Minecraft;
import net.minecraft.util.MathHelper;
import mapwriter.map.MapView;
@@ -13,8 +12,9 @@ import mcp.mobius.opis.gui.interfaces.IWidget;
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk.ReducedData;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
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;
public class TableEntities extends ViewTable {
MapView mapView;
@@ -39,7 +39,7 @@ public class TableEntities extends ViewTable {
//PacketDispatcher.sendPacketToServer(Packet_ReqTeleport.create(coord));
int eid = ((DataEntity)row.getObject()).eid;
int dim = ((DataEntity)row.getObject()).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();
}
}
@@ -1,20 +1,21 @@
package mcp.mobius.opis.helpers;
import net.minecraft.network.TcpReaderThread;
import net.minecraft.network.TcpWriterThread;
import net.minecraft.server.ServerListenThread;
import net.minecraft.server.ThreadMinecraftServer;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
public class Helpers {
public static Side getEffectiveSide(){
Thread thr = Thread.currentThread();
return FMLCommonHandler.instance().getEffectiveSide();
/*
if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread) || (thr instanceof TcpWriterThread) || (thr instanceof TcpReaderThread))
{
return Side.SERVER;
}
return Side.CLIENT;
return Side.CLIENT;
*/
}
}
@@ -5,28 +5,25 @@ import java.lang.reflect.Field;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Set;
import java.util.logging.Level;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.ItemData;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.registry.GameData;
public class ModIdentification {
public static HashMap<String, String> modSource_Name = new HashMap<String, String>();
public static HashMap<String, String> modSource_ID = new HashMap<String, String>();
public static HashMap<Integer, String> itemMap = new HashMap<Integer, String>();
public static HashMap<String, String> modSource_Name = new HashMap<String, String>();
public static HashMap<String, String> modSource_ID = new HashMap<String, String>();
public static HashMap<Integer, String> itemMap = new HashMap<Integer, String>();
public static HashMap<String, String> keyhandlerStrings = new HashMap<String, String>();
public static void init(){
//TODO : Redo this for the new frameworkn (1.7.2)
/*
NBTTagList itemDataList = new NBTTagList();
GameData.writeItemData(itemDataList);
@@ -35,18 +32,45 @@ public class ModIdentification {
ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i));
itemMap.put(itemData.getItemId(), itemData.getModId());
}
*/
for (ModContainer mod : Loader.instance().getModList()){
modSource_Name.put(mod.getSource().getName(), mod.getName());
modSource_ID.put(mod.getSource().getName(), mod.getModId());
}
//TODO : Update this to match new version (1.7.2)
modSource_Name.put("1.6.2.jar", "Minecraft");
modSource_Name.put("1.6.3.jar", "Minecraft");
modSource_Name.put("1.6.4.jar", "Minecraft");
modSource_Name.put("1.6.4.jar", "Minecraft");
modSource_Name.put("1.7.2.jar", "Minecraft");
modSource_Name.put("Forge", "Minecraft");
modSource_ID.put("1.6.2.jar", "Minecraft");
modSource_ID.put("1.6.3.jar", "Minecraft");
modSource_ID.put("1.6.4.jar", "Minecraft");
modSource_ID.put("1.7.2.jar", "Minecraft");
modSource_ID.put("Forge", "Minecraft");
// for (String s : this.modSourceList.keySet())
// if (this.modSourceList.get(s) == "Minecraft Coder Pack")
// this.modSourceList.put(s, "Minecraft");
// Code to retrieve all the registered keybindings along with the mod adding them.
/*
Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", "keyHandlers");
try {
Set<KeyHandler> keyHandlers = (Set<KeyHandler>)keyHandlers_Field.get(KeyBindingRegistry.instance());
for (KeyHandler keyhandler : keyHandlers)
for (int i = 0; i < keyhandler.getKeyBindings().length; i++)
keyhandlerStrings.put(keyhandler.getKeyBindings()[i].keyDescription, idFromObject(keyhandler));
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
*/
}
public static String nameFromObject(Object obj){
@@ -60,8 +84,10 @@ public class ModIdentification {
String modName = "<Unknown>";
for (String s: modSource_Name.keySet())
if (objPath.contains(s))
if (objPath.contains(s)){
modName = modSource_Name.get(s);
break;
}
if (modName.equals("Minecraft Coder Pack"))
modName = "Minecraft";
@@ -69,6 +95,7 @@ public class ModIdentification {
return modName;
}
/*
public static String idFromObject(Object obj){
String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString();
@@ -81,20 +108,24 @@ public class ModIdentification {
String modName = "<Unknown>";
for (String s: modSource_ID.keySet())
if (objPath.contains(s))
if (objPath.contains(s)){
modName = modSource_ID.get(s);
break;
}
if (modName.equals("Minecraft Coder Pack"))
modName = "Minecraft";
return modName;
}
*/
public static String nameFromStack(ItemStack itemstack){
public static String nameFromStack(ItemStack stack){
try{
String modID = itemMap.get(itemstack.itemID);
ModContainer mod = findModContainer(modID);
String modname = mod == null ? modID : mod.getName();
//String modID = itemMap.get(itemstack.itemID);
//ModContainer mod = ModIdentification.findModContainer(modID);
ModContainer mod = GameData.findModOwner(GameData.itemRegistry.getNameForObject(stack.getItem()));
String modname = mod == null ? "Minecraft" : mod.getName();
return modname;
} catch (NullPointerException e){
//System.out.printf("NPE : %s\n",itemstack.toString());
@@ -102,16 +133,7 @@ public class ModIdentification {
}
}
public static String idFromStack(ItemStack itemstack){
try{
String modID = itemMap.get(itemstack.itemID);
return modID;
} catch (NullPointerException e){
//System.out.printf("NPE : %s\n",itemstack.toString());
return "";
}
}
/*
public static ModContainer findModContainer(String modID)
{
for(ModContainer mc : Loader.instance().getModList())
@@ -120,28 +142,5 @@ public class ModIdentification {
return null;
}
public static String getStackName(int id, int meta){
ItemStack is;
String name = String.format("te.%d.%d", id, meta);
try{
is = new ItemStack(id, 1, meta);
name = is.getDisplayName();
} catch (Exception e) { }
return name;
}
public static String getModStackName(int id, int meta){
ItemStack is;
String modID = "<UNKNOWN>";
try{
is = new ItemStack(id, 1, meta);
modID = ModIdentification.idFromStack(is);
} catch (Exception e) { }
return modID;
}
*/
}
@@ -36,6 +36,7 @@ public class NBTUtil {
return deepTag;
}
/*
public static NBTTagCompound setTag(String key, NBTTagCompound targetTag, NBTBase addedTag){
String[] path = key.split("\\.");
@@ -66,6 +67,7 @@ public class NBTUtil {
return outTag;
}
*/
public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream ostream) throws IOException
{
@@ -8,8 +8,7 @@ import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.packet.Packet41EntityEffect;
import net.minecraft.network.packet.Packet9Respawn;
import net.minecraft.init.Blocks;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.ServerConfigurationManager;
@@ -35,6 +34,7 @@ public class Teleport {
// Originally in ServerConfigurationManager
public boolean transferPlayerToDimension(ServerConfigurationManager manager, EntityPlayerMP player, int targetID)
{
/*
int sourceID = player.dimension;
WorldServer sourceWorld = DimensionManager.getWorld(player.dimension);
WorldServer targetWorld = DimensionManager.getWorld(targetID);
@@ -44,7 +44,7 @@ public class Teleport {
player.dimension = targetID;
player.playerNetServerHandler.sendPacketToPlayer(new Packet9Respawn(player.dimension, (byte)player.worldObj.difficultySetting, targetWorld.getWorldInfo().getTerrainType(), targetWorld.getHeight(), player.theItemInWorldManager.getGameType()));
player.playerNetServerHandler.sendPacket(new Packet9Respawn(player.dimension, (byte)player.worldObj.difficultySetting, targetWorld.getWorldInfo().getTerrainType(), targetWorld.getHeight(), player.theItemInWorldManager.getGameType()));
sourceWorld.removePlayerEntityDangerously(player);
player.isDead = false;
this.transferEntityToWorld(player, sourceID, sourceWorld, targetWorld);
@@ -60,10 +60,11 @@ public class Teleport {
while (iterator.hasNext())
{
PotionEffect potioneffect = (PotionEffect)iterator.next();
player.playerNetServerHandler.sendPacketToPlayer(new Packet41EntityEffect(player.entityId, potioneffect));
player.playerNetServerHandler.sendPacket(new Packet41EntityEffect(player.entityId, potioneffect));
}
GameRegistry.onPlayerChangedDimension(player);
*/
return true;
}
@@ -174,7 +175,7 @@ public class Teleport {
} else {
int y = 256;
while (world.isAirBlock(coord.x, y, coord.z) ||
world.getBlockId(coord.x, y, coord.z) == Block.vine.blockID
world.getBlock(coord.x, y, coord.z) == Blocks.vine
)
y--;
@@ -200,7 +201,7 @@ public class Teleport {
public CoordinatesBlock fixNetherTP(CoordinatesBlock target){
World targetWorld = DimensionManager.getWorld(target.dim);
boolean isBedrock = targetWorld.getBlockId(target.x, target.y - 1, target.z) == Block.bedrock.blockID;
boolean isBedrock = targetWorld.getBlock(target.x, target.y - 1, target.z) == Blocks.bedrock;
boolean canTeleport = false;
CoordinatesBlock finalTarget;
+4 -2
View File
@@ -128,13 +128,15 @@ public class modOpis {
MinecraftForge.EVENT_BUS.register(new OpisClientEventHandler());
MinecraftForge.EVENT_BUS.register(new OpisServerEventHandler());
FMLCommonHandler.instance().bus().register(OpisClientTickHandler.INSTANCE);
FMLCommonHandler.instance().bus().register(OpisServerTickHandler.INSTANCE);
//Packet.addIdClassMapping(251, true, true, Packet251Extended.class);
}
@EventHandler
public void load(FMLInitializationEvent event) {
TickRegistry.registerTickHandler(OpisServerTickHandler.INSTANCE, Side.SERVER);
TickRegistry.registerTickHandler(OpisClientTickHandler.INSTANCE, Side.CLIENT);
//TickRegistry.registerTickHandler(OpisServerTickHandler.INSTANCE, Side.SERVER);
//TickRegistry.registerTickHandler(OpisClientTickHandler.INSTANCE, Side.CLIENT);
if (lagGenID != -1){
Block blockDemo = new BlockLag(lagGenID, Material.wood);
@@ -47,7 +47,6 @@ public class PacketReqData extends PacketBase{
if (param1 != null){
output.writeBoolean(true);
//Packet.writeString(param1.getClass().getCanonicalName(), outputStream);
output.writeInt(DataType.getForClass(param1.getClass()).ordinal());
param1.writeToStream(output);
} else {
@@ -68,7 +67,6 @@ public class PacketReqData extends PacketBase{
this.dataReq = Message.values()[input.readInt()];
if (input.readBoolean()){
//String datatype = Packet.readString(istream, 255);
Class datatype = DataType.getForOrdinal(input.readInt());
this.param1 = dataRead(datatype, input);
}