From 6f8d0a72a6c18468bb870b16513635e3deaf237b Mon Sep 17 00:00:00 2001 From: Esophose Date: Thu, 13 Aug 2020 05:34:43 -0600 Subject: [PATCH] Resolve reflection issue with paper 1.16.2 --- .../holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NMS/v1_16_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java b/NMS/v1_16_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java index c9a6c7a3..86d470d0 100644 --- a/NMS/v1_16_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java +++ b/NMS/v1_16_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java @@ -16,8 +16,8 @@ package com.gmail.filoghost.holographicdisplays.nms.v1_16_R2; import java.util.List; +import java.util.Map; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2IntMap; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.inventory.ItemStack; @@ -48,7 +48,7 @@ import net.minecraft.server.v1_16_R2.WorldServer; public class NmsManagerImpl implements NMSManager { - private static final ReflectField>> REGISTRY_TO_ID_FIELD = new ReflectField<>(RegistryMaterials.class, "bg"); + private static final ReflectField, Integer>> REGISTRY_TO_ID_FIELD = new ReflectField<>(RegistryMaterials.class, "bg"); private static final ReflectMethod REGISTER_ENTITY_METHOD = new ReflectMethod<>(WorldServer.class, "registerEntity", Entity.class); @Override @@ -58,7 +58,7 @@ public class NmsManagerImpl implements NMSManager { public void registerCustomEntity(Class entityClass, int id, float sizeWidth, float sizeHeight) throws Exception { // Use reflection to map the custom entity to the correct ID - Object2IntMap> entityTypesToId = REGISTRY_TO_ID_FIELD.get(IRegistry.ENTITY_TYPE); + Map, Integer> entityTypesToId = REGISTRY_TO_ID_FIELD.get(IRegistry.ENTITY_TYPE); EntityTypes customEntityTypes = EntityTypes.Builder.a(EnumCreatureType.MONSTER).a(sizeWidth, sizeHeight).b().a((String) null); entityTypesToId.put(customEntityTypes, id); }