Merge branch '1.20.1' of github.com:LordDeatHunter/FabricWaystones into 1.20.1

Author: LordDeatHunter

build.gradle

@@ -46,6 +46,8 @@ dependencies {
     modApi "maven.modrinth:pinlib:$project.pinlib_api_version"
     modRuntimeOnly "maven.modrinth:pinlib:$project.pinlib_api_version"
 
+    modImplementation "maven.modrinth:lithostitched:1.4.4-fabric-1.20"
+
     annotationProcessor modImplementation("io.wispforest:owo-lib:${project.owo_version}")
     include "io.wispforest:owo-sentinel:${project.owo_version}"
 }

src/main/java/wraith/fwaystones/integration/lithostitched/LithostitchedPlugin.java

@@ -0,0 +1,48 @@
+package wraith.fwaystones.integration.lithostitched;
+
+import dev.worldgen.lithostitched.worldgen.poolelement.legacy.GuaranteedPoolElement;
+import dev.worldgen.lithostitched.worldgen.poolelement.legacy.LimitedPoolElement;
+import net.minecraft.structure.pool.SinglePoolElement;
+import net.minecraft.structure.pool.StructurePool;
+import net.minecraft.structure.pool.StructurePoolElement;
+
+import wraith.fwaystones.FabricWaystones;
+import wraith.fwaystones.util.FWConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * If Lithostitched is present, use its guaranteed/limited pool element system given it bypasses the vanilla system.
+ *
+ * @author Apollo
+ */
+public class LithostitchedPlugin {
+    /**
+     * Creates two elements: One to force waystones up to the min count, and one to limit them at the max count.
+     * Not 1:1 with normal behavior (particularly in modded villages with few house variants) but it's still fairly close.
+     */
+    public static List<StructurePoolElement> createPieces(String name) {
+        FWConfig.Worldgen config = FabricWaystones.CONFIG.worldgen;
+        List<StructurePoolElement> elements = new ArrayList<>();
+
+        if (config.min_per_village() > 0) {
+            elements.add(new GuaranteedPoolElement(
+                SinglePoolElement.ofSingle(name).apply(StructurePool.Projection.RIGID),
+                Optional.empty(),
+                config.min_per_village()
+            ));
+        }
+
+        if (config.max_per_village() - config.min_per_village() > 0) {
+            elements.add(new LimitedPoolElement(
+                SinglePoolElement.ofSingle(name).apply(StructurePool.Projection.RIGID),
+                Optional.empty(),
+                config.max_per_village() - config.min_per_village()
+            ));
+        }
+
+        return elements;
+    }
+}

src/main/java/wraith/fwaystones/util/Utils.java

@@ -1,14 +1,14 @@
 package wraith.fwaystones.util;
 
 import com.mojang.datafixers.util.Pair;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.structure.pool.StructurePool;
 import net.minecraft.structure.pool.StructurePoolElement;
@@ -20,6 +20,7 @@
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 import wraith.fwaystones.FabricWaystones;
+import wraith.fwaystones.integration.lithostitched.LithostitchedPlugin;
 import wraith.fwaystones.item.LocalVoidItem;
 import wraith.fwaystones.mixin.StructurePoolAccessor;
 import wraith.fwaystones.screen.AbyssScreenHandler;
@@ -84,11 +85,6 @@ private static String generateUniqueId() {
     }
 
     public static void addToStructurePool(MinecraftServer server, Identifier village, Identifier waystone, int weight) {
-
-        RegistryEntry<StructureProcessorList> emptyProcessorList = server.getRegistryManager()
-            .get(RegistryKeys.PROCESSOR_LIST)
-            .entryOf(EMPTY_PROCESSOR_LIST_KEY);
-
         var poolGetter = server.getRegistryManager()
             .get(RegistryKeys.TEMPLATE_POOL)
             .getOrEmpty(village);
@@ -99,15 +95,25 @@ public static void addToStructurePool(MinecraftServer server, Identifier village
         }
         var pool = poolGetter.get();
 
-        var pieceList = ((StructurePoolAccessor) pool).getElements();
-        var piece = StructurePoolElement.ofProcessedSingle(waystone.toString(), emptyProcessorList).apply(StructurePool.Projection.RIGID);
+        if (FabricLoader.getInstance().isModLoaded("lithostitched")) {
+            var pieces = LithostitchedPlugin.createPieces(waystone.toString());
+            for (StructurePoolElement piece : pieces) {
+                addPieceToPool(piece, ((StructurePoolAccessor)pool), weight);
+            }
+        } else {
+            var piece = StructurePoolElement.ofSingle(waystone.toString()).apply(StructurePool.Projection.RIGID);
+            addPieceToPool(piece, ((StructurePoolAccessor)pool), weight);
+        }
+    }
 
-        var list = new ArrayList<>(((StructurePoolAccessor) pool).getElementCounts());
-        list.add(Pair.of(piece, weight));
-        ((StructurePoolAccessor) pool).setElementCounts(list);
+    private static void addPieceToPool(StructurePoolElement element, StructurePoolAccessor accessor, int weight) {
+        var pieceList = accessor.getElements();
+        var list = new ArrayList<>(accessor.getElementCounts());
+        list.add(Pair.of(element, weight));
+        accessor.setElementCounts(list);
 
         for (int i = 0; i < weight; ++i) {
-            pieceList.add(piece);
+            pieceList.add(element);
         }
     }