Fix datagen crash

Signed-off-by: shedaniel <daniel@shedaniel.me>
shedaniel · Sep 9, 2020 · cefbc31 · cefbc31
1 parent 34e755d
commit cefbc31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cloth-datagen-api-v1/src/main/java/me/shedaniel/cloth/impl/datagen/TagDataProvider.java b/cloth-datagen-api-v1/src/main/java/me/shedaniel/cloth/impl/datagen/TagDataProvider.java
@@ -161,15 +161,20 @@ enum TagType {
             } else if (isTag2) {
                 return -1;
             } else {
-                Integer first = (Integer) registry.getOrEmpty(new Identifier(entry1.toString())).map(registry::getRawId).orElse(null);
-                Integer second = (Integer) registry.getOrEmpty(new Identifier(entry2.toString())).map(registry::getRawId).orElse(null);
+                Integer first = (Integer) registry.getOrEmpty(new Identifier(stripOptional(entry1.toString()))).map(registry::getRawId).orElse(null);
+                Integer second = (Integer) registry.getOrEmpty(new Identifier(stripOptional(entry2.toString()))).map(registry::getRawId).orElse(null);
                 return objectComparator.compare(first, second);
             }
         };
 
         TagType(Registry<?> registry) {
             this.registry = registry;
         }
+
+        private String stripOptional(String s) {
+            if (s.endsWith("?")) return s.substring(0, s.length() - 1);
+            return s;
+        }
     }
 
     private static class Builder<T> extends Tag.Builder implements TagBuilder<T> {

diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ minecraft_version=1.16.2
 yarn_version=1.16.2+build.1+legacy.20w09a+build.8
 fabric_loader_version=0.9.1+build.205
 fabric_version=0.17.2+build.396-1.16
-mod_version=1.4.7
+mod_version=1.4.8
 cloth_basic_math=0.5.1