update most mods to 1.21.4

Author: GT3CH1

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.1.0'
     repositories {
         mavenCentral()
     }
@@ -39,7 +39,7 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modImplementation "net.fabricmc:fabric-language-kotlin:1.10.19+kotlin.$kotlin_version"
+    modImplementation "net.fabricmc:fabric-language-kotlin:1.13.0+kotlin.$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     // add gson as a dependency
     implementation "com.google.code.gson:gson:2.11.0"

gradle/wrapper/gradle-wrapper.properties

@@ -25,6 +25,6 @@
 #Sun May 05 13:40:32 MDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/peasenet/gavui/Gui.java

@@ -614,7 +614,7 @@ public void setDefaultPosition(BoxF newDefaultPosition) {
 
     //NOTE: I wrote this so that I don't have to deal with the API in drawContext and I can just use the textRenderer directly.
     protected void drawText(DrawContext drawContext, TextRenderer textRenderer, Text text, float x, float y, Color color, boolean shadow) {
-        textRenderer.draw(text, x, y, color.getAsInt(), shadow, drawContext.getMatrices().peek().getPositionMatrix(), drawContext.getVertexConsumers(), TextRenderer.TextLayerType.NORMAL, 0, 15728880);
+        drawContext.drawText(textRenderer, text.asOrderedText(), (int)x, (int)y, color.getAsInt(), shadow);
     }
 
     protected void drawText(DrawContext drawContext, TextRenderer textRenderer, String text, float x, float y, Color color) {

src/main/java/com/peasenet/gavui/util/GuiUtil.java

@@ -29,6 +29,7 @@
 import com.peasenet.gavui.color.Color;
 import com.peasenet.gavui.math.BoxF;
 import com.peasenet.gavui.math.PointF;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.render.*;
 import net.minecraft.client.util.math.MatrixStack;
 import org.joml.Matrix4f;
@@ -65,7 +66,8 @@ public static void drawBox(Color c, BoxF box, MatrixStack matrixStack, float alp
 //        GL11.glEnable(GL11.GL_BLEND);
 //        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 //        
-        RenderSystem.setShader(GameRenderer::getPositionProgram);
+//        RenderSystem.setShader(ShaderProgramKeys.POSITION);
+        RenderSystem.setShader(ShaderProgramKeys.POSITION);
         RenderSystem.enableBlend();
         var shaderColors = RenderSystem.getShaderColor();
         RenderSystem.setShaderColor(acColor[0], acColor[1], acColor[2], alpha);
@@ -75,7 +77,7 @@ public static void drawBox(Color c, BoxF box, MatrixStack matrixStack, float alp
         drawBox(box, matrix, bufferBuilder);
         var e = bufferBuilder.end();
         BufferRenderer.drawWithGlobalProgram(e);
-        RenderSystem.applyModelViewMatrix();
+//        RenderSystem.applyModelViewMatrix();
         RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
         RenderSystem.disableBlend();
     }
@@ -112,7 +114,7 @@ public static void drawOutline(BoxF boxF, MatrixStack matrixStack) {
     public static void drawOutline(Color c, BoxF box, MatrixStack matrixStack, float alpha) {
         alpha = Math.max(0, Math.min(1, alpha));
         var acColor = c.getAsFloatArray();
-        RenderSystem.setShader(GameRenderer::getPositionProgram);
+        RenderSystem.setShader(ShaderProgramKeys.POSITION);
         RenderSystem.enableBlend();
         RenderSystem.setShaderColor(acColor[0], acColor[1], acColor[2], alpha);
 
@@ -122,7 +124,7 @@ public static void drawOutline(Color c, BoxF box, MatrixStack matrixStack, float
         drawBox(box, matrix, bb);
         var e = bb.end();
         BufferRenderer.drawWithGlobalProgram(e);
-        RenderSystem.applyModelViewMatrix();
+//        RenderSystem.applyModelViewMatrix();
         RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
         RenderSystem.disableBlend();
     }
@@ -157,7 +159,7 @@ private static void drawBox(BoxF box, Matrix4f matrix, BufferBuilder bufferBuild
     public static void renderSingleLine(Color color, PointF p1, PointF p2, MatrixStack matrixStack, float alpha) {
         alpha = Math.max(0, Math.min(1, alpha));
         var accColor = color.getAsFloatArray();
-        RenderSystem.setShader(GameRenderer::getPositionProgram);
+        RenderSystem.setShader(ShaderProgramKeys.POSITION);
         RenderSystem.enableBlend();
         var matrix = matrixStack.peek().getPositionMatrix();
         var tessellator = RenderSystem.renderThreadTesselator();

src/main/java/com/peasenet/mixins/EntityRendererMixin.java

@@ -31,6 +31,7 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;
+import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Final;
@@ -41,15 +42,20 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(EntityRenderer.class)
-public abstract class EntityRendererMixin<T extends Entity> {
+public abstract class EntityRendererMixin<T extends Entity, S extends EntityRenderState> {
     //SEE: EntityRenderer#renderLabelIfPresent
 
+    @Shadow
+    @Final
+    private S state;
+
     @Inject(at = @At("HEAD"), method = "render", cancellable = true)
-    private void renderHealth(T entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (!Mods.getMod("hptags").isActive()) return;
-        var event = new EntityRenderNameEvent(entity, matrices, vertexConsumers, tickDelta, light);
-        EventManager.getEventManager().call(event);
-        ci.cancel();
+    private void renderHealth(S state, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
+        // TODO: Fix HealthTags
+//        if (!Mods.getMod("hptags").isActive()) return;
+//        var event = new EntityRenderNameEvent(state.displayName, matrices, vertexConsumers, 0f, light);
+//        EventManager.getEventManager().call(event);
+//        ci.cancel();
     }
 
 

src/main/java/com/peasenet/mixins/MixinBlock.java

@@ -26,12 +26,10 @@
 
 import com.peasenet.util.event.EventManager;
 import com.peasenet.util.event.ShouldDrawSideEvent;
-import com.peasenet.util.event.data.DrawSide;
+import com.peasenet.util.event.data.DrawState;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.BlockView;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -44,8 +42,8 @@
 @Mixin(Block.class)
 public class MixinBlock {
     @Inject(at = @At("RETURN"), method = "shouldDrawSide", cancellable = true)
-    private static void xray(BlockState state, BlockView world, BlockPos pos, Direction side, BlockPos otherPos, CallbackInfoReturnable<Boolean> cir) {
-        var drawSide = new DrawSide(pos, state);
+    private static void xray(BlockState state, BlockState otherState, Direction side, CallbackInfoReturnable<Boolean> cir) {
+        var drawSide = new DrawState(state);
         var evt = new ShouldDrawSideEvent(drawSide);
         EventManager.getEventManager().call(evt);
         if (drawSide.shouldDraw() != null) {

src/main/java/com/peasenet/mixins/MixinClientPlayerEntity.java

@@ -25,6 +25,8 @@
 package com.peasenet.mixins;
 
 import com.mojang.authlib.GameProfile;
+import com.peasenet.main.GavinsMod;
+import com.peasenet.main.GavinsModClient;
 import com.peasenet.mixinterface.IClientPlayerEntity;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
@@ -134,7 +136,8 @@ public float getAttackCoolDownProgress(float f) {
 
     @Override
     public boolean tryAttack(Entity target) {
-        return super.tryAttack(target);
+//TODO:        return super.tryAttack(getserverWorld(), target);
+        return false;
     }
 
     @Shadow
@@ -173,7 +176,8 @@ public ItemStack getMainHandStack() {
 
     @Override
     public boolean isFallFlying() {
-        return super.isFallFlying();
+        // TODO: super.isFallFlying();
+        return false;
     }
 
     @Override

src/main/java/com/peasenet/mixins/MixinGameRenderer.java

@@ -54,7 +54,7 @@ public void checkAntiHurt(MatrixStack stack, float f, CallbackInfo ci) {
             ordinal = 0),
             method = "renderWorld")
     public void handleRender(RenderTickCounter tickCounter,
-                             CallbackInfo ci, @Local(ordinal = 1) Matrix4f matrix4f2,
+                             CallbackInfo ci, @Local(ordinal = 2) Matrix4f matrix4f2,
                              @Local(ordinal = 1) float tickDelta) {
         var matrixStack = new MatrixStack();
         matrixStack.multiplyPositionMatrix(matrix4f2);

src/main/java/com/peasenet/mixins/MixinSodiumblockOcclusionCache.java

@@ -26,7 +26,7 @@
 
 import com.peasenet.util.event.EventManager;
 import com.peasenet.util.event.ShouldDrawSideEvent;
-import com.peasenet.util.event.data.DrawSide;
+import com.peasenet.util.event.data.DrawState;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -48,7 +48,7 @@
 public class MixinSodiumblockOcclusionCache {
     @Inject(at = @At("HEAD"), method = "shouldDrawSide", cancellable = true)
     private void xray(BlockState state, BlockView world, BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
-        var drawSide = new DrawSide(pos, state);
+        var drawSide = new DrawState(state);
         var evt = new ShouldDrawSideEvent(drawSide);
         EventManager.getEventManager().call(evt);
         if (drawSide.shouldDraw() != null) {

src/main/kotlin/com/peasenet/config/BlockListConfig.kt

@@ -134,7 +134,8 @@ open class BlockListConfig<E : Config<*>>(blockFilter: (it: Block) -> Boolean =
          * @return The name of the block.
          */
         fun getId(b: Block): String {
-            val path = b.lootTableKey.value.path
+
+            val path = b.translationKey
             return if (path == "empty") b.translationKey.replace("block.minecraft.", "") else path.replace(
                 "blocks/",
                 ""