Update yarn mappings

gradle.properties

@@ -14,7 +14,7 @@ mod_version = 0.20.999-snap
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 24w33a
 minecraft_version = 24w33a
-mappings_version = 24w33a+build.12
+mappings_version = 24w33a+build.20
 
 fabric_loader_version = 0.15.11
 mod_menu_version = 11.0.1

src/main/java/fi/dy/masa/malilib/event/RenderEventHandler.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.jetbrains.annotations.ApiStatus;
 import org.joml.Matrix4f;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.Framebuffer;
@@ -51,9 +52,7 @@ public void registerWorldLastRenderer(IRenderer renderer)
         }
     }
 
-    /**
-     * NOT PUBLIC API - DO NOT CALL
-     */
+    @ApiStatus.Internal
     public void onRenderGameOverlayPost(DrawContext drawContext, MinecraftClient mc, float partialTicks)
     {
         mc.getProfiler().push("malilib_rendergameoverlaypost");
@@ -75,9 +74,7 @@ public void onRenderGameOverlayPost(DrawContext drawContext, MinecraftClient mc,
         mc.getProfiler().pop();
     }
 
-    /**
-     * NOT PUBLIC API - DO NOT CALL
-     */
+    @ApiStatus.Internal
     public void onRenderTooltipLast(DrawContext drawContext, ItemStack stack, int x, int y)
     {
         if (this.tooltipLastRenderers.isEmpty() == false)
@@ -89,11 +86,8 @@ public void onRenderTooltipLast(DrawContext drawContext, ItemStack stack, int x,
         }
     }
 
-    /**
-     * NOT PUBLIC API - DO NOT CALL
-     * --> Changed to Matrix4f for all Downstream Mods.
-     */
-    public void onRenderWorldLast(Matrix4f matrix4f, Matrix4f projMatrix, MinecraftClient mc)
+    @ApiStatus.Internal
+    public void onRenderWorldLast(Matrix4f posMatrix, Matrix4f projMatrix, MinecraftClient mc)
     {
         if (this.worldLastRenderers.isEmpty() == false)
         {
@@ -109,7 +103,7 @@ public void onRenderWorldLast(Matrix4f matrix4f, Matrix4f projMatrix, MinecraftC
             for (IRenderer renderer : this.worldLastRenderers)
             {
                 mc.getProfiler().push(renderer.getProfilerSectionSupplier());
-                renderer.onRenderWorldLast(matrix4f, projMatrix);
+                renderer.onRenderWorldLast(posMatrix, projMatrix);
                 mc.getProfiler().pop();
             }
 

src/main/java/fi/dy/masa/malilib/hotkeys/KeybindMulti.java

@@ -175,7 +175,7 @@ else if (pressedLast == false && this.heldTime == 0)
             if (this.keyCodes.contains(KeyCodes.KEY_F3))
             {
                 // Prevent the debug GUI from opening after the F3 key is released
-                ((IF3KeyStateSetter) MinecraftClient.getInstance().keyboard).setF3KeyState(true);
+                ((IF3KeyStateSetter) MinecraftClient.getInstance().keyboard).malilib$setF3KeyState(true);
             }
 
             KeyAction activateOn = this.settings.getActivateOn();

src/main/java/fi/dy/masa/malilib/mixin/MixinKeyboard.java

@@ -12,11 +12,10 @@
 @Mixin(Keyboard.class)
 public abstract class MixinKeyboard implements IF3KeyStateSetter
 {
-    @Shadow
-    private boolean switchF3State;
+    @Shadow private boolean switchF3State;
 
     @Override
-    public void setF3KeyState(boolean value)
+    public void malilib$setF3KeyState(boolean value)
     {
         this.switchF3State = value;
     }

src/main/java/fi/dy/masa/malilib/mixin/MixinMinecraftClient.java

@@ -23,11 +23,8 @@
 @Mixin(MinecraftClient.class)
 public abstract class MixinMinecraftClient
 {
-    @Shadow
-    public ClientWorld world;
-
-    @Unique
-    private ClientWorld worldBefore;
+    @Shadow public ClientWorld world;
+    @Unique private ClientWorld worldBefore;
 
     @Inject(method = "<init>(Lnet/minecraft/client/RunArgs;)V", at = @At("RETURN"))
     private void onInitComplete(RunArgs args, CallbackInfo ci)

src/main/java/fi/dy/masa/malilib/mixin/MixinMouse.java

@@ -1,27 +1,25 @@
 package fi.dy.masa.malilib.mixin;
 
-import net.minecraft.class_9928;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Mouse;
+import net.minecraft.client.input.Scroller;
+import net.minecraft.client.util.Window;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.Mouse;
-import net.minecraft.client.util.Window;
-
 import fi.dy.masa.malilib.event.InputEventHandler;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(Mouse.class)
 public abstract class MixinMouse
 {
     @Shadow @Final private MinecraftClient client;
+    @Shadow @Final private Scroller scroller;
     //@Shadow private double eventDeltaHorizontalWheel;
     //@Shadow private double eventDeltaVerticalWheel;
-    @Shadow @Final private class_9928 field_52757;
 
     @Inject(method = "onCursorPos",
             at = @At(value = "FIELD", target = "Lnet/minecraft/client/Mouse;hasResolutionChanged:Z", ordinal = 0))
@@ -45,11 +43,9 @@ private void hookOnMouseScroll(long handle, double xOffset, double yOffset, Call
 
         if (((InputEventHandler) InputEventHandler.getInputManager()).onMouseScroll(mouseX, mouseY, xOffset, yOffset))
         {
+            this.scroller.update(0.0, 0.0);
             //this.eventDeltaHorizontalWheel = 0.0; --> e
             //this.eventDeltaVerticalWheel = 0.0; --> f
-            //this.field_52764 = 0.0;
-            //this.field_52765 = 0.0;
-            this.field_52757.method_61971(0.0, 0.0);
             ci.cancel();
         }
     }

src/main/java/fi/dy/masa/malilib/mixin/MixinWorldRenderer.java

@@ -1,16 +1,17 @@
 package fi.dy.masa.malilib.mixin;
 
-import net.minecraft.class_9922;
 import org.joml.Matrix4f;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.*;
+import net.minecraft.client.util.ObjectAllocator;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.*;
+
 import fi.dy.masa.malilib.event.RenderEventHandler;
 
 @Mixin(WorldRenderer.class)
@@ -20,23 +21,28 @@ public abstract class MixinWorldRenderer
 
     @Inject(method = "render",
             at = @At(value = "INVOKE",
-                     target = "Lnet/minecraft/class_9909;method_61911(Ljava/lang/String;)Lnet/minecraft/class_9916;"))
-    private void onRenderWorldLastNormal(class_9922 arg, RenderTickCounter renderTickCounter, boolean bl, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci)
+                    target = "Lnet/minecraft/client/render/WorldRenderer;renderWeather(Lnet/minecraft/client/render/FrameGraphBuilder;Lnet/minecraft/client/render/LightmapTextureManager;Lnet/minecraft/util/math/Vec3d;FLnet/minecraft/client/render/Fog;)V"))
+    private void onRenderWorldLastNormal(ObjectAllocator objectAllocator, RenderTickCounter tickCounter, boolean bl,
+                                         Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager,
+                                         Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci)
     {
-        ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderWorldLast(matrix4f, matrix4f2, this.client);
+        ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderWorldLast(positionMatrix, projectionMatrix, this.client);
     }
 
+    // Was used for switching between regular and 'Fabulous' graphics, but we no longer need a second hook.
     /*
     @Inject(method = "render",
             slice = @Slice(from = @At(value = "FIELD", ordinal = 1, // start from the endDrawing() call
-                                      target = "Lnet/minecraft/client/render/RenderPhase;WEATHER_TARGET:Lnet/minecraft/client/render/RenderPhase$Target;"),
-                            to = @At(value = "INVOKE", ordinal = 1, // end at the second renderWeather call
-                                     target = "Lnet/minecraft/client/render/WorldRenderer;renderWeather(Lnet/minecraft/client/render/LightmapTextureManager;FDDD)V")),
+                    target = "Lnet/minecraft/client/render/RenderPhase;WEATHER_TARGET:Lnet/minecraft/client/render/RenderPhase$Target;"),
+                    to = @At(value = "INVOKE", ordinal = 1, // end at the second renderWeather call
+                            target = "Lnet/minecraft/client/render/WorldRenderer;renderWeather(Lnet/minecraft/client/render/LightmapTextureManager;FDDD)V")),
             at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/client/gl/PostEffectProcessor;render(F)V"))
-    private void onRenderWorldLastFabulous(class_9922 arg, RenderTickCounter renderTickCounter, boolean bl, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci)
+    private void onRenderWorldLastFabulous(ObjectAllocator objectAllocator, RenderTickCounter tickCounter, boolean bl,
+                                           Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager,
+                                           Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci)
     {
-        ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderWorldLast(matrix4f, matrix4f2, this.client);
+        ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderWorldLast(positionMatrix, projectionMatrix, this.client);
     }
      */
 }

src/main/java/fi/dy/masa/malilib/render/RenderUtils.java

@@ -1,19 +1,19 @@
 package fi.dy.masa.malilib.render;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.joml.Matrix4f;
 import org.joml.Matrix4fStack;
+
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.ShulkerBoxBlock;
 import net.minecraft.block.entity.ShulkerBoxBlockEntity;
-import net.minecraft.class_10090;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
@@ -45,6 +45,7 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.random.LocalRandom;
+
 import fi.dy.masa.malilib.config.HudAlignment;
 import fi.dy.masa.malilib.gui.GuiBase;
 import fi.dy.masa.malilib.util.*;
@@ -1153,9 +1154,9 @@ public static void renderMapPreview(ItemStack stack, int x, int y, int dimension
                 //mc().gameRenderer.getMapRenderer().draw(matrixStack, consumer, mapId, mapState, false, 0xF000F0);
                 // TODO --> MapRenderState.MapDecorationRenderState() // class_10090.class_10091()
                 // TODO --> MapTextureManager.MapTexture() // class_10093.MapTexture()
-                class_10090 mapRenderState = new class_10090();
-                mc().method_61965().method_62230(mapId, mapState, mapRenderState);
-                mc().method_61965().draw(mapRenderState, matrixStack, consumer, false, 0xF000F0);
+                MapRenderState mapRenderState = new MapRenderState();
+                mc().getMapRenderer().update(mapId, mapState, mapRenderState);
+                mc().getMapRenderer().draw(mapRenderState, matrixStack, consumer, false, 0xF000F0);
                 consumer.draw();
                 matrixStack.pop();
             }

src/main/java/fi/dy/masa/malilib/util/IF3KeyStateSetter.java

@@ -2,5 +2,5 @@
 
 public interface IF3KeyStateSetter
 {
-    void setF3KeyState(boolean value);
+    void malilib$setF3KeyState(boolean value);
 }

src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
 
 	"depends": {
 		"minecraft": "1.21-alpha.24.33.a",
-		"fabric-networking-api-v1": ">=4.1.0",
+		"fabric-networking-api-v1": ">=4.2.2",
 		"fabric-resource-loader-v0": "*"
 	}
 }