Merge branch 'Architectury-1.20.4' into sb1.20

Author: phit

.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          arguments: build
+          
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Package
+          path: "**/build/libs"

build.gradle

@@ -34,6 +34,38 @@ subprojects {
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
         mappings loom.officialMojangMappings()
+
+        tasks.withType(ProcessResources).configureEach {
+            var replaceProperties = [
+                minecraft_version      : minecraft_version,
+                architectury_api_version: architectury_api_version,
+                mod_id                 : mod_id,
+                mod_name               : mod_name,
+                mod_license            : mod_license,
+                mod_version            : mod_version,
+                mod_authors            : mod_authors,
+                mod_description        : mod_description,
+                maven_group            : maven_group,
+                mod_contact            : mod_contact,
+                mod_git                : mod_git,
+
+                //Fabric
+                fabric_java            : fabric_java,
+                fabric_fabricapi       : fabric_fabricapi,
+                fabric_api_version     : fabric_api_version,
+                fabric_loader_version  : fabric_loader_version,
+
+                //NeoForge
+                neoforge_loaderversion : neoforge_loaderversion,
+                neoforge_loaderrange   : neoforge_loaderrange,
+                neoforge_version       : neoforge_version,
+            ]
+            inputs.properties replaceProperties
+
+            filesMatching(['META-INF/neoforge.mods.toml', 'fabric.mod.json']  ) {
+                expand replaceProperties
+            }
+        }
     }
 
     java {
@@ -42,12 +74,12 @@ subprojects {
         // If you remove this line, sources will not be generated.
         withSourcesJar()
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     tasks.withType(JavaCompile).configureEach {
-        it.options.release = 17
+        it.options.release = 21
     }
 
     // Configure Maven publishing.

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

@@ -9,6 +9,7 @@ public class SIBConstants {
     public static final String FORMAT1_MC_LOGIN = "> %s joined the game";
     public static final String FORMAT1_MC_LOGOUT = "< %s left the game";
     public static final String FORMAT1_MC_DEATH = "RIP: %s";
+    public static final String FORMAT1_MC_LOGOUT_STOP = ">>>%s was still online when time came to a halt<<<";
 
     /* == MC FORMATS, 2 PARAMETERS == */
     public static final String FORMAT2_MC_EMOTE = "* %s %s";

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

@@ -13,6 +13,8 @@
 import net.stonebound.simpleircbridge.utils.MircColors;
 import org.slf4j.Logger;
 
+import static net.stonebound.simpleircbridge.simpleircbridge.SIBConstants.FORMAT1_MC_LOGOUT_STOP;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.regex.Matcher;
@@ -49,7 +51,9 @@ public void serverStarting(MinecraftServer instance) {
 
     public void serverStopping(MinecraftServer instance) {
         if (this.mcServer != null && Config.timestop) {
-            this.mcServer.getPlayerList().getPlayers().forEach(player -> sendToIrc(MircColors.BOLD + MircColors.LIGHT_RED + ">>>" + player.getName().getString() + " was still online when time came to a halt<<<"));
+            this.mcServer.getPlayerList()
+                .getPlayers()
+                .forEach(player -> sendToIrc(MircColors.BOLD + MircColors.LIGHT_RED + String.format(FORMAT1_MC_LOGOUT_STOP, SIBUtil.mangle(player.getName().getString()))));
         }
         if (this.bot != null) {
             this.bot.disconnect();

…in/resources/simpleircbridge.mixins.json …in/resources/simpleircbridge.mixins.jsonquilt/src/main/resources/simpleircbridge.mixins.json renamed to common/src/main/resources/simpleircbridge.mixins.json quilt/src/main/resources/simpleircbridge.mixins.json renamed to common/src/main/resources/simpleircbridge.mixins.json

@@ -36,8 +36,8 @@ dependencies {
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
 
-    include("com.electronwill.night-config:core:$rootProject.nightconfig_version")
-    include("com.electronwill.night-config:toml:$rootProject.nightconfig_version")
+    shadowBundle(implementation("com.electronwill.night-config:core:$rootProject.nightconfig_version") )
+    shadowBundle(implementation("com.electronwill.night-config:toml:$rootProject.nightconfig_version"))
 }
 
 processResources {
@@ -51,6 +51,13 @@ processResources {
 shadowJar {
     configurations = [project.configurations.shadowBundle]
     archiveClassifier = 'dev-shadow'
+
+    relocate 'com.electronwill', 'net.stonebound.SimpleIRCBridge.shaded.com.electronwill'
+
+    dependencies {
+        exclude(dependency("org.slf4j:.*:.*"))
+        exclude(dependency("org.jetbrains:.*:.*"))
+    }
 }
 
 remapJar {

fabric/build.gradle

@@ -1,31 +1,29 @@
 {
   "schemaVersion": 1,
-  "id": "simpleircbridge",
-  "version": "${version}",
-  "name": "simple irc bridge",
-  "description": "This is an example description! Tell everyone what your mod is about!",
+  "id": "${mod_id}",
+  "version": "${mod_version}",
+  "name": "${mod_name}",
+  "description": "${mod_description}",
   "authors": [
-    "Xnrand and contributors"
+    "${mod_authors}"
   ],
   "contact": {
-    "homepage": "https://fabricmc.net/",
-    "sources": "https://github.com/FabricMC/fabric-example-mod"
+    "homepage": "${mod_contact}",
+    "sources": "${mod_git}"
   },
-  "license": "BSD-2-Clause",
+  "license": "${mod_license}",
+  "icon": "assets/simpleircbridge/icon.png",
   "environment": "*",
   "entrypoints": {
     "main": [
       "net.stonebound.simpleircbridge.fabric.SimpleIRCBridgeFabric"
     ]
   },
   "depends": {
-    "fabricloader": ">=0.15.11",
-    "minecraft": "~1.20.4",
-    "java": ">=17",
-    "architectury": ">=11.1.17",
-    "fabric-api": "*"
-  },
-  "suggests": {
-    "another-mod": "*"
+    "fabricloader": ">=${fabric_loader_version}",
+    "minecraft": "~${minecraft_version}",
+    "java": "${fabric_java}",
+    "architectury": ">=${architectury_api_version}",
+    "fabric-api": "${fabric_fabricapi}"
   }
 }