1.21.6

Author: MrKinau

.github/workflows/build.yml

@@ -8,33 +8,23 @@ on: [pull_request, push]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          21,    # Current Java LTS & minimum supported by Minecraft
-        ]
-        # and run on both Linux and Windows
-        os: [ubuntu-22.04, windows-2022]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: gradle/actions/wrapper-validation@v4
+      - name: setup jdk
+        uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: '21'
           distribution: 'microsoft'
       - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.2
-loader_version=0.16.7
+minecraft_version=1.21.6-pre4
+loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.1.0+1.21.2
+mod_version=1.1.0+1.21.6
 maven_group=dev.kinau
 archives_base_name=better-pie-chart

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/kinau/betterpiechart/mixin/ProfilerPieChartMixin.java

@@ -16,30 +16,42 @@ public abstract class ProfilerPieChartMixin {
 
     @Shadow private String profilerTreePath;
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;III)I"))
-    private int renderPieChartText(GuiGraphics instance, Font font, String string, int i, int j, int k) {
-        if (!string.startsWith("["))
-            return instance.drawString(font, string, i, j, k);
-        if (string.startsWith("[0] root.") || string.equals("[?] unspecified"))
-            return instance.drawString(font, string, i, j, k);
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;III)V"))
+    private void renderPieChartText(GuiGraphics instance, Font font, String string, int i, int j, int k) {
+        if (!string.startsWith("[")) {
+            instance.drawString(font, string, i, j, k);
+            return;
+        }
+        if (string.startsWith("[0] root.") || string.equals("[?] unspecified")) {
+            instance.drawString(font, string, i, j, k);
+            return;
+        }
         int lastControlCharacter = profilerTreePath.lastIndexOf(30);
         String last = profilerTreePath.substring(Math.max(lastControlCharacter + 1, 0));
         String previousPath = profilerTreePath.substring(0, Math.max(lastControlCharacter, 0));
         int previousControlCharacter = previousPath.lastIndexOf(30);
         String previous = previousPath.substring(Math.max(previousControlCharacter + 1, 0));
         if (last.equals("entities")) {
             int firstBracketClose = string.indexOf(']');
-            if (firstBracketClose < 0) return instance.drawString(font, string, i, j, k);
+            if (firstBracketClose < 0) {
+                instance.drawString(font, string, i, j, k);
+                return;
+            }
             String entityType = string.substring(firstBracketClose + 2);
             if (Minecraft.getInstance().levelRenderer instanceof LevelRendererExpander levelRendererExpander) {
-                return instance.drawString(font, string + " (" + levelRendererExpander.betterPieChart$getLastVisibleEntityCounts().getOrDefault(entityType, 0L) + ")", i, j, k);
+                instance.drawString(font, string + " (" + levelRendererExpander.betterPieChart$getLastVisibleEntityCounts().getOrDefault(entityType, 0L) + ")", i, j, k);
+                return;
             }
         } else if (last.equals("blockentities") || previous.equals("blockentities")) {
             int firstBracketClose = string.indexOf(']');
-            if (firstBracketClose < 0) return instance.drawString(font, string, i, j, k);
+            if (firstBracketClose < 0) {
+                instance.drawString(font, string, i, j, k);
+                return;
+            }
             String blockEntityOrTag = string.substring(firstBracketClose + 2);
-            return instance.drawString(font, string + " (" + BlockEntityTracker.getInstance().counts().getOrDefault(blockEntityOrTag, 0L) + ")", i, j, k);
+            instance.drawString(font, string + " (" + BlockEntityTracker.getInstance().counts().getOrDefault(blockEntityOrTag, 0L) + ")", i, j, k);
+            return;
         }
-        return instance.drawString(font, string, i, j, k);
+        instance.drawString(font, string, i, j, k);
     }
 }