From 49b0911aaf1fa42445d1476794a1da4c563239e4 Mon Sep 17 00:00:00 2001
From: coolGi2007 <sasanaps@hotmail.com>
Date: Fri, 14 Jan 2022 13:52:42 +1030
Subject: [PATCH] Escape saves config and added a immersive portals comment

---
 .../lod/common/wrappers/config/ConfigGui.java  | 16 +++++++++++++---
 fabric/build.gradle                            | 18 +++++++++++++++++-
 gradle.properties                              |  1 +
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
index 788960b87..a0f7de9c8 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
@@ -18,10 +18,11 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 // Logger (for debug stuff)
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge allready includes this)
+// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this)
 
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 
@@ -33,6 +34,7 @@ import com.seibel.lod.core.config.*;
 
 // Minecraft imports
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -48,7 +50,6 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.resources.language.I18n;	// translation
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16
 
 /**
@@ -60,7 +61,7 @@ import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16
  * Credits to Motschen
  *
  * @author coolGi2007
- * @version 1-6-2022
+ * @version 1-14-2022
  */
 @SuppressWarnings("unchecked")
 public abstract class ConfigGui
@@ -486,6 +487,15 @@ public abstract class ConfigGui
 			super.tick();
 		}
 
+
+		/** When you close it, it goes to the previous screen and saves */
+		@Override
+		public void onClose()
+		{
+			saveToFile();
+			Objects.requireNonNull(minecraft).setScreen(this.parent);
+		}
+
 		@Override
 		protected void init()
 		{
diff --git a/fabric/build.gradle b/fabric/build.gradle
index b24f8d4ba..394130302 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -38,7 +38,6 @@ dependencies {
     // Fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    // TODO: This is only for LodMain, try to find a way to remove it
     // Fabric API
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
 
@@ -54,6 +53,23 @@ dependencies {
     // Iris
 //    modImplementation "maven.modrinth:iris:${project.iris_version}"
 
+    // Immersive Portals
+    /*
+    modImplementation("com.github.qouteall.ImmersivePortalsMod:build:${project.immersive_portals_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+        transitive(false)
+    }
+    modImplementation("com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+        transitive(false)
+    }
+    modImplementation("com.github.qouteall.ImmersivePortalsMod:q_misc_util:${project.immersive_portals_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+        transitive(false)
+    }
+    */
+
+
 
     // Toml
     implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
diff --git a/gradle.properties b/gradle.properties
index 013ec4dc6..511450b44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ fabric_api_version=0.44.0+1.18
     modmenu_version=3.0.0
     sodium_version=mc1.18-0.4.0-alpha5
 #    iris_version=1.18.x-v1.1.4
+#    immersive_portals_version = v1.0.4-1.18
 
 # Forge loader
 forge_version=39.0.5