feat: update to 26.1+

Author: MichaelHillcox

.github/workflows/build-and-release.yml

@@ -1,32 +1,20 @@
-name: CI Build & Release
+name: Release
 
 on:
   push:
-    tags: [ "v*" ]
+    tags:
+      - "v*"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     if: |
       !contains(github.event.head_commit.message, '[ciskip]')
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21 & Cache
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'microsoft'
-          java-version: '21'
-          cache: 'gradle'
-      - name: Release
-        if: |
-          !contains(github.event.head_commit.message, '[norelease]')
-        env:
-          GIT_COMMIT: ${{ github.event.after }}
-          GIT_PREVIOUS_COMMIT: ${{ github.event.before }}
-          CURSE_DEPLOY_TOKEN: ${{ secrets.CURSE_DEPLOY_TOKEN }}
-          SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          chmod +x ./gradlew
-          ./gradlew clean build publish publishMods --stacktrace --no-daemon
+    uses: nanite/workflows/.github/workflows/release.yml@v1.3
+    with:
+      java-version: 25
+      gradle-tasks: build publish publishMods --no-daemon
+    secrets:
+      saps-token: ${{ secrets.SAPS_TOKEN }}
+      curse-token: ${{ secrets.CURSE_DEPLOY_TOKEN }}
+      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+      github-token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [26.1.2.1]
+
+### Changed
+
+- Updated to 26.1
+
 ## [21.11.0]
 
 ### Changed

build.gradle

@@ -1,54 +1,57 @@
 plugins {
-    id 'dev.architectury.loom' version '1.13-SNAPSHOT' apply false
-    id 'architectury-plugin' version '3.4-SNAPSHOT'
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
-    id 'maven-publish'
+    id 'java-library'
+    id 'fabric-loom' version '1.15-SNAPSHOT' apply(false)
+    id 'net.neoforged.moddev' version '2.0.141' apply(false)
+    id "me.modmuss50.mod-publish-plugin" version "1.1.0"
     id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
-    id "me.modmuss50.mod-publish-plugin" version "0.7.4"
-}
-
-architectury {
-    minecraft = project.minecraft_version
 }
 
 allprojects {
-    group = rootProject.maven_group
-    version = rootProject.mod_version
-}
-
-subprojects {
-    version = project.mod_version
-    group = project.maven_group
-
-    apply plugin: 'dev.architectury.loom'
-    apply plugin: 'architectury-plugin'
+    apply plugin: 'idea'
+    apply plugin: 'java-library'
     apply plugin: 'maven-publish'
 
-    base {
-        // Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
-        archivesName = "$rootProject.archives_name-$project.name"
+    version = mod_version
+    group = maven_group
+
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
+        options.release = 25
     }
 
     repositories {
-        maven { url "https://maven.terraformersmc.com/releases/"}
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+        mavenCentral()
     }
 
     dependencies {
-        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
-        mappings loom.officialMojangMappings()
+//        testImplementation platform('org.junit:junit-bom:5.10.3')
     }
 
-    java {
-        withSourcesJar()
+    idea {
+        module {
+            downloadSources = true
+            downloadJavadoc = true
+        }
+    }
+}
 
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+subprojects {
+    base {
+        archivesName = "${archives_base_name}-$project.name"
     }
 
-    tasks.withType(JavaCompile).configureEach {
-        it.options.release = 21
-        it.options.encoding = "UTF-8"
+    if (project.name != "common") {
+        dependencies {
+            api project(":common")
+        }
+
+        jar {
+            from project(":common").sourceSets.main.output
+        }
+    }
+
+    java {
+        withSourcesJar()
     }
 
     jar {
@@ -57,13 +60,32 @@ subprojects {
         }
     }
 
+    def replaceProperties = [
+            mod_id: mod_id,
+            minecraft_version: minecraft_version,
+            minecraft_version_range_sem: minecraft_version_range_sem,
+            minecraft_version_range_mvn: minecraft_version_range_mvn,
+            neoforge_version: neoforge_version,
+            neoforge_version_range: neoforge_version_range,
+            fabric_loader_version: fabric_loader_version,
+            fabric_api_version: fabric_api_version,
+            fabric_api_version_range: fabric_api_version_range,
+            version: version,
+    ]
+
+    processResources {
+        inputs.properties replaceProperties
+
+        filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json", "pack.mcmeta"]) {
+            expand replaceProperties
+        }
+    }
+
     // Configure Maven publishing.
     publishing {
         publications {
-            mavenJava(MavenPublication) {
-                groupId project.group
-                artifactId project.archivesBaseName
-                version project.version
+            register("maven${project.name.capitalize()}", MavenPublication) {
+                artifactId = "${rootProject.archives_base_name}-${project.name}"
                 from components.java
             }
         }
@@ -100,8 +122,8 @@ publishMods {
 
     def createOptions = (String name) -> {
         publishOptions {
-            file = project.provider { project(":$name").tasks.remapJar }.flatMap { it.archiveFile }
-            displayName = "[${name.toUpperCase()}][${minecraft_version}] Auto Clicker ${mod_version}"
+            file = project.provider { project(":$name").tasks.jar }.flatMap { it.archiveFile }
+            displayName = "Auto Clicker ${name.capitalize()} ${mod_version}"
             modLoaders.add(name.toLowerCase())
         }
     }
@@ -110,7 +132,7 @@ publishMods {
         projectId = project.curseforge_id
         accessToken = providers.environmentVariable("CURSE_DEPLOY_TOKEN")
         minecraftVersions.add("${minecraft_version}")
-        javaVersions.add(JavaVersion.VERSION_21)
+        javaVersions.add(JavaVersion.VERSION_25)
     }
 
     def modrinthOptions = modrinthOptions {
@@ -141,9 +163,9 @@ publishMods {
     }
 
     github {
-        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
-        additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        additionalFiles.from project.provider { project(":common").tasks.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":neoforge").tasks.jar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":fabric").tasks.jar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":common").tasks.jar }.flatMap { it.archiveFile }
 
         repository = "AdvancedXRay/Auto-Clicker"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")

common/build.gradle

@@ -1,10 +1,16 @@
-architectury {
-    common rootProject.enabled_platforms.split(',')
+plugins {
+    id 'net.fabricmc.fabric-loom'
+}
+
+loom {
+    mixin {
+        useLegacyMixinAp = false
+    }
 }
 
 dependencies {
-    // We depend on Fabric Loader here to use the Fabric @Environment annotations,
-    // which get remapped to the correct annotations on each platform.
-    // Do NOT use other classes from Fabric Loader.
-    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+
+    compileOnly group: 'net.fabricmc', name: 'sponge-mixin', version: '0.17.0+mixin.0.8.7'
+    compileOnly "io.github.llamalad7:mixinextras-fabric:0.5.0"
 }

common/src/main/java/pro/mikey/autoclicker/AutoClicker.java

@@ -7,7 +7,7 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
@@ -115,7 +115,7 @@ public void saveConfig() {
         }
     }
 
-    public void renderGameOverlayEvent(GuiGraphics context, DeltaTracker delta) {
+    public void renderGameOverlayEvent(GuiGraphicsExtractor context, DeltaTracker delta) {
 
         if ((!leftHolding.isActive() && !rightHolding.isActive() && !jumpHolding.isActive()) || !this.isActive || !config.getHudConfig().isEnabled()) {
             return;
@@ -127,21 +127,21 @@ public void renderGameOverlayEvent(GuiGraphics context, DeltaTracker delta) {
             Component text = Language.HUD_HOLDING.getText(I18n.get(leftHolding.getKey().getName()));
             int y = getHudY() + (15 * 0);
             int x = getHudX(text);
-            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
+            context.text(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
         }
 
         if (rightHolding.isActive()) {
             Component text = Language.HUD_HOLDING.getText(I18n.get(rightHolding.getKey().getName()));
             int y = getHudY() + (15 * 1);
             int x = getHudX(text);
-            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
+            context.text(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
         }
 
         if (jumpHolding.isActive()) {
             Component text = Language.HUD_HOLDING.getText(I18n.get(jumpHolding.getKey().getName()));
             int y = getHudY() + (15 * 2);
             int x = getHudX(text);
-            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
+            context.text(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
         }
     }
 
@@ -276,11 +276,10 @@ private void keyInputEvent(Minecraft mc) {
         assert mc.player != null;
         while (toggleHolding.consumeClick()) {
             this.isActive = !this.isActive;
-            mc.player.displayClientMessage(
+            mc.player.sendOverlayMessage(
                     (this.isActive ? Language.MSG_HOLDING_KEYS : Language.MSG_RELEASED_KEYS)
                     .getText()
-                            .withStyle(this.isActive ? ChatFormatting.GREEN : ChatFormatting.RED),
-                    true
+                            .withStyle(this.isActive ? ChatFormatting.GREEN : ChatFormatting.RED)
                     );
 
             if (!this.isActive) {

common/src/main/java/pro/mikey/autoclicker/OptionsScreen.java

@@ -1,7 +1,7 @@
 package pro.mikey.autoclicker;
 
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
@@ -237,22 +237,22 @@ private String getNextLocation(String currentLocation){
         return "top-left";
     }
 
-    private void renderHelpingTip(GuiGraphics context, Component text, int mouseX, int mouseY) {
-        context.renderTooltip(
+    private void renderHelpingTip(GuiGraphicsExtractor context, Component text, int mouseX, int mouseY) {
+        context.tooltip(
             this.font, this.font.split(FormattedText.of(text.getString()), 250).stream().map(ClientTooltipComponent::create).toList(), mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        super.render(context, mouseX, mouseY, delta);
+    public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
+        super.extractRenderState(context, mouseX, mouseY, delta);
 
-        context.drawString(
+        context.text(
             this.font,Language.GUI_ATTACK.getText().getVisualOrderText(), this.width / 2 - 200, this.height / 2 - 116, 0xFFFFFFFF);
 
-        context.drawString(
+        context.text(
             this.font, Language.GUI_USE.getText().getVisualOrderText(), this.width / 2 - 65, this.height / 2 - 116, 0xFFFFFFFF);
 
-        context.drawString(
+        context.text(
             this.font, Language.GUI_JUMP.getText().getVisualOrderText(), this.width / 2 + 70, this.height / 2 - 116, 0xFFFFFFFF);
 
         for (Button button : buttonTooltips.keySet()) {