diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataError.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataError.java index 9bfa780..4480ca2 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataError.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataError.java @@ -4,15 +4,18 @@ 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 DataError implements ISerializable { @Override - public void writeToStream(DataOutputStream stream) throws IOException { + public void writeToStream(ByteArrayDataOutput stream){ } - public static DataError readFromStream(DataInputStream stream) throws IOException { + public static DataError readFromStream(ByteArrayDataInput stream){ return new DataError(); } } diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index 1db0cd7..5cf5d12 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -110,6 +110,6 @@ public enum PlayerTracker{ } */ - StringCache.INSTANCE.syncCache(event.player); + StringCache.INSTANCE.syncCache((EntityPlayerMP)event.player); } } diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index 436b353..d8fd820 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -139,11 +139,11 @@ public class modOpis { //TickRegistry.registerTickHandler(OpisClientTickHandler.INSTANCE, Side.CLIENT); if (lagGenID != -1){ - Block blockDemo = new BlockLag(lagGenID, Material.wood); + Block blockDemo = new BlockLag(Material.wood); GameRegistry.registerBlock(blockDemo, "opis.laggen"); GameRegistry.registerTileEntity(TileLag.class, "opis.laggen"); - Block blockDebug = new BlockDebug(lagGenID+1, Material.wood); + Block blockDebug = new BlockDebug(Material.wood); GameRegistry.registerBlock(blockDebug, "opis.debug"); GameRegistry.registerTileEntity(TileDebug.class, "opis.debug"); } 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 158962f..965c0ab 100644 --- a/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java +++ b/src/main/java/mcp/mobius/opis/network/OpisPacketHandler_OLD.java @@ -130,7 +130,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { */ public static void validateAndSend(NetDataRaw_OLD capsule, EntityPlayerMP player){ - if (!capsule.msg.isDisplayActive(PlayerTracker.instance().getPlayerSelectedTab(player))) return; + if (!capsule.msg.isDisplayActive(PlayerTracker.INSTANCE.getPlayerSelectedTab(player))) return; if (capsule.msg.canPlayerUseCommand(player) && capsule.packet.getPacketSize() < 32000) PacketManager.sendPacketToPlayer(capsule.packet, player); @@ -139,7 +139,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { } public static void sendPacketToAllSwing(NetDataRaw_OLD capsule){ - for (EntityPlayerMP player : PlayerTracker.instance().playersSwing) + for (EntityPlayerMP player : PlayerTracker.INSTANCE.playersSwing) OpisPacketHandler_OLD.validateAndSend(capsule, player); } @@ -153,7 +153,7 @@ public class OpisPacketHandler_OLD implements IPacketHandler { } public static void sendChatMsg(String msg, EntityPlayerMP player){ - PacketManager.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(msg)), player); + PacketManager.sendToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(msg)), player); } public static void sendFullUpdate(EntityPlayerMP player){ @@ -193,13 +193,13 @@ public class OpisPacketHandler_OLD implements IPacketHandler { OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerSection.timeStampLastRun)), player); - OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.instance().getPlayerAccessLevel(player).ordinal())), player); + OpisPacketHandler_OLD.validateAndSend(NetDataValue_OLD.create(Message.STATUS_ACCESS_LEVEL, new SerialInt(PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal())), player); // This portion is to get the proper filtered amounts depending on the player preferences. String name = player.getDisplayName(); boolean filtered = false; - if (PlayerTracker.instance().filteredAmount.containsKey(name)) - filtered = PlayerTracker.instance().filteredAmount.get(name); + if (PlayerTracker.INSTANCE.filteredAmount.containsKey(name)) + filtered = PlayerTracker.INSTANCE.filteredAmount.get(name); ArrayList amountEntities = EntityManager.INSTANCE.getCumulativeEntities(filtered); // Here we send a full update to the player diff --git a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index 3f926be..f6d7fb2 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -77,14 +77,14 @@ public class ServerMessageHandler { } else if (maintype == Message.LIST_CHUNK_LOADED){ - PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS); - PlayerTracker.instance().playerDimension.put(player, ((SerialInt)param1).value); + PlayerTracker.INSTANCE.playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS); + PlayerTracker.INSTANCE.playerDimension.put(player, ((SerialInt)param1).value); OpisPacketHandler_OLD.validateAndSend(NetDataCommand_OLD.create(Message.LIST_CHUNK_LOADED_CLEAR), player); OpisPacketHandler_OLD.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE.getLoadedChunks(((SerialInt)param1).value), player); } else if (maintype == Message.LIST_CHUNK_TICKETS){ - PacketManager.sendPacketToPlayer(Packet_Tickets_OLD.create(ChunkManager.INSTANCE.getTickets()), player); + PacketManager.sendToPlayer(Packet_Tickets_OLD.create(ChunkManager.INSTANCE.getTickets()), player); } else if (maintype == Message.LIST_TIMING_TILEENTS){ @@ -122,8 +122,8 @@ public class ServerMessageHandler { else if (maintype == Message.LIST_AMOUNT_ENTITIES){ boolean filtered = false; - if (PlayerTracker.instance().filteredAmount.containsKey(name)) - filtered = PlayerTracker.instance().filteredAmount.get(name); + if (PlayerTracker.INSTANCE.filteredAmount.containsKey(name)) + filtered = PlayerTracker.INSTANCE.filteredAmount.get(name); ArrayList ents = EntityManager.INSTANCE.getCumulativeEntities(filtered); OpisPacketHandler_OLD.validateAndSend(NetDataList_OLD.create(Message.LIST_AMOUNT_ENTITIES, ents), player); @@ -134,16 +134,16 @@ public class ServerMessageHandler { } else if (maintype == Message.COMMAND_FILTERING_TRUE){ - PlayerTracker.instance().filteredAmount.put(name, true); + PlayerTracker.INSTANCE.filteredAmount.put(name, true); } else if (maintype == Message.COMMAND_FILTERING_FALSE){ - PlayerTracker.instance().filteredAmount.put(name, false); + PlayerTracker.INSTANCE.filteredAmount.put(name, false); } else if (maintype == Message.COMMAND_UNREGISTER){ - PlayerTracker.instance().playerOverlayStatus.remove(player); - PlayerTracker.instance().playerDimension.remove(player); + PlayerTracker.INSTANCE.playerOverlayStatus.remove(player); + PlayerTracker.INSTANCE.playerDimension.remove(player); } else if (maintype == Message.COMMAND_START){ @@ -183,7 +183,7 @@ public class ServerMessageHandler { } else if(maintype == Message.COMMAND_UNREGISTER_SWING){ - PlayerTracker.instance().playersSwing.remove(player); + PlayerTracker.INSTANCE.playersSwing.remove(player); } else if(maintype == Message.STATUS_TIME_LAST_RUN){ @@ -244,7 +244,7 @@ public class ServerMessageHandler { for (CoordinatesChunk chunk : entities.keySet()) perChunk.put(chunk, entities.get(chunk).size()); - PacketManager.sendPacketToPlayer(Packet_DataOverlayChunkEntities_OLD.create(perChunk), player); + PacketManager.sendToPlayer(Packet_DataOverlayChunkEntities_OLD.create(perChunk), player); } } diff --git a/src/main/java/mcp/mobius/opis/network/enums/Message.java b/src/main/java/mcp/mobius/opis/network/enums/Message.java index 5fe2bb1..afef066 100644 --- a/src/main/java/mcp/mobius/opis/network/enums/Message.java +++ b/src/main/java/mcp/mobius/opis/network/enums/Message.java @@ -127,11 +127,11 @@ public enum Message { } public boolean canPlayerUseCommand(EntityPlayerMP player){ - return PlayerTracker.instance().getPlayerAccessLevel(player).ordinal() >= this.accessLevel.ordinal(); + return PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal() >= this.accessLevel.ordinal(); } public boolean canPlayerUseCommand(String name){ - return PlayerTracker.instance().getPlayerAccessLevel(name).ordinal() >= this.accessLevel.ordinal(); + return PlayerTracker.INSTANCE.getPlayerAccessLevel(name).ordinal() >= this.accessLevel.ordinal(); } public boolean isDisplayActive(SelectedTab tab){ diff --git a/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqChunks.java b/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqChunks.java index f5c234f..83aea59 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqChunks.java +++ b/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqChunks.java @@ -49,7 +49,7 @@ public class PacketReqChunks extends PacketBase{ @Override public void actionServer(World world, EntityPlayerMP player) { - if (PlayerTracker.instance().getPlayerAccessLevel(player).ordinal() > AccessLevel.PRIVILEGED.ordinal()){ + if (PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal() > AccessLevel.PRIVILEGED.ordinal()){ ArrayList list = new ArrayList(); if (world != null){ diff --git a/src/main/java/mcp/mobius/opis/tools/BlockDebug.java b/src/main/java/mcp/mobius/opis/tools/BlockDebug.java index d9761fd..c893cb2 100644 --- a/src/main/java/mcp/mobius/opis/tools/BlockDebug.java +++ b/src/main/java/mcp/mobius/opis/tools/BlockDebug.java @@ -8,13 +8,13 @@ import net.minecraft.world.World; public class BlockDebug extends BlockContainer { - public BlockDebug(int par1, Material par2Material) { - super(par1, par2Material); - this.setUnlocalizedName("Debug Companion Cube"); + public BlockDebug(Material par2Material) { + super(par2Material); + //this.setUnlocalizedName("Debug Companion Cube"); } - + @Override - public TileEntity createNewTileEntity(World world) { + public TileEntity createNewTileEntity(World var1, int var2) { return new TileDebug(); } diff --git a/src/main/java/mcp/mobius/opis/tools/BlockLag.java b/src/main/java/mcp/mobius/opis/tools/BlockLag.java index 8108676..f836329 100644 --- a/src/main/java/mcp/mobius/opis/tools/BlockLag.java +++ b/src/main/java/mcp/mobius/opis/tools/BlockLag.java @@ -7,13 +7,13 @@ import net.minecraft.world.World; public class BlockLag extends BlockContainer { - public BlockLag(int par1, Material par2Material) { - super(par1, par2Material); - this.setUnlocalizedName("Lag Generator"); + public BlockLag(Material par2Material) { + super(par2Material); + //this.setUnlocalizedName("Lag Generator"); } - + @Override - public TileEntity createNewTileEntity(World world) { + public TileEntity createNewTileEntity(World var1, int var2) { return new TileLag(); }