From 187ce56f3ee8ec7eff159e09fa20c04ddb46eb2a Mon Sep 17 00:00:00 2001
From: JFronny <jo.frohnmeyer@protonmail.com>
Date: Sat, 21 Aug 2021 19:35:20 +0200
Subject: [PATCH] Update yarn

---
 build.gradle                                             | 9 ++++++---
 gradle.properties                                        | 2 +-
 src/main/java/io/gitlab/jfronny/libjf/Libjf.java         | 4 ----
 .../jfronny/libjf/config/gui/TinyConfigScreen.java       | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 67d02b1..a5ad194 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,10 @@
 apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
 
 repositories {
-    maven { url = 'https://raw.githubusercontent.com/TerraformersMC/Archive/main/releases/'; name = "ModMenu" }
+    maven {
+        name = 'TerraformersMC'
+        url = 'https://maven.terraformersmc.com/'
+    }
 }
 
 sourceSets {
@@ -17,8 +20,8 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    include modImplementation(fabricApi.module("fabric-tag-extensions-v0", "0.37.0+1.17"))
-    modImplementation "com.terraformersmc:modmenu:2.0.2"
+    include modImplementation(fabricApi.module("fabric-tag-extensions-v0", "0.38.1+1.17"))
+    modImplementation "com.terraformersmc:modmenu:2.0.5"
 }
 
 loom {
diff --git a/gradle.properties b/gradle.properties
index 6ba7c01..ebb0f73 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.17.1
-yarn_mappings=build.1
+yarn_mappings=build.40
 loader_version=0.11.6
 # Mod Properties
 mod_version=1.2.0
diff --git a/src/main/java/io/gitlab/jfronny/libjf/Libjf.java b/src/main/java/io/gitlab/jfronny/libjf/Libjf.java
index 6022e29..c14cdbb 100644
--- a/src/main/java/io/gitlab/jfronny/libjf/Libjf.java
+++ b/src/main/java/io/gitlab/jfronny/libjf/Libjf.java
@@ -4,11 +4,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.gitlab.jfronny.libjf.config.Config;
-import io.gitlab.jfronny.libjf.config.JfConfig;
 import io.gitlab.jfronny.libjf.gson.HiddenAnnotationExclusionStrategy;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
-import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/io/gitlab/jfronny/libjf/config/gui/TinyConfigScreen.java b/src/main/java/io/gitlab/jfronny/libjf/config/gui/TinyConfigScreen.java
index b410ba1..fcc4029 100644
--- a/src/main/java/io/gitlab/jfronny/libjf/config/gui/TinyConfigScreen.java
+++ b/src/main/java/io/gitlab/jfronny/libjf/config/gui/TinyConfigScreen.java
@@ -69,7 +69,7 @@ public class TinyConfigScreen extends Screen {
                     }
                 }
             }
-            Objects.requireNonNull(client).openScreen(parent);
+            Objects.requireNonNull(client).setScreen(parent);
         }));
 
         ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
@@ -78,7 +78,7 @@ public class TinyConfigScreen extends Screen {
                     info.field.set(null, info.value);
                 } catch (IllegalAccessException ignored) {}
             config.write();
-            Objects.requireNonNull(client).openScreen(parent);
+            Objects.requireNonNull(client).setScreen(parent);
         }));
 
         this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
@@ -89,7 +89,7 @@ public class TinyConfigScreen extends Screen {
                 info.value = info.defaultValue;
                 info.tempValue = info.value.toString();
                 double scrollAmount = list.getScrollAmount();
-                Objects.requireNonNull(client).openScreen(this);
+                Objects.requireNonNull(client).setScreen(this);
                 list.setScrollAmount(scrollAmount);
             }));