Replace some generic CompoundTag get usages

kennytv · kennytv · commit ced1a6523064 · 2024-03-09T13:08:36.000+01:00
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java b/common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java
@@ -57,27 +57,27 @@ public BackwardsMappings(final String unmappedVersion, final String mappedVersio
 
     @Override
     protected void loadExtras(final CompoundTag data) {
-        final CompoundTag itemNames = data.get("itemnames");
+        final CompoundTag itemNames = data.getCompoundTag("itemnames");
         if (itemNames != null) {
             Preconditions.checkNotNull(itemMappings);
             backwardsItemMappings = new Int2ObjectOpenHashMap<>(itemNames.size());
 
-            final CompoundTag extraItemData = data.get("itemdata");
+            final CompoundTag extraItemData = data.getCompoundTag("itemdata");
             for (final Map.Entry<String, Tag> entry : itemNames.entrySet()) {
                 final StringTag name = (StringTag) entry.getValue();
                 final int id = Integer.parseInt(entry.getKey());
                 Integer customModelData = null;
                 if (extraItemData != null && extraItemData.contains(entry.getKey())) {
-                    final CompoundTag entryTag = extraItemData.get(entry.getKey());
-                    final NumberTag customModelDataTag = entryTag.get("custom_model_data");
+                    final CompoundTag entryTag = extraItemData.getCompoundTag(entry.getKey());
+                    final NumberTag customModelDataTag = entryTag.getNumberTag("custom_model_data");
                     customModelData = customModelDataTag != null ? customModelDataTag.asInt() : null;
                 }
 
                 backwardsItemMappings.put(id, new MappedItem(getNewItemId(id), name.getValue(), customModelData));
             }
         }
 
-        final CompoundTag entityNames = data.get("entitynames");
+        final CompoundTag entityNames = data.getCompoundTag("entitynames");
         if (entityNames != null) {
             this.entityNames = new HashMap<>(entityNames.size());
             for (final Map.Entry<String, Tag> entry : entityNames.entrySet()) {
@@ -86,7 +86,7 @@ protected void loadExtras(final CompoundTag data) {
             }
         }
 
-        final CompoundTag soundNames = data.get("soundnames");
+        final CompoundTag soundNames = data.getCompoundTag("soundnames");
         if (soundNames != null) {
             backwardsSoundMappings = new HashMap<>(soundNames.size());
             for (final Map.Entry<String, Tag> entry : soundNames.entrySet()) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/data/VBMappingDataLoader.java b/common/src/main/java/com/viaversion/viabackwards/api/data/VBMappingDataLoader.java
@@ -79,7 +79,7 @@ private static CompoundTag mergeTags(final CompoundTag original, final CompoundT
         for (final Map.Entry<String, Tag> entry : extra.entrySet()) {
             if (entry.getValue() instanceof CompoundTag) {
                 // For compound tags, don't replace the entire tag
-                final CompoundTag originalEntry = original.get(entry.getKey());
+                final CompoundTag originalEntry = original.getCompoundTag(entry.getKey());
                 if (originalEntry != null) {
                     mergeTags(originalEntry, (CompoundTag) entry.getValue());
                     continue;
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java
@@ -75,13 +75,13 @@ public void register() {
                     CompoundTag registry = wrapper.read(Type.NAMED_COMPOUND_TAG);
                     if (wrapper.user().getProtocolInfo().getProtocolVersion() <= ProtocolVersion.v1_15_2.getVersion()) {
                         // Store biomes for <1.16 client handling
-                        CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
+                        CompoundTag biomeRegistry = registry.getCompoundTag("minecraft:worldgen/biome");
                         ListTag<CompoundTag> biomes = biomeRegistry.getListTag("value", CompoundTag.class);
                         BiomeStorage biomeStorage = wrapper.user().get(BiomeStorage.class);
                         biomeStorage.clear();
                         for (CompoundTag biome : biomes) {
-                            StringTag name = biome.get("name");
-                            NumberTag id = biome.get("id");
+                            StringTag name = biome.getStringTag("name");
+                            NumberTag id = biome.getNumberTag("id");
                             biomeStorage.addBiome(name.getValue(), id.asInt());
                         }
                     } else if (!warned) {
@@ -114,7 +114,7 @@ public void register() {
 
     private String getDimensionFromData(CompoundTag dimensionData) {
         // This may technically break other custom dimension settings for 1.16/1.16.1 clients, so those cases are considered semi "unsupported" here
-        StringTag effectsLocation = dimensionData.get("effects");
+        StringTag effectsLocation = dimensionData.getStringTag("effects");
         return effectsLocation != null && oldDimensions.contains(effectsLocation.getValue()) ?
             effectsLocation.getValue() : "minecraft:overworld";
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -84,20 +84,20 @@ public void register() {
                 handler(worldDataTrackerHandler(1));
                 handler(wrapper -> {
                     CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
-                    CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
+                    CompoundTag biomeRegistry = registry.getCompoundTag("minecraft:worldgen/biome");
                     ListTag<CompoundTag> biomes = biomeRegistry.getListTag("value", CompoundTag.class);
                     for (CompoundTag biome : biomes) {
-                        CompoundTag biomeCompound = biome.get("element");
-                        StringTag category = biomeCompound.get("category");
+                        CompoundTag biomeCompound = biome.getCompoundTag("element");
+                        StringTag category = biomeCompound.getStringTag("category");
                         if (category.getValue().equalsIgnoreCase("underground")) {
                             category.setValue("none");
                         }
                     }
 
-                    CompoundTag dimensionRegistry = registry.get("minecraft:dimension_type");
+                    CompoundTag dimensionRegistry = registry.getCompoundTag("minecraft:dimension_type");
                     ListTag<CompoundTag> dimensions = dimensionRegistry.getListTag("value", CompoundTag.class);
                     for (CompoundTag dimension : dimensions) {
-                        CompoundTag dimensionCompound = dimension.get("element");
+                        CompoundTag dimensionCompound = dimension.getCompoundTag("element");
                         reduceExtendedHeight(dimensionCompound, false);
                     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
@@ -61,11 +61,11 @@ public void register() {
                 handler(worldDataTrackerHandler(1));
                 handler(wrapper -> {
                     final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
-                    final CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
+                    final CompoundTag biomeRegistry = registry.getCompoundTag("minecraft:worldgen/biome");
                     final ListTag<CompoundTag> biomes = biomeRegistry.getListTag("value", CompoundTag.class);
                     for (final CompoundTag biome : biomes) {
-                        final CompoundTag biomeCompound = biome.get("element");
-                        final StringTag category = biomeCompound.get("category");
+                        final CompoundTag biomeCompound = biome.getCompoundTag("element");
+                        final StringTag category = biomeCompound.getStringTag("category");
                         if (category.getValue().equals("mountain")) {
                             category.setValue("extreme_hills");
                         }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/data/BackwardsMappings.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/data/BackwardsMappings.java
@@ -40,7 +40,7 @@ protected void loadExtras(final CompoundTag data) {
 
         final ListTag<CompoundTag> chatTypes = VBMappingDataLoader.loadNBT("chat-types-1.19.1.nbt").getListTag("values", CompoundTag.class);
         for (final CompoundTag chatType : chatTypes) {
-            final NumberTag idTag = chatType.get("id");
+            final NumberTag idTag = chatType.getNumberTag("id");
             defaultChatTypes.put(idTag.asInt(), chatType);
         }
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
@@ -131,11 +131,11 @@ public void register() {
                     // Cache dimensions and find current dimension
                     final String dimensionKey = wrapper.read(Type.STRING);
                     final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
-                    final ListTag<CompoundTag> dimensions = ((CompoundTag) registry.get("minecraft:dimension_type")).getListTag("value", CompoundTag.class);
+                    final ListTag<CompoundTag> dimensions = registry.getCompoundTag("minecraft:dimension_type").getListTag("value", CompoundTag.class);
                     boolean found = false;
                     for (final CompoundTag dimension : dimensions) {
-                        final StringTag nameTag = dimension.get("name");
-                        final CompoundTag dimensionData = dimension.get("element");
+                        final StringTag nameTag = dimension.getStringTag("name");
+                        final CompoundTag dimensionData = dimension.getCompoundTag("element");
                         dimensionRegistryStorage.addDimension(nameTag.getValue(), dimensionData.copy());
 
                         if (!found && nameTag.getValue().equals(dimensionKey)) {
@@ -148,18 +148,18 @@ public void register() {
                     }
 
                     // Add biome category and track biomes
-                    final CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
+                    final CompoundTag biomeRegistry = registry.getCompoundTag("minecraft:worldgen/biome");
                     final ListTag<CompoundTag> biomes = biomeRegistry.getListTag("value", CompoundTag.class);
-                    for (final CompoundTag biome : biomes.getValue()) {
-                        final CompoundTag biomeCompound = biome.get("element");
+                    for (final CompoundTag biome : biomes) {
+                        final CompoundTag biomeCompound = biome.getCompoundTag("element");
                         biomeCompound.putString("category", "none");
                     }
                     tracker(wrapper.user()).setBiomesSent(biomes.size());
 
                     // Cache and remove chat types
                     final ListTag<CompoundTag> chatTypes = ((CompoundTag) registry.remove("minecraft:chat_type")).getListTag("value", CompoundTag.class);
                     for (final CompoundTag chatType : chatTypes) {
-                        final NumberTag idTag = chatType.get("id");
+                        final NumberTag idTag = chatType.getNumberTag("id");
                         dimensionRegistryStorage.addChatType(idTag.asInt(), chatType);
                     }
                 });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java
@@ -81,10 +81,10 @@ public void register() {
                 map(Type.NAMED_COMPOUND_TAG); // Current dimension data
                 handler(wrapper -> {
                     final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
-                    final CompoundTag dimensionsHolder = registry.get("minecraft:dimension_type");
+                    final CompoundTag dimensionsHolder = registry.getCompoundTag("minecraft:dimension_type");
                     final ListTag<CompoundTag> dimensions = dimensionsHolder.getListTag("value", CompoundTag.class);
                     for (final CompoundTag dimension : dimensions) {
-                        removeTagPrefix(dimension.get("element"));
+                        removeTagPrefix(dimension.getCompoundTag("element"));
                     }
 
                     removeTagPrefix(wrapper.get(Type.NAMED_COMPOUND_TAG, 1));
@@ -96,10 +96,9 @@ public void register() {
     }
 
     private void removeTagPrefix(CompoundTag tag) {
-        final Tag infiniburnTag = tag.get("infiniburn");
-        if (infiniburnTag instanceof StringTag) {
-            final StringTag infiniburn = (StringTag) infiniburnTag;
-            infiniburn.setValue(infiniburn.getValue().substring(1));
+        final StringTag infiniburnTag = tag.getStringTag("infiniburn");
+        if (infiniburnTag != null) {
+            infiniburnTag.setValue(infiniburnTag.getValue().substring(1));
         }
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/EntityPackets1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/EntityPackets1_19_3.java
@@ -84,7 +84,7 @@ public void register() {
                     final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final ListTag<CompoundTag> chatTypes = registry.getCompoundTag("minecraft:chat_type").getListTag("value", CompoundTag.class);
                     for (final CompoundTag chatType : chatTypes) {
-                        final NumberTag idTag = chatType.get("id");
+                        final NumberTag idTag = chatType.getNumberTag("id");
                         chatTypeStorage.addChatType(idTag.asInt(), chatType);
                     }
                 });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
@@ -67,11 +67,11 @@ public void register() {
                     registry.remove("minecraft:trim_material");
                     registry.remove("minecraft:damage_type");
 
-                    final CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
+                    final CompoundTag biomeRegistry = registry.getCompoundTag("minecraft:worldgen/biome");
                     final ListTag<CompoundTag> biomes = biomeRegistry.getListTag("value", CompoundTag.class);
                     for (final CompoundTag biomeTag : biomes) {
-                        final CompoundTag biomeData = biomeTag.get("element");
-                        final NumberTag hasPrecipitation = biomeData.get("has_precipitation");
+                        final CompoundTag biomeData = biomeTag.getCompoundTag("element");
+                        final NumberTag hasPrecipitation = biomeData.getNumberTag("has_precipitation");
                         biomeData.putString("precipitation", hasPrecipitation.asByte() == 1 ? "rain" : "none");
                     }
                 });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/EntityPackets1_20.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/EntityPackets1_20.java
@@ -89,12 +89,12 @@ public void register() {
                     } else {
                         final CompoundTag trimPatternRegistry = Protocol1_19_4To1_20.MAPPINGS.getTrimPatternRegistry().copy();
                         registry.put("minecraft:trim_pattern", trimPatternRegistry);
-                        values = trimPatternRegistry.get("value");
+                        values = trimPatternRegistry.getListTag("value", CompoundTag.class);
                     }
 
                     for (final CompoundTag entry : values) {
-                        final CompoundTag element = entry.get("element");
-                        final StringTag templateItem = element.get("template_item");
+                        final CompoundTag element = entry.getCompoundTag("element");
+                        final StringTag templateItem = element.getStringTag("template_item");
                         if (newTrimPatterns.contains(Key.stripMinecraftNamespace(templateItem.getValue()))) {
                             templateItem.setValue("minecraft:spire_armor_trim_smithing_template");
                         }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19to1_19_1/Protocol1_19To1_19_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19to1_19_1/Protocol1_19To1_19_1.java
@@ -105,7 +105,7 @@ public void register() {
                     final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final ListTag<CompoundTag> chatTypes = registry.getCompoundTag("minecraft:chat_type").getListTag("value", CompoundTag.class);
                     for (final CompoundTag chatType : chatTypes) {
-                        final NumberTag idTag = chatType.get("id");
+                        final NumberTag idTag = chatType.getNumberTag("id");
                         chatTypeStorage.addChatType(idTag.asInt(), chatType);
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected void loadExtras(final CompoundTag data) {`
`40`	`40`
`41`	`41`	`final ListTag<CompoundTag> chatTypes = VBMappingDataLoader.loadNBT("chat-types-1.19.1.nbt").getListTag("values", CompoundTag.class);`
`42`	`42`	`for (final CompoundTag chatType : chatTypes) {`
`43`		`- final NumberTag idTag = chatType.get("id");`
	`43`	`+ final NumberTag idTag = chatType.getNumberTag("id");`
`44`	`44`	`defaultChatTypes.put(idTag.asInt(), chatType);`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ public void register() {`
`81`	`81`	`map(Type.NAMED_COMPOUND_TAG); // Current dimension data`
`82`	`82`	`handler(wrapper -> {`
`83`	`83`	`final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);`
`84`		`- final CompoundTag dimensionsHolder = registry.get("minecraft:dimension_type");`
	`84`	`+ final CompoundTag dimensionsHolder = registry.getCompoundTag("minecraft:dimension_type");`
`85`	`85`	`final ListTag<CompoundTag> dimensions = dimensionsHolder.getListTag("value", CompoundTag.class);`
`86`	`86`	`for (final CompoundTag dimension : dimensions) {`
`87`		`- removeTagPrefix(dimension.get("element"));`
	`87`	`+ removeTagPrefix(dimension.getCompoundTag("element"));`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`removeTagPrefix(wrapper.get(Type.NAMED_COMPOUND_TAG, 1));`
`@@ -96,10 +96,9 @@ public void register() {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`private void removeTagPrefix(CompoundTag tag) {`
`99`		`- final Tag infiniburnTag = tag.get("infiniburn");`
`100`		`- if (infiniburnTag instanceof StringTag) {`
`101`		`- final StringTag infiniburn = (StringTag) infiniburnTag;`
`102`		`- infiniburn.setValue(infiniburn.getValue().substring(1));`
	`99`	`+ final StringTag infiniburnTag = tag.getStringTag("infiniburn");`
	`100`	`+ if (infiniburnTag != null) {`
	`101`	`+ infiniburnTag.setValue(infiniburnTag.getValue().substring(1));`
`103`	`102`	`}`
`104`	`103`	`}`
`105`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void register() {`
`84`	`84`	`final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);`
`85`	`85`	`final ListTag<CompoundTag> chatTypes = registry.getCompoundTag("minecraft:chat_type").getListTag("value", CompoundTag.class);`
`86`	`86`	`for (final CompoundTag chatType : chatTypes) {`
`87`		`- final NumberTag idTag = chatType.get("id");`
	`87`	`+ final NumberTag idTag = chatType.getNumberTag("id");`
`88`	`88`	`chatTypeStorage.addChatType(idTag.asInt(), chatType);`
`89`	`89`	`}`
`90`	`90`	`});`