Rename "AdvancementCriterion" to "AdvancementStep" to avoid conflict with Fabric mapping class name

build.gradle

@@ -18,7 +18,7 @@ ext.Versions = new Properties()
 Versions.load(file("Versionfiles/mcversion-1.16.2.properties").newReader())
 
 archivesBaseName = "advancementinfo"
-ext.projectVersion = "1.0"
+ext.projectVersion = "1.1"
 
 version = "${Versions['minecraft_version']}-fabric${Versions['fabric_versiononly']}-${project.projectVersion}"
 

src/main/java/de/guntram/mcmod/advancementinfo/AdvancementInfo.java

@@ -20,16 +20,16 @@ public class AdvancementInfo implements ClientModInitializer
     static final public int AI_infoWidth = 120;
     
     static public AdvancementWidget mouseOver, mouseClicked;
-    static public List<AdvancementCriterion> cachedClickList;
+    static public List<AdvancementStep> cachedClickList;
 
-    public static List<AdvancementCriterion> getCriteriaList(AdvancementProgressSupplier widget) {
-        List<AdvancementCriterion> result = new ArrayList<>();
-        addCriteria(result, widget.getProgress().getUnobtainedCriteria(), false);
-        addCriteria(result, widget.getProgress().getObtainedCriteria(), true);
+    public static List<AdvancementStep> getSteps(AdvancementProgressSupplier widget) {
+        List<AdvancementStep> result = new ArrayList<>();
+        addStep(result, widget.getProgress().getUnobtainedCriteria(), false);
+        addStep(result, widget.getProgress().getObtainedCriteria(), true);
         return result;        
     }
     
-    private static void addCriteria(List<AdvancementCriterion> result, Iterable<String> criteria, boolean obtained) {
+    private static void addStep(List<AdvancementStep> result, Iterable<String> criteria, boolean obtained) {
         final String[] prefixes = new String[] { "item.minecraft", "block.minecraft", "entity.minecraft", "container", "effect.minecraft", "biome.minecraft" };
         // criteria is actually a List<> .. but play nice
         ArrayList<String> sorted=new ArrayList<>();
@@ -52,7 +52,7 @@ public class AdvancementInfo implements ClientModInitializer
             if (translation == null) {
                 translation = new LiteralText(key);
             }
-            result.add(new AdvancementCriterion(translation, obtained));
+            result.add(new AdvancementStep(translation, obtained));
         }
     }
     

src/main/java/de/guntram/mcmod/advancementinfo/AdvancementCriterion.java → src/main/java/de/guntram/mcmod/advancementinfo/AdvancementStep.java

@@ -11,11 +11,11 @@ import net.minecraft.text.Text;
  *
  * @author gbl
  */
-public class AdvancementCriterion {
+public class AdvancementStep {
     private Text name;
     private boolean obtained;
     
-    AdvancementCriterion(Text name, boolean obtained) {
+    AdvancementStep(Text name, boolean obtained) {
         this.name = name;
         this.obtained = obtained;
     }

src/main/java/de/guntram/mcmod/advancementinfo/mixin/AdvancementScreenMixin.java

@@ -5,7 +5,7 @@
  */
 package de.guntram.mcmod.advancementinfo.mixin;
 
-import de.guntram.mcmod.advancementinfo.AdvancementCriterion;
+import de.guntram.mcmod.advancementinfo.AdvancementStep;
 import de.guntram.mcmod.advancementinfo.AdvancementInfo;
 import static de.guntram.mcmod.advancementinfo.AdvancementInfo.AI_spaceX;
 import static de.guntram.mcmod.advancementinfo.AdvancementInfo.AI_spaceY;
@@ -124,7 +124,7 @@ public class AdvancementScreenMixin extends Screen {
         AdvancementInfo.mouseClicked = AdvancementInfo.mouseOver;
         scrollPos = 0;
         if (AdvancementInfo.mouseClicked != null) {
-            AdvancementInfo.cachedClickList = AdvancementInfo.getCriteriaList((AdvancementProgressSupplier) AdvancementInfo.mouseClicked);
+            AdvancementInfo.cachedClickList = AdvancementInfo.getSteps((AdvancementProgressSupplier) AdvancementInfo.mouseClicked);
         } else {
             AdvancementInfo.cachedClickList = null;
         }
@@ -145,15 +145,15 @@ public class AdvancementScreenMixin extends Screen {
     private void renderCriteria(MatrixStack stack, AdvancementWidget widget) {
         int y = AI_spaceY + 20;
         int skip;
-        List<AdvancementCriterion> list;
+        List<AdvancementStep> list;
         if (widget == AdvancementInfo.mouseClicked) {
             list = AdvancementInfo.cachedClickList;
             skip = scrollPos;
         } else {
-            list = AdvancementInfo.getCriteriaList((AdvancementProgressSupplier) widget);
+            list = AdvancementInfo.getSteps((AdvancementProgressSupplier) widget);
             skip = 0;
         }
-        for (AdvancementCriterion entry: list) {
+        for (AdvancementStep entry: list) {
             if (skip-- > 0) {
                 continue;
             }