Ver/1.21.1

.github/workflows/build.yml

@@ -7,21 +7,30 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        submodules: true
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 22
         java-package: jdk
-
-    - uses: actions/cache@v2
+
+    - name: Install LLVM
+      uses: KyleMayes/install-llvm-action@v2
+      with:
+        version: "18.1.8"
+
+    - name: Install required dependencies
+      run: sudo apt update && sudo apt install libtinfo5
+
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -37,15 +46,15 @@ jobs:
 
     - name: upload to modrinth and curseforge
       run: ./gradlew modrinth curseforge
-      if: github.ref == 'refs/heads/ver/1.20.1'
+      if: github.ref == 'refs/heads/ver/1.21.1'
       env:
         MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
         CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}
         GITHUB_EVENT_RAW_PATH: ${{ github.event_path }}
       continue-on-error: true
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: c2me-artifact
         path: 'build/libs/*.jar'

.github/workflows/test.yml

@@ -6,26 +6,35 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
       matrix:
         testTask: [runTestC2MEServer]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        submodules: true
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 22
         java-package: jdk
-
-    - uses: actions/cache@v2
+
+    - name: Install LLVM
+      uses: KyleMayes/install-llvm-action@v2
+      with:
+        version: "18.1.8"
+
+    - name: Install required dependencies
+      run: sudo apt update && sudo apt install libtinfo5
+
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "FlowSched"]
+	path = FlowSched
+	url = https://github.com/RelativityMC/FlowSched.git

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
         }
         stage('Build') {
             tools {
-                jdk "OpenJDK 17"
+                jdk "OpenJDK 21"
             }
             steps {
                 withMaven(
@@ -19,6 +19,7 @@ pipeline {
                 ) {
                     sh 'git fetch --tags'
                     sh 'git reset --hard'
+                    sh 'git submodule update --init --recursive --force'
                     sh './gradlew clean build'
                 }
             }

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021-2023 ishland
+Copyright (c) 2021-2024 ishland
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@
 
 [![Github-CI](https://github.com/RelativityMC/C2ME-fabric/workflows/C2ME%20Build%20Script/badge.svg)](https://github.com/RelativityMC/C2ME-fabric/actions?query=workflow%3ACI)
 [![Build Status](https://ci.codemc.io/job/RelativityMC/job/C2ME-fabric/job/ver%252F1.18/badge/icon)](https://ci.codemc.io/job/RelativityMC/job/C2ME-fabric/job/ver%252F1.18/)
-[![Discord](https://img.shields.io/discord/756715786747248641?logo=discord&logoColor=white)](https://discord.io/ishlandbukkit)
+[![Discord](https://img.shields.io/discord/756715786747248641?logo=discord&logoColor=white)](https://discord.gg/Kdy8NM5HW4)
 <h3>A Fabric mod designed to improve the chunk performance of Minecraft.</h3>
 </div>
 
@@ -19,33 +19,25 @@ Concurrent chunk management engine, it's about making the game better threaded a
 Although it is usable in most cases and tested during build time, it doesn't mean that it is fully stable for a production server.  
 So backup your worlds and practice good game modding skills.
 
-## Branch development status
-| Branch            | Status                               |
-|-------------------|--------------------------------------|
-| fabric/ver/1.20.1 | Active, Mainline                     |
-| fabric/ver/1.19.4 | Bugfixes only                        |
-| fabric/ver/1.18   | Bugfixes only                        |
-
-
 ## Downloads
-You can find semi-stable releases here: https://github.com/RelativityMC/C2ME-fabric/releases  
-
-### Development builds
-**Note: Development builds may modify the config files in a way unreadable by previous versions. You may encounter crashes or config reset when rolling back to previous versions. Please always backup your config.**
+Modrinth: https://modrinth.com/mod/c2me-fabric
+CurseForge: https://www.curseforge.com/minecraft/mc-mods/c2me-fabric
 
-You can find development builds here: https://ci.codemc.io/job/RelativityMC/job/C2ME-fabric  
-Note that these builds may contain more bugfixes and performance improvements but are less tested.  
-If you have encountered any problems in release builds, give development builds a try before reporting.
+## Support status for Minecraft versions
+Only the latest Minecraft release and the latest Minecraft snapshot are fully supported. 
+Older Minecraft releases are in long-term support and will receive critical bug fixes.
+Older Minecraft snapshots are not supported. 
 
 ## Support
 Our issue tracker: [link](https://github.com/RelativityMC/C2ME-fabric/issues)  
-Our discord server: [link](https://discord.io/ishlandbukkit)
+Our discord server: [link](https://discord.gg/Kdy8NM5HW4)
 
 ## Building and setting up
-JDK 17+ is required to build and use C2ME  
+JDK 22+, Clang 18+ and MinGW are required to build C2ME  
 Run the following commands in the root directory:
 
 ```shell
+git submodule update --init --recursive
 ./gradlew clean build
 ```
 

build.gradle

@@ -1,10 +1,11 @@
 plugins {
     id 'java-library'
-    id 'fabric-loom' version '1.2-SNAPSHOT' apply false
-    id 'io.github.juuxel.loom-quiltflower' version '1.+' apply false
-    id "me.champeau.jmh" version "0.7.1"
+    id 'fabric-loom' version '1.7-SNAPSHOT' apply false
+    id "me.champeau.jmh" version "0.7.2"
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
+    id 'com.gradleup.shadow' version '8.3.0' apply false
+    id 'io.github.tomtzook.gradle-cmake' version '1.2.2' apply false
 }
 
 @SuppressWarnings('unused')
@@ -20,11 +21,15 @@ configure(allprojects) {
     apply plugin: 'java'
     apply plugin: 'java-library'
 
-    it.archivesBaseName = "${it.name}-mc${project.minecraft_version}"
+    base {
+        archivesName = "${project.name}-mc${project.minecraft_version}"
+    }
     it.group = project.maven_group
-    it.sourceCompatibility = JavaVersion.VERSION_17
-    it.targetCompatibility = JavaVersion.VERSION_17
     it.version = project.mod_version + "." + getVersionSuffix()
+    java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
 
     afterEvaluate {
         if (it.plugins.hasPlugin("fabric-loom")) {
@@ -35,31 +40,49 @@ configure(allprojects) {
     }
 }
 
-archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
+base {
+    archivesName = "${project.archives_base_name}-mc${project.minecraft_version}"
+}
+
+clean.dependsOn gradle.includedBuild('FlowSched').task(':clean')
+
+allprojects {
+    repositories {
+        maven { url 'https://jitpack.io' }
+        maven {
+            url "https://maven.bawnorton.com/releases"
+            content {
+                includeGroup "com.bawnorton.mixinsquared"
+            }
+        }
+    }
+}
 
 configure (allprojects - project(":tests")) {
     if (project != project(":") && project.parent != project(":")) return
 
     apply plugin: 'fabric-loom'
-    apply plugin: 'io.github.juuxel.loom-quiltflower'
     apply plugin: 'maven-publish'
 
-    repositories {
-        maven { url 'https://jitpack.io' }
-    }
-
     dependencies {
         //to change the versions see the gradle.properties file
         minecraft "com.mojang:minecraft:${project.minecraft_version}"
         mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
         modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+        [
+                "fabric-networking-api-v1",
+                "fabric-lifecycle-events-v1",
+        ].forEach {
+            modCompileOnly(fabricApi.module(it, "${project.fabric_version}"))
+        }
     }
 
     loom {
-        def awFile = file("src/main/resources/${project.name}.accesswidener")
-        if (awFile.isFile()) {
-            accessWidenerPath = awFile
-        }
+        def file = project(":c2me-base").file("src/main/resources/c2me-base.accesswidener")
+        accessWidenerPath = file
+        enableTransitiveAccessWideners = false
+//        logger.lifecycle(String.format("%s: Using access widener at %s", project, file.getAbsolutePath()))
         runs {
             server {
                 ideConfigGenerated project.rootProject == project
@@ -71,20 +94,20 @@ configure (allprojects - project(":tests")) {
     }
 
     processResources {
-        inputs.property "version", project.version
+        inputs.property "version", project.version + "+" + project.minecraft_version
 
         filesMatching("fabric.mod.json") {
-            expand "version": project.version
+            expand "version": project.version + "+" + project.minecraft_version
         }
     }
 
     jar {
         from rootProject.file("LICENSE")
     }
 
-//    java {
-//        withSourcesJar()
-//    }
+    java {
+        withSourcesJar()
+    }
 
     // ensure that the encoding is set to UTF-8, no matter what the system default is
     // this fixes some edge cases with special characters not displaying correctly
@@ -119,21 +142,19 @@ configure (allprojects - project(":tests")) {
     dependencies {
         implementation "com.ibm.async:asyncutil:${async_util_version}"
         implementation "com.electronwill.night-config:toml:${night_config_version}"
-        implementation "org.threadly:threadly:${threadly_version}"
         implementation "net.objecthunter:exp4j:${exp4j_version}"
-        implementation "com.github.LlamaLad7:MixinExtras:${mixinextras_version}"
-
-        annotationProcessor "com.github.LlamaLad7:MixinExtras:${mixinextras_version}"
+        implementation "org.jctools:jctools-core:${jctools_version}"
+        implementation annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:${mixinsquared_version}")
+        api "com.ishland.flowsched:flowsched"
     }
 }
 
 subprojects {
     afterEvaluate {
         afterEvaluate {
             genSourcesWithFernFlower.enabled = false
-            genSourcesWithQuiltflower.enabled = false
+            genSourcesWithVineflower.enabled = false
             genSourcesWithCfr.enabled = false
-            unpickJar.enabled = false
             downloadAssets.enabled = false
         }
     }
@@ -150,9 +171,12 @@ dependencies {
     include implementation("com.ibm.async:asyncutil:${async_util_version}")
     include implementation("com.electronwill.night-config:toml:${night_config_version}")
     include implementation("com.electronwill.night-config:core:${night_config_version}")
-    include implementation("org.threadly:threadly:${threadly_version}")
     include implementation("net.objecthunter:exp4j:${exp4j_version}")
-    include implementation("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
+    include implementation("org.jctools:jctools-core:${jctools_version}")
+    include implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:${mixinsquared_version}"))
+    include "io.reactivex.rxjava3:rxjava:${rxjava_version}"
+    include "org.reactivestreams:reactive-streams:${reactive_streams_version}"
+//    include implementation("com.ishland.flowsched:flowsched")
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
@@ -184,7 +208,7 @@ if (System.getenv("CURSEFORGE_TOKEN")) {
 
             addGameVersion project.minecraft_version
             addGameVersion "Fabric"
-            addGameVersion "Java 17"
+            addGameVersion "Java 21"
 
             mainArtifact(remapJar) {
                 displayName = project.version + " devbuild for " + project.minecraft_version
@@ -203,8 +227,9 @@ dependencies {
         (subprojects - project(":tests")).forEach {
             if (it.parent != project(":")) return
 
-            api project(path: ":${it.name}", configuration: "namedElements")
-            include project("${it.name}:")
+            def projectName = it.name
+            api project(path: ":${projectName}", configuration: "namedElements")
+            include project("${projectName}:")
         }
     }
 }
@@ -232,6 +257,11 @@ String getVersionSuffix() {
     return split[split.length - 2] + suffix
 }
 
+compileJmhJava {
+    sourceCompatibility = JavaVersion.VERSION_22
+    targetCompatibility = JavaVersion.VERSION_22
+}
+
 jmh {
 //    includes = ['some regular expression'] // include pattern (regular expression) for benchmarks to be executed
 //    excludes = ['some regular expression'] // exclude pattern (regular expression) for benchmarks to be executed

buildSrc/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:22.0.0'
 
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
 
 gradlePlugin {