1.20.4 Update

Author: Phonavis

common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/SIBUtil.java

@@ -1,7 +1,7 @@
 package net.stonebound.simpleircbridge.simpleircbridge;
 
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.contents.LiteralContents;
+import net.minecraft.network.chat.contents.PlainTextContents.LiteralContents;
 
 public class SIBUtil {
 	private SIBUtil() {
@@ -35,6 +35,10 @@ public static String mangle(String nick) {
 
 
 	//This is "borrowed" directly from forgehooks.java, and i will slightly rename variables if someone complains
+	//1.20.4 update
+	// since i didn't cheat to look where this was refactored to, is this now original code despite being exactly the same but with a different reference?
+	//but how do I prove that?
+	//This is truly something to despair over
 
 	public static String getRawText(Component message) {
 		return message.getContents() instanceof LiteralContents literalContents ? literalContents.text() : "";

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

@@ -24,9 +24,9 @@
   ],
   "depends": {
     "fabricloader": ">=0.15.11",
-    "minecraft": "~1.20.1",
+    "minecraft": "~1.20.4",
     "java": ">=17",
-    "architectury": ">=9.2.14",
+    "architectury": ">=11.1.17",
     "fabric-api": "*"
   },
   "suggests": {

forge/src/main/java/net/stonebound/simpleircbridge/forge/simpleircbridgeForge.java

@@ -5,7 +5,7 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 import net.stonebound.simpleircbridge.simpleIRCbridgeLoader;
-
+//TODO Test to ensure this actually works on forge, for some reason its not working in IDE but is assembled, but I can't get a normal vanilla forge server to work
 @Mod(simpleIRCbridgeLoader.MOD_ID)
 public final class simpleircbridgeForge {
     public simpleircbridgeForge() {

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

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[47,)"
+loaderVersion = "[49,)"
 #issueTrackerURL = "https://github.com/Stonebound/SimpleIRCBridge"
 license = "BSD-2-Clause"
 
@@ -16,20 +16,20 @@ simple irc bridge stonebound fork
 [[dependencies.simpleircbridge]]
 modId = "forge"
 mandatory = true
-versionRange = "[47,)"
+versionRange = "[49,)"
 ordering = "NONE"
 side = "SERVER"
 
 [[dependencies.simpleircbridge]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.1,)"
+versionRange = "[1.20.4,)"
 ordering = "NONE"
 side = "SERVER"
 
 [[dependencies.simpleircbridge]]
 modId = "architectury"
 mandatory = true
-versionRange = "[9.2.14,)"
+versionRange = "[11.1.17,)"
 ordering = "AFTER"
 side = "SERVER"

forge/src/main/resources/pack.mcmeta

@@ -1,7 +1,6 @@
 {
   "pack": {
     "description": "simple irc bridge",
-    "forge:server_data_pack_format": 15,
-    "pack_format": 15
+    "pack_format": 22
   }
 }

gradle.properties

@@ -3,18 +3,19 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 1.0.0
+mod_version = 1.0.1
 maven_group = net.stonebound.simpleircbridge
 archives_name = simpleircbridge
-enabled_platforms = fabric,forge,quilt
+enabled_platforms = fabric,forge,neoforge,quilt
 
 # Minecraft properties
-minecraft_version = 1.20.1
+minecraft_version = 1.20.4
 
 # Dependencies
-architectury_api_version = 9.2.14
+architectury_api_version = 11.1.17
 fabric_loader_version = 0.15.11
-fabric_api_version = 0.92.2+1.20.1
-forge_version = 1.20.1-47.2.32
-quilt_loader_version = 0.26.0-beta.4
-quilted_fabric_api_version = 7.5.0+0.91.0-1.20.1
+fabric_api_version = 0.97.1+1.20.4
+forge_version = 1.20.4-49.0.50
+neoforge_version = 20.4.234
+quilt_loader_version = 0.26.1-beta.1
+quilted_fabric_api_version = 9.0.0-alpha.8+0.97.0-1.20.4

neoforge/build.gradle

@@ -0,0 +1,59 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+repositories {
+    maven {
+        name = 'NeoForged'
+        url = 'https://maven.neoforged.net/releases'
+    }
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
+
+    // Architectury API. This is optional, and you can comment it out if you don't need it.
+    modImplementation "dev.architectury:architectury-neoforge:$rootProject.architectury_api_version"
+
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
+}
+
+processResources {
+    inputs.property 'version', project.version
+
+    filesMatching('META-INF/mods.toml') {
+        expand version: project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+}

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform = neoforge

neoforge/src/main/java/net/stonebound/simpleircbridge/neoforge/SimpleIrcBridgeNeoForge.java

@@ -0,0 +1,13 @@
+package net.stonebound.simpleircbridge.neoforge;
+
+import net.neoforged.fml.common.Mod;
+
+import net.stonebound.simpleircbridge.simpleIRCbridgeLoader;
+
+@Mod(simpleIRCbridgeLoader.MOD_ID)
+public final class SimpleIrcBridgeNeoForge {
+    public SimpleIrcBridgeNeoForge() {
+        // Run our common setup.
+        simpleIRCbridgeLoader.init();
+    }
+}

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

@@ -0,0 +1,38 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+#issueTrackerURL = "https://github.com/Stonebound/SimpleIRCBridge"
+license = "BSD-2-Clause"
+
+[[mods]]
+modId = "simpleircbridge"
+version = "${version}"
+displayName = "simple irc bridge"
+authors = "Xnrand & contributors"
+description = '''
+simple irc bridge stonebound fork
+'''
+#logoFile = ""
+
+[[dependencies.simpleircbridge]]
+modId = "neoforge"
+type = "required"
+versionRange = "[20.4,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.simpleircbridge]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.20.4,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.simpleircbridge]]
+modId = "architectury"
+type = "required"
+versionRange = "[11.1.17,)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[mixins]]
+config = "simpleircbridge.mixins.json"