Merge pull request #46 from DaemonUmbra/1.18/main

Fix StatCondition failing to construct due to IdentityHashMap in StatType

Author: desht

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/StatCondition.java

@@ -2,11 +2,14 @@
 
 import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
 import dev.ftb.mods.ftbranks.api.RankCondition;
+import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 
+import java.util.NoSuchElementException;
+
 /**
  * @author LatvianModder
  */
@@ -25,7 +28,13 @@ public class StatCondition implements RankCondition {
 
 	public StatCondition(SNBTCompoundTag tag) {
 		statId = new ResourceLocation(tag.getString("stat"));
-		stat = Stats.CUSTOM.get(statId);
+		stat = Registry.CUSTOM_STAT.getOptional(statId)
+			.map(Stats.CUSTOM::get)
+			.orElseThrow(
+				() -> new NoSuchElementException(
+					String.format("%s does not match any known stat", statId)
+				)
+			);
 		value = tag.getInt("value");
 
 		switch (tag.getString("value_check")) {