diff --git a/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java b/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java index 164b8df..a813cda 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java @@ -1,6 +1,6 @@ package mcp.mobius.opis.commands.client; -import cpw.mods.fml.common.network.Player; + import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; @@ -22,8 +22,8 @@ public class CommandClientShowRenderTick extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - if (icommandsender instanceof Player) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_SHOW_RENDER_TICK), (Player)icommandsender); + if (icommandsender instanceof EntityPlayerMP) + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_SHOW_RENDER_TICK), (EntityPlayerMP)icommandsender); //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK)); } diff --git a/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java b/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java index e4b9d27..9b6b85d 100644 --- a/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java +++ b/src/main/java/mcp/mobius/opis/commands/client/CommandClientStart.java @@ -1,6 +1,5 @@ package mcp.mobius.opis.commands.client; -import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.network.OpisPacketHandler_OLD; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataCommand_OLD; @@ -22,8 +21,8 @@ public class CommandClientStart extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - if (icommandsender instanceof Player) - OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_START_PROFILING), (Player)icommandsender); + if (icommandsender instanceof EntityPlayerMP) + OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.CLIENT_START_PROFILING), (EntityPlayerMP)icommandsender); //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_START_PROFILING)); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java b/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java index 1c93cf9..3f6f9c6 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java @@ -37,7 +37,7 @@ public class CommandAddPrivileged extends CommandBase implements IOpisCommand{ public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java b/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java index 79ad6dc..c3d9321 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java @@ -46,7 +46,7 @@ public class CommandEntityCreate extends CommandBase { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java b/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java index 68a29b2..4b8e0e6 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java @@ -48,7 +48,7 @@ public class CommandFrequency extends CommandBase implements IOpisCommand { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java b/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java index 94377a4..94b6adc 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java @@ -62,7 +62,7 @@ public class CommandKill extends CommandBase implements IOpisCommand { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java b/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java index 9c4f499..437b0e9 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -85,7 +85,7 @@ public class CommandKillAll extends CommandBase implements IOpisCommand { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java index ec35542..43fd31d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java @@ -57,7 +57,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java b/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java index da685b0..7b0de62 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java @@ -40,7 +40,7 @@ public class CommandRmPrivileged extends CommandBase implements IOpisCommand{ public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java b/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java index 31eae39..ac3962d 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java @@ -48,7 +48,7 @@ public class CommandStop extends CommandBase implements IOpisCommand { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java b/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java index 2bd3c16..83a8037 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java @@ -48,7 +48,7 @@ public class CommandTicks extends CommandBase implements IOpisCommand { public boolean canCommandSenderUseCommand(ICommandSender sender) { if (sender instanceof DedicatedServer) return true; - if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getDisplayName()); } diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/CachedString.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/CachedString.java index 12e13c8..b271229 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/CachedString.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/CachedString.java @@ -7,10 +7,6 @@ import java.io.IOException; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; -import net.minecraft.server.ServerListenThread; -import net.minecraft.server.ThreadMinecraftServer; -import net.minecraft.network.TcpReaderThread; -import net.minecraft.network.TcpWriterThread; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.server.FMLServerHandler; diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataAmountRate.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataAmountRate.java index 5128868..208f122 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataAmountRate.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataAmountRate.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataAmountRate implements Comparable, ISerializable { @@ -26,12 +29,12 @@ public class DataAmountRate implements Comparable, ISerializable { return String.format("%.2f packet/s", (double)this.size / (double)this.interval); } - public void writeToStream(DataOutputStream stream) throws IOException{ + public void writeToStream(ByteArrayDataOutput stream){ stream.writeLong(this.size); stream.writeInt(this.interval); } - public static DataAmountRate readFromStream(DataInputStream stream) throws IOException { + public static DataAmountRate readFromStream(ByteArrayDataInput stream){ return new DataAmountRate(stream.readLong(), stream.readInt()); } } diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java index 7ed4a06..35c8285 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTick.java @@ -7,6 +7,9 @@ import java.util.HashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.profilers.ProfilerDimBlockTick; @@ -28,7 +31,7 @@ public class DataBlockTick implements ISerializable{ } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeShort(this.perdim.size()); for (Integer key : this.perdim.keySet()){ stream.writeInt(key); @@ -37,7 +40,7 @@ public class DataBlockTick implements ISerializable{ this.total.writeToStream(stream); } - public static DataBlockTick readFromStream(DataInputStream stream) throws IOException { + public static DataBlockTick readFromStream(ByteArrayDataInput stream){ DataBlockTick retVal = new DataBlockTick(); int nkeys = stream.readShort(); for (int i = 0; i < nkeys; i++) diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java index 6a2fd26..e71cfd1 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataBlockTileEntityPerClass implements ISerializable, Comparable { @@ -42,14 +45,14 @@ public class DataBlockTileEntityPerClass implements ISerializable, Comparable { } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeInt(this.id); stream.writeInt(this.meta); stream.writeInt(this.amount); this.update.writeToStream(stream); } - public static DataBlockTileEntityPerClass readFromStream(DataInputStream stream) throws IOException { + public static DataBlockTileEntityPerClass readFromStream(ByteArrayDataInput stream){ DataBlockTileEntityPerClass retVal = new DataBlockTileEntityPerClass(); retVal.id = stream.readInt(); retVal.meta = stream.readInt(); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteRate.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteRate.java index be9695b..6cae341 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteRate.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteRate.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataByteRate implements Comparable, ISerializable { @@ -35,12 +38,12 @@ public class DataByteRate implements Comparable, ISerializable { return String.format("%4d B/s", this.size / this.interval); } - public void writeToStream(DataOutputStream stream) throws IOException{ + public void writeToStream(ByteArrayDataOutput stream){ stream.writeLong(this.size); stream.writeInt(this.interval); } - public static DataByteRate readFromStream(DataInputStream stream) throws IOException { + public static DataByteRate readFromStream(ByteArrayDataInput stream){ return new DataByteRate(stream.readLong(), stream.readInt()); } } diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteSize.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteSize.java index a43205f..880d8ff 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteSize.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataByteSize.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataByteSize implements Comparable, ISerializable { @@ -30,11 +33,11 @@ public class DataByteSize implements Comparable, ISerializable { return String.format("%4d B", this.size); } - public void writeToStream(DataOutputStream stream) throws IOException{ + public void writeToStream(ByteArrayDataOutput stream){ stream.writeLong(this.size); } - public static DataByteSize readFromStream(DataInputStream stream) throws IOException { + public static DataByteSize readFromStream(ByteArrayDataInput stream){ return new DataByteSize(stream.readLong()); } } diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunk.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunk.java index 15ad358..4250d55 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunk.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunk.java @@ -5,6 +5,9 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.managers.EntityManager; @@ -35,14 +38,14 @@ public class DataChunk implements ISerializable, Comparable { } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeInt(this.nentities); stream.writeInt(this.ntileents); this.update.writeToStream(stream); this.chunk.writeToStream(stream); } - public static DataChunk readFromStream(DataInputStream stream) throws IOException { + public static DataChunk readFromStream(ByteArrayDataInput stream){ DataChunk retVal = new DataChunk(); retVal.nentities = stream.readInt(); retVal.ntileents = stream.readInt(); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataDimension.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataDimension.java index 42d140f..274856c 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataDimension.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataDimension.java @@ -8,6 +8,9 @@ import java.util.HashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.profilers.ProfilerDimTick; @@ -15,7 +18,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.network.packet.Packet; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; @@ -64,7 +66,7 @@ public class DataDimension implements ISerializable { } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeInt(dim); stream.writeInt(players); stream.writeInt(forced); @@ -78,7 +80,7 @@ public class DataDimension implements ISerializable { this.name.writeToStream(stream); } - public static DataDimension readFromStream(DataInputStream stream) throws IOException { + public static DataDimension readFromStream(ByteArrayDataInput stream){ DataDimension retVal = new DataDimension(); retVal.dim = stream.readInt(); retVal.players = stream.readInt(); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntity.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntity.java index ed18956..1a696d9 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntity.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntity.java @@ -8,8 +8,10 @@ import java.util.WeakHashMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import net.minecraft.entity.Entity; -import net.minecraft.network.packet.Packet; import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; @@ -26,7 +28,7 @@ public class DataEntity implements ISerializable, Comparable { public DataEntity fill(Entity entity){ - this.eid = entity.entityId; + this.eid = entity.getEntityId(); this.name = new CachedString(EntityManager.INSTANCE.getEntityName(entity, false)); this.pos = new CoordinatesBlock(entity); @@ -38,7 +40,7 @@ public class DataEntity implements ISerializable, Comparable { } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeInt(this.eid); this.name.writeToStream(stream); this.pos.writeToStream(stream); @@ -46,7 +48,7 @@ public class DataEntity implements ISerializable, Comparable { stream.writeLong(this.npoints); } - public static DataEntity readFromStream(DataInputStream stream) throws IOException { + public static DataEntity readFromStream(ByteArrayDataInput stream){ DataEntity retVal = new DataEntity(); retVal.eid = stream.readInt(); retVal.name = CachedString.readFromStream(stream); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityPerClass.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityPerClass.java index c6a2360..3527eaa 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityPerClass.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityPerClass.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataEntityPerClass implements Comparable, ISerializable{ @@ -28,13 +31,13 @@ public class DataEntityPerClass implements Comparable, ISerializable{ } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeInt(this.nents); this.name.writeToStream(stream); this.update.writeToStream(stream); } - public static DataEntityPerClass readFromStream(DataInputStream stream) throws IOException { + public static DataEntityPerClass readFromStream(ByteArrayDataInput stream){ DataEntityPerClass retVal = new DataEntityPerClass(); retVal.nents = stream.readInt(); retVal.name = CachedString.readFromStream(stream); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityRender.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityRender.java index 2b5ffb6..d653efd 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityRender.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataEntityRender.java @@ -14,7 +14,7 @@ public class DataEntityRender extends DataEntity { public DataEntityRender fill(Entity entity){ - this.eid = entity.entityId; + this.eid = entity.getEntityId(); this.name = new CachedString(EntityManager.INSTANCE.getEntityName(entity, false)); this.pos = new CoordinatesBlock(entity); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataHandler.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataHandler.java index c6ab022..3889f5e 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataHandler.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataHandler.java @@ -16,6 +16,7 @@ public class DataHandler implements ISerializable, Comparable { public CachedString name; public DataTiming update; + /* public DataHandler fillServer(IScheduledTickHandler ticker){ double timingPre = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.get(ticker).getGeometricMean(); double timingPost = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTOP.getProfiler())).dataServer.get(ticker).getGeometricMean(); @@ -35,6 +36,7 @@ public class DataHandler implements ISerializable, Comparable { return this; } + */ @Override public void writeToStream(ByteArrayDataOutput stream){ diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataNetworkTick.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataNetworkTick.java index ec2e6c7..c9582a4 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataNetworkTick.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataNetworkTick.java @@ -6,6 +6,9 @@ import java.io.IOException; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.profilers.ProfilerNetworkTick; @@ -22,11 +25,11 @@ public class DataNetworkTick implements ISerializable, Comparable { } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ this.update.writeToStream(stream); } - public static DataNetworkTick readFromStream(DataInputStream stream) throws IOException { + public static DataNetworkTick readFromStream(ByteArrayDataInput stream){ DataNetworkTick retVal = new DataNetworkTick(); retVal.update = DataTiming.readFromStream(stream); return retVal; diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket.java index 73ee09d..958257f 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket.java @@ -4,8 +4,10 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; -import net.minecraft.network.packet.Packet; public class DataPacket implements ISerializable{ public int id; @@ -18,6 +20,7 @@ public class DataPacket implements ISerializable{ } public DataPacket(int id){ + /* this.id = id; this.size = new DataByteSize(0); this.rate = new DataByteRate(0, 5); @@ -27,14 +30,17 @@ public class DataPacket implements ISerializable{ } catch (Exception e) { this.type = ""; } + */ } - + + /* public DataPacket fill(Packet packet){ this.size.size += packet.getPacketSize() + 1; this.rate.size += packet.getPacketSize() + 1; this.amount.size += 1; return this; } + */ public void startInterval(){ this.rate.reset(); @@ -42,15 +48,16 @@ public class DataPacket implements ISerializable{ } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ stream.writeInt(this.id); this.size.writeToStream(stream); this.rate.writeToStream(stream); this.amount.writeToStream(stream); } - public static DataPacket readFromStream(DataInputStream stream) throws IOException { + public static DataPacket readFromStream(ByteArrayDataInput stream){ DataPacket retVal = new DataPacket(); + /* retVal.id = stream.readInt(); retVal.size = DataByteSize.readFromStream(stream); retVal.rate = DataByteRate.readFromStream(stream); @@ -60,6 +67,7 @@ public class DataPacket implements ISerializable{ } catch (Exception e) { retVal.type = ""; } + */ return retVal; } } diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java index ffecd31..06d2b7d 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java @@ -4,9 +4,10 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.network.packet.Packet; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; -import net.minecraft.network.packet.Packet250CustomPayload; public class DataPacket250 implements ISerializable{ public CachedString channel; @@ -23,12 +24,14 @@ public class DataPacket250 implements ISerializable{ this.amount = new DataAmountRate(0, 5); } + /* public DataPacket250 fill(Packet packet){ this.size.size += packet.getPacketSize() + 1; this.rate.size += packet.getPacketSize() + 1; this.amount.size += 1; return this; } + */ public void startInterval(){ this.rate.reset(); @@ -36,14 +39,14 @@ public class DataPacket250 implements ISerializable{ } @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ this.channel.writeToStream(stream); this.size.writeToStream(stream); this.rate.writeToStream(stream); this.amount.writeToStream(stream); } - public static DataPacket250 readFromStream(DataInputStream stream) throws IOException { + public static DataPacket250 readFromStream(ByteArrayDataInput stream){ DataPacket250 retVal = new DataPacket250(); retVal.channel = CachedString.readFromStream(stream); retVal.size = DataByteSize.readFromStream(stream); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataStringUpdate.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataStringUpdate.java index f85a9b5..5e4bfc6 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataStringUpdate.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataStringUpdate.java @@ -4,7 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.network.packet.Packet; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataStringUpdate implements ISerializable { @@ -20,14 +22,14 @@ public class DataStringUpdate implements ISerializable { } @Override - public void writeToStream(DataOutputStream stream) throws IOException { - Packet.writeString(this.str, stream); + public void writeToStream(ByteArrayDataOutput stream){ + stream.writeUTF(this.str); stream.writeInt(this.index); } - public static DataStringUpdate readFromStream(DataInputStream stream) throws IOException { - return new DataStringUpdate(Packet.readString(stream, 255), stream.readInt()); + public static DataStringUpdate readFromStream(ByteArrayDataInput stream){ + return new DataStringUpdate(stream.readUTF(), stream.readInt()); } } diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataThread.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataThread.java index 929bbd3..57cb558 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataThread.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataThread.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import mcp.mobius.opis.data.holders.ISerializable; public class DataThread implements ISerializable{ @@ -17,13 +20,13 @@ public class DataThread implements ISerializable{ return this; } - public void writeToStream(DataOutputStream stream) throws IOException{ + public void writeToStream(ByteArrayDataOutput stream){ this.name.writeToStream(stream); this.clzz.writeToStream(stream); } - public static DataThread readFromStream(DataInputStream stream) throws IOException { + public static DataThread readFromStream(ByteArrayDataInput stream){ DataThread retVal = new DataThread(); retVal.name = CachedString.readFromStream(stream); retVal.clzz = CachedString.readFromStream(stream); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java index b3d49bc..2969e08 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntity.java @@ -22,7 +22,7 @@ public class DataTileEntity implements ISerializable { public CachedString cause; public DataTileEntity fill(TileEntity tileEntity, String cause){ - this.pos = new CoordinatesBlock(tileEntity.worldObj.provider.dimensionId, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); + this.pos = new CoordinatesBlock(tileEntity.getWorldObj().provider.dimensionId, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); this.clazz = new CachedString(tileEntity.getClass().getCanonicalName()); this.hashCode = System.identityHashCode(tileEntity); this.isValid = !tileEntity.isInvalid(); diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntityRender.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntityRender.java index 9825dca..52652bf 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntityRender.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataTileEntityRender.java @@ -8,6 +8,7 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.profilers.ProfilerRenderTileEntity; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -16,10 +17,10 @@ import net.minecraftforge.common.DimensionManager; public class DataTileEntityRender extends DataBlockTileEntity { public DataTileEntityRender fill(TileEntity ent){ - this.pos = new CoordinatesBlock(ent.worldObj.provider.dimensionId, ent.xCoord, ent.yCoord, ent.zCoord); + this.pos = new CoordinatesBlock(ent.getWorldObj().provider.dimensionId, ent.xCoord, ent.yCoord, ent.zCoord); World world = Minecraft.getMinecraft().theWorld; //DimensionManager.getWorld(this.pos.dim); - this.id = (short) world.getBlockId(this.pos.x, this.pos.y, this.pos.z); + this.id = (short) Block.getIdFromBlock(world.getBlock(this.pos.x, this.pos.y, this.pos.z)); this.meta = (short) world.getBlockMetadata(this.pos.x, this.pos.y, this.pos.z); WeakHashMap data = ((ProfilerRenderTileEntity)(ProfilerSection.RENDER_TILEENTITY.getProfiler())).data; diff --git a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java index 4c70275..20db1a2 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java @@ -34,6 +34,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate; import mcp.mobius.opis.helpers.Teleport; +import mcp.mobius.opis.network.PacketManager; public enum EntityManager { INSTANCE; @@ -183,14 +184,14 @@ public enum EntityManager { return true; } - public boolean teleportEntity(Entity src, Entity trg, Player msgtrg){ + public boolean teleportEntity(Entity src, Entity trg, EntityPlayerMP msgtrg){ if ((src == null) && (msgtrg != null)) { - PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find source entity %s", src))), (Player)msgtrg); + PacketManager.sendToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find source entity %s", src))), msgtrg); return false; } if ((trg == null) && (msgtrg != null)) { - PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find target entity %s", trg))), (Player)msgtrg); + PacketManager.sendToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find target entity %s", trg))), msgtrg); return false; } diff --git a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java index ba3b160..5c2ba98 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java +++ b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java @@ -7,13 +7,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import com.google.common.collect.HashBiMap; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; import cpw.mods.fml.relauncher.Side; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.newtypes.DataStringUpdate; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataList_OLD; import mcp.mobius.opis.network.packets.server.NetDataRaw_OLD; @@ -53,7 +52,7 @@ public enum StringCache implements IMessageHandler { DataStringUpdate upd = new DataStringUpdate(str, currentIndex); this.toSend.add(upd); - PacketDispatcher.sendPacketToAllPlayers(NetDataValue_OLD.create(Message.STATUS_STRINGUPD, upd).packet); + PacketManager.sendToAll(NetDataValue_OLD.create(Message.STATUS_STRINGUPD, upd).packet); return currentIndex; } } @@ -65,7 +64,7 @@ public enum StringCache implements IMessageHandler { ArrayList toSendCopy = new ArrayList(toSend); while (i < toSendCopy.size()){ - PacketDispatcher.sendPacketToPlayer(NetDataList_OLD.create(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))).packet, player); + PacketManager.sendToPlayer(NetDataList_OLD.create(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))).packet, player); i += 50; } diff --git a/src/main/java/mcp/mobius/opis/data/managers/TickHandlerManager.java b/src/main/java/mcp/mobius/opis/data/managers/TickHandlerManager.java index 63a8e8f..753a4f0 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/TickHandlerManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/TickHandlerManager.java @@ -5,8 +5,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import cpw.mods.fml.common.IScheduledTickHandler; -import cpw.mods.fml.common.SingleIntervalHandler; import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; @@ -30,6 +28,7 @@ public class TickHandlerManager { } } + /* public static ArrayList getCumulatedStatsServer(){ ArrayList retVal = new ArrayList(); for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.keySet()) @@ -39,7 +38,9 @@ public class TickHandlerManager { return retVal; } + */ + /* public static ArrayList getCumulatedStatsRender(){ ArrayList retVal = new ArrayList(); for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataRender.keySet()) @@ -48,8 +49,10 @@ public class TickHandlerManager { Collections.sort(retVal); return retVal; - } - + } + */ + + /* public static String getHandlerName(IScheduledTickHandler handler){ String name = handler.getLabel(); if (name == null || name.equals("")){ @@ -64,25 +67,18 @@ public class TickHandlerManager { name = handler.getClass().getName(); } } - /* - }else{ - name = handler.getClass().getName(); - } - */ - /* - if (name == null || name.equals("")){ - name = ""; - } - */ return name; } + */ + /* public static DataTiming getTotalUpdateTime(){ double updateTime = 0D; for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.keySet()) updateTime += new DataHandler().fillServer(ticker).update.timing; return new DataTiming(updateTime); - } + } + */ } diff --git a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerHandler.java b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerHandler.java index cbf455e..5f897a5 100644 --- a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerHandler.java +++ b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerHandler.java @@ -7,15 +7,12 @@ import mcp.mobius.opis.data.profilers.Clock.IClock; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import cpw.mods.fml.common.IScheduledTickHandler; -import cpw.mods.fml.common.TickType; - public class ProfilerHandler extends ProfilerAbstract { private IClock clockServer = Clock.getNewClock(); private IClock clockRender = Clock.getNewClock(); - public WeakHashMap dataServer = new WeakHashMap(); - public WeakHashMap dataRender = new WeakHashMap(); + //public WeakHashMap dataServer = new WeakHashMap(); + //public WeakHashMap dataRender = new WeakHashMap(); @Override public void reset() { @@ -24,6 +21,7 @@ public class ProfilerHandler extends ProfilerAbstract { @Override public void start(Object key1, Object key2) { + /* IScheduledTickHandler ticker = (IScheduledTickHandler) key1; EnumSet ticksToRun = (EnumSet) key2; @@ -39,11 +37,13 @@ public class ProfilerHandler extends ProfilerAbstract { dataRender.put(ticker, new DescriptiveStatistics()); clockRender.start(); - } + } + */ } @Override public void stop(Object key1, Object key2) { + /* IScheduledTickHandler ticker = (IScheduledTickHandler) key1; EnumSet ticksToRun = (EnumSet) key2; if (ticksToRun.contains(TickType.SERVER) && ticksToRun.size() == 1){ @@ -54,6 +54,7 @@ public class ProfilerHandler extends ProfilerAbstract { else if (ticksToRun.contains(TickType.RENDER) && ticksToRun.size() == 1){ clockRender.stop(); dataRender.get(ticker).addValue((double)clockRender.getDelta()); - } + } + */ } } diff --git a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java index 9db0821..6a4c096 100644 --- a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java +++ b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java @@ -7,8 +7,6 @@ import cpw.mods.fml.relauncher.Side; import mcp.mobius.opis.data.holders.newtypes.DataPacket; import mcp.mobius.opis.data.holders.newtypes.DataPacket250; import mcp.mobius.opis.helpers.Helpers; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; public class ProfilerPacket extends ProfilerAbstract { @@ -39,6 +37,7 @@ public class ProfilerPacket extends ProfilerAbstract { @Override public void start(Object key) { + /* if (key != null && Helpers.getEffectiveSide() == Side.SERVER){ //System.out.printf("%s | %s\n", Thread.currentThread().getClass(), Thread.currentThread().getName()); @@ -57,6 +56,7 @@ public class ProfilerPacket extends ProfilerAbstract { } } } + */ } } diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index 5a8ee51..1db0cd7 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -9,7 +9,6 @@ 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; @@ -104,32 +103,13 @@ public enum PlayerTracker{ 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) { - } - - @Override - public void onPlayerLogout(EntityPlayer player) { - this.playerOverlayStatus.remove(player); - this.playerDimension.remove(player); - //this.playersOpis.remove(player); - this.playersSwing.remove(player); - } - - @Override - public void onPlayerChangedDimension(EntityPlayer player) { - } - - @Override - public void onPlayerRespawn(EntityPlayer player) { - } - */ } diff --git a/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java b/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java index e5bab26..158962f 100644 --- a/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java @@ -68,8 +68,9 @@ import cpw.mods.fml.relauncher.Side; public class OpisPacketHandler_OLD implements IPacketHandler { + /* @Override - public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) { + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, EntityPlayerMP player) { if (packet.channel.equals("Opis") || packet.channel.equals("Opis_Chunk")) { byte header = this.getHeader(packet); @@ -79,8 +80,9 @@ public class OpisPacketHandler_OLD implements IPacketHandler { this.onPacketToClient(manager, packet, player, header); } } + */ - void onPacketToClient(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) { + void onPacketToClient(INetworkManager manager, Packet250CustomPayload packet, EntityPlayerMP player, Byte header) { if (header == Packets.TICKETS){ Packet_Tickets_OLD castedPacket = new Packet_Tickets_OLD(packet); @@ -116,6 +118,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { } } + /* public byte getHeader(Packet250CustomPayload packet){ try{ DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); @@ -123,7 +126,8 @@ public class OpisPacketHandler_OLD implements IPacketHandler { } catch (Exception e){ return -1; } - } + } + */ public static void validateAndSend(NetDataRaw_OLD capsule, EntityPlayerMP player){ if (!capsule.msg.isDisplayActive(PlayerTracker.instance().getPlayerSelectedTab(player))) return; diff --git a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index 6c9e0bc..3f926be 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -223,7 +223,7 @@ public class ServerMessageHandler { else if(maintype == Message.SWING_TAB_CHANGED){ SelectedTab tab = SelectedTab.values()[((SerialInt)param1).value]; - PlayerTracker.instance().playerTab.put(player, tab); + PlayerTracker.INSTANCE.playerTab.put(player, tab); } else if(maintype == Message.LIST_ORPHAN_TILEENTS){ diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java index d47ea81..ca1ea29 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataCommand_OLD.java @@ -8,7 +8,6 @@ import java.io.IOException; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; -import net.minecraft.network.packet.Packet250CustomPayload; public class NetDataCommand_OLD extends NetDataRaw_OLD{ diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java index 6871293..3dcc165 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataList_OLD.java @@ -14,8 +14,6 @@ import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; public class NetDataList_OLD extends NetDataRaw_OLD{ diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java index 55910b3..343d1aa 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataRaw_OLD.java @@ -4,7 +4,6 @@ import java.io.DataInputStream; import java.lang.reflect.Method; import java.util.ArrayList; -import net.minecraft.network.packet.Packet250CustomPayload; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.newtypes.DataError; import mcp.mobius.opis.network.enums.Message; diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java index 41d5802..edc4684 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/NetDataValue_OLD.java @@ -7,8 +7,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Method; import mcp.mobius.opis.data.holders.DataType; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java index 9874ced..6f6cedb 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Chunks_OLD.java @@ -8,15 +8,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.logging.Level; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mapwriter.region.MwChunk; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Packets; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.network.packet.Packet56MapChunks; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; @@ -119,13 +118,13 @@ public class Packet_Chunks_OLD { } catch (IOException e){} } - public static void send(int dim, boolean hasNoSky, ArrayList chunks, Player player){ + public static void send(int dim, boolean hasNoSky, ArrayList chunks, EntityPlayerMP player){ Packet250CustomPayload packet = create(dim, hasNoSky, chunks); Packet250CustomPayload[] packets = createPackets("Opis_Chunk", Packets.CHUNKS, packet.data); for (Packet250CustomPayload p : packets){ if (p != null) - PacketDispatcher.sendPacketToPlayer(p, player); + PacketManager.sendToPlayer(p, player); } } diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java index b5e5043..9a066d9 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_DataOverlayChunkEntities_OLD.java @@ -9,7 +9,6 @@ import java.util.HashMap; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.network.enums.Packets; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.ChunkCoordIntPair; public class Packet_DataOverlayChunkEntities_OLD { diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java index a2ae333..122aec9 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/packets/server/Packet_Tickets_OLD.java @@ -9,7 +9,6 @@ import java.util.HashSet; import mcp.mobius.opis.data.holders.basetypes.TicketData; import mcp.mobius.opis.network.enums.Packets; -import net.minecraft.network.packet.Packet250CustomPayload; public class Packet_Tickets_OLD { diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java b/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java index db80dc4..a8f2804 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyServer.java @@ -3,7 +3,6 @@ package mcp.mobius.opis.proxy; import java.util.ArrayList; import java.util.HashMap; -import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.enums.Message; diff --git a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java index ff403a6..b4f33eb 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/timingserver/PanelTimingHandlers.java @@ -11,7 +11,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatAbstract; 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.server.NetDataRaw_OLD; import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.actions.ActionRunOpis; @@ -29,7 +28,6 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -import cpw.mods.fml.common.network.PacketDispatcher; public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{ private JButtonAccess btnRun;