Update VV usage

kennytv · kennytv · commit 8a9d4bd97179 · 2023-10-20T12:46:29.000+10:00
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
@@ -177,7 +177,7 @@ public void register() {
         protocol.registerClientbound(ClientboundPackets1_9_3.CHUNK_DATA, wrapper -> {
             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
@@ -153,7 +153,7 @@ public void register() {
         protocol.registerClientbound(ClientboundPackets1_12.CHUNK_DATA, wrapper -> {
             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
@@ -258,8 +258,8 @@ public void register() {
         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
@@ -170,10 +170,10 @@ public void init(UserConnection user) {
         user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_14.PLAYER));
 
         if (!user.has(ChunkLightStorage.class)) {
-            user.put(new ChunkLightStorage(user));
+            user.put(new ChunkLightStorage());
         }
 
-        user.put(new DifficultyStorage(user));
+        user.put(new DifficultyStorage());
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
@@ -366,8 +366,8 @@ public void register() {
 
         protocol.registerClientbound(ClientboundPackets1_14.CHUNK_DATA, wrapper -> {
             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 void register() {
                         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
@@ -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 ChunkLight(byte[][] skyLight, byte[][] blockLight) {
             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
@@ -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
@@ -38,7 +38,7 @@ public static void register(Protocol1_13To1_13_1 protocol) {
 
         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
@@ -61,8 +61,8 @@ protected void registerPackets() {
         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
@@ -142,8 +142,8 @@ public void register() {
         });
 
         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
@@ -75,8 +75,8 @@ protected void registerPackets() {
         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
@@ -325,7 +325,7 @@ public void register() {
             int currentWorldSectionHeight = tracker.currentWorldSectionHeight();
 
             Chunk chunk = wrapper.read(new ChunkType1_17(currentWorldSectionHeight));
-            wrapper.write(new ChunkType1_16_2(), chunk);
+            wrapper.write(ChunkType1_16_2.TYPE, chunk);
 
             // Cut sections
             int startFromSection = Math.max(0, -(tracker.currentMinY() >> 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
@@ -72,8 +72,8 @@ public void register() {
         registerClientbound(ClientboundPackets1_9_3.CHUNK_DATA, wrapper -> {
             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
@@ -78,7 +78,7 @@ public void register() {
         protocol.registerClientbound(ClientboundPackets1_9_3.CHUNK_DATA, wrapper -> {
             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);

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,10 @@ public void init(UserConnection user) {`
`170`	`170`	`user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_14.PLAYER));`
`171`	`171`
`172`	`172`	`if (!user.has(ChunkLightStorage.class)) {`
`173`		`- user.put(new ChunkLightStorage(user));`
	`173`	`+ user.put(new ChunkLightStorage());`
`174`	`174`	`}`
`175`	`175`
`176`		`- user.put(new DifficultyStorage(user));`
	`176`	`+ user.put(new DifficultyStorage());`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,14 @@`
`17`	`17`	`*/`
`18`	`18`	`package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage;`
`19`	`19`
`20`		`-import com.viaversion.viaversion.api.connection.StoredObject;`
`21`		`-import com.viaversion.viaversion.api.connection.UserConnection;`
	`20`	`+import com.viaversion.viaversion.api.connection.StorableObject;`
`22`	`21`	`import java.lang.reflect.Constructor;`
`23`	`22`	`import java.lang.reflect.InvocationTargetException;`
`24`	`23`	`import java.util.Arrays;`
`25`	`24`	`import java.util.HashMap;`
`26`	`25`	`import java.util.Map;`
`27`	`26`
`28`		`-public class ChunkLightStorage extends StoredObject {`
	`27`	`+public class ChunkLightStorage implements StorableObject {`
`29`	`28`	`public static final byte[] FULL_LIGHT = new byte[2048];`
`30`	`29`	`public static final byte[] EMPTY_LIGHT = new byte[2048];`
`31`	`30`	`private static Constructor<?> fastUtilLongObjectHashMap;`
`@@ -41,10 +40,6 @@ public class ChunkLightStorage extends StoredObject {`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`
`44`		`- public ChunkLightStorage(UserConnection user) {`
`45`		`- super(user);`
`46`		`- }`
`47`		`-`
`48`	`43`	`public void setStoredLight(byte[][] skyLight, byte[][] blockLight, int x, int z) {`
`49`	`44`	`storedLight.put(getChunkSectionIndex(x, z), new ChunkLight(skyLight, blockLight));`
`50`	`45`	`}`
`@@ -85,11 +80,11 @@ public ChunkLight(byte[][] skyLight, byte[][] blockLight) {`
`85`	`80`	`this.blockLight = blockLight;`
`86`	`81`	`}`
`87`	`82`
`88`		`- public byte[][] getSkyLight() {`
	`83`	`+ public byte[][] skyLight() {`
`89`	`84`	`return skyLight;`
`90`	`85`	`}`
`91`	`86`
`92`		`- public byte[][] getBlockLight() {`
	`87`	`+ public byte[][] blockLight() {`
`93`	`88`	`return blockLight;`
`94`	`89`	`}`
`95`	`90`	`}`