From 5a5a01a7c770904ce13c4f96bd99047f14c46d89 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Wed, 6 Aug 2025 17:34:13 +0200 Subject: [PATCH] ignore datapack structures in mantle radius calc --- .../engine/object/IrisJigsawPlacement.java | 43 ------------------- .../engine/object/IrisJigsawStructure.java | 4 ++ 2 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java deleted file mode 100644 index 8494550e7..000000000 --- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2022 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.engine.object; - -import com.volmit.iris.engine.object.annotations.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -@Snippet("jigsaw-placer") -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@Desc("Represents a jigsaw placement") -@Data -public class IrisJigsawPlacement { - @RegistryListResource(IrisJigsawStructure.class) - @Required - @Desc("The jigsaw structure to use") - private String structure = ""; - - @Required - @MinNumber(1) - @Desc("The rarity for this jigsaw structure to place on a per chunk basis") - private int rarity = 29; -} diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java index 210dd622f..ed7a61e53 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java @@ -123,6 +123,10 @@ public class IrisJigsawStructure extends IrisRegistrant { public int getMaxDimension() { return maxDimension.aquire(() -> { + if (datapackStructures.isNotEmpty()) { + return 0; + } + if (useMaxPieceSizeForParallaxRadius) { int max = 0; KList pools = new KList<>();