From ed4e9f6c1950c733d31d9036867047dacae9248e Mon Sep 17 00:00:00 2001
From: Luligabi1 <luligabi111@gmail.com>
Date: Sat, 11 Dec 2021 15:09:18 -0300
Subject: [PATCH] Updates to 1.18.1

---
 build.gradle                                  | 19 +++++++++----------
 gradle.properties                             | 10 ++++++----
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../src/main/resources/fabric.mod.json        |  2 +-
 .../api/screen/OmegaConfigScreen.java         |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index b203c9f..f20b7f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 }
 
 plugins {
-    id "fabric-loom" version "0.8-SNAPSHOT"
+    id "fabric-loom" version "0.10-SNAPSHOT"
     id "maven-publish"
     id "java-library"
 }
@@ -154,8 +154,9 @@ allprojects {
         mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
         modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
         modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-        modRuntime "com.terraformersmc:modmenu:2.0.0-beta.4"
-        modCompileOnly "com.terraformersmc:modmenu:2.0.0-beta.4"
+
+        modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
+        modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
     }
 
 }
@@ -209,10 +210,10 @@ repositories {
 }
 
 dependencies {
-    implementation project(":omega-config-base")
-    implementation project(":omega-config-gui")
-    modRuntime "com.terraformersmc:modmenu:1.16.8"
-    modCompileOnly "com.terraformersmc:modmenu:1.16.8"
+    implementation project(path: ":omega-config-base", configuration: "namedElements")
+    implementation project(path: ":omega-config-gui", configuration: "namedElements")
+    modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
+    modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
 
     afterEvaluate {
         testmodImplementation sourceSets.main.output
@@ -222,9 +223,7 @@ dependencies {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact(file("${project.buildDir}/libs/${archivesBaseName}-${project.mod_version}.jar")) {
-                builtBy(remapJar)
-            }
+            from components.java
 
             pom.withXml {
                 def depsNode = asNode().appendNode("dependencies")
diff --git a/gradle.properties b/gradle.properties
index a878845..a4572df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,13 +2,15 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.17
-yarn_mappings=1.17+build.7
-loader_version=0.11.3
+minecraft_version=1.18.1
+yarn_mappings=1.18.1+build.2
+loader_version=0.12.11
 
 #Fabric api
-fabric_version=0.34.10+1.17
+fabric_version=0.44.0+1.18
 # Mod Properties
 mod_version=1.1.0
 maven_group=draylar
 archives_base_name=omega-config
+
+modmenu_version=3.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..84d1f85 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/omega-config-base/src/main/resources/fabric.mod.json b/omega-config-base/src/main/resources/fabric.mod.json
index 13c403a..b7d8755 100644
--- a/omega-config-base/src/main/resources/fabric.mod.json
+++ b/omega-config-base/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "omega-config",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "name": "OmegaConfig",
   "description": "The last config solution you will ever use.",
   "authors": [
diff --git a/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java
index 184e1ae..3eb21fd 100644
--- a/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java
+++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java
@@ -114,7 +114,7 @@ public class OmegaConfigScreen<T extends Config> extends Screen {
 
     @Override
     public void onClose() {
-        client.openScreen(parent);
+        client.setScreen(parent);
     }
 
     @Override