From e2506f1126b0b480c128884e35faf77d57d90f13 Mon Sep 17 00:00:00 2001 From: natpalmer-e4o4 Date: Thu, 9 Nov 2023 00:02:04 -0600 Subject: [PATCH] Change config records into classes to run on 1.19 --- .../sparsestructures/CustomSpreadFactors.java | 23 +++++++++++++++++++ .../SparseStructuresConfig.java | 12 ++++++++-- .../SparseStructuresRegistryLoaderMixin.java | 3 ++- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 src/main/java/io/github/maxencedc/sparsestructures/CustomSpreadFactors.java diff --git a/src/main/java/io/github/maxencedc/sparsestructures/CustomSpreadFactors.java b/src/main/java/io/github/maxencedc/sparsestructures/CustomSpreadFactors.java new file mode 100644 index 0000000..4d6c446 --- /dev/null +++ b/src/main/java/io/github/maxencedc/sparsestructures/CustomSpreadFactors.java @@ -0,0 +1,23 @@ +package io.github.maxencedc.sparsestructures; + +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +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; + } +} \ No newline at end of file diff --git a/src/main/java/io/github/maxencedc/sparsestructures/SparseStructuresConfig.java b/src/main/java/io/github/maxencedc/sparsestructures/SparseStructuresConfig.java index b17a853..aa5023a 100644 --- a/src/main/java/io/github/maxencedc/sparsestructures/SparseStructuresConfig.java +++ b/src/main/java/io/github/maxencedc/sparsestructures/SparseStructuresConfig.java @@ -4,6 +4,14 @@ import java.util.List; -public record SparseStructuresConfig(double spreadFactor, List customSpreadFactors) { - public record customSpreadFactors(String structure, double factor) {} +public class SparseStructuresConfig { + public double spreadFactor; + public double spreadFactor() { return this.spreadFactor; } + public List customSpreadFactors; + public List customSpreadFactors() { return this.customSpreadFactors; } + public SparseStructuresConfig(double spreadFactor, List customSpreadFactors) + { + this.spreadFactor = spreadFactor; + this.customSpreadFactors = customSpreadFactors; + } } diff --git a/src/main/java/io/github/maxencedc/sparsestructures/mixins/SparseStructuresRegistryLoaderMixin.java b/src/main/java/io/github/maxencedc/sparsestructures/mixins/SparseStructuresRegistryLoaderMixin.java index 77c1e24..a9847f7 100644 --- a/src/main/java/io/github/maxencedc/sparsestructures/mixins/SparseStructuresRegistryLoaderMixin.java +++ b/src/main/java/io/github/maxencedc/sparsestructures/mixins/SparseStructuresRegistryLoaderMixin.java @@ -2,6 +2,7 @@ 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.*; @@ -30,7 +31,7 @@ private static void load(RegistryOps.RegistryInfoGetter registryInfoGetter, 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(); + }).findFirst().orElse(new 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); if (separation >= spacing) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c7e8002..caab0b3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -36,6 +36,6 @@ }, "depends": { - "minecraft": "1.20.x" + "minecraft": "1.19.x" } }