From 264704b60289eac99998caf1db8f95aa8ceb4496 Mon Sep 17 00:00:00 2001
From: JFronny <jo.frohnmeyer@protonmail.com>
Date: Wed, 21 Jul 2021 15:51:19 +0200
Subject: [PATCH] libjf 1.2.0

---
 .../java/io/gitlab/jfronny/modsmod/Entry.java  | 16 ++++++++++++++++
 .../io/gitlab/jfronny/modsmod/ModsMod.java     |  5 ++++-
 .../gitlab/jfronny/modsmod/ModsModAdapter.java | 18 ------------------
 src/main/resources/fabric.mod.json             |  8 +++-----
 4 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/io/gitlab/jfronny/modsmod/Entry.java
 delete mode 100644 src/main/java/io/gitlab/jfronny/modsmod/ModsModAdapter.java

diff --git a/src/main/java/io/gitlab/jfronny/modsmod/Entry.java b/src/main/java/io/gitlab/jfronny/modsmod/Entry.java
new file mode 100644
index 0000000..e22ea5e
--- /dev/null
+++ b/src/main/java/io/gitlab/jfronny/modsmod/Entry.java
@@ -0,0 +1,16 @@
+package io.gitlab.jfronny.modsmod;
+
+import io.gitlab.jfronny.libjf.entry.UltraEarlyInit;
+
+import java.io.IOException;
+
+public class Entry implements UltraEarlyInit {
+    @Override
+    public void init() {
+        try {
+            ModsMod.prepare();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
index 6337d3f..fbe372c 100644
--- a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
+++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
@@ -1,6 +1,7 @@
 package io.gitlab.jfronny.modsmod;
 
 import io.gitlab.jfronny.libjf.Libjf;
+import io.gitlab.jfronny.libjf.entry.UltraEarlyInit;
 import net.fabricmc.loader.FabricLoader;
 import net.fabricmc.loader.discovery.ModCandidate;
 import net.fabricmc.loader.discovery.ModResolver;
@@ -84,7 +85,9 @@ public class ModsMod {
                 sb.append("\"entrypoints\": {},");
                 sb.append("\"custom\": {");
                 if (Cfg.parent) {
-                    sb.append("\"modmenu:parent\": \"modsmod\"");
+                    sb.append("\"modmenu\": {");
+                    sb.append("\"parent\": \"modsmod\"");
+                    sb.append("}");
                 }
                 sb.append("}");
                 sb.append("}");
diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsModAdapter.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsModAdapter.java
deleted file mode 100644
index 588bda3..0000000
--- a/src/main/java/io/gitlab/jfronny/modsmod/ModsModAdapter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.gitlab.jfronny.modsmod;
-
-import net.fabricmc.loader.api.LanguageAdapter;
-
-import java.io.IOException;
-
-public class ModsModAdapter implements LanguageAdapter {
-    @Override
-    public native <T> T create(net.fabricmc.loader.api.ModContainer mod, String value, Class<T> type);
-
-    static {
-        try {
-            ModsMod.prepare();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 53cb4d7..db80b42 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -15,14 +15,12 @@
   "icon": "assets/modsmod/icon.png",
   "environment": "*",
   "entrypoints": {
-    "libjf:config": ["io.gitlab.jfronny.modsmod.Cfg"]
-  },
-  "languageAdapters": {
-    "modsmod": "io.gitlab.jfronny.modsmod.ModsModAdapter"
+    "libjf:config": ["io.gitlab.jfronny.modsmod.Cfg"],
+    "libjf:early": ["io.gitlab.jfronny.modsmod.Entry"]
   },
   "depends": {
     "fabricloader": ">=0.9.2+build.206",
-    "libjf": "*",
+    "libjf": ">=1.2.0",
     "minecraft": "*"
   }
 }