From f6c42c4b539d8f9ad54d7d1b7943fc146eeea5fd Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 14 Aug 2021 22:23:51 +0200 Subject: [PATCH 1/4] Idk what I did here but it's bad --- src/main/java/com/volmit/iris/Iris.java | 32 ++++++++++++------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index fbe2762b2..5c3aebe7a 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -443,40 +443,38 @@ public class Iris extends VolmitPlugin implements Listener { @Override public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) { - String dimension = IrisSettings.get().getGenerator().getDefaultWorldType(); - if (id != null && !id.isEmpty()) { - dimension = id; - Iris.info("Generator ID: " + id + " requested by bukkit/plugin. Assuming IrisDimension: " + id); + IrisDimension dim; + if (id == null || id.isEmpty()){ + dim = IrisData.loadAnyDimension(IrisSettings.get().getGenerator().getDefaultWorldType()); + } else { + dim = IrisData.loadAnyDimension(id); } + Iris.info("Generator ID: " + id + " requested by bukkit/plugin"); - IrisDimension d = IrisData.loadAnyDimension(dimension); - - if (d == null) { + if (dim == null) { Iris.warn("Unable to find dimension type " + id + " Looking for online packs..."); - d = IrisData.loadAnyDimension(dimension); - if (dimension == null) { - Iris.warn("Unable to find dimension type \"" + dimensionName + "\". Looking for online packs..."); - Iris.proj.downloadSearch(new VolmitSender(Bukkit.getConsoleSender()), dimensionName, true); - dimension = IrisData.loadAnyDimension(dimensionName); - if (d == null) { - throw new RuntimeException("Can't find dimension " + dimension + "!"); + Iris.proj.downloadSearch(new VolmitSender(Bukkit.getConsoleSender()), id, true); + dim = IrisData.loadAnyDimension(id); + + if (dim == null) { + throw new RuntimeException("Can't find dimension " + id + "!"); } else { Iris.info("Resolved missing dimension, proceeding with generation."); } } + Iris.info("Assuming IrisDimension: " + dim.getName()); IrisWorld w = IrisWorld.builder() .name(worldName) .seed(RNG.r.lmax()) - .environment(d.getEnvironment()) + .environment(dim.getEnvironment()) .worldFolder(new File(worldName)) .minHeight(0) .maxHeight(256) .build(); - - return new BukkitChunkGenerator(w, false, new File(w.worldFolder(), "iris"), dimension); + return new BukkitChunkGenerator(w, false, new File(w.worldFolder(), "iris"), dim.getName()); } public static void msg(String string) { From a9289df93f9e8119fef227365be9a25bcc716b1d Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 14 Aug 2021 23:25:15 +0200 Subject: [PATCH 2/4] another I hate this --- src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java index d930f6b48..dc59489a0 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java @@ -21,6 +21,10 @@ package com.volmit.iris.util.decree; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.platform.PlatformChunkGenerator; +<<<<<<< HEAD +======= +import com.volmit.iris.util.format.C; +>>>>>>> 486e92d... another I hate this import com.volmit.iris.util.plugin.VolmitSender; public interface DecreeExecutor { From 8ab79ec1ae6c290313527fac21484b23b48b89ee Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 14 Aug 2021 23:25:37 +0200 Subject: [PATCH 3/4] DAMNIT --- src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java index dc59489a0..d930f6b48 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java @@ -21,10 +21,6 @@ package com.volmit.iris.util.decree; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.platform.PlatformChunkGenerator; -<<<<<<< HEAD -======= -import com.volmit.iris.util.format.C; ->>>>>>> 486e92d... another I hate this import com.volmit.iris.util.plugin.VolmitSender; public interface DecreeExecutor { From 70e9ee0dd139303db6650780505f5de1a2151f2b Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sun, 15 Aug 2021 21:41:40 +0200 Subject: [PATCH 4/4] debug --- src/main/java/com/volmit/iris/Iris.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 5c3aebe7a..f227a28ed 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -450,7 +450,7 @@ public class Iris extends VolmitPlugin implements Listener { } else { dim = IrisData.loadAnyDimension(id); } - Iris.info("Generator ID: " + id + " requested by bukkit/plugin"); + Iris.debug("Generator ID: " + id + " requested by bukkit/plugin"); if (dim == null) { Iris.warn("Unable to find dimension type " + id + " Looking for online packs..."); @@ -464,7 +464,7 @@ public class Iris extends VolmitPlugin implements Listener { Iris.info("Resolved missing dimension, proceeding with generation."); } } - Iris.info("Assuming IrisDimension: " + dim.getName()); + Iris.debug("Assuming IrisDimension: " + dim.getName()); IrisWorld w = IrisWorld.builder() .name(worldName)