From 1c5eb8b910567a220f917dfec45b88c9a6eb10be Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 10 Mar 2025 12:09:28 +0100
Subject: [PATCH] automatically update vanilla dimension type if present in
 Iris datapack

---
 .../main/java/com/volmit/iris/core/ServerConfigurator.java   | 1 +
 .../java/com/volmit/iris/engine/object/IrisDimension.java    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
index 9a641f1d3..8d579d859 100644
--- a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
+++ b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
@@ -107,6 +107,7 @@ public class ServerConfigurator {
         DimensionHeight height = new DimensionHeight(fixer);
 
         allPacks().flatMap(height::merge)
+                .toList()
                 .forEach(dim -> {
                     for (File dpack : getDatapacksFolder()) {
                         Iris.verbose("  Checking Dimension " + dim.getLoadFile().getPath());
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index 818a8ac78..08dc3b77f 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -456,6 +456,8 @@ public class IrisDimension extends IrisRegistrant {
 
     private static boolean write(boolean changed, File datapacks, String type, String json) {
         File dimType = new File(datapacks, "iris/data/iris/dimension_type/" + type + ".json");
+        File dimTypeVanilla = new File(datapacks, "iris/data/minecraft/dimension_type/" + type + ".json");
+
         if (!dimType.exists())
             changed = true;
         dimType.getParentFile().mkdirs();
@@ -466,8 +468,7 @@ public class IrisDimension extends IrisRegistrant {
             e.printStackTrace();
         }
 
-        if (IrisSettings.get().getGeneral().adjustVanillaHeight) {
-            File dimTypeVanilla = new File(datapacks, "iris/data/minecraft/dimension_type/" + type + ".json");
+        if (IrisSettings.get().getGeneral().adjustVanillaHeight || dimTypeVanilla.exists()) {
             if (!dimTypeVanilla.exists())
                 changed = true;
             dimTypeVanilla.getParentFile().mkdirs();