Rename RESOURCE_LOCATION Type to IDENTIFIER

kennytv · kennytv · commit 43bb38f4cff6 · 2025-12-12T15:59:08.000+01:00
Includes method and local variable names of cross-version code. Key stays unchanged, as it's quite clear what it represents (and is shorter)
diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java
@@ -172,7 +172,7 @@ public void load() {
     }
 
     private void loadTags(final RegistryType type, final CompoundTag data) {
-        final CompoundTag tag = data.getCompoundTag(type.resourceLocation());
+        final CompoundTag tag = data.getCompoundTag(type.identifier());
         if (tag == null) {
             return;
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/PaintingVariant.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/PaintingVariant.java
@@ -78,7 +78,7 @@ public void writeDirect(final Ops ops, final PaintingVariant value) {
             ops.writeMap(map -> map
                 .write("width", Types.INT, value.width())
                 .write("height", Types.INT, value.height())
-                .write("asset_id", Types.RESOURCE_LOCATION, Key.of(value.assetId()))
+                .write("asset_id", Types.IDENTIFIER, Key.of(value.assetId()))
                 .writeOptional("title", Types.TAG, value.title())
                 .writeOptional("author", Types.TAG, value.author()));
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryType.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryType.java
@@ -41,30 +41,30 @@ public enum RegistryType implements RegistryKey {
 
     static {
         for (RegistryType type : getValues()) {
-            MAP.put(type.resourceLocation, type);
+            MAP.put(type.identifier, type);
         }
     }
 
     public static RegistryType[] getValues() {
         return VALUES;
     }
 
-    public static @Nullable RegistryType getByKey(String resourceKey) {
-        return MAP.get(resourceKey);
+    public static @Nullable RegistryType getByKey(String identifier) {
+        return MAP.get(identifier);
     }
 
-    private final String resourceLocation;
+    private final String identifier;
 
-    RegistryType(final String resourceLocation) {
-        this.resourceLocation = resourceLocation;
+    RegistryType(final String identifier) {
+        this.identifier = identifier;
     }
 
-    public String resourceLocation() {
-        return resourceLocation;
+    public String identifier() {
+        return identifier;
     }
 
     @Override
     public Key key() {
-        return Key.of(resourceLocation);
+        return Key.of(identifier);
     }
 }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java
@@ -86,7 +86,6 @@
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
-import com.viaversion.viaversion.api.type.types.EitherType;
 import com.viaversion.viaversion.api.type.types.misc.SynchronizedRegistryEitherType;
 import com.viaversion.viaversion.api.type.types.misc.SynchronizedRegistryValueType;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
@@ -152,7 +151,7 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<Equippable> EQUIPPABLE1_21_6 = new StructuredDataKey<>("equippable", Equippable.TYPE1_21_6);
     public static final StructuredDataKey<Repairable> REPAIRABLE = new StructuredDataKey<>("repairable", Repairable.TYPE);
     public static final StructuredDataKey<Unit> GLIDER = new StructuredDataKey<>("glider", Types.EMPTY);
-    public static final StructuredDataKey<Key> TOOLTIP_STYLE = new StructuredDataKey<>("tooltip_style", Types.RESOURCE_LOCATION);
+    public static final StructuredDataKey<Key> TOOLTIP_STYLE = new StructuredDataKey<>("tooltip_style", Types.IDENTIFIER);
     public static final StructuredDataKey<DeathProtection> DEATH_PROTECTION = new StructuredDataKey<>("death_protection", DeathProtection.TYPE);
     public static final StructuredDataKey<BlocksAttacks> BLOCKS_ATTACKS = new StructuredDataKey<>("blocks_attacks", BlocksAttacks.TYPE);
     public static final StructuredDataKey<PiercingWeapon> PIERCING_WEAPON = new StructuredDataKey<>("piercing_weapon", PiercingWeapon.TYPE);
@@ -196,7 +195,7 @@ public record StructuredDataKey<T>(String identifier, Type<T> type) {
     public static final StructuredDataKey<Fireworks> FIREWORKS = new StructuredDataKey<>("fireworks", Fireworks.TYPE);
     public static final StructuredDataKey<GameProfile> PROFILE1_20_5 = new StructuredDataKey<>("profile", Types.GAME_PROFILE);
     public static final StructuredDataKey<ResolvableProfile> PROFILE1_21_9 = new StructuredDataKey<>("profile", Types.RESOLVABLE_PROFILE);
-    public static final StructuredDataKey<Key> NOTE_BLOCK_SOUND = new StructuredDataKey<>("note_block_sound", Types.RESOURCE_LOCATION);
+    public static final StructuredDataKey<Key> NOTE_BLOCK_SOUND = new StructuredDataKey<>("note_block_sound", Types.IDENTIFIER);
     public static final StructuredDataKey<BannerPatternLayer[]> BANNER_PATTERNS = new StructuredDataKey<>("banner_patterns", BannerPatternLayer.ARRAY_TYPE);
     public static final StructuredDataKey<Integer> BASE_COLOR = new StructuredDataKey<>("base_color", EnumTypes.DYE_COLOR);
     public static final StructuredDataKey<PotDecorations> POT_DECORATIONS = new StructuredDataKey<>("pot_decorations", PotDecorations.TYPE);
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java
@@ -186,7 +186,7 @@ public void writeDirect(final Ops ops, final ArmorTrimMaterial object) {
                 if (!object.overrideArmorMaterials.isEmpty()) {
                     map.writeMap("override_armor_assets", materials -> {
                         for (final Map.Entry<String, String> entry : object.overrideArmorMaterials.entrySet()) {
-                            materials.write(Types.RESOURCE_LOCATION, Key.of(entry.getKey()), Types.STRING, entry.getValue());
+                            materials.write(Types.IDENTIFIER, Key.of(entry.getKey()), Types.STRING, entry.getValue());
                         }
                     });
                 }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java
@@ -76,7 +76,7 @@ public void writeDirect(final ByteBuf buffer, final ArmorTrimPattern value) {
         @Override
         public void writeDirect(final Ops ops, final ArmorTrimPattern object) {
             ops.writeMap(map -> map
-                .write("asset_id", Types.RESOURCE_LOCATION, Key.of(object.assetName()))
+                .write("asset_id", Types.IDENTIFIER, Key.of(object.assetName()))
                 .write("description", Types.TEXT_COMPONENT_TAG, object.description())
                 .write("decal", Types.BOOLEAN, object.decal()));
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttributeModifiers1_21.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttributeModifiers1_21.java
@@ -152,8 +152,8 @@ public void write(final ByteBuf buffer, final AttributeModifier value) {
             public void write(final Ops ops, final AttributeModifier value) {
                 final Key attribute = ops.context().registryAccess().attributeModifier(value.attribute);
                 ops.writeMap(map -> map
-                    .write("type", Types.RESOURCE_LOCATION, attribute)
-                    .write("id", Types.RESOURCE_LOCATION, Key.of(value.modifier.id()))
+                    .write("type", Types.IDENTIFIER, attribute)
+                    .write("id", Types.IDENTIFIER, Key.of(value.modifier.id()))
                     .write("amount", Types.DOUBLE, value.modifier.amount)
                     .write("operation", Types.STRING, OPERATION[value.modifier.operation()])
                     .writeOptional("slot", Types.STRING, EQUIPMENT_SLOT_GROUPS[value.slotType()], "any"));
@@ -184,8 +184,8 @@ public void write(final ByteBuf buffer, final AttributeModifier value) {
             public void write(final Ops ops, final AttributeModifier value) {
                 final Key attribute = ops.context().registryAccess().attributeModifier(value.attribute);
                 ops.writeMap(map -> {
-                    map.write("type", Types.RESOURCE_LOCATION, attribute)
-                        .write("id", Types.RESOURCE_LOCATION, Key.of(value.modifier.id()))
+                    map.write("type", Types.IDENTIFIER, attribute)
+                        .write("id", Types.IDENTIFIER, Key.of(value.modifier.id()))
                         .write("amount", Types.DOUBLE, value.modifier.amount)
                         .write("operation", Types.STRING, OPERATION[value.modifier.operation()])
                         .writeOptional("slot", Types.STRING, EQUIPMENT_SLOT_GROUPS[value.slotType()], "any");
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BannerPattern.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BannerPattern.java
@@ -47,7 +47,7 @@ public void writeDirect(final ByteBuf buffer, final BannerPattern value) {
         @Override
         public void writeDirect(final Ops ops, final BannerPattern object) {
             ops.writeMap(map -> map
-                .write("asset_id", Types.RESOURCE_LOCATION, Key.of(object.assetId))
+                .write("asset_id", Types.IDENTIFIER, Key.of(object.assetId))
                 .write("translation_key", Types.STRING, object.translationKey));
         }
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockEntityData.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockEntityData.java
@@ -50,7 +50,7 @@ public void write(final ByteBuf buffer, final BlockEntityData value) {
         @Override
         public void write(final Ops ops, final BlockEntityData data) {
             ops.writeMap(map -> map
-                .write("id", Types.RESOURCE_LOCATION, ops.context().registryAccess().blockEntity(data.type))
+                .write("id", Types.IDENTIFIER, ops.context().registryAccess().blockEntity(data.type))
                 .writeInlinedMap(Types.COMPOUND_TAG, data.tag)
             );
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DamageResistant.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DamageResistant.java
@@ -30,7 +30,7 @@
 
 public record DamageResistant(Key typesTagKey) {
 
-    public static final Type<DamageResistant> TYPE = new TransformingType<>(Types.RESOURCE_LOCATION, DamageResistant.class, DamageResistant::new, DamageResistant::typesTagKey) {
+    public static final Type<DamageResistant> TYPE = new TransformingType<>(Types.IDENTIFIER, DamageResistant.class, DamageResistant::new, DamageResistant::typesTagKey) {
 
         @Override
         public void write(final Ops ops, final DamageResistant value) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Enchantments.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Enchantments.java
@@ -89,7 +89,7 @@ public void write(final Ops ops, final Enchantments value) {
             ops.writeMap(map -> {
                 for (final Int2IntMap.Entry entry : value.enchantments.int2IntEntrySet()) {
                     final Key key = ops.context().registryAccess().registryKey("enchantment", entry.getIntKey());
-                    map.write(Types.RESOURCE_LOCATION, key, Types.VAR_INT, entry.getIntValue());
+                    map.write(Types.IDENTIFIER, key, Types.VAR_INT, entry.getIntValue());
                 }
             });
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EntityData.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EntityData.java
@@ -51,7 +51,7 @@ public void write(final ByteBuf buffer, final EntityData value) {
         @Override
         public void write(final Ops ops, final EntityData data) {
             ops.writeMap(map -> map
-                .write("id", Types.RESOURCE_LOCATION, ops.context().registryAccess().entity(data.type))
+                .write("id", Types.IDENTIFIER, ops.context().registryAccess().entity(data.type))
                 .writeInlinedMap(Types.COMPOUND_TAG, data.tag)
             );
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EnumTypes.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/EnumTypes.java
@@ -50,7 +50,7 @@ public final class EnumTypes {
     public static final EnumType ITEM_USE_ANIMATION = new EnumType("none", "eat", "drink", "block", "bow", "trident", "crossbow", "spyglass", "toot_horn", "brush", "bundle", "spear");
     // Enums with non-ordinal ids
     public static final FakeEnumType RABBIT_VARIANT = new FakeEnumType(List.of("brown", "white", "black", "white_splotched", "gold", "salt"), of(99, "evil"));
-    // Pretty much enums, but with a resource location
+    // Hardcoded registries
     public static final RegistryValueType VILLAGER_TYPE = new RegistryValueType(Key.of("villager_type"), "desert", "jungle", "plains", "savanna", "snow", "swamp", "taiga");
     public static final RegistryValueType POTION = new RegistryValueType(Key.of("potion"), "water", "mundane", "thick", "awkward", "night_vision", "long_night_vision", "invisibility", "long_invisibility", "leaping", "long_leaping", "strong_leaping", "fire_resistance", "long_fire_resistance", "swiftness", "long_swiftness", "strong_swiftness", "slowness", "long_slowness", "strong_slowness", "turtle_master", "long_turtle_master", "strong_turtle_master", "water_breathing", "long_water_breathing", "healing", "strong_healing", "harming", "strong_harming", "poison", "long_poison", "strong_poison", "regeneration", "long_regeneration", "strong_regeneration", "strength", "long_strength", "strong_strength", "weakness", "long_weakness", "luck", "slow_falling", "long_slow_falling", "wind_charged", "weaving", "oozing", "infested");
     public static final RegistryValueType MOB_EFFECT = new RegistryValueType(Key.of("mob_effect"), "speed", "slowness", "haste", "mining_fatigue", "strength", "instant_health", "instant_damage", "jump_boost", "nausea", "regeneration", "resistance", "fire_resistance", "water_breathing", "invisibility", "blindness", "night_vision", "hunger", "weakness", "poison", "wither", "health_boost", "absorption", "saturation", "glowing", "levitation", "luck", "unluck", "slow_falling", "conduit_power", "dolphins_grace", "bad_omen", "hero_of_the_village", "darkness", "trial_omen", "raid_omen", "wind_charged", "weaving", "oozing", "infested");
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Equippable.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Equippable.java
@@ -112,8 +112,8 @@ public void write(final Ops ops, final Equippable value) {
             ops.writeMap(map -> map
                 .write("slot", EnumTypes.EQUIPMENT_SLOT, value.equipmentSlot)
                 .writeOptional("equip_sound", Types.SOUND_EVENT, value.soundEvent, defaultEquipSound)
-                .writeOptional("asset_id", Types.RESOURCE_LOCATION, value.model != null ? Key.of(value.model) : null)
-                .writeOptional("camera_overlay", Types.RESOURCE_LOCATION, value.cameraOverlay != null ? Key.of(value.cameraOverlay) : null)
+                .writeOptional("asset_id", Types.IDENTIFIER, value.model != null ? Key.of(value.model) : null)
+                .writeOptional("camera_overlay", Types.IDENTIFIER, value.cameraOverlay != null ? Key.of(value.cameraOverlay) : null)
                 .writeOptional("allowed_entities", new HolderSetType(MappingData.MappingType.ENTITY_TYPE), value.allowedEntities)
                 .writeOptional("dispensable", Types.BOOLEAN, value.dispensable, true)
                 .writeOptional("swappable", Types.BOOLEAN, value.swappable, true)
@@ -160,8 +160,8 @@ public void write(final Ops ops, final Equippable value) {
             ops.writeMap(map -> map
                 .write("slot", EnumTypes.EQUIPMENT_SLOT, value.equipmentSlot)
                 .writeOptional("equip_sound", Types.SOUND_EVENT, value.soundEvent, defaultSound)
-                .writeOptional("asset_id", Types.RESOURCE_LOCATION, value.model != null ? Key.of(value.model) : null)
-                .writeOptional("camera_overlay", Types.RESOURCE_LOCATION, value.cameraOverlay != null ? Key.of(value.cameraOverlay) : null)
+                .writeOptional("asset_id", Types.IDENTIFIER, value.model != null ? Key.of(value.model) : null)
+                .writeOptional("camera_overlay", Types.IDENTIFIER, value.cameraOverlay != null ? Key.of(value.cameraOverlay) : null)
                 .writeOptional("allowed_entities", new HolderSetType(MappingData.MappingType.ENTITY_TYPE), value.allowedEntities)
                 .writeOptional("dispensable", Types.BOOLEAN, value.dispensable, true)
                 .writeOptional("swappable", Types.BOOLEAN, value.swappable, true)
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ItemModel.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ItemModel.java
@@ -32,7 +32,7 @@
 
 public record ItemModel(Key key) implements Rewritable {
 
-    public static final Type<ItemModel> TYPE = TransformingType.of(Types.RESOURCE_LOCATION, ItemModel.class, ItemModel::new, ItemModel::key);
+    public static final Type<ItemModel> TYPE = TransformingType.of(Types.IDENTIFIER, ItemModel.class, ItemModel::new, ItemModel::key);
 
     @Override
     public ItemModel rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/PotDecorations.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/PotDecorations.java
@@ -30,7 +30,6 @@
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.Rewritable;
-import io.netty.buffer.ByteBuf;
 
 public record PotDecorations(int[] itemIds) implements Copyable, Rewritable {
 
@@ -39,7 +38,7 @@ public record PotDecorations(int[] itemIds) implements Copyable, Rewritable {
         public void write(final Ops ops, final PotDecorations value) {
             ops.writeList(list -> {
                 for (final int itemId : value.itemIds) {
-                    list.write(Types.RESOURCE_LOCATION, ops.context().registryAccess().item(itemId));
+                    list.write(Types.IDENTIFIER, ops.context().registryAccess().item(itemId));
                 }
             });
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/TooltipDisplay.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/TooltipDisplay.java
@@ -63,7 +63,7 @@ public void write(final Ops ops, final TooltipDisplay value) {
             final Key[] hiddenComponents = value.hiddenComponents.intStream().mapToObj(id -> ops.context().registryAccess().dataComponentType(id)).toArray(Key[]::new);
             ops.writeMap(map -> map
                 .writeOptional("hide_tooltip", Types.BOOLEAN, value.hideTooltip, false)
-                .writeOptional("hidden_components", Types.RESOURCE_LOCATION_ARRAY, hiddenComponents, new Key[0]));
+                .writeOptional("hidden_components", Types.IDENTIFIER_ARRAY, hiddenComponents, new Key[0]));
         }
     };
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/UseCooldown.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/UseCooldown.java
@@ -53,7 +53,7 @@ public void write(final Ops ops, final UseCooldown value) {
             final Key cooldownGroup = value.cooldownGroup != null ? Key.of(value.cooldownGroup) : null;
             ops.writeMap(map -> map
                 .write("seconds", Types.FLOAT, value.seconds())
-                .writeOptional("cooldown_group", Types.RESOURCE_LOCATION, cooldownGroup));
+                .writeOptional("cooldown_group", Types.IDENTIFIER, cooldownGroup));
         }
     };
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/Types.java b/api/src/main/java/com/viaversion/viaversion/api/type/Types.java
@@ -185,9 +185,9 @@ public final class Types {
     /* MC Types */
     public static final Type<byte[]> SERVERBOUND_CUSTOM_PAYLOAD_DATA = new RemainingBytesType(Short.MAX_VALUE);
 
-    public static final Type<Key> RESOURCE_LOCATION = new KeyType();
-    public static final Type<Key> OPTIONAL_RESOURCE_LOCATION = new KeyType.OptionalKeyType();
-    public static final Type<Key[]> RESOURCE_LOCATION_ARRAY = new ArrayType<>(RESOURCE_LOCATION);
+    public static final Type<Key> IDENTIFIER = new KeyType();
+    public static final Type<Key> OPTIONAL_IDENTIFIER = new KeyType.OptionalKeyType();
+    public static final Type<Key[]> IDENTIFIER_ARRAY = new ArrayType<>(IDENTIFIER);
     public static final Type<Key> TAG_KEY = new TagKeyType();
 
     public static final Type<BlockPosition> BLOCK_POSITION1_8 = new BlockPositionType1_8();
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_5.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_5.java
@@ -121,7 +121,7 @@ public void write(final ByteBuf buffer, final Item object) {
     @Override
     public void write(final Ops ops, final Item item) {
         ops.writeMap(map -> {
-            map.write("id", Types.RESOURCE_LOCATION, ops.context().registryAccess().item(item.identifier()))
+            map.write("id", Types.IDENTIFIER, ops.context().registryAccess().item(item.identifier()))
                 .write("count", Types.VAR_INT, item.amount());
 
             if (item.dataContainer().isEmpty()) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/math/GlobalBlockPositionType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/math/GlobalBlockPositionType.java
@@ -51,7 +51,7 @@ public void write(ByteBuf buffer, GlobalBlockPosition object) {
     @Override
     public void write(final Ops ops, final GlobalBlockPosition value) {
         ops.writeMap(map -> map
-            .write("dimension", Types.RESOURCE_LOCATION, Key.of(value.dimension()))
+            .write("dimension", Types.IDENTIFIER, Key.of(value.dimension()))
             .write("pos", Types.BLOCK_POSITION1_14, value));
     }
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/EitherHolderType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/EitherHolderType.java
@@ -73,7 +73,7 @@ public static <T> void write(final Ops ops, final EitherHolder<T> object, final
         if (object.hasHolder()) {
             holderType.write(ops, object.holder());
         } else {
-            ops.write(Types.RESOURCE_LOCATION, Key.of(object.key()));
+            ops.write(Types.IDENTIFIER, Key.of(object.key()));
         }
     }
 }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/HolderSetType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/HolderSetType.java
@@ -88,13 +88,13 @@ public void write(final Ops ops, final HolderSet value) {
             Preconditions.checkArgument(registryKey != null, "Cannot write HolderSet with direct ids without a mapping type");
             if (value.ids().length == 1) {
                 // Single entries are inlined
-                ops.write(Types.RESOURCE_LOCATION, key(ops, value.ids()[0]));
+                ops.write(Types.IDENTIFIER, key(ops, value.ids()[0]));
                 return;
             }
 
             ops.writeList(list -> {
                 for (final int id : value.ids()) {
-                    list.write(Types.RESOURCE_LOCATION, key(ops, id));
+                    list.write(Types.IDENTIFIER, key(ops, id));
                 }
             });
         }
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/HolderType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/HolderType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/KeyType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/KeyType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/RegistryValueType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/RegistryValueType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ResolvableProfileType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ResolvableProfileType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/SoundEventType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/SoundEventType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/SynchronizedRegistryEitherType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/SynchronizedRegistryEitherType.java
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/SynchronizedRegistryValueType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/SynchronizedRegistryValueType.java
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public void load() {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`private void loadTags(final RegistryType type, final CompoundTag data) {`
`175`		`- final CompoundTag tag = data.getCompoundTag(type.resourceLocation());`
	`175`	`+ final CompoundTag tag = data.getCompoundTag(type.identifier());`
`176`	`176`	`if (tag == null) {`
`177`	`177`	`return;`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void writeDirect(final Ops ops, final PaintingVariant value) {`
`78`	`78`	`ops.writeMap(map -> map`
`79`	`79`	`.write("width", Types.INT, value.width())`
`80`	`80`	`.write("height", Types.INT, value.height())`
`81`		`- .write("asset_id", Types.RESOURCE_LOCATION, Key.of(value.assetId()))`
	`81`	`+ .write("asset_id", Types.IDENTIFIER, Key.of(value.assetId()))`
`82`	`82`	`.writeOptional("title", Types.TAG, value.title())`
`83`	`83`	`.writeOptional("author", Types.TAG, value.author()));`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,30 +41,30 @@ public enum RegistryType implements RegistryKey {`
`41`	`41`
`42`	`42`	`static {`
`43`	`43`	`for (RegistryType type : getValues()) {`
`44`		`- MAP.put(type.resourceLocation, type);`
	`44`	`+ MAP.put(type.identifier, type);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static RegistryType[] getValues() {`
`49`	`49`	`return VALUES;`
`50`	`50`	`}`
`51`	`51`
`52`		`- public static @Nullable RegistryType getByKey(String resourceKey) {`
`53`		`- return MAP.get(resourceKey);`
	`52`	`+ public static @Nullable RegistryType getByKey(String identifier) {`
	`53`	`+ return MAP.get(identifier);`
`54`	`54`	`}`
`55`	`55`
`56`		`- private final String resourceLocation;`
	`56`	`+ private final String identifier;`
`57`	`57`
`58`		`- RegistryType(final String resourceLocation) {`
`59`		`- this.resourceLocation = resourceLocation;`
	`58`	`+ RegistryType(final String identifier) {`
	`59`	`+ this.identifier = identifier;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public String resourceLocation() {`
`63`		`- return resourceLocation;`
	`62`	`+ public String identifier() {`
	`63`	`+ return identifier;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
`67`	`67`	`public Key key() {`
`68`		`- return Key.of(resourceLocation);`
	`68`	`+ return Key.of(identifier);`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public void writeDirect(final Ops ops, final ArmorTrimMaterial object) {`
`186`	`186`	`if (!object.overrideArmorMaterials.isEmpty()) {`
`187`	`187`	`map.writeMap("override_armor_assets", materials -> {`
`188`	`188`	`for (final Map.Entry<String, String> entry : object.overrideArmorMaterials.entrySet()) {`
`189`		`- materials.write(Types.RESOURCE_LOCATION, Key.of(entry.getKey()), Types.STRING, entry.getValue());`
	`189`	`+ materials.write(Types.IDENTIFIER, Key.of(entry.getKey()), Types.STRING, entry.getValue());`
`190`	`190`	`}`
`191`	`191`	`});`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void writeDirect(final ByteBuf buffer, final ArmorTrimPattern value) {`
`76`	`76`	`@Override`
`77`	`77`	`public void writeDirect(final Ops ops, final ArmorTrimPattern object) {`
`78`	`78`	`ops.writeMap(map -> map`
`79`		`- .write("asset_id", Types.RESOURCE_LOCATION, Key.of(object.assetName()))`
	`79`	`+ .write("asset_id", Types.IDENTIFIER, Key.of(object.assetName()))`
`80`	`80`	`.write("description", Types.TEXT_COMPONENT_TAG, object.description())`
`81`	`81`	`.write("decal", Types.BOOLEAN, object.decal()));`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void writeDirect(final ByteBuf buffer, final BannerPattern value) {`
`47`	`47`	`@Override`
`48`	`48`	`public void writeDirect(final Ops ops, final BannerPattern object) {`
`49`	`49`	`ops.writeMap(map -> map`
`50`		`- .write("asset_id", Types.RESOURCE_LOCATION, Key.of(object.assetId))`
	`50`	`+ .write("asset_id", Types.IDENTIFIER, Key.of(object.assetId))`
`51`	`51`	`.write("translation_key", Types.STRING, object.translationKey));`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void write(final ByteBuf buffer, final BlockEntityData value) {`
`50`	`50`	`@Override`
`51`	`51`	`public void write(final Ops ops, final BlockEntityData data) {`
`52`	`52`	`ops.writeMap(map -> map`
`53`		`- .write("id", Types.RESOURCE_LOCATION, ops.context().registryAccess().blockEntity(data.type))`
	`53`	`+ .write("id", Types.IDENTIFIER, ops.context().registryAccess().blockEntity(data.type))`
`54`	`54`	`.writeInlinedMap(Types.COMPOUND_TAG, data.tag)`
`55`	`55`	`);`
`56`	`56`	`}`