From 281efef2073aa56eaed832a386dd6489dccd846d Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Wed, 8 Sep 2021 08:49:34 -0400 Subject: [PATCH 1/6] Revert "V+" This reverts commit 986de265fe61edcc4b151611be0fe70798c114f7. --- build.gradle | 2 +- .../iris/engine/mantle/components/MantleJigsawComponent.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b648883d..61aa39d6a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { } group 'com.volmit.iris' -version '1.8.7' +version '1.8.6' def apiVersion = '1.17' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 7478c668f..d8dfcafc4 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -117,6 +117,10 @@ public class MantleJigsawComponent extends IrisMantleComponent { } writer.setData(position.getX(), 0, position.getZ(), new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature())); + + if (structure.getFeature().getEntitySpawners().isNotEmpty()) { + Iris.info("Placed Structure MAIN SPAWN " + structure.getFeature().getEntitySpawners().get(0) + " @R " + structure.getFeature().getBlockRadius()); + } } new PlannedStructure(structure, position, rng).place(writer, getMantle(), post); From 9ae60d485974822286bcc0ea204aeb89b503293d Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Wed, 8 Sep 2021 08:49:34 -0400 Subject: [PATCH 2/6] Revert "Revert "V+"" This reverts commit 281efef2073aa56eaed832a386dd6489dccd846d. --- build.gradle | 2 +- .../iris/engine/mantle/components/MantleJigsawComponent.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 61aa39d6a..9b648883d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { } group 'com.volmit.iris' -version '1.8.6' +version '1.8.7' def apiVersion = '1.17' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index d8dfcafc4..7478c668f 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -117,10 +117,6 @@ public class MantleJigsawComponent extends IrisMantleComponent { } writer.setData(position.getX(), 0, position.getZ(), new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature())); - - if (structure.getFeature().getEntitySpawners().isNotEmpty()) { - Iris.info("Placed Structure MAIN SPAWN " + structure.getFeature().getEntitySpawners().get(0) + " @R " + structure.getFeature().getBlockRadius()); - } } new PlannedStructure(structure, position, rng).place(writer, getMantle(), post); From 693baa8cef04bce0f7439aa2c151e5e088a6e243 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Wed, 8 Sep 2021 08:49:34 -0400 Subject: [PATCH 3/6] Revert "Revert "Revert "V+""" This reverts commit 9ae60d485974822286bcc0ea204aeb89b503293d. --- build.gradle | 2 +- .../iris/engine/mantle/components/MantleJigsawComponent.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b648883d..61aa39d6a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { } group 'com.volmit.iris' -version '1.8.7' +version '1.8.6' def apiVersion = '1.17' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 7478c668f..d8dfcafc4 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -117,6 +117,10 @@ public class MantleJigsawComponent extends IrisMantleComponent { } writer.setData(position.getX(), 0, position.getZ(), new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature())); + + if (structure.getFeature().getEntitySpawners().isNotEmpty()) { + Iris.info("Placed Structure MAIN SPAWN " + structure.getFeature().getEntitySpawners().get(0) + " @R " + structure.getFeature().getBlockRadius()); + } } new PlannedStructure(structure, position, rng).place(writer, getMantle(), post); From bc7448730150fb23b31d2fd8ac9810972319fe05 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Wed, 8 Sep 2021 08:49:34 -0400 Subject: [PATCH 4/6] Revert "Revert "Revert "Revert "V+"""" This reverts commit 693baa8cef04bce0f7439aa2c151e5e088a6e243. --- build.gradle | 2 +- .../iris/engine/mantle/components/MantleJigsawComponent.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 61aa39d6a..9b648883d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { } group 'com.volmit.iris' -version '1.8.6' +version '1.8.7' def apiVersion = '1.17' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index d8dfcafc4..7478c668f 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -117,10 +117,6 @@ public class MantleJigsawComponent extends IrisMantleComponent { } writer.setData(position.getX(), 0, position.getZ(), new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature())); - - if (structure.getFeature().getEntitySpawners().isNotEmpty()) { - Iris.info("Placed Structure MAIN SPAWN " + structure.getFeature().getEntitySpawners().get(0) + " @R " + structure.getFeature().getBlockRadius()); - } } new PlannedStructure(structure, position, rng).place(writer, getMantle(), post); From 9f19e585db1811e857eae80ebf960af3433f4249 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Wed, 8 Sep 2021 08:49:34 -0400 Subject: [PATCH 5/6] Revert "Revert "Revert "Revert "Revert "V+""""" This reverts commit bc7448730150fb23b31d2fd8ac9810972319fe05. --- build.gradle | 2 +- .../iris/engine/mantle/components/MantleJigsawComponent.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b648883d..61aa39d6a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { } group 'com.volmit.iris' -version '1.8.7' +version '1.8.6' def apiVersion = '1.17' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 7478c668f..d8dfcafc4 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -117,6 +117,10 @@ public class MantleJigsawComponent extends IrisMantleComponent { } writer.setData(position.getX(), 0, position.getZ(), new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature())); + + if (structure.getFeature().getEntitySpawners().isNotEmpty()) { + Iris.info("Placed Structure MAIN SPAWN " + structure.getFeature().getEntitySpawners().get(0) + " @R " + structure.getFeature().getBlockRadius()); + } } new PlannedStructure(structure, position, rng).place(writer, getMantle(), post); From f346f080ee657a153e80b22688446d2fdfb96165 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Wed, 8 Sep 2021 08:49:34 -0400 Subject: [PATCH 6/6] Revert "Revert "Revert "Revert "Revert "Revert "V+"""""" This reverts commit 9f19e585db1811e857eae80ebf960af3433f4249. --- build.gradle | 2 +- .../iris/engine/mantle/components/MantleJigsawComponent.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 61aa39d6a..9b648883d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { } group 'com.volmit.iris' -version '1.8.6' +version '1.8.7' def apiVersion = '1.17' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index d8dfcafc4..7478c668f 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -117,10 +117,6 @@ public class MantleJigsawComponent extends IrisMantleComponent { } writer.setData(position.getX(), 0, position.getZ(), new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature())); - - if (structure.getFeature().getEntitySpawners().isNotEmpty()) { - Iris.info("Placed Structure MAIN SPAWN " + structure.getFeature().getEntitySpawners().get(0) + " @R " + structure.getFeature().getBlockRadius()); - } } new PlannedStructure(structure, position, rng).place(writer, getMantle(), post);