Fix inventory type enum resolver on paper 1.21.11

Author: GeorgH93

.idea/compiler.xml

@@ -7,29 +7,4 @@ net.minecraft.world.entity.player.EntityHuman#activeContainer bV
 net.minecraft.world.inventory.Container#windowId q
 
 #Containers enum mappings
-net.minecraft.world.inventory.MenuType#GENERIC_9X1 a
-net.minecraft.world.inventory.MenuType#GENERIC_9X2 b
-net.minecraft.world.inventory.MenuType#GENERIC_9X3 c
-net.minecraft.world.inventory.MenuType#GENERIC_9X4 d
-net.minecraft.world.inventory.MenuType#GENERIC_9X5 e
-net.minecraft.world.inventory.MenuType#GENERIC_9X6 f
-net.minecraft.world.inventory.MenuType#GENERIC_3X3 g
-net.minecraft.world.inventory.MenuType#CRAFTER h
-net.minecraft.world.inventory.MenuType#CRAFTER_3x3 h
-net.minecraft.world.inventory.MenuType#ANVIL i
-net.minecraft.world.inventory.MenuType#BEACON j
-net.minecraft.world.inventory.MenuType#BLAST_FURNACE k
-net.minecraft.world.inventory.MenuType#BREWING_STAND l
-net.minecraft.world.inventory.MenuType#CRAFTING m
-net.minecraft.world.inventory.MenuType#ENCHANTMENT n
-net.minecraft.world.inventory.MenuType#FURNACE o
-net.minecraft.world.inventory.MenuType#GRINDSTONE p
-net.minecraft.world.inventory.MenuType#HOPPER q
-net.minecraft.world.inventory.MenuType#LECTERN r
-net.minecraft.world.inventory.MenuType#LOOM s
-net.minecraft.world.inventory.MenuType#MERCHANT t
-net.minecraft.world.inventory.MenuType#SHULKER_BOX u
-net.minecraft.world.inventory.MenuType#SMITHING v
-net.minecraft.world.inventory.MenuType#SMOKER w
-net.minecraft.world.inventory.MenuType#CARTOGRAPHY_TABLE x
-net.minecraft.world.inventory.MenuType#STONECUTTER y
+net.minecraft.world.inventory.MenuType#CRAFTER CRAFTER_3x3

platform/pcgf_pluginlib-platform-nms/pcgf_pluginlib-platform-nms-reflection/resources/mappings/1_21_R7_Paper/FieldMappings.txt

@@ -19,13 +19,15 @@
 
 import at.pcgamingfreaks.Bukkit.MCVersion;
 import at.pcgamingfreaks.Bukkit.NmsReflector;
+import at.pcgamingfreaks.Reflection;
 
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
-import java.util.EnumMap;
+import java.util.*;
+import java.util.function.Function;
 
 final class InventoryTypeMapper_Reflection
 {
@@ -37,6 +39,20 @@ final class InventoryTypeMapper_Reflection
 	{
 		if(CLASS_CONTAINERS != null)
 		{
+			Collection<Field> fields = Reflection.getFieldsIncludeParents(CLASS_CONTAINERS);
+			Map<String, Field> fieldMap = new HashMap<>();
+			for(Field f : fields)
+			{
+				//System.out.println(f.getName());
+				fieldMap.put(f.getName(), f);
+				fieldMap.put(f.getName().toUpperCase(Locale.ENGLISH), f);
+			}
+			Function<String, Field> resolveField = type -> {
+				Field field = fieldMap.get(type); // Fast pass when no remapping is needed
+				if(field != null) return field;
+				field = NmsReflector.INSTANCE.getNmsField(CLASS_CONTAINERS, type);  // Fallback when remapping is needed
+				return field;
+			};
 			for(InventoryType inventoryType : InventoryType.values())
 			{
 				String type = inventoryType.name();
@@ -51,7 +67,7 @@ final class InventoryTypeMapper_Reflection
 				else if(type.equals("COMPOSTER") || type.equals("CHISELED_BOOKSHELF") || type.equals("SMITHING_NEW") || type.equals("JUKEBOX") || type.equals("DECORATED_POT") || type.equals("SHELF")) continue; // They don't have inventory screens
 				try
 				{
-					Field field = NmsReflector.INSTANCE.getNmsField(CLASS_CONTAINERS, type);
+					Field field = resolveField.apply(type);
 					if(field == null) continue;
 					INVENTORY_TYPE_MAP.put(inventoryType, field.get(null));
 				}
@@ -62,7 +78,7 @@ final class InventoryTypeMapper_Reflection
 			{
 				try
 				{
-					INVENTORY_TYPE_CHEST[i] = NmsReflector.INSTANCE.getNmsField(CLASS_CONTAINERS, "GENERIC_9X" + (i + 1)).get(null);
+					INVENTORY_TYPE_CHEST[i] = resolveField.apply("GENERIC_9X" + (i + 1)).get(null);
 				}
 				catch(IllegalAccessException | NullPointerException ignored) {}
 			}