diff --git a/build.gradle b/build.gradle index 9eb74a80b..620a96800 100644 --- a/build.gradle +++ b/build.gradle @@ -69,6 +69,7 @@ dependencies { implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' implementation 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' implementation 'org.bukkit.craftbukkit:1.17:1.17' + implementation 'org.bukkit.craftbukkit:1.17.1:1.17.1' implementation 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' implementation 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' implementation 'io.lumine.xikage:MythicMobs:4.9.1' diff --git a/src/main/java/com/volmit/iris/object/IrisGenerator.java b/src/main/java/com/volmit/iris/object/IrisGenerator.java index ce5deb3e5..7b4871eed 100644 --- a/src/main/java/com/volmit/iris/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisGenerator.java @@ -30,7 +30,6 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) public class IrisGenerator extends IrisRegistrant { - @MinNumber(0.001) @DontObfuscate @Desc("The zoom or frequency.") @@ -315,4 +314,15 @@ public class IrisGenerator extends IrisRegistrant zoom /= scale; return this; } + + public KList getAllComposites() { + KList g = new KList<>(); + + for(IrisNoiseGenerator i : composite) + { + g.addAll(i.getAllComposites()); + } + + return g; + } } diff --git a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java index 0281afafe..48e5c93fa 100644 --- a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java @@ -16,6 +16,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Collection; + @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @@ -138,4 +140,17 @@ public class IrisNoiseGenerator return n; } + + public KList getAllComposites() { + KList g = new KList(); + + g.add(this); + + for(IrisNoiseGenerator i : getFracture()) + { + g.addAll(i.getAllComposites()); + } + + return g; + } } diff --git a/src/main/java/com/volmit/iris/util/J.java b/src/main/java/com/volmit/iris/util/J.java index 197041fbb..cf1f43c2a 100644 --- a/src/main/java/com/volmit/iris/util/J.java +++ b/src/main/java/com/volmit/iris/util/J.java @@ -54,6 +54,22 @@ public class J return false; } + public static void arun(Runnable a) + { + e.submit(() -> { + try + { + a.run(); + } + + catch(Throwable e) + { + System.out.println("Failed to run async task"); + e.printStackTrace(); + } + }); + } + public static void a(Runnable a) { e.submit(() -> {