From f164494cde0e8cfb2f7909568c9dd699069d029a Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Thu, 8 Jun 2023 21:09:15 +0800
Subject: [PATCH] Make registry type less specific in 1.19.4 to try and be more
 compatible with arclight

---
 .../nms/v1_19_R3/util/CustomEntityRegistry.java           | 8 ++++----
 .../java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java  | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java
index b9adc60ab..f6145d15c 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java
@@ -154,17 +154,17 @@ import net.minecraft.world.entity.vehicle.MinecartTNT;
 
 @SuppressWarnings("rawtypes")
 public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
-        implements Supplier<DefaultedMappedRegistry<EntityType<?>>> {
+        implements Supplier<MappedRegistry<EntityType<?>>> {
     private final BiMap<ResourceLocation, EntityType> entities = HashBiMap.create();
     private final BiMap<EntityType, ResourceLocation> entityClasses = this.entities.inverse();
     private final Map<EntityType, Integer> entityIds = Maps.newHashMap();
-    private final DefaultedMappedRegistry<EntityType<?>> wrapped;
+    private final MappedRegistry<EntityType<?>> wrapped;
 
     public CustomEntityRegistry(DefaultedRegistry<EntityType<?>> original) throws Throwable {
         super(original.getDefaultKey().getNamespace(),
                 (ResourceKey<? extends Registry<EntityType<?>>>) IREGISTRY_RESOURCE_KEY.invoke(original),
                 (Lifecycle) IREGISTRY_LIFECYCLE.invoke(original), true);
-        this.wrapped = (DefaultedMappedRegistry<EntityType<?>>) original;
+        this.wrapped = (MappedRegistry<EntityType<?>>) original;
     }
 
     @Override
@@ -212,7 +212,7 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
     }
 
     @Override
-    public DefaultedMappedRegistry<EntityType<?>> get() {
+    public MappedRegistry<EntityType<?>> get() {
         return wrapped;
     }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index aef11aee9..e97e7a62d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -2526,9 +2526,7 @@ public class NMSImpl implements NMSBridge {
 
     private static final MethodHandle ADVANCEMENTS_PLAYER_SETTER = NMS.getFirstFinalSetter(ServerPlayer.class,
             PlayerAdvancements.class);
-
     private static final MethodHandle ATTRIBUTE_PROVIDER_MAP = NMS.getFirstGetter(AttributeSupplier.class, Map.class);
-
     private static final MethodHandle ATTRIBUTE_PROVIDER_MAP_SETTER = NMS.getFirstFinalSetter(AttributeSupplier.class,
             Map.class);
     private static final MethodHandle ATTRIBUTE_SUPPLIER = NMS.getFirstGetter(AttributeMap.class,