From f64fb2dfdb494394fda22a8beab7b9a288b61e6c Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Sun, 17 May 2026 14:54:34 +0200 Subject: [PATCH] feat: 26.1 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- README.md | 3 + build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- modern-build.gradle.kts | 78 +++++++++++++++++++ settings.gradle.kts | 6 +- .../net/blockhost/anarchymod/AnarchyMod.java | 8 +- .../net/blockhost/anarchymod/JoinPayload.java | 3 +- src/main/resources/fabric.mod.json | 2 +- stonecutter.gradle.kts | 2 +- versions/26.1.1/gradle.properties | 4 + versions/26.1.2/gradle.properties | 4 + versions/26.1/gradle.properties | 4 + 14 files changed, 110 insertions(+), 12 deletions(-) create mode 100644 modern-build.gradle.kts create mode 100644 versions/26.1.1/gradle.properties create mode 100644 versions/26.1.2/gradle.properties create mode 100644 versions/26.1/gradle.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bcbd1ab..5230205 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: distribution: temurin java-version: 21 - - uses: gradle/actions/setup-gradle@v6 + - uses: gradle/actions/setup-gradle@v5 - run: ./gradlew chiseledBuild diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 745c23c..922304b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: ref: ${{ github.ref }} - name: Set up Gradle - uses: gradle/actions/setup-gradle@v6 + uses: gradle/actions/setup-gradle@v5 - name: Set up JDK 21 uses: actions/setup-java@v5 diff --git a/README.md b/README.md index ca03e1f..12d0f33 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,9 @@ | 1.21.9 | `mc-1.21.9` | | 1.21.10 | `mc-1.21.10` | | 1.21.11 | `mc-1.21.11` | +| 26.1 | `mc-26.1` | +| 26.1.1 | `mc-26.1.1` | +| 26.1.2 | `mc-26.1.2` | ## Installation diff --git a/build.gradle.kts b/build.gradle.kts index 1b723c9..c33da82 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("fabric-loom") version "1.16.2" + id("net.fabricmc.fabric-loom-remap") version "1.16.2" id("maven-publish") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df6a6ad..b52fb7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/modern-build.gradle.kts b/modern-build.gradle.kts new file mode 100644 index 0000000..1399c6e --- /dev/null +++ b/modern-build.gradle.kts @@ -0,0 +1,78 @@ +plugins { + id("net.fabricmc.fabric-loom") version "1.16.2" + id("maven-publish") +} + +val minecraftVersion = stonecutter.current.project +val loaderVersion = property("loader_version") as String +val fabricApiVersion = property("fabric_api_version") as String +val javaVersion = (property("java_version") as String).toInt() + +version = property("mod_version")!! +group = property("maven_group")!! + +base { + archivesName.set("anarchymod-mc-${minecraftVersion}") +} + +dependencies { + minecraft("com.mojang:minecraft:$minecraftVersion") + implementation("net.fabricmc:fabric-loader:$loaderVersion") + implementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion") + implementation("com.google.code.gson:gson:2.14.0") +} + +loom { + runConfigs.all { + ideConfigGenerated(true) + runDir = "../../run" + } +} + +tasks.processResources { + inputs.property("version", project.version) + inputs.property("minecraft_version", minecraftVersion) + inputs.property("loader_version", loaderVersion) + inputs.property("java_version", javaVersion) + filteringCharset = "UTF-8" + + filesMatching("fabric.mod.json") { + expand( + "version" to project.version, + "minecraft_version" to minecraftVersion, + "loader_version" to loaderVersion, + "java_version" to javaVersion + ) + } + + filesMatching("anarchymod.mixins.json") { + expand( + "java_version" to javaVersion + ) + } +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" + options.release.set(javaVersion) +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersion)) + withSourcesJar() +} + +tasks.jar { + from("LICENSE") { + rename { "${it}_${base.archivesName.get()}" } + } +} + +publishing { + publications { + create("mavenJava") { + artifactId = base.archivesName.get() + from(components["java"]) + } + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index b41ddf9..f2630a4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,12 +12,16 @@ plugins { stonecutter { create(rootProject) { - versions( + val legacy = arrayOf( "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11" ) + val modern = arrayOf("26.1", "26.1.1", "26.1.2") + + versions(*legacy).buildscript("build.gradle.kts") + versions(*modern).buildscript("modern-build.gradle.kts") } } diff --git a/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/src/main/java/net/blockhost/anarchymod/AnarchyMod.java index f2bc05a..ad93799 100644 --- a/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ b/src/main/java/net/blockhost/anarchymod/AnarchyMod.java @@ -14,9 +14,11 @@ public class AnarchyMod implements ClientModInitializer { @Override public void onInitializeClient() { - //? if >=1.20.5 { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - //?} + //? if >=26.1 { + PayloadTypeRegistry.serverboundPlay().register(JoinPayload.TYPE, JoinPayload.CODEC); + //?} else if >=1.20.5 { + /*PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); + *///?} ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) //? if <1.20.5 { diff --git a/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/src/main/java/net/blockhost/anarchymod/JoinPayload.java index cd4fe00..61343b9 100644 --- a/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ b/src/main/java/net/blockhost/anarchymod/JoinPayload.java @@ -29,8 +29,7 @@ public class JoinPayload implements CustomPacketPayload { public static final StreamCodec CODEC = StreamCodec.of( - (payload, buf) -> { - }, + (buf, payload) -> {}, buf -> new JoinPayload() ); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b49ec11..3e56a96 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ } }, "depends": { - "fabric": "*", + "fabric-api": "*", "fabricloader": ">=${loader_version}", "minecraft": "${minecraft_version}", "java": ">=${java_version}" diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index 8450af7..5c1feed 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -2,7 +2,7 @@ plugins { id("dev.kikugie.stonecutter") } -stonecutter active "1.21.11" +stonecutter active "26.1.2" tasks.register("chiseledBuild") { group = "project" diff --git a/versions/26.1.1/gradle.properties b/versions/26.1.1/gradle.properties new file mode 100644 index 0000000..6f98188 --- /dev/null +++ b/versions/26.1.1/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=26.1.1 +loader_version=0.19.2 +fabric_api_version=0.145.4+26.1.1 +java_version=25 diff --git a/versions/26.1.2/gradle.properties b/versions/26.1.2/gradle.properties new file mode 100644 index 0000000..b19e3ea --- /dev/null +++ b/versions/26.1.2/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=26.1.2 +loader_version=0.19.2 +fabric_api_version=0.148.2+26.1.2 +java_version=25 diff --git a/versions/26.1/gradle.properties b/versions/26.1/gradle.properties new file mode 100644 index 0000000..9713ae8 --- /dev/null +++ b/versions/26.1/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=26.1 +loader_version=0.19.2 +fabric_api_version=0.145.1+26.1 +java_version=25