Update to 1.21.2

shurik204 · Oct 22, 2024 · e5d2ffc · e5d2ffc
1 parent 3247d65
commit e5d2ffc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT" // Fabric Loom
+    id("fabric-loom") version "1.8-SNAPSHOT" // Fabric Loom
     id("io.github.p03w.machete") version "1.1.4" // Build jar compression
     id("me.modmuss50.mod-publish-plugin") version "0.4.5" // Mod publishing
 
@@ -55,12 +55,13 @@ dependencies {
     mappings(loom.layered {
         officialMojangMappings()
 
-        if (parchmentVersion.contains(":"))
-            // Use exact version
-            parchment("org.parchmentmc.data:parchment-${parchmentVersion}@zip")
-        else
-            // Use minecraft version + given date
-            parchment("org.parchmentmc.data:parchment-${minecraftVersion}:${parchmentVersion}@zip")
+        if (hasProperty("parchmentVersion"))
+            if (parchmentVersion.contains(":"))
+                // Use exact version
+                parchment("org.parchmentmc.data:parchment-${parchmentVersion}@zip")
+            else
+                // Use minecraft version + given date
+                parchment("org.parchmentmc.data:parchment-${minecraftVersion}:${parchmentVersion}@zip")
     })
     modImplementation("net.fabricmc:fabric-loader:${loaderVersion}")
 
@@ -78,6 +79,7 @@ dependencies {
     // YAML support
     include(implementation("org.snakeyaml:snakeyaml-engine:${property("deps.snakeyaml")}")) {}
 
+    compileOnly("com.google.code.findbugs:jsr305:3.0.2")
     compileOnly("org.eclipse.jdt:org.eclipse.jdt.annotation:${property("deps.jdtAnnotation")}")
 }
 
@@ -163,12 +165,9 @@ tasks {
     }
 
     // Fix machete compression
-    getAllTasks(true).forEach {
-        for (task in it.value) {
-            // All publishing tasks depend on the remapJar task. But also metadata generation.
-            if (task.name.startsWith("publish") || task.name == "generateMetadataFileForJarPublication") {
-                task.dependsOn("optimizeOutputsOfRemapJar")
-            }
+    configureEach {
+        if (name.startsWith("publish") || name == "generateMetadataFileForJarPublication") {
+            dependsOn("optimizeOutputsOfRemapJar")
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G
 
 # Main properties
 mod.java=21
-mod.minecraft=1.21
-mod.loader=0.15.11
-mod.parchment=1.20.6:2024.05.01
+mod.minecraft=1.21.2
+mod.loader=0.16.7
+mod.parchment=1.21:2024.07.28
 
 # Mod properties
 mod.group=me.shurik
@@ -15,7 +15,7 @@ mod.description=Improved syntax highlighting for Minecraft commands with theme s
 
 
 # Dependencies
-deps.fabricApi=0.100.3+1.21
+deps.fabricApi=0.106.1+1.21.2
 # TM4E
 deps.tm4e=0.12.1-SNAPSHOT
 deps.joni=2.2.1

diff --git 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-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/me/shurik/betterhighlighting/resource/TextMateResourceLoaderImpl.java b/src/main/java/me/shurik/betterhighlighting/resource/TextMateResourceLoaderImpl.java
@@ -48,7 +48,7 @@ public ResourceLocation getFabricId() {
     }
 
     @Override
-    public CompletableFuture<Void> reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, ProfilerFiller preparationsProfiler, ProfilerFiller reloadProfiler, Executor backgroundExecutor, Executor gameExecutor) {
+    public CompletableFuture<Void> reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, Executor backgroundExecutor, Executor gameExecutor) {
         // How to handle different file types?
         // 0. Only support one format
         // 1. Priority: .tmlanguage > .tmlanguage.json > .tmlanguage.yaml > .tmlanguage.yml

diff --git a/src/main/java/me/shurik/betterhighlighting/util/DebugRender.java b/src/main/java/me/shurik/betterhighlighting/util/DebugRender.java
@@ -54,7 +54,7 @@ public static boolean renderScopes(GuiGraphics guiGraphics, int mouseX, int mous
                     List<Component> tooltipLines = Lists.newArrayList(Component.literal(padded.substring(token.getStartIndex(), token.getEndIndex()).replace(' ', '·')));
                     tooltipLines.add(Component.literal("------------"));
                     tooltipLines.add(Component.literal("Scopes:").withStyle(ChatFormatting.AQUA));
-                    for (String scope : token.getScopes()) {
+                    for (String scope : token.getScopes().reversed()) {
                         tooltipLines.add(Component.literal(scope));
                     }
                     StyleAttributes style = Styler.getTextMateStyle(token);