Compatible with 1.19 & 1.20.

Fixed #8 and #5 (related).
Fixed #3.

README.md

@@ -31,6 +31,7 @@ For now (v2.0), you have to restart the game for the config to be reloaded. This
 This mod doesn't have any (not even fabric-api).
 
 ## Future Updates
+* World-specific configs
 * *Open an issue on this project's repo if you have any suggestion!*
 * *~~Add an option to blacklist mods/structures.~~* (added in v2.0)
 * *~~Add an option to change the spread factor.~~* (added in v2.0)

gradle.properties

@@ -5,13 +5,13 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://modmuss50.me/fabric.html
 	minecraft_version=1.20.2
 	yarn_mappings=1.20.2+build.4
-	loader_version=0.14.23
+	loader_version=0.14.24
 
 # Mod Properties
-	mod_version = 2.0
+	mod_version = 2.1
 	maven_group = io.github.maxencedc
 	archives_base_name = sparsestructures
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.90.0+1.20.2
+	fabric_version=0.90.7+1.20.2

src/main/java/io/github/maxencedc/sparsestructures/CustomSpreadFactors.java

@@ -0,0 +1,19 @@
+package io.github.maxencedc.sparsestructures;
+
+public class CustomSpreadFactors {
+    public String structure;
+    public double factor;
+
+    public CustomSpreadFactors(String structure, double factor) {
+        this.structure = structure;
+        this.factor = factor;
+    }
+
+    public String structure() {
+        return this.structure;
+    }
+
+    public double factor() {
+        return this.factor;
+    }
+}

src/main/java/io/github/maxencedc/sparsestructures/SparseStructuresConfig.java

@@ -1,9 +1,15 @@
 package io.github.maxencedc.sparsestructures;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
-public record SparseStructuresConfig(double spreadFactor, List<customSpreadFactors> customSpreadFactors) {
-    public record customSpreadFactors(String structure, double factor) {}
+public class SparseStructuresConfig {
+    public double spreadFactor;
+    public double spreadFactor() { return this.spreadFactor; }
+    public List<CustomSpreadFactors> customSpreadFactors;
+    public List<CustomSpreadFactors> customSpreadFactors() { return this.customSpreadFactors; }
+    public SparseStructuresConfig(double spreadFactor, List<CustomSpreadFactors> customSpreadFactors)
+    {
+        this.spreadFactor = spreadFactor;
+        this.customSpreadFactors = customSpreadFactors;
+    }
 }

src/main/java/io/github/maxencedc/sparsestructures/mixins/SparseStructuresRegistryLoaderMixin.java

@@ -2,14 +2,13 @@
 
 import com.google.gson.JsonElement;
 import com.mojang.serialization.Decoder;
+import io.github.maxencedc.sparsestructures.CustomSpreadFactors;
 import io.github.maxencedc.sparsestructures.SparseStructures;
-import io.github.maxencedc.sparsestructures.SparseStructuresConfig;
 import net.minecraft.registry.*;
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceFinder;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -25,14 +24,14 @@ public abstract class SparseStructuresRegistryLoaderMixin {
 
     @Inject(at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Decoder;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;"), method = "load(Lnet/minecraft/registry/RegistryOps$RegistryInfoGetter;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/MutableRegistry;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V", locals = LocalCapture.CAPTURE_FAILHARD)
     private static <E> void load(RegistryOps.RegistryInfoGetter registryInfoGetter, ResourceManager resourceManager, RegistryKey<? extends Registry<E>> registryRef, MutableRegistry<E> newRegistry, Decoder<E> decoder, Map<RegistryKey<?>, Exception> exceptions, CallbackInfo ci, String string, ResourceFinder resourceFinder, RegistryOps registryOps, Iterator var9, Map.Entry entry, Identifier identifier, RegistryKey registryKey, Resource resource, Reader reader, JsonElement jsonElement) {
-        if (string.equals("worldgen/structure_set") && jsonElement.getAsJsonObject().getAsJsonObject("placement").get("type").getAsString().equals("minecraft:random_spread")) {
+        if (string.equals("worldgen/structure_set") && !jsonElement.getAsJsonObject().getAsJsonObject("placement").get("type").getAsString().equals("minecraft:concentric_rings")) {
             double factor = SparseStructures.config.customSpreadFactors().stream().filter(s -> {
                 if (s == null) return false;
                 String structure_set = registryKey.getValue().toString();
                 return structure_set.equals(s.structure()) || jsonElement.getAsJsonObject().getAsJsonArray("structures").asList().stream().anyMatch(p -> p.getAsJsonObject().get("structure").getAsString().equals(s.structure()));
-            }).findFirst().orElse(new SparseStructuresConfig.customSpreadFactors("", SparseStructures.config.spreadFactor())).factor();
-            int spacing = (int)(jsonElement.getAsJsonObject().getAsJsonObject("placement").get("spacing").getAsDouble() * factor);
-            int separation = (int)(jsonElement.getAsJsonObject().getAsJsonObject("placement").get("separation").getAsDouble() * factor);
+            }).findFirst().orElse(new CustomSpreadFactors("", SparseStructures.config.spreadFactor())).factor();
+            int spacing = (int)(Math.min(jsonElement.getAsJsonObject().getAsJsonObject("placement").get("spacing").getAsDouble() * factor, 4096.0));
+            int separation = (int)(Math.min(jsonElement.getAsJsonObject().getAsJsonObject("placement").get("separation").getAsDouble() * factor, 4096.0));
             if (separation >= spacing) {
                 if (spacing == 0) spacing = 1;
                 separation = spacing - 1;

src/main/resources/fabric.mod.json

@@ -36,6 +36,6 @@
   },
 
   "depends": {
-    "minecraft": "1.20.x"
+    "minecraft": ["1.19.x", "1.20.x"]
   }
 }