Fixed not getting minecraft names correctly

BG-Software-LLC · Sep 30, 2023 · 90c2255 · 90c2255
1 parent 0a81f81
commit 90c2255
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/io/MenuParserImpl.java b/src/main/java/com/bgsoftware/superiorskyblock/core/io/MenuParserImpl.java
@@ -291,7 +291,7 @@ private static TemplateItem getItemStackUnsafe(String fileName, ConfigurationSec
             try {
                 String materialType = section.getString("type");
                 materialType = MinecraftNamesMapper.getMinecraftName(materialType)
-                        .flatMap(minecraftKey -> NAMES_MAPPER.get().getMappedName(Material.class, minecraftKey))
+                        .map(minecraftKey -> NAMES_MAPPER.get().getMappedName(Material.class, minecraftKey).orElse(minecraftKey))
                         .orElse(materialType);
                 if (materialType.contains(":")) {
                     String[] materialSections = materialType.toUpperCase(Locale.ENGLISH).split(":");
@@ -410,15 +410,18 @@ public List<Integer> parseButtonSlots(ConfigurationSection section, String key,
     }
 
     private static <E extends Enum<E>> E getMinecraftEnum(Class<E> type, String name) throws IllegalArgumentException {
-        return MinecraftNamesMapper.getMinecraftName(name)
-                .flatMap(minecraftKey -> NAMES_MAPPER.get().mapName(type, minecraftKey))
-                .orElseGet(() -> Enum.valueOf(type, name.toUpperCase(Locale.ENGLISH)));
+        String mappedName = MinecraftNamesMapper.getMinecraftName(name)
+                .map(minecraftKey -> NAMES_MAPPER.get().getMappedName(type, minecraftKey).orElse(minecraftKey))
+                .orElse(name);
+
+        return Enum.valueOf(type, mappedName.toUpperCase(Locale.ENGLISH));
     }
 
     private static <T> T getMinecraftEnum(Class<T> type, String name, Function<String, T> enumCreator) throws IllegalArgumentException {
         String mappedName = MinecraftNamesMapper.getMinecraftName(name)
-                .flatMap(minecraftKey -> NAMES_MAPPER.get().getMappedName(type, minecraftKey))
+                .map(minecraftKey -> NAMES_MAPPER.get().getMappedName(type, minecraftKey).orElse(minecraftKey))
                 .orElse(name);
+
         return Optional.ofNullable(enumCreator.apply(mappedName.toUpperCase(Locale.ENGLISH)))
                 .orElseThrow(() -> new IllegalArgumentException("No enum constant " + type.getCanonicalName() + "." + name));
     }

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/itemstack/MinecraftNamesMapper.java b/src/main/java/com/bgsoftware/superiorskyblock/core/itemstack/MinecraftNamesMapper.java
@@ -36,24 +36,6 @@ public MinecraftNamesMapper() {
         this.enumNamesMapping = fetchEnumNamesMapping();
     }
 
-    public <E extends Enum<E>> Optional<E> mapName(Class<E> expectedEnumClass, String name) {
-        return Optional.ofNullable(getMappedName(expectedEnumClass, name)
-                .map(mappedName -> {
-                    try {
-                        return Enum.valueOf(expectedEnumClass, mappedName.toUpperCase(Locale.ENGLISH));
-                    } catch (IllegalArgumentException error) {
-                        return null;
-                    }
-                })
-                .orElseGet(() -> {
-                    try {
-                        return Enum.valueOf(expectedEnumClass, name.toUpperCase(Locale.ENGLISH));
-                    } catch (IllegalArgumentException error) {
-                        return null;
-                    }
-                }));
-    }
-
     public Optional<String> getMappedName(Class<?> expectedEnumClass, String name) {
         return Optional.ofNullable(enumNamesMapping.get(expectedEnumClass))
                 .map(mappings -> mappings.get(name));