Minecraft 1.21.2 backport

Signed-off-by: Lilly Rose Berner <lilly@lostluma.net>

Author: LostLuma

gradle.properties

@@ -13,9 +13,9 @@ maven_group = juliand665
 archives_name = dynamic-fps
 
 # File naming version
-minecraft_version = 1.21.5-alpha.25w09a
+minecraft_version = 1.21.2
 # Version for publishing
-minecraft_version_min = 25w09a
-minecraft_version_max = 25w09b
+minecraft_version_min = 1.21.2
+minecraft_version_max = 1.21.4
 
-enabled_platforms=fabric,quilt
+enabled_platforms=fabric,forge,neoforge,quilt

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-minecraft = "25w09b"
+minecraft = "1.21.3"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
-fabric_api = "0.118.2+1.21.5"
+fabric_api = "0.102.2+1.21.2"
 
 forge = "1.21.3-53.0.7"
 

platforms/common/src/main/java/dynamic_fps/impl/mixin/GameRendererMixin.java

@@ -28,7 +28,7 @@ public class GameRendererMixin {
 		)
 	)
 	private boolean skipRendering(boolean original) {
-		return original || !DynamicFPSMod.renderedCurrentFrame();
+		return original || !DynamicFPSMod.checkForRender();
 	}
 
 	/**

platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java

@@ -1,9 +1,6 @@
 package dynamic_fps.impl.mixin;
 
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.mojang.blaze3d.platform.Window;
-import com.mojang.blaze3d.systems.CommandEncoder;
-import com.mojang.blaze3d.textures.GpuTexture;
 import dynamic_fps.impl.DynamicFPSMod;
 import dynamic_fps.impl.feature.state.IdleHandler;
 import net.minecraft.client.Minecraft;
@@ -34,18 +31,4 @@ private void onInit(CallbackInfo callbackInfo) {
 	private void setScreen(CallbackInfo callbackInfo) {
 		IdleHandler.onActivity();
 	}
-
-	/**
-	 * Delay cleaning up the previously rendered frame until we are rendering another frame.
-	 */
-	@WrapWithCondition(
-		method = "runTick",
-		at = @At(
-			value = "INVOKE",
-			target = "Lcom/mojang/blaze3d/systems/CommandEncoder;clearColorAndDepthTextures(Lcom/mojang/blaze3d/textures/GpuTexture;ILcom/mojang/blaze3d/textures/GpuTexture;D)V"
-		)
-	)
-	private boolean runTick(CommandEncoder instance, GpuTexture gpuTexture, int i, GpuTexture gpuTexture2, double v) {
-		return DynamicFPSMod.checkForRender();
-	}
 }

platforms/fabric/src/main/resources/fabric.mod.json

@@ -72,7 +72,11 @@
     },
     "depends": {
         "fabricloader": ">=0.15.10",
-        "minecraft": ">=1.21.5-alpha.25.9.a",
+        "minecraft": [
+            "=1.21.2",
+            "=1.21.3",
+            "=1.21.4"
+        ],
         "mixinextras": ">=0.3.2",
         "fabric-resource-loader-v0": "*",
         "fabric-lifecycle-events-v1": "*"

platforms/quilt/src/main/resources/quilt.mod.json

@@ -83,7 +83,7 @@
             },
             {
                 "id": "minecraft",
-                "versions": ">=1.21.5-alpha.25.9.a"
+                "versions": { "all": [">=1.21.2", "<=1.21.4"] }
             },
             {
                 "id": "mixinextras",

settings.gradle.kts

@@ -17,7 +17,7 @@ includeBuild("build-logic")
 
 include(":platforms:common")
 include(":platforms:fabric")
-// include(":platforms:forge")
-// include(":platforms:neoforge")
+include(":platforms:forge")
+include(":platforms:neoforge")
 include(":platforms:quilt")
 include(":platforms:textile")