Update to mc1.21.3

Author: NotRyken

common/build.gradle

@@ -3,7 +3,24 @@ plugins {
     id("net.neoforged.moddev")
 }
 
+// Vanilla depends on ASM 9.3, MDG makes that a 'strict' version constraint,
+// but Mixin and MixinExtras needs newer ASM so we override that here.
+configurations.configureEach {
+    resolutionStrategy.eachDependency { details ->
+        if (details.requested.group == "org.ow2.asm") {
+            details.useVersion(asm_version)
+            details.because("Mixin requires new ASM")
+        }
+    }
+}
+
 dependencies {
+    compileOnly "org.ow2.asm:asm:${asm_version}"
+    compileOnly "org.ow2.asm:asm-analysis:${asm_version}"
+    compileOnly "org.ow2.asm:asm-commons:${asm_version}"
+    compileOnly "org.ow2.asm:asm-tree:${asm_version}"
+    compileOnly "org.ow2.asm:asm-util:${asm_version}"
+    
     compileOnly("org.spongepowered:mixin:${mixin_version}")
     compileOnly("io.github.llamalad7:mixinextras-common:${mixinextras_version}")
     annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}")

common/src/main/java/dev/terminalmc/effecttimerplus/gui/screen/YaclScreenProvider.java

@@ -26,6 +26,8 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.util.ARGB;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 
@@ -363,11 +365,17 @@ public int render(GuiGraphics graphics, int x, int y, int width, float delta) {
 
             for (MobEffectInstance effect : DEMO_EFFECTS) {
                 if (effect.isAmbient()) {
-                    graphics.blitSprite(GuiAccessor.getEffectBackgroundAmbientSprite(), movingX, movingY, spriteSize, spriteSize);
+                    graphics.blitSprite(RenderType::guiTextured, 
+                            GuiAccessor.getEffectBackgroundAmbientSprite(), 
+                            movingX, movingY, spriteSize, spriteSize);
                 } else {
-                    graphics.blitSprite(GuiAccessor.getEffectBackgroundSprite(), movingX, movingY, spriteSize, spriteSize);
+                    graphics.blitSprite(RenderType::guiTextured, 
+                            GuiAccessor.getEffectBackgroundSprite(), 
+                            movingX, movingY, spriteSize, spriteSize);
                 }
-                graphics.blit(movingX + 3, movingY + 3, 0, iconSize, iconSize, mc.getMobEffectTextures().get(effect.getEffect()));
+                graphics.blitSprite(RenderType::guiTextured, 
+                        mc.getMobEffectTextures().get(effect.getEffect()), 
+                        movingX + 3, movingY + 3, iconSize, iconSize, ARGB.white(1.0F));
 
                 // Render potency overlay
                 if (potencyEnabled && effect.getAmplifier() > 0) {

common/src/main/java/dev/terminalmc/effecttimerplus/mixin/MixinGui.java

@@ -27,6 +27,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffectInstance;
 import org.jetbrains.annotations.Nullable;
@@ -36,6 +37,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
+import java.util.function.Function;
 
 import static dev.terminalmc.effecttimerplus.util.IndicatorUtil.*;
 
@@ -77,13 +79,14 @@ private void descale(GuiGraphics graphics, DeltaTracker delta, CallbackInfo ci)
             method = "renderEffects",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lnet/minecraft/resources/ResourceLocation;IIII)V"
+                    target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIII)V"
             )
     )
-    private void CreateOverlayRunnable(GuiGraphics graphics, ResourceLocation sprite, int x, int y,
-                                       int width, int height, Operation<Void> original,
-                                       @Local MobEffectInstance effectInstance) {
-        original.call(graphics, sprite, x, y, width, height);
+    private void CreateOverlayRunnable(
+            GuiGraphics graphics, Function<ResourceLocation, RenderType> function, 
+            ResourceLocation sprite, int x, int y, int width, int height, 
+            Operation<Void> original, @Local MobEffectInstance effectInstance) {
+        original.call(graphics, function, sprite, x, y, width, height);
 
         Config options = Config.get();
         effectTimerPlus$runnable = () -> {

gradle.properties

@@ -2,7 +2,7 @@
 # Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
 
 # Project
-mod_version=2.2.4+1.21
+mod_version=2.2.4+1.21.3
 mod_group=dev.terminalmc
 mod_id=effecttimerplus
 mod_name=EffectTimerPlus
@@ -24,35 +24,35 @@ java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21
-minecraft_versions_fabric=>1.20.6 <1.22
-minecraft_versions_neoforge=(1.20.6, 1.22)
+minecraft_version=1.21.3
+minecraft_versions_fabric=>1.21.1 <1.22
+minecraft_versions_neoforge=(1.21.1, 1.22)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
 parchment_minecraft_version=1.21
-parchment_version=2024.07.28
+parchment_version=2024.11.10
 
 # Fabric https://fabricmc.net/develop
 fabric_loader_version=0.16.5
 fabric_loader_versions=>=0.15.0
-fabric_api_version=0.102.0+1.21
+fabric_api_version=0.108.0+1.21.3
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 neoforge_loader_versions=[1,)
-neoforge_version=21.0.167
-neoforge_versions=[21.0.143, 22)
+neoforge_version=21.3.33-beta
+neoforge_versions=[21.2.0, 22)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21-20240613.152323
+neoform_version=1.21.3-20241023.131943
 
 # YACL https://modrinth.com/mod/1eAoo2KR/versions
-yacl_version=3.6.1+1.21
+yacl_version=3.6.1+1.21.2
 yacl_versions_fabric=>=3.6.1
 yacl_versions_neoforge=[3.6.1,)
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
-modmenu_version=11.0.2
-modmenu_versions_fabric=>10
+modmenu_version=12.0.0-beta.1
+modmenu_versions_fabric=>11
 
 # GitHub, Modrinth, CurseForge releases
 # Plural properties expect CSV lists
@@ -64,33 +64,35 @@ curseforge_id=1049882
 release_type=release
 # Fabric
 release_mod_loaders_fabric=fabric
-release_game_versions_fabric=1.21,1.21.1
+release_game_versions_fabric=1.21.2,1.21.3
 release_required_dep_ids_fabric_mr=P7dR8mSH,mOgUt4GM,1eAoo2KR
 release_required_dep_ids_fabric_cf=fabric-api,modmenu,yacl
 # NeoForge
 release_mod_loaders_neoforge=neoforge
-release_game_versions_neoforge=1.21,1.21.1
+release_game_versions_neoforge=1.21.2,1.21.3
 release_required_dep_ids_neoforge_mr=1eAoo2KR
 release_required_dep_ids_neoforge_cf=yacl
 
 # Mixin https://mvnrepository.com/artifact/org.spongepowered/mixin
 mixin_version=0.8.7
 # MixinExtras https://github.com/LlamaLad7/MixinExtras/releases
 mixinextras_version=0.4.1
+# ASM https://mvnrepository.com/artifact/org.ow2.asm/asm
+asm_version=9.7
 
 # Plugins
 # Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
-loom_version=1.7.4
+loom_version=1.8.12
 # ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
-moddev_version=1.0.19
+moddev_version=2.0.44-beta
 # Minotaur https://plugins.gradle.org/plugin/com.modrinth.minotaur
 minotaur_version=2.8.7
 # CurseForgeGradle https://plugins.gradle.org/plugin/net.darkhax.curseforgegradle
 curseforgegradle_version=1.1.25
 # github-release https://plugins.gradle.org/plugin/com.github.breadmoirai.github-release
 githubrelease_version=2.5.2
 # grgit-service https://github.com/ajoberstar/grgit/releases
-grgitservice_version=5.2.2
+grgitservice_version=5.3.0
 # licenser https://plugins.gradle.org/plugin/org.cadixdev.licenser
 licenser_version=0.6.1
 

gradle/wrapper/gradle-wrapper.properties

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