Update to 1.21.11 (#54)

- Downgrade java requirement to 21
- Update Loom and Gradle

Author: ScribbleTAS

.github/workflows/release.yml

@@ -10,13 +10,13 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: '23'
+          java-version: '25'
           distribution: 'temurin'
           architecture: x64
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 8.14
+          gradle-version: 9.2.1
       - name: Setup workspace
         run: gradle preprocessBase
       - name: Build
@@ -38,7 +38,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        version: ["1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.8", "1.21.10"]
+        version: ["1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11"]
     steps:
       - uses: actions/download-artifact@v4
         with:

1.21.11/build.gradle

@@ -0,0 +1,5 @@
+plugins {
+	id 'fabric-loom' version "${loom_version}"
+}
+
+apply from: "../common.gradle"

1.21.11/gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.jvmargs=-Xmx3G
+
+minecraft_version=1.21.11
+allowed_mc_version=>1.21.10 <=1.21.11
+fabric_version=0.139.5+1.21.11

CONTRIBUTING.md

@@ -32,7 +32,7 @@ You only need to open the build.gradle file in LoTAS-Light (not in sub projects
 1. Set your workspace folder to the parent folder of the LoTAS-Light folder, so if you have something like `workspace/LoTAS-Light`, set the workspace folder to "workspace".
 2. Click `File>Import` then search for "Existing Gradle project" and click next
 3. Select the "LoTAS-Light" folder as a project root directory then click next
-4. (optional) In this step you can set up a specific JDK and gradle version if you haven't set that up yet, but currently this project needs JDK 23 and a Gradle version greater than 8.12.1. 
+4. (optional) In this step you can set up a specific JDK and gradle version if you haven't set that up yet, but currently this project needs at least JDK 21 and a Gradle version greater than 9.2.1. 
 5. Then click finish and wait for it to set up
 
 ### 5. Decompile source and download assets

build.gradle

@@ -4,6 +4,7 @@ plugins {
 
 discombobulator {
 	versions = [
+		"1.21.11":"",
 		"1.21.10":"",
 		"1.21.8":"",
 		"1.21.5":"",

common.gradle

@@ -4,7 +4,9 @@ java {
 }
 
 def snapshot = project.release=="true" ? "" : "-SNAPSHOT"
-version = project.mod_version + snapshot
+def mod_version = project.mod_version + snapshot
+def allowed_mc_version = project.allowed_mc_version
+version = mod_version
 group = project.maven_group
 
 base { 
@@ -51,13 +53,13 @@ loom {
 }
 
 processResources {
-	inputs.property "version", project.version
-	inputs.property "allowedMcVersion", project.allowed_mc_version
+	inputs.property "version", mod_version
+	inputs.property "allowedMcVersion", allowed_mc_version
 
 	filesMatching("fabric.mod.json") { file -> 
-		expand "version": project.version
+		expand "version": mod_version
         filter { String line ->
-            line.replace('"minecraft": "*",', '"minecraft": "' + project.allowed_mc_version + '",')
+            line.replace('"minecraft": "*",', '"minecraft": "' + allowed_mc_version + '",')
         };
 	}
 }

gradle.properties

@@ -1,14 +1,15 @@
 org.gradle.jvmargs=-Xmx3G
+org.gradle.configuration-cache=true
 
 # fabric
-loader_version=0.17.2
-loom_version=1.11-SNAPSHOT
+loader_version=0.18.2
+loom_version=1.14-SNAPSHOT
 
 # preprocessor
-discombobulator_version=1.3.1
+discombobulator_version=1.4
 
 # mod
 mod_name=LoTAS-Light
-mod_version=1.3.3
+mod_version=1.3.4
 maven_group=com.minecrafttas
 release=false

src/main/java/com/minecrafttas/lotas_light/LoTASLightClient.java

@@ -36,7 +36,11 @@
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.chat.Component;
+//# 1.21.11
+//$$import net.minecraft.resources.Identifier;
+//# def
 import net.minecraft.resources.ResourceLocation;
+//# end
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerTickRateManager;
 import net.minecraft.server.level.ServerLevel;
@@ -58,6 +62,8 @@
 public class LoTASLightClient implements ClientModInitializer {
 
 	private KeybindManager keybindManager = new KeybindManager(KeybindManager::isKeyDownExceptTextField);
+	// # 1.21.11
+//$$	private static final KeyMapping.Category LOTASLIGHT_CATEGORY = KeyMapping.Category.register(Identifier.fromNamespaceAndPath("lotaslight", "lotaslight"));
 	// # 1.21.10
 //$$	private static final KeyMapping.Category LOTASLIGHT_CATEGORY = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath("lotaslight", "lotaslight"));
 	//# end
@@ -203,6 +209,11 @@ private void advanceTickrate(Minecraft client) {
 	}
 
 	private void drawHud(GuiGraphics context, float deltaTicks) { //@GraphicsDelta;
+		//# 1.21.11
+//$$		int i = ARGB.colorFromFloat(.2F, 1f, 1f, 1f);
+//$$		context.blit(RenderPipelines.GUI_TEXTURED, Identifier.fromNamespaceAndPath("lotaslight", "potion.png"), Minecraft.getInstance().getWindow().getGuiScaledWidth() / 2
+//$$				- 10, Minecraft.getInstance().getWindow().getGuiScaledHeight()
+//$$						- 50, 0, 0, 20, 20, 20, 20, i);
 		//# 1.21.8
 //$$		int i = ARGB.colorFromFloat(.2F, 1f, 1f, 1f);
 //$$		context.blit(RenderPipelines.GUI_TEXTURED, ResourceLocation.fromNamespaceAndPath("lotaslight", "potion.png"), Minecraft.getInstance().getWindow().getGuiScaledWidth() / 2
@@ -245,7 +256,13 @@ private void advanceTickrate(Minecraft client) {
 	}
 
 	private void renderIcon(IndicatorLocation location, float uvCoordinate, GuiGraphics context) {
-		ResourceLocation streamIcons = new ResourceLocation("lotaslight", "stream_indicator.png"); //@ResourceLocation;
+		//# 1.21.11
+//$$		Identifier streamIcons = Identifier.fromNamespaceAndPath("lotaslight", "stream_indicator.png");
+		//# 1.21.1
+//$$		ResourceLocation streamIcons = ResourceLocation.fromNamespaceAndPath("lotaslight", "stream_indicator.png");
+		//# def
+		ResourceLocation streamIcons = new ResourceLocation("lotaslight", "stream_indicator.png");
+		//# end
 
 		int x = 0;
 		int y = 0;

src/main/java/com/minecrafttas/lotas_light/keybind/KeybindManager.java

@@ -11,7 +11,11 @@
 import com.mojang.blaze3d.platform.InputConstants.Type;
 
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+//# 1.21.11
+//$$import net.minecraft.util.Util;
+//# def
 import net.minecraft.Util;
+//# end
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.ChatScreen;

src/main/java/com/minecrafttas/lotas_light/mixin/MixinMinecraftServer.java

@@ -14,7 +14,11 @@
 import com.minecrafttas.lotas_light.LoTASLightClient;
 import com.minecrafttas.lotas_light.duck.Tickratechanger;
 
+//# 1.21.11
+//$$import net.minecraft.util.Util;
+//# def
 import net.minecraft.Util;
+//# end
 import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
@@ -43,13 +47,21 @@ public long modifyVariable_preventOverload(long original) {
 		else
 			return original;
 	}
-
+	
+	//# 1.21.11
+//$$	@Redirect(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getNanos()J"))
+	//# def
 	@Redirect(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J"))
+	//# end
 	public long redirectGetMeasuringTimeMsInRun() {
 		return getCurrentTime();
 	}
 
+	//# 1.21.11
+//$$	@Redirect(method = "haveTime", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getNanos()J"))
+	//# def
 	@Redirect(method = "haveTime", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J"))
+	//# end
 	public long redirectGetMeasuringTimeMsInShouldKeepTicking() {
 		return getCurrentTime();
 	}