Port to 1.18 and include ModMenu icon, closes #17

build.gradle

@@ -3,14 +3,12 @@ apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
 repositories {
     maven { url = "https://maven.terraformersmc.com/releases/"; name = "ModMenu" }
     maven { url = "https://maven.shedaniel.me/"; name = "Cloth Config" }
-    //maven { url = "https://maven.dblsaiko.net/"; name = "Canvas" }
     maven {
         name = "vram"
         url = "https://maven.vram.io/"
     }
-    //maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Required for canvas" }
+    maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Required for canvas" }
     maven { url = "https://minecraft.curseforge.com/api/maven"; name = "CurseForge (for canvas)" }
-    maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" }
     maven {
         url "https://oskarstrom.net/maven"
         content {
@@ -21,6 +19,7 @@ repositories {
         url "https://gitlab.com/api/v4/projects/25805200/packages/maven"
     }
     mavenCentral()
+    maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" }
 }
 
 dependencies {
@@ -29,20 +28,21 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
-    modImplementation("com.terraformersmc:modmenu:2.0.5")
+    modImplementation("com.terraformersmc:modmenu:3.0.0")
     include modImplementation("com.github.MeteorDevelopment:starscript:0.1.5")
-    modApi("me.shedaniel.cloth:cloth-config-fabric:5.0.38")
+    modApi("me.shedaniel.cloth:cloth-config-fabric:6.0.42")
-    modCompileOnly "io.vram:frex-fabric-mc117:6.0.145"
+    modCompileOnly "io.vram:frex-fabric-mc118:+"
     include modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${project.jfapi_version}") {
         exclude(group: "net.fabricmc.fabric-api")
     }
     include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
     include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
+    modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.8.1')
 
     //Canvas for FREX testing
-    //modRuntime("grondag:canvas-mc117-1.17:+") {
+    //modRuntimeOnly("io.vram:canvas-fabric-mc118:+") {
     //    exclude(group: "me.shedaniel.cloth")
     //}
 

gradle.properties

@@ -2,16 +2,16 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.17.1
+minecraft_version=1.18-pre2
-yarn_mappings=build.63
+yarn_mappings=build.2
 loader_version=0.12.5
 # Mod Properties
-mod_version=2.8.2
+mod_version=2.8.3
 maven_group=io.gitlab.jfronny
 archives_base_name=respackopts
 # Dependencies
-fabric_version=0.42.1+1.17
+fabric_version=0.42.5+1.18
-jfapi_version=2.1.3
+jfapi_version=2.1.4-410670846
 
 modrinth_id=TiF5QWZY
 modrinth_required_dependencies=3CD6YUw1

src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java

@@ -2,6 +2,7 @@ package io.gitlab.jfronny.respackopts;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import io.gitlab.jfronny.respackopts.integration.FrexCompat;
 import io.gitlab.jfronny.respackopts.model.*;
 import io.gitlab.jfronny.respackopts.model.condition.Condition;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
@@ -133,6 +134,9 @@ public class Respackopts implements ClientModInitializer {
         FileFilterEventImpl.init();
         if (CONFIG.debugCommands)
             RpoCommand.register();
+        if (FabricLoader.getInstance().isModLoaded("frex")) {
+            FrexCompat.onInitializeFrex();
+        }
     }
 
     public static void save() {

src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java

@@ -1,13 +1,11 @@
 package io.gitlab.jfronny.respackopts.integration;
 
-import grondag.frex.FrexInitializer;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.vram.frex.api.config.ShaderConfig;
 
-public class FrexCompat implements FrexInitializer {
+public class FrexCompat {
-    boolean initial = true;
+    private static boolean initial = true;
-    @Override
+    public static void onInitializeFrex() {
-    public void onInitalizeFrex() {
         ShaderConfig.registerShaderConfigSupplier(Respackopts.RPO_SHADER_ID, Respackopts::getShaderImportSource);
         Respackopts.LOGGER.info("enabled frex/canvas support");
         Respackopts.SAVE_ACTIONS.add(() -> {
@@ -21,5 +19,4 @@ public class FrexCompat implements FrexInitializer {
             }
         });
     }
-
 }