diff --git a/mcp/mobius/opis/network/server/Packet_ChunkTopList.java b/mcp/mobius/opis/network/server/Packet_ChunkTopList.java index d9eb713..fffaf6b 100644 --- a/mcp/mobius/opis/network/server/Packet_ChunkTopList.java +++ b/mcp/mobius/opis/network/server/Packet_ChunkTopList.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.util.ArrayList; import mcp.mobius.opis.data.holders.ChunkStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -30,7 +29,7 @@ public class Packet_ChunkTopList { } public static Packet250CustomPayload create(ArrayList stats){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_Chunks.java b/mcp/mobius/opis/network/server/Packet_Chunks.java index 6cd8a29..88c1088 100644 --- a/mcp/mobius/opis/network/server/Packet_Chunks.java +++ b/mcp/mobius/opis/network/server/Packet_Chunks.java @@ -6,24 +6,15 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; -import java.util.logging.Level; -import java.util.zip.ZipInputStream; -import java.util.zip.ZipOutputStream; - 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.Packet251Extended; import mcp.mobius.opis.network.Packets; -import net.minecraft.client.Minecraft; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.network.packet.Packet56MapChunks; -import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; -import net.minecraftforge.common.DimensionManager; public class Packet_Chunks { @@ -55,7 +46,7 @@ public class Packet_Chunks { public static Packet250CustomPayload create(int dim, boolean hasNoSky, ArrayList chunks){ //Packet250CustomPayload packet = new Packet250CustomPayload(); - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_ClearSelection.java b/mcp/mobius/opis/network/server/Packet_ClearSelection.java index 2d48ad3..424ec81 100644 --- a/mcp/mobius/opis/network/server/Packet_ClearSelection.java +++ b/mcp/mobius/opis/network/server/Packet_ClearSelection.java @@ -6,7 +6,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; diff --git a/mcp/mobius/opis/network/server/Packet_ClientCommand.java b/mcp/mobius/opis/network/server/Packet_ClientCommand.java index 9385542..bc41889 100644 --- a/mcp/mobius/opis/network/server/Packet_ClientCommand.java +++ b/mcp/mobius/opis/network/server/Packet_ClientCommand.java @@ -6,7 +6,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import mcp.mobius.opis.network.ClientCommand; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; diff --git a/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java b/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java index 8d3d1dc..f44b695 100644 --- a/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java +++ b/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import net.minecraft.network.packet.Packet250CustomPayload; import mcp.mobius.opis.data.holders.EntityStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; public class Packet_DataListChunkEntities { @@ -32,7 +31,7 @@ public class Packet_DataListChunkEntities { } public static Packet250CustomPayload create(ArrayList entities){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_DataOverlayChunkEntities.java b/mcp/mobius/opis/network/server/Packet_DataOverlayChunkEntities.java index 3a60be7..0d1f2d8 100644 --- a/mcp/mobius/opis/network/server/Packet_DataOverlayChunkEntities.java +++ b/mcp/mobius/opis/network/server/Packet_DataOverlayChunkEntities.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.util.HashMap; import mcp.mobius.opis.data.holders.CoordinatesChunk; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.ChunkCoordIntPair; @@ -36,7 +35,7 @@ public class Packet_DataOverlayChunkEntities { } public static Packet250CustomPayload create(HashMap chunks){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_DataScreenAmountEntities.java b/mcp/mobius/opis/network/server/Packet_DataScreenAmountEntities.java index e9683f3..d7af819 100644 --- a/mcp/mobius/opis/network/server/Packet_DataScreenAmountEntities.java +++ b/mcp/mobius/opis/network/server/Packet_DataScreenAmountEntities.java @@ -7,8 +7,8 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.HashMap; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; +import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; public class Packet_DataScreenAmountEntities { @@ -23,7 +23,7 @@ public class Packet_DataScreenAmountEntities { this.header = inputStream.readByte(); int ndata = inputStream.readInt(); for (int i = 0; i < ndata; i++){ - String name = packet.readString(inputStream, 255); + String name = Packet.readString(inputStream, 255); int amount = inputStream.readInt(); entities.put(name, amount); } @@ -31,7 +31,7 @@ public class Packet_DataScreenAmountEntities { } public static Packet250CustomPayload create(HashMap entities){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_DataScreenTimingEntities.java b/mcp/mobius/opis/network/server/Packet_DataScreenTimingEntities.java index 2bce5a2..ab994cb 100644 --- a/mcp/mobius/opis/network/server/Packet_DataScreenTimingEntities.java +++ b/mcp/mobius/opis/network/server/Packet_DataScreenTimingEntities.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import net.minecraft.network.packet.Packet250CustomPayload; import mcp.mobius.opis.data.holders.EntityStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; public class Packet_DataScreenTimingEntities { @@ -29,7 +28,7 @@ public class Packet_DataScreenTimingEntities { } public static Packet250CustomPayload create(ArrayList stats){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java b/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java index ea47e1a..dcb5eb7 100644 --- a/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java +++ b/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import net.minecraft.network.packet.Packet250CustomPayload; import mcp.mobius.opis.data.holders.TickHandlerStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; public class Packet_DataScreenTimingHandlers { @@ -30,7 +29,7 @@ public class Packet_DataScreenTimingHandlers { } public static Packet250CustomPayload create(ArrayList stats){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_LoadedChunks.java b/mcp/mobius/opis/network/server/Packet_LoadedChunks.java index 4a1ed1e..862c92c 100644 --- a/mcp/mobius/opis/network/server/Packet_LoadedChunks.java +++ b/mcp/mobius/opis/network/server/Packet_LoadedChunks.java @@ -7,7 +7,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.HashMap; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.ChunkCoordIntPair; @@ -34,7 +33,7 @@ public class Packet_LoadedChunks { } public static Packet250CustomPayload create(HashMap chunks){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_MeanTime.java b/mcp/mobius/opis/network/server/Packet_MeanTime.java index f931d25..71f4f7d 100644 --- a/mcp/mobius/opis/network/server/Packet_MeanTime.java +++ b/mcp/mobius/opis/network/server/Packet_MeanTime.java @@ -9,7 +9,6 @@ import java.util.HashMap; import mcp.mobius.opis.data.holders.ChunkStats; import mcp.mobius.opis.data.holders.CoordinatesChunk; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -37,7 +36,7 @@ public class Packet_MeanTime { } public static Packet250CustomPayload create(HashMap chunks, int dim){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_ModMeanTime.java b/mcp/mobius/opis/network/server/Packet_ModMeanTime.java index 0527158..8825ad0 100644 --- a/mcp/mobius/opis/network/server/Packet_ModMeanTime.java +++ b/mcp/mobius/opis/network/server/Packet_ModMeanTime.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import net.minecraft.network.packet.Packet250CustomPayload; import mcp.mobius.opis.data.holders.ModStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; public class Packet_ModMeanTime { @@ -29,7 +28,7 @@ public class Packet_ModMeanTime { } public static Packet250CustomPayload create(ArrayList stats){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_TPS.java b/mcp/mobius/opis/network/server/Packet_TPS.java index 96ad99c..cb3f856 100644 --- a/mcp/mobius/opis/network/server/Packet_TPS.java +++ b/mcp/mobius/opis/network/server/Packet_TPS.java @@ -10,7 +10,6 @@ import java.util.Hashtable; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.server.MinecraftServer; @@ -43,7 +42,7 @@ public class Packet_TPS { } public static Packet250CustomPayload create(){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_Tickets.java b/mcp/mobius/opis/network/server/Packet_Tickets.java index 1aacda6..9012a46 100644 --- a/mcp/mobius/opis/network/server/Packet_Tickets.java +++ b/mcp/mobius/opis/network/server/Packet_Tickets.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.util.HashSet; import mcp.mobius.opis.data.holders.TicketData; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -31,7 +30,7 @@ public class Packet_Tickets { } public static Packet250CustomPayload create(HashSet data){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java b/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java index 10547e7..2e7b50e 100644 --- a/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java +++ b/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import mcp.mobius.opis.data.holders.TileEntityStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -30,7 +29,7 @@ public class Packet_TileEntitiesChunkList { } public static Packet250CustomPayload create(ArrayList stats){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java b/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java index 3e290e1..45ee208 100644 --- a/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java +++ b/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import mcp.mobius.opis.data.holders.TileEntityStats; -import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -30,7 +29,7 @@ public class Packet_TileEntitiesTopList { } public static Packet250CustomPayload create(ArrayList stats){ - Packet251Extended packet = new Packet251Extended(); + Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos);