Merge remote-tracking branch 'origin/1.18' into 1.19.2

build.gradle

@@ -70,6 +70,9 @@ allprojects {
                 url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
             }
         }
+        maven {
+            url 'https://maven.terraformersmc.com/releases'
+        }
     }
 }
 

fabric/build.gradle

@@ -34,6 +34,7 @@ dependencies {
     modIncludeImplementation(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modImplementation(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+    modCompileOnly("com.terraformersmc:modmenu:${rootProject.modmenu_version}") { transitive false }
     // Remove the next line if you don't want to depend on the API
     // modApi "me.shedaniel:architectury-fabric:${rootProject.architectury_version}"
 

fabric/src/main/java/org/embeddedt/modernfix/fabric/modmenu/ModernFixModMenuApiImpl.java

@@ -0,0 +1,13 @@
+package org.embeddedt.modernfix.fabric.modmenu;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import org.embeddedt.modernfix.screen.ModernFixConfigScreen;
+
+@SuppressWarnings("unused")
+public class ModernFixModMenuApiImpl implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<ModernFixConfigScreen> getModConfigScreenFactory() {
+        return ModernFixConfigScreen::new;
+    }
+}

fabric/src/main/resources/fabric.mod.json

@@ -3,14 +3,17 @@
   "id": "modernfix",
   "version": "${version}",
   "name": "ModernFix",
-  "description": "Optimization mod",
+  "description": "Egregious, yet effective performance improvements for modern Minecraft",
   "authors": [
     "embeddedt"
   ],
   "contact": {
+    "sources": "https://github.com/embeddedt/ModernFix",
+    "homepage": "https://modrinth.com/mod/modernfix",
+    "issues": "https://github.com/embeddedt/ModernFix/issues"
   },
   "license": "LGPL-3.0",
-  "icon": "assets/modernfix/icon.png",
+  "icon": "icon.png",
   "environment": "*",
   "entrypoints": {
     "main": [
@@ -18,7 +21,8 @@
     ],
     "client": [
       "org.embeddedt.modernfix.ModernFixClientFabric"
-    ]
+    ],
+    "modmenu": [ "org.embeddedt.modernfix.fabric.modmenu.ModernFixModMenuApiImpl" ]
   },
   "mixins": [
     "modernfix-fabric.mixins.json",
@@ -27,6 +31,7 @@
   "depends": {
     "fabric-lifecycle-events-v1": "*",
     "fabric-screen-api-v1": "*",
+    "fabric-command-api-v1": "*",
     "minecraft": ">=1.16.5"
   }
 }

forge/src/main/resources/META-INF/mods.toml

@@ -11,7 +11,7 @@ loaderVersion = "[43,)" #mandatory This is typically bumped every Minecraft vers
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
 license = "GNU LGPL 3.0"
 # A URL to refer people to when problems occur with this mod
-#issueTrackerURL="http://my.issue.tracker/" #optional
+issueTrackerURL="https://github.com/embeddedt/ModernFix/issues" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
@@ -22,16 +22,16 @@ displayName = "ModernFix" #mandatory
 # A URL to query for updates for this mod. See the JSON update specification <here>
 #updateJSONURL="http://myurl.me/" #optional
 # A URL for the "homepage" for this mod, displayed in the mod UI
-#displayURL="http://example.com/" #optional
+displayURL="https://modrinth.com/mod/modernfix" #optional
 # A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="modernfix.png" #optional
+logoFile="icon.png" #optional
 # A text field displayed in the mod UI
 #credits="Thanks for this example mod goes to Java" #optional
 # A text field displayed in the mod UI
-#authors="Love, Cheese and small house plants" #optional
+authors="embeddedt" #optional
 # The description text for the mod (multi line!) (#mandatory)
 description = '''
-
+Egregious, yet effective performance improvements for modern Minecraft
 '''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
 [[dependencies.modernfix]] #optional

gradle.properties

@@ -15,3 +15,5 @@ rhino_version=1902.2.2-build.268
 
 fabric_loader_version=0.14.18
 fabric_api_version=0.76.0+1.19.2
+
+modmenu_version=4.1.2