Merge branch '26.2'

# Conflicts:
#	src/main/java/dev/dfonline/codeclient/dev/NoClip.java
#	src/main/java/dev/dfonline/codeclient/hypercube/actiondump/Action.java
#	src/main/java/dev/dfonline/codeclient/hypercube/actiondump/Icon.java

Author: GeorgeRNG

build.gradle

@@ -1,11 +1,21 @@
 plugins {
-    id 'fabric-loom' version '1.13-SNAPSHOT'
+    id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT'
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+/*
+    Disable DevAuth if you're using a mod
+    like AuthMe instead.
+ */
+boolean devAuth = true;
+
+base {
+    archivesName = project.archives_base_name
+}
+
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
@@ -23,24 +33,27 @@ repositories {
     maven {
         url 'https://maven.terraformersmc.com/'
     }
+    // DevAuth
+    maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
 }
 
 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}"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
     // YetAnotherConfigLib.
-    modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
+    implementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
     // ModMenu.
-    modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+    implementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 
     // Adventure for MiniMessage parsing.
     implementation("net.kyori:adventure-api:${project.adventure_api_version}")
-    modImplementation include("net.kyori:adventure-platform-fabric:${project.adventure_fabric_version}")
+    implementation include("net.kyori:adventure-platform-fabric:${project.adventure_fabric_version}")
+
+    if (devAuth) runtimeOnly("me.djtheredstoner:DevAuth-fabric:1.2.2")
 
     // WebSocket for CodeClient API.
     implementation include("org.java-websocket:Java-WebSocket:1.5.3")
@@ -55,7 +68,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 21
+def targetJavaVersion = 25
 tasks.withType(JavaCompile).configureEach {
     // 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
@@ -72,7 +85,6 @@ java {
     if (JavaVersion.current() < javaVersion) {
         toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
     }
-    archivesBaseName = project.archives_base_name
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
@@ -85,7 +97,7 @@ loom {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
+        rename { "${it}_${project.base.archivesName.get()}" }
     }
 }
 

gradle.properties

@@ -1,20 +1,21 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+org.gradle.configuration-cache=false
 
 # Fabric Properties
 ## Check these on https://fabricmc.net/develop/
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.3
-loader_version=0.18.4
+minecraft_version=26.2
+loader_version=0.19.3
 
 # Mod Properties
 mod_version=2.0.1
 maven_group=dev.dfonline
 archives_base_name=CodeClient
 
 # Dependencies
-fabric_version=0.140.2+1.21.11
-modmenu_version=17.0.0-beta.1
-yacl_version=3.8.1+1.21.11-fabric
-adventure_api_version=4.26.1
-adventure_fabric_version=6.8.0
+fabric_api_version=0.158.0+26.2
+modmenu_version=20.0.1
+yacl_version=3.9.6+26.2-fabric
+adventure_api_version=5.2.0
+adventure_fabric_version=7.1.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,21 +1,21 @@
 package dev.dfonline.codeclient;
 
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 
 public enum ChatType {
-    SUCCESS(Text.literal("»").formatted(Formatting.GREEN, Formatting.BOLD)),
-    FAIL(Text.literal("»").formatted(Formatting.RED, Formatting.BOLD)),
-    INFO(Text.literal("»").formatted(Formatting.AQUA, Formatting.BOLD));
+    SUCCESS(Component.literal("»").withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)),
+    FAIL(Component.literal("»").withStyle(ChatFormatting.RED, ChatFormatting.BOLD)),
+    INFO(Component.literal("»").withStyle(ChatFormatting.AQUA, ChatFormatting.BOLD));
 
-    private final MutableText prefix;
+    private final MutableComponent prefix;
 
-    ChatType(MutableText prefix) {
+    ChatType(MutableComponent prefix) {
         this.prefix = prefix;
     }
 
-    public MutableText getText() {
+    public MutableComponent getText() {
         return this.prefix;
     }
 }