diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index 79d8bf90..72b54ea1 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -177,7 +177,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - ChunkType1_9_3 type = new ChunkType1_9_3(clientWorld); // Use the 1.10 Chunk type since nothing changed. + ChunkType1_9_3 type = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); // Use the 1.10 Chunk type since nothing changed. Chunk chunk = wrapper.passthrough(type); handleChunk(chunk); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java index 6bfb89eb..04f4b5d7 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java @@ -153,7 +153,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - ChunkType1_9_3 type = new ChunkType1_9_3(clientWorld); // Use the 1.9.4 Chunk type since nothing changed. + ChunkType1_9_3 type = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); // Use the 1.9.4 Chunk type since nothing changed. Chunk chunk = wrapper.passthrough(type); handleChunk(chunk); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java index be58f72d..626586fa 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java @@ -258,8 +258,8 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, wrapper -> { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - ChunkType1_9_3 type_old = new ChunkType1_9_3(clientWorld); - ChunkType1_13 type = new ChunkType1_13(clientWorld); + ChunkType1_9_3 type_old = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); + ChunkType1_13 type = ChunkType1_13.forEnvironment(clientWorld.getEnvironment()); Chunk chunk = wrapper.read(type); // Handle Block Entities before block rewrite diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java index 2ed47e04..1e806a8a 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java @@ -170,10 +170,10 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - Chunk chunk = wrapper.read(new ChunkType1_14()); - wrapper.write(new ChunkType1_13(clientWorld), chunk); + Chunk chunk = wrapper.read(ChunkType1_14.TYPE); + wrapper.write(ChunkType1_13.forEnvironment(clientWorld.getEnvironment()), chunk); ChunkLightStorage.ChunkLight chunkLight = wrapper.user().get(ChunkLightStorage.class).getStoredLight(chunk.getX(), chunk.getZ()); for (int i = 0; i < chunk.getSections().length; i++) { @@ -382,10 +382,10 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit sectionLight.setSkyLight(ChunkLightStorage.FULL_LIGHT); } } else { - byte[] blockLight = chunkLight.getBlockLight()[i]; + byte[] blockLight = chunkLight.blockLight()[i]; sectionLight.setBlockLight(blockLight != null ? blockLight : ChunkLightStorage.FULL_LIGHT); if (clientWorld.getEnvironment() == Environment.NORMAL) { - byte[] skyLight = chunkLight.getSkyLight()[i]; + byte[] skyLight = chunkLight.skyLight()[i]; sectionLight.setSkyLight(skyLight != null ? skyLight : ChunkLightStorage.FULL_LIGHT); } } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java index 901263a0..833fe1d9 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java @@ -17,15 +17,14 @@ */ package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage; -import com.viaversion.viaversion.api.connection.StoredObject; -import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StorableObject; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -public class ChunkLightStorage extends StoredObject { +public class ChunkLightStorage implements StorableObject { public static final byte[] FULL_LIGHT = new byte[2048]; public static final byte[] EMPTY_LIGHT = new byte[2048]; private static Constructor fastUtilLongObjectHashMap; @@ -41,10 +40,6 @@ public class ChunkLightStorage extends StoredObject { } } - public ChunkLightStorage(UserConnection user) { - super(user); - } - public void setStoredLight(byte[][] skyLight, byte[][] blockLight, int x, int z) { storedLight.put(getChunkSectionIndex(x, z), new ChunkLight(skyLight, blockLight)); } @@ -85,11 +80,11 @@ public class ChunkLightStorage extends StoredObject { this.blockLight = blockLight; } - public byte[][] getSkyLight() { + public byte[][] skyLight() { return skyLight; } - public byte[][] getBlockLight() { + public byte[][] blockLight() { return blockLight; } } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/DifficultyStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/DifficultyStorage.java index b0841da6..ba0c09d2 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/DifficultyStorage.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/DifficultyStorage.java @@ -17,16 +17,11 @@ */ package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage; -import com.viaversion.viaversion.api.connection.StoredObject; -import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.connection.StorableObject; -public class DifficultyStorage extends StoredObject { +public class DifficultyStorage implements StorableObject { private byte difficulty; - public DifficultyStorage(UserConnection user) { - super(user); - } - public byte getDifficulty() { return difficulty; } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java index 5291af68..e8060f67 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java @@ -38,7 +38,7 @@ public class WorldPackets1_13_1 { protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, wrapper -> { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - Chunk chunk = wrapper.passthrough(new ChunkType1_13(clientWorld)); + Chunk chunk = wrapper.passthrough(ChunkType1_13.forEnvironment(clientWorld.getEnvironment())); for (ChunkSection section : chunk.getSections()) { if (section == null) { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java index 01a554dc..a7025b40 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java @@ -61,8 +61,8 @@ public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewrit blockRewriter.registerMultiBlockChange(ClientboundPackets1_15.MULTI_BLOCK_CHANGE); protocol.registerClientbound(ClientboundPackets1_15.CHUNK_DATA, wrapper -> { - Chunk chunk = wrapper.read(new ChunkType1_15()); - wrapper.write(new ChunkType1_14(), chunk); + Chunk chunk = wrapper.read(ChunkType1_15.TYPE); + wrapper.write(ChunkType1_14.TYPE, chunk); if (chunk.isFullChunk()) { int[] biomeData = chunk.getBiomeData(); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java index 6e3b9393..8c1cdb58 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java @@ -142,8 +142,8 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit }); protocol.registerClientbound(ClientboundPackets1_16.CHUNK_DATA, wrapper -> { - Chunk chunk = wrapper.read(new ChunkType1_16()); - wrapper.write(new ChunkType1_15(), chunk); + Chunk chunk = wrapper.read(ChunkType1_16.TYPE); + wrapper.write(ChunkType1_15.TYPE, chunk); for (int i = 0; i < chunk.getSections().length; i++) { ChunkSection section = chunk.getSections()[i]; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java index f940c54c..dc87c625 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java @@ -75,8 +75,8 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr blockRewriter.registerBlockChange(ClientboundPackets1_16_2.BLOCK_CHANGE); protocol.registerClientbound(ClientboundPackets1_16_2.CHUNK_DATA, wrapper -> { - Chunk chunk = wrapper.read(new ChunkType1_16_2()); - wrapper.write(new ChunkType1_16(), chunk); + Chunk chunk = wrapper.read(ChunkType1_16_2.TYPE); + wrapper.write(ChunkType1_16.TYPE, chunk); chunk.setIgnoreOldLightData(true); for (int i = 0; i < chunk.getSections().length; i++) { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java index 42f4ca29..427ef073 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java @@ -325,7 +325,7 @@ public final class BlockItemPackets1_17 extends ItemRewriter> 4)); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java index d0456e90..4885d24e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java @@ -72,8 +72,8 @@ public class Protocol1_9_1_2To1_9_3_4 extends AbstractProtocol { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - ChunkType1_9_3 newType = new ChunkType1_9_3(clientWorld); - ChunkType1_9_1 oldType = new ChunkType1_9_1(clientWorld); // Get the old type to not write Block Entities + ChunkType1_9_3 newType = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); + ChunkType1_9_1 oldType = ChunkType1_9_1.forEnvironment(clientWorld.getEnvironment()); // Get the old type to not write Block Entities Chunk chunk = wrapper.read(newType); wrapper.write(oldType, chunk); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java index fc606de9..453e6cce 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java @@ -78,7 +78,7 @@ public class BlockItemPackets1_10 extends LegacyBlockItemRewriter { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); - ChunkType1_9_3 type = new ChunkType1_9_3(clientWorld); + ChunkType1_9_3 type = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); Chunk chunk = wrapper.passthrough(type); handleChunk(chunk);