Small cleanups

kennytv · kennytv · commit b60464296b56 · 2024-02-12T11:02:55.000+01:00
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/exceptions/RemovedValueException.java b/common/src/main/java/com/viaversion/viabackwards/api/exceptions/RemovedValueException.java
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriter.java
@@ -29,6 +29,7 @@
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -118,7 +119,7 @@ public ItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType)
         if (item.tag() != null) {
             Tag originalId = item.tag().remove(nbtTagName + "|id");
             if (originalId instanceof IntTag) {
-                item.setIdentifier(((IntTag) originalId).asInt());
+                item.setIdentifier(((NumberTag) originalId).asInt());
             }
         }
         return item;
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriterBase.java
@@ -35,7 +35,7 @@ public abstract class ItemRewriterBase<C extends ClientboundPacketType, S extend
     protected final String nbtTagName;
     protected final boolean jsonNameFormat;
 
-    public ItemRewriterBase(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, boolean jsonNameFormat) {
+    protected ItemRewriterBase(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, boolean jsonNameFormat) {
         super(protocol, itemType, itemArrayType);
         this.jsonNameFormat = jsonNameFormat;
         nbtTagName = "VB|" + protocol.getClass().getSimpleName();
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java
@@ -20,7 +20,6 @@
 
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
@@ -34,7 +33,7 @@ public class BannerHandler implements BackwardsBlockEntityHandler {
     private static final int BANNER_STOP = 7109;
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         // Normal banners
         if (blockId >= BANNER_START && blockId <= BANNER_STOP) {
             int color = (blockId - BANNER_START) >> 4;
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java
@@ -19,13 +19,12 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 
 public class BedHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         int offset = blockId - 748;
         int color = offset >> 4;
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java
@@ -19,7 +19,6 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
@@ -70,7 +69,7 @@ public Pair<String, Byte> getOrDefault(int blockId) {
 
     // TODO THIS IS NEVER CALLED BECAUSE ITS NO LONGER A BLOCK ENTITY :(
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         Pair<String, Byte> item = getOrDefault(blockId);
 
         tag.putString("Item", item.key());
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
@@ -20,7 +20,6 @@
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.MappingDataLoader;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
@@ -77,7 +76,7 @@ private void addEntries(String data, int id) {
     }
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         CompoundTag blockState = tag.getCompoundTag("blockState");
         if (blockState == null) return tag;
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java
@@ -19,14 +19,13 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 
 public class SkullHandler implements BackwardsBlockEntityHandler {
     private static final int SKULL_START = 5447;
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         int diff = blockId - SKULL_START;
         int pos = diff % 20;
         byte type = (byte) Math.floor(diff / 20f);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java
@@ -20,14 +20,13 @@
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.EntityNameRewrites;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 
 public class SpawnerHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         CompoundTag dataTag = tag.getCompoundTag("SpawnData");
         if (dataTag != null) {
             StringTag idTag = dataTag.getStringTag("id");
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
@@ -711,7 +711,7 @@ private void rewriteEnchantmentsToClient(CompoundTag tag, boolean storedEnch) {
             tag.putInt("HideFlags", value);
         }
 
-        if (noMapped.size() != 0) {
+        if (!noMapped.isEmpty()) {
             tag.put(extraNbtTag + "|" + key, noMapped);
 
             if (!lore.isEmpty()) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
@@ -61,12 +61,10 @@ protected void registerPackets() {
             public void register() {
                 handler(packetWrapper -> {
                     packetWrapper.cancel();
-                    packetWrapper.create(0x02, new PacketHandler() { // Plugin response
-                        @Override
-                        public void handle(PacketWrapper newWrapper) throws Exception {
-                            newWrapper.write(Type.VAR_INT, packetWrapper.read(Type.VAR_INT)); // Packet id
-                            newWrapper.write(Type.BOOLEAN, false); // Success
-                        }
+                    // Plugin response
+                    packetWrapper.create(0x02, wrapper -> {
+                        wrapper.write(Type.VAR_INT, packetWrapper.read(Type.VAR_INT)); // Packet id
+                        wrapper.write(Type.BOOLEAN, false); // Success
                     }).sendToServer(Protocol1_12_2To1_13.class);
                 });
             }
@@ -392,7 +390,7 @@ public void register() {
                     if (type == 0) {
                         //Information from https://wiki.vg/index.php?title=Plugin_channels&oldid=14089
                         //The Notchain client only uses this for command block minecarts and uses MC|AutoCmd for blocks, but the Notchian server still accepts it for either.
-                        //Maybe older versions used this and we need to implement this? The issues is that we would have to save the command block types
+                        //Maybe older versions used this and we need to implement this? The issue is that we would have to save the command block types
                         wrapper.setPacketType(ServerboundPackets1_13.UPDATE_COMMAND_BLOCK);
                         wrapper.cancel();
                         ViaBackwards.getPlatform().getLogger().warning("Client send MC|AdvCmd custom payload to update command block, weird!");
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java
@@ -80,7 +80,7 @@ public CompoundTag transform(UserConnection user, Position position, CompoundTag
             return tag;
         }
 
-        return handler.transform(user, blockId, tag);
+        return handler.transform(blockId, tag);
     }
 
     /**
@@ -102,6 +102,7 @@ public CompoundTag transform(UserConnection user, Position position, String id)
 
     @FunctionalInterface
     public interface BackwardsBlockEntityHandler {
-        CompoundTag transform(UserConnection user, int blockId, CompoundTag tag);
+
+        CompoundTag transform(int blockId, CompoundTag tag);
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java
@@ -24,6 +24,7 @@
 import com.viaversion.viaversion.libs.fastutil.ints.IntSet;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class BackwardsBlockStorage implements StorableObject {
     // This BlockStorage is very exclusive (;
@@ -77,11 +78,7 @@ public void checkAndStore(Position position, int block) {
         blocks.put(position, block);
     }
 
-    public boolean isWelcome(int block) {
-        return WHITELIST.contains(block);
-    }
-
-    public Integer get(Position position) {
+    public @Nullable Integer get(Position position) {
         return blocks.get(position);
     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java
@@ -20,7 +20,4 @@
 import com.viaversion.viabackwards.api.entities.storage.PlayerPositionStorage;
 
 public class PlayerPositionStorage1_13 extends PlayerPositionStorage {
-
-    public PlayerPositionStorage1_13() {
-    }
 }
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
@@ -103,9 +103,7 @@ protected void registerPackets() {
             public void register() {
                 map(Type.POSITION1_14);
                 map(Type.UNSIGNED_BYTE);
-                handler(wrapper -> {
-                    handleBlockEntity(wrapper.passthrough(Type.NAMED_COMPOUND_TAG));
-                });
+                handler(wrapper -> handleBlockEntity(wrapper.passthrough(Type.NAMED_COMPOUND_TAG)));
             }
         });
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
@@ -37,6 +37,7 @@
 import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
 import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
 import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_3;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -59,6 +60,7 @@
 import com.viaversion.viaversion.util.Pair;
 import java.util.BitSet;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundPackets1_19_3, ClientboundPackets1_19_1, ServerboundPackets1_19_3, ServerboundPackets1_19_1> {
 
@@ -91,60 +93,19 @@ protected void registerPackets() {
         final SoundRewriter<ClientboundPackets1_19_3> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerStopSound(ClientboundPackets1_19_3.STOP_SOUND);
         registerClientbound(ClientboundPackets1_19_3.SOUND, wrapper -> {
-            final int soundId = wrapper.read(Type.VAR_INT) - 1; // Normalize the id
-            if (soundId != -1) {
-                final int mappedId = MAPPINGS.getSoundMappings().getNewId(soundId);
-                if (mappedId == -1) {
-                    wrapper.cancel();
-                    return;
-                }
-
-                wrapper.write(Type.VAR_INT, mappedId);
-                return;
-            }
-
-            String soundIdentifier = wrapper.read(Type.STRING);
-            wrapper.read(Type.OPTIONAL_FLOAT); // Fixed range
-            final String mappedIdentifier = MAPPINGS.getMappedNamedSound(soundIdentifier);
+            final String mappedIdentifier = rewriteSound(wrapper);
             if (mappedIdentifier != null) {
-                if (mappedIdentifier.isEmpty()) {
-                    wrapper.cancel();
-                    return;
-                }
-
-                soundIdentifier = mappedIdentifier;
+                wrapper.write(Type.STRING, mappedIdentifier);
+                wrapper.setPacketType(ClientboundPackets1_19_1.NAMED_SOUND);
             }
-
-            wrapper.write(Type.STRING, soundIdentifier);
-            wrapper.setPacketType(ClientboundPackets1_19_1.NAMED_SOUND);
         });
         registerClientbound(ClientboundPackets1_19_3.ENTITY_SOUND, wrapper -> {
-            final int soundId = wrapper.read(Type.VAR_INT) - 1; // Normalize the id
-            if (soundId != -1) {
-                final int mappedId = MAPPINGS.getSoundMappings().getNewId(soundId);
-                if (mappedId == -1) {
-                    wrapper.cancel();
-                    return;
-                }
-
-                wrapper.write(Type.VAR_INT, mappedId);
+            final String mappedIdentifier = rewriteSound(wrapper);
+            if (mappedIdentifier == null) {
                 return;
             }
 
-            // Convert the resource location to the corresponding integer id
-            String soundIdentifier = wrapper.read(Type.STRING);
-            wrapper.read(Type.OPTIONAL_FLOAT); // Fixed range
-            final String mappedIdentifier = MAPPINGS.getMappedNamedSound(soundIdentifier);
-            if (mappedIdentifier != null) {
-                if (mappedIdentifier.isEmpty()) {
-                    wrapper.cancel();
-                    return;
-                }
-
-                soundIdentifier = mappedIdentifier;
-            }
-
-            final int mappedId = MAPPINGS.mappedSound(soundIdentifier);
+            final int mappedId = MAPPINGS.mappedSound(mappedIdentifier);
             if (mappedId == -1) {
                 wrapper.cancel();
                 return;
@@ -387,6 +348,35 @@ public void register() {
         cancelServerbound(ServerboundPackets1_19_1.CHAT_ACK);
     }
 
+    private @Nullable String rewriteSound(final PacketWrapper wrapper) throws Exception {
+        final int soundId = wrapper.read(Type.VAR_INT) - 1; // Normalize the id
+        if (soundId != -1) {
+            final int mappedId = MAPPINGS.getSoundMappings().getNewId(soundId);
+            if (mappedId == -1) {
+                wrapper.cancel();
+                return null;
+            }
+
+            wrapper.write(Type.VAR_INT, mappedId);
+            return null;
+        }
+
+        // Convert the resource location to the corresponding integer id
+        final String soundIdentifier = wrapper.read(Type.STRING);
+        wrapper.read(Type.OPTIONAL_FLOAT); // Fixed range
+        final String mappedIdentifier = MAPPINGS.getMappedNamedSound(soundIdentifier);
+        if (mappedIdentifier == null) {
+            return soundIdentifier;
+        }
+
+        if (mappedIdentifier.isEmpty()) {
+            wrapper.cancel();
+            return null;
+        }
+
+        return mappedIdentifier;
+    }
+
     @Override
     public void init(final UserConnection user) {
         user.put(new ChatSessionStorage());
diff --git a/common/src/main/java/com/viaversion/viabackwards/utils/Block.java b/common/src/main/java/com/viaversion/viabackwards/utils/Block.java
@@ -27,11 +27,6 @@ public Block(int id, int data) {
         this.data = (short) data;
     }
 
-    public Block(int id) {
-        this.id = id;
-        this.data = 0;
-    }
-
     public int getId() {
         return id;
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/utils/ChatUtil.java b/common/src/main/java/com/viaversion/viabackwards/utils/ChatUtil.java
@@ -22,7 +22,7 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-public class ChatUtil {
+public final class ChatUtil {
     private static final Pattern UNUSED_COLOR_PATTERN = Pattern.compile("(?>(?>§[0-fk-or])*(§r|\\Z))|(?>(?>§[0-f])*(§[0-f]))");
     private static final Pattern UNUSED_COLOR_PATTERN_PREFIX = Pattern.compile("(?>(?>§[0-fk-or])*(§r))|(?>(?>§[0-f])*(§[0-f]))");
 
diff --git a/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java b/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java
diff --git a/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java b/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,7 @@ private void rewriteEnchantmentsToClient(CompoundTag tag, boolean storedEnch) {`
`711`	`711`	`tag.putInt("HideFlags", value);`
`712`	`712`	`}`
`713`	`713`
`714`		`- if (noMapped.size() != 0) {`
	`714`	`+ if (!noMapped.isEmpty()) {`
`715`	`715`	`tag.put(extraNbtTag + "\|" + key, noMapped);`
`716`	`716`
`717`	`717`	`if (!lore.isEmpty()) {`