Merge branch '1.21.11' into 1.21.11-unobf

Author: Sollace

src/main/java/eu/ha3/presencefootsteps/sound/Isolator.java

@@ -83,10 +83,10 @@ public boolean load(ResourceManager manager) {
             return lookup.load(entries, globalBlocks()) ? lookup : null;
         }));
         hasConfigurations |= !blocks.isEmpty();
-        hasConfigurations |= ResourceUtils.forEach(BIOME_MAP, manager, biomes()::load);
+        hasConfigurations |= ResourceUtils.forEach(BIOME_MAP, manager, biomes().createLoader());
         hasConfigurations |= golems().load(ResourceUtils.load(GOLEM_MAP, manager, GolemLookup::new));
         hasConfigurations |= primitives().load(ResourceUtils.load(PRIMITIVE_MAP, manager, PrimitiveLookup::new));
-        hasConfigurations |= ResourceUtils.forEach(LOCOMOTION_MAP, manager, locomotions()::load);
+        hasConfigurations |= ResourceUtils.forEach(LOCOMOTION_MAP, manager, locomotions().createLoader());
         var acoustics = ResourceUtils.loadAll(ACOUSTICS, manager, Acoustic.CODEC);
         hasConfigurations |= !acoustics.isEmpty();
         acoustics.forEach((id, acoustic) -> {

src/main/java/eu/ha3/presencefootsteps/sound/acoustics/Acoustic.java

@@ -28,7 +28,7 @@ public interface Acoustic {
     MapCodec<Acoustic> MAP_CODEC = Codec.STRING.dispatchMap(Acoustic::type, TYPES::get);
     Codec<Acoustic> CODEC = Codec.xor(Codec.lazyInitialized(() -> SimultaneousAcoustic.CODEC.xmap(i -> (Acoustic)i, i-> (SimultaneousAcoustic)i)), MAP_CODEC.codec()).xmap(
             either -> Either.unwrap(either),
-            acoustic -> acoustic.type() == "simultaneous" ? Either.left(acoustic) : Either.right(acoustic)
+            acoustic -> Acoustic.SIMULTANEOUS.contentEquals(acoustic.type()) ? Either.left(acoustic) : Either.right(acoustic)
     );
     String BASIC = register("basic", VaryingAcoustic.CODEC);
     String EVENTS = register("events", EventSelectorAcoustics.CODEC);
@@ -78,11 +78,11 @@ private static String getType(JsonElement unsolved, String defaultUnassigned) {
         }
 
         if (unsolved.isJsonArray()) {
-            return "simultaneous";
+            return SIMULTANEOUS;
         }
 
         if (unsolved.isJsonPrimitive() && unsolved.getAsJsonPrimitive().isString()) {
-            return "basic";
+            return BASIC;
         }
 
         return "";

src/main/java/eu/ha3/presencefootsteps/util/Range.java

@@ -17,7 +17,10 @@ public record Range (float min, float max) {
         PERCENTAGE_CODEC.fieldOf("max").forGetter(Range::max)
     ).apply(i, Range::new));
     private static final Codec<Range> POINT_CODEC = PERCENTAGE_CODEC.xmap(Range::exactly, Range::min);
-    public static final Codec<Range> CODEC = Codec.xor(POINT_CODEC, RANGE_CODEC).xmap(either -> Either.unwrap(either), i -> Mth.equal(i.min(), i.max()) ? Either.left(i) : Either.right(i));
+    public static final Codec<Range> CODEC = Codec.xor(POINT_CODEC, RANGE_CODEC).xmap(
+            Either::unwrap,
+            i -> Mth.equal(i.min(), i.max()) ? Either.left(i) : Either.right(i)
+    );
 
     public static final Range DEFAULT = exactly(1);
 

src/main/java/eu/ha3/presencefootsteps/world/BiomeVarianceLookup.java

@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.gson.JsonElement;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
@@ -28,10 +27,12 @@ public boolean contains(Identifier key) {
     }
 
     @Override
-    public void add(String key, JsonElement value) {
-        BiomeVariance.CODEC.decode(JsonOps.INSTANCE, value).result().map(Pair::getFirst).ifPresent(i -> {
-            entries.put(Identifier.parse(key), i);
-        });
+    public Loader createLoader() {
+        return (key, value) -> {
+            BiomeVariance.CODEC.decode(JsonOps.INSTANCE, value).result().map(Pair::getFirst).ifPresent(i -> {
+                entries.put(Identifier.parse(key), i);
+            });
+        };
     }
 
     @Override

src/main/java/eu/ha3/presencefootsteps/world/ContextualBlockState.java

@@ -12,7 +12,6 @@ public record ContextualBlockState(EntityType<?> type, BlockState state) {
                     state -> new ContextualBlockState(entityType, state)
     ));
 
-
     public static ContextualBlockState of(EntityType<?> type, BlockState state) {
         return CACHE.apply(type).apply(state);
     }

src/main/java/eu/ha3/presencefootsteps/world/Index.java

@@ -1,10 +1,43 @@
 package eu.ha3.presencefootsteps.world;
 
+import java.io.Reader;
+import java.util.function.Consumer;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
 import eu.ha3.presencefootsteps.util.BlockReport.Reportable;
 import net.minecraft.resources.Identifier;
 
-public interface Index<K, V> extends Loadable, Reportable {
+public interface Index<K, V> extends Reportable {
+    /**
+     * Finds the mapped result for a given key.
+     */
     V lookup(K key);
 
+    /**
+     * Checks whether the given key identifier contains a mapping in this index.
+     */
     boolean contains(Identifier key);
+
+    /**
+     * Creates a resource loader to populate this index.
+     */
+    Loader createLoader();
+
+    interface Loader extends Consumer<Reader> {
+        Gson GSON = new Gson();
+
+        @Override
+        default void accept(Reader reader) {
+            JsonObject json = GSON.fromJson(reader, JsonObject.class);
+
+            json.entrySet().forEach(entry -> {
+                accept(entry.getKey(), entry.getValue());
+            });
+        }
+
+        void accept(String key, JsonElement json);
+    }
 }

src/main/java/eu/ha3/presencefootsteps/world/Loadable.java

@@ -18,8 +18,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-import com.google.gson.JsonElement;
-
 public class LocomotionLookup implements Index<Entity, Locomotion> {
     private final Map<Identifier, Locomotion> values = new Object2ObjectLinkedOpenHashMap<>();
 
@@ -38,14 +36,16 @@ public Locomotion lookup(Entity key) {
     }
 
     @Override
-    public void add(String key, JsonElement value) {
-        Identifier id = Identifier.parse(key);
+    public Loader createLoader() {
+        return (key, value) -> {
+            Identifier id = Identifier.parse(key);
 
-        if (!BuiltInRegistries.ENTITY_TYPE.containsKey(id)) {
-            PresenceFootsteps.logger.warn("Locomotion registered for unknown entity type " + id);
-        }
+            if (!BuiltInRegistries.ENTITY_TYPE.containsKey(id)) {
+                PresenceFootsteps.logger.warn("Locomotion registered for unknown entity type " + id);
+            }
 
-        values.put(id, Locomotion.byName(value.getAsString().toUpperCase()));
+            values.put(id, Locomotion.byName(value.getAsString().toUpperCase()));
+        };
     }
 
     @Override

src/main/java/eu/ha3/presencefootsteps/world/LocomotionLookup.java

@@ -2,7 +2,6 @@
     "required": true,
     "minVersion": "0.7",
     "package": "eu.ha3.presencefootsteps.mixins",
-    "refmap": "presencefootsteps.mixin.refmap.json",
     "compatibilityLevel": "JAVA_17",
     "client": [
       "MAbstractBlock",