Remove old ResourceLocation usage

Author: gecolay

mcv/v1_21_11/src/main/java/dev/geco/gholo/mcv/v1_21_11/object/holo/type/GHoloRowBlockContent.java

@@ -16,7 +16,7 @@
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Brightness;
 import net.minecraft.world.entity.Display;
@@ -85,9 +85,9 @@ private ClientboundSetEntityDataPacket getDataPacket(String content) {
         List<SynchedEntityData.DataValue<?>> defaultResetData = getEntityData().packDirty();
         if(defaultResetData != null) data.addAll(defaultResetData);
         if(content != null) {
-            ResourceLocation resourceLocation = ResourceLocation.tryParse(content.toLowerCase());
-            if(resourceLocation != null) {
-                Optional<Holder.Reference<Block>> blockData = BuiltInRegistries.BLOCK.get(resourceLocation);
+            Identifier identifier = Identifier.tryParse(content.toLowerCase());
+            if(identifier != null) {
+                Optional<Holder.Reference<Block>> blockData = BuiltInRegistries.BLOCK.get(identifier);
                 if(blockData.isPresent()) data.add(new SynchedEntityData.DataValue<>(holoBlockData.id(), holoBlockData.serializer(), blockData.get().value().defaultBlockState()));
             }
         }

mcv/v1_21_11/src/main/java/dev/geco/gholo/mcv/v1_21_11/object/holo/type/GHoloRowEntityContent.java

@@ -53,9 +53,9 @@ public GHoloRowEntityContent(GHoloRow holoRow, GHoloMain gHoloMain) {
     @Override
     public void load(Player player, String content, boolean create) {
         ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
-        Identifier resourceLocation = Identifier.tryParse(content.toLowerCase());
-        if(resourceLocation == null) return;
-        Optional<Holder.Reference<EntityType<?>>> entityData = BuiltInRegistries.ENTITY_TYPE.get(resourceLocation);
+        Identifier identifier = Identifier.tryParse(content.toLowerCase());
+        if(identifier == null) return;
+        Optional<Holder.Reference<EntityType<?>>> entityData = BuiltInRegistries.ENTITY_TYPE.get(identifier);
         if(entityData.isEmpty()) return;
         EntityType<?> entityType = entityData.get().value();
         if(create || currentEntityTypes.get(player.getUniqueId()) != entityType) {

mcv/v1_21_11/src/main/java/dev/geco/gholo/mcv/v1_21_11/object/holo/type/GHoloRowItemContent.java

@@ -16,7 +16,7 @@
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Brightness;
 import net.minecraft.world.entity.Display;
@@ -85,9 +85,9 @@ private ClientboundSetEntityDataPacket getDataPacket(String content) {
         List<SynchedEntityData.DataValue<?>> defaultResetData = getEntityData().packDirty();
         if(defaultResetData != null) data.addAll(defaultResetData);
         if(content != null) {
-            ResourceLocation resourceLocation = ResourceLocation.tryParse(content.toLowerCase());
-            if(resourceLocation != null) {
-                Optional<Holder.Reference<Item>> itemData = BuiltInRegistries.ITEM.get(resourceLocation);
+            Identifier identifier = Identifier.tryParse(content.toLowerCase());
+            if(identifier != null) {
+                Optional<Holder.Reference<Item>> itemData = BuiltInRegistries.ITEM.get(identifier);
                 if(itemData.isPresent()) data.add(new SynchedEntityData.DataValue<>(holoItemData.id(), holoItemData.serializer(), itemData.get().value().getDefaultInstance()));
             }
         }

mcv/v1_21_11/src/main/java/dev/geco/gholo/mcv/v1_21_11/object/holo/type/GHoloRowItemStackContent.java

@@ -15,7 +15,7 @@
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.PositionMoveRotation;
@@ -74,9 +74,9 @@ private ClientboundSetEntityDataPacket getDataPacket(String content) {
         List<SynchedEntityData.DataValue<?>> defaultResetData = getEntityData().packDirty();
         if(defaultResetData != null) data.addAll(defaultResetData);
         if(content != null) {
-            ResourceLocation resourceLocation = ResourceLocation.tryParse(content.toLowerCase());
-            if(resourceLocation != null) {
-                Optional<Holder.Reference<Item>> itemData = BuiltInRegistries.ITEM.get(resourceLocation);
+            Identifier identifier = Identifier.tryParse(content.toLowerCase());
+            if(identifier != null) {
+                Optional<Holder.Reference<Item>> itemData = BuiltInRegistries.ITEM.get(identifier);
                 if(itemData.isPresent()) data.add(new SynchedEntityData.DataValue<>(holoItemData.id(), holoItemData.serializer(), itemData.get().value().getDefaultInstance()));
             }
         }