feat: 1.20.5 - 1.20.6 support!

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {
@@ -17,10 +17,10 @@ subprojects {
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
 
-        // The following line declares the yarn mappings you may select this one as well.
         mappings loom.layered {
             it.mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-            it.mappings "dev.architectury:yarn-mappings-patch-forge:${project.yarn_mappings_patch}"
+            it.mappings "dev.architectury:yarn-mappings-patch-forge:${project.forge_yarn_mappings_patch}"
+            it.mappings "dev.architectury:yarn-mappings-patch-neoforge:${project.neoforge_yarn_mappings_patch}"
         }
     }
 
@@ -50,7 +50,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {

common/src/main/java/dev/norbiros/emojitype/config/EmojiTypeConfig.java

@@ -13,9 +13,12 @@
     public class EmojiTypeConfig    {
         public static Screen createConfigScreen(Screen parent) {
             ConfigUtil.deserialise();
-            ConfigBuilder builder = ConfigBuilder.create();
-            builder.setTitle(Text.translatable("config.emojitype.title"));
-            builder.setSavingRunnable(ConfigUtil::serialise);
+            ConfigBuilder builder = ConfigBuilder
+                    .create()
+                    .setParentScreen(parent)
+                    .setTitle(Text.translatable("config.emojitype.title"))
+                    .setSavingRunnable(ConfigUtil::serialise);
+
             ConfigEntryBuilder entryBuilder = builder.entryBuilder();
             builder.getOrCreateCategory(Text.translatable("config.emojitype.category"))
                 .addEntry(entryBuilder.startStrList(Text.translatable("config.emojitype.codes"), ConfigUtil.emojiCodeStrings)
@@ -31,6 +34,6 @@ public static Screen createConfigScreen(Screen parent) {
                         ConfigUtil.emojiCodeStrings.addAll(lstr);
                     })
                     .build());
-            return builder.setParentScreen(parent).build();
+            return builder.build();
         }
     }

common/src/main/resources/emojitype-common.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "dev.norbiros.emojitype.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [

fabric/src/main/resources/emojitype.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "dev.norbiros.emojitype.mixin.fabric",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [

forge/build.gradle

@@ -18,7 +18,7 @@ configurations {
 dependencies {
     forge "net.minecraftforge:forge:${project.forge_version}"
 
-    modApi "me.shedaniel.cloth:cloth-config-forge:${project.cloth_config_version}"
+    implementation "me.shedaniel.cloth:cloth-config-forge:13.0.121"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }

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

@@ -31,6 +31,6 @@ credits="Thanks to cyborgcabbage for original mod!"
 [[dependencies.emojitype]]
     modId = "cloth_config"
     mandatory = false
-    versionRange = "[11.0.0,)"
+    versionRange = "[13.0.0,)"
     ordering = "NONE"
     side = "BOTH"

gradle.properties

@@ -3,20 +3,22 @@ org.gradle.jvmargs=-Xmx2G
 # https://linkie.shedaniel.me/dependencies
 
 archives_base_name=emoji-type
-mod_version=2.2.3+1.20.4
+mod_version=2.2.3+1.20.6
 maven_group=dev.norbiros
 
-minecraft_version=1.20.4
-minecraft_version_range=[1.20,1.20.4]
-forge_version=1.20.4-49.0.9
-fabric_loader_version=0.15.2
-fabric_api_version=0.91.2+1.20.4
-yarn_mappings=1.20.4+build.3
-yarn_mappings_patch=1.20.4+build.1
-neoforge_version=20.4.3-beta
+minecraft_version=1.20.6
+minecraft_version_range=[1.20.5,1.20.6]
+forge_version=1.20.6-50.0.6
+fabric_loader_version=0.15.11
+fabric_api_version=0.97.8+1.20.6
+yarn_mappings=1.20.6+build.1
+neoforge_version=20.6.43-beta
+
+forge_yarn_mappings_patch=1.20.4+build.3
+neoforge_yarn_mappings_patch=1.20.5+build.3
 
 enabled_platforms=fabric,forge,neoforge
-architectury_version=11.0.8
+architectury_version=12.0.27
 
-cloth_config_version=13.0.114
-modmenu_version=9.0.0-pre.1
+cloth_config_version=14.0.126
+modmenu_version=10.0.0-beta.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/build.gradle

@@ -18,18 +18,15 @@ configurations {
 dependencies {
     neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
-    modApi "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
+    implementation "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
 }
 
 processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version,
-        "minecraft_version_range": minecraft_version_range
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand "version": project.version
     }
 }
 

neoforge/src/main/java/dev/norbiros/emojitype/neoforge/EmojitypeNeoforge.java

@@ -2,7 +2,7 @@
 
 import dev.norbiros.emojitype.EmojiType;
 import dev.norbiros.emojitype.config.EmojiTypeConfig;
-import net.neoforged.neoforge.client.ConfigScreenHandler;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 
@@ -11,6 +11,7 @@ public class EmojitypeNeoforge {
     public EmojitypeNeoforge() {
         EmojiType.init();
 
-        ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> EmojiTypeConfig.createConfigScreen(parent)));
+        ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class,
+                () -> (client, parent) -> EmojiTypeConfig.createConfigScreen(parent));
     }
 }

neoforge/src/main/resources/META-INF/mods.toml → neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -8,27 +8,26 @@ logoFile = "logo.png"
 authors = "Cyborgcabbage,Norbiros"
 
 [[mods]]
-modId = "emojitype"
-version = "${version}"
-displayName = "Emoji Type"
-description='''
-A mod that lets you type minecraft emojis easier!
-'''
-credits="Thanks to cyborgcabbage for original mod!"
+    modId = "emojitype"
+    version = "${version}"
+    displayName = "Emoji Type"
+    description='''
+    A mod that lets you type minecraft emojis easier!
+    '''
+    credits="Thanks to cyborgcabbage for original mod!"
 
 [[mixins]]
-config = "emojitype-common.mixins.json"
+    config = "emojitype-common.mixins.json"
 
 [[dependencies.emojitype]]
-    modId="neoforge"
-    mandatory=true
-    versionRange="[20.2,)"
-    ordering="NONE"
-    side="BOTH"
-
-[[dependencies.emojitype]]
-    modId = "cloth_config"
-    mandatory = false
-    versionRange = "[11.0.0,)"
+    modId = "neoforge"
+    type = "required"
+    versionRange = "[20.6,)"
     ordering = "NONE"
     side = "BOTH"
+[[dependencies.emojitype]]
+    modId = "cloth_config"
+    type = "optional"
+    versionRange = "[14.0.0,)"
+    ordering = "AFTER"
+    side = "BOTH"