Some fixes

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 # Fabric (https://fabricmc.net/develop)
 minecraft_version=1.21.2
 yarn_mappings=1.21.2+build.1
-loader_version=0.15.11
+loader_version=0.16.9
 fapi_version=0.106.1+1.21.2
 
 # Mod Properties

src/main/java/meteordevelopment/meteorclient/asm/transformers/GameRendererTransformer.java

@@ -17,7 +17,7 @@ public class GameRendererTransformer extends AsmTransformer {
     public GameRendererTransformer() {
         super(mapClassName("net/minecraft/class_757"));
 
-        getFovMethod = new MethodInfo("net/minecraft/class_4184", null, new Descriptor("Lnet/minecraft/class_4184;", "F", "Z", "D"), true);
+        getFovMethod = new MethodInfo("net/minecraft/class_4184", null, new Descriptor("Lnet/minecraft/class_4184;", "F", "Z", "F"), true);
     }
 
     @Override
@@ -30,7 +30,7 @@ public void transform(ClassNode klass) {
 
         //noinspection DataFlowIssue
         for (AbstractInsnNode insn : method.instructions) {
-            if (insn instanceof LdcInsnNode in && in.cst instanceof Double && (double) in.cst == 90) {
+            if (insn instanceof LdcInsnNode in && in.cst instanceof Float && (float) in.cst == 90) {
                 InsnList insns = new InsnList();
                 generateEventCall(insns, new LdcInsnNode(in.cst));
 
@@ -39,14 +39,14 @@ public void transform(ClassNode klass) {
                 injectionCount++;
             }
             else if (
-                (insn instanceof MethodInsnNode in1 && in1.name.equals("intValue") && insn.getNext() instanceof InsnNode _in && _in.getOpcode() == Opcodes.I2D)
+                (insn instanceof MethodInsnNode in1 && in1.name.equals("intValue") && insn.getNext() instanceof InsnNode _in && _in.getOpcode() == Opcodes.I2F)
                 ||
                 (insn instanceof MethodInsnNode in2 && in2.owner.equals(klass.name) && in2.name.startsWith("redirect") && in2.name.endsWith("getFov")) // Wi Zoom compatibility
             ) {
                 InsnList insns = new InsnList();
 
-                insns.add(new VarInsnNode(Opcodes.DSTORE, method.maxLocals));
-                generateEventCall(insns, new VarInsnNode(Opcodes.DLOAD, method.maxLocals));
+                insns.add(new VarInsnNode(Opcodes.FSTORE, method.maxLocals));
+                generateEventCall(insns, new VarInsnNode(Opcodes.FLOAD, method.maxLocals));
 
                 method.instructions.insert(insn.getNext(), insns);
                 injectionCount++;
@@ -59,9 +59,9 @@ else if (
     private void generateEventCall(InsnList insns, AbstractInsnNode loadPreviousFov) {
         insns.add(new FieldInsnNode(Opcodes.GETSTATIC, "meteordevelopment/meteorclient/MeteorClient", "EVENT_BUS", "Lmeteordevelopment/orbit/IEventBus;"));
         insns.add(loadPreviousFov);
-        insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "meteordevelopment/meteorclient/events/render/GetFovEvent", "get", "(D)Lmeteordevelopment/meteorclient/events/render/GetFovEvent;"));
+        insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "meteordevelopment/meteorclient/events/render/GetFovEvent", "get", "(F)Lmeteordevelopment/meteorclient/events/render/GetFovEvent;"));
         insns.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "meteordevelopment/orbit/IEventBus", "post", "(Ljava/lang/Object;)Ljava/lang/Object;"));
         insns.add(new TypeInsnNode(Opcodes.CHECKCAST, "meteordevelopment/meteorclient/events/render/GetFovEvent"));
-        insns.add(new FieldInsnNode(Opcodes.GETFIELD, "meteordevelopment/meteorclient/events/render/GetFovEvent", "fov", "D"));
+        insns.add(new FieldInsnNode(Opcodes.GETFIELD, "meteordevelopment/meteorclient/events/render/GetFovEvent", "fov", "F"));
     }
 }

src/main/java/meteordevelopment/meteorclient/events/render/GetFovEvent.java

@@ -8,9 +8,9 @@
 public class GetFovEvent {
     private static final GetFovEvent INSTANCE = new GetFovEvent();
 
-    public double fov;
+    public float fov;
 
-    public static GetFovEvent get(double fov) {
+    public static GetFovEvent get(float fov) {
         INSTANCE.fov = fov;
         return INSTANCE;
     }

src/main/java/meteordevelopment/meteorclient/mixin/AbstractBlockStateMixin.java

@@ -10,7 +10,6 @@
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-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;
@@ -19,9 +18,9 @@
 @Mixin(AbstractBlock.AbstractBlockState.class)
 public abstract class AbstractBlockStateMixin {
     @Inject(method = "getModelOffset", at = @At("HEAD"), cancellable = true)
-    private void modifyPos(BlockView world, BlockPos pos, CallbackInfoReturnable<Vec3d> cir) {
+    private void modifyPos(BlockPos pos, CallbackInfoReturnable<Vec3d> info) {
         if (Modules.get() == null) return;
 
-        if (Modules.get().get(NoRender.class).noTextureRotations()) cir.setReturnValue(Vec3d.ZERO);
+        if (Modules.get().get(NoRender.class).noTextureRotations()) info.setReturnValue(Vec3d.ZERO);
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/BlockCollisionSpliteratorMixin.java

@@ -16,27 +16,26 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockCollisionSpliterator;
-import net.minecraft.world.BlockView;
+import net.minecraft.world.CollisionView;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(BlockCollisionSpliterator.class)
 public abstract class BlockCollisionSpliteratorMixin {
-
     @WrapOperation(method = "computeNext",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/block/BlockState;getCollisionShape(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/ShapeContext;)Lnet/minecraft/util/shape/VoxelShape;"
+            target = "Lnet/minecraft/block/ShapeContext;getCollisionShape(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;"
         )
     )
-    private VoxelShape onComputeNextCollisionBox(BlockState state, BlockView world, BlockPos pos, ShapeContext context, Operation<VoxelShape> original) {
-        VoxelShape shape = original.call(state, world, pos, context);
+    private VoxelShape onComputeNextCollisionBox(ShapeContext instance, BlockState blockState, CollisionView collisionView, BlockPos blockPos, Operation<VoxelShape> original) {
+        VoxelShape shape = original.call(instance, blockState, collisionView, blockPos);
 
-        if (world != MinecraftClient.getInstance().world) {
+        if (collisionView != MinecraftClient.getInstance().world) {
             return shape;
         }
 
-        CollisionShapeEvent event = MeteorClient.EVENT_BUS.post(CollisionShapeEvent.get(state, pos, shape));
+        CollisionShapeEvent event = MeteorClient.EVENT_BUS.post(CollisionShapeEvent.get(blockState, blockPos, shape));
         return event.isCancelled() ? VoxelShapes.empty() : event.shape;
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/DrawContextMixin.java

@@ -6,12 +6,15 @@
 package meteordevelopment.meteorclient.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReceiver;
+import com.llamalad7.mixinextras.sugar.Local;
 import meteordevelopment.meteorclient.utils.tooltip.MeteorTooltipData;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.item.tooltip.TooltipData;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -24,13 +27,13 @@
 
 @Mixin(value = DrawContext.class)
 public abstract class DrawContextMixin {
-    @Inject(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;II)V", at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V", shift = At.Shift.BEFORE), locals = LocalCapture.CAPTURE_FAILHARD)
-    private void onDrawTooltip(TextRenderer textRenderer, List<Text> text, Optional<TooltipData> data, int x, int y, CallbackInfo ci, List<TooltipComponent> list) {
+    @Inject(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V", at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V", shift = At.Shift.BEFORE))
+    private void onDrawTooltip(TextRenderer textRenderer, List<Text> text, Optional<TooltipData> data, int x, int y, @Nullable Identifier texture, CallbackInfo info, @Local(ordinal = 1) List<TooltipComponent> list) {
         if (data.isPresent() && data.get() instanceof MeteorTooltipData meteorTooltipData)
             list.add(meteorTooltipData.getComponent());
     }
 
-    @ModifyReceiver(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;II)V", at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V"))
+    @ModifyReceiver(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V", at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V"))
     private Optional<TooltipData> onDrawTooltip_modifyIfPresentReceiver(Optional<TooltipData> data, Consumer<TooltipData> consumer) {
         if (data.isPresent() && data.get() instanceof MeteorTooltipData) return Optional.empty();
         return data;

src/main/java/meteordevelopment/meteorclient/mixin/EnchantingTableBlockEntityRendererMixin.java

@@ -17,8 +17,8 @@
 
 @Mixin(EnchantingTableBlockEntityRenderer.class)
 public abstract class EnchantingTableBlockEntityRendererMixin {
-    @WrapWithCondition(method = "render(Lnet/minecraft/block/entity/EnchantingTableBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BookModel;renderBook(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;III)V"))
-    private boolean onRenderBookModelRenderProxy(BookModel instance, MatrixStack matrices, VertexConsumer vertices, int light, int overlay, int i) {
+    @WrapWithCondition(method = "render(Lnet/minecraft/block/entity/EnchantingTableBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BookModel;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;II)V"))
+    private boolean onRenderBookModelRenderProxy(BookModel instance, MatrixStack matrixStack, VertexConsumer vertexConsumer, int light, int overlay) {
         return !Modules.get().get(NoRender.class).noEnchTableBook();
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/EntityRenderDispatcherMixin.java

@@ -15,9 +15,11 @@
 import net.minecraft.client.render.VertexConsumer;
 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.render.entity.state.LivingEntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.WorldView;
@@ -33,8 +35,8 @@
 public abstract class EntityRenderDispatcherMixin {
     @Shadow public Camera camera;
 
-    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
-    private <E extends Entity> void render(E entity, double x, double y, double z, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo info) {
+    @Inject(method = "render(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V", at = @At("HEAD"), cancellable = true)
+    private <E extends Entity, S extends EntityRenderState> void render(E entity, double x, double y, double z, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EntityRenderer<? super E, S> renderer, CallbackInfo info) {
         if (entity instanceof FakePlayerEntity player && player.hideWhenInsideCamera) {
             int cX = MathHelper.floor(this.camera.getPos().x);
             int cY = MathHelper.floor(this.camera.getPos().y);
@@ -44,7 +46,7 @@ private <E extends Entity> void render(E entity, double x, double y, double z, f
         }
     }
 
-    @Inject(method = "renderHitbox", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;drawBox(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;Lnet/minecraft/util/math/Box;FFFF)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILSOFT)
+    @Inject(method = "renderHitbox", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/VertexRendering;drawBox(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;Lnet/minecraft/util/math/Box;FFFF)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILSOFT)
     private static void onRenderHitbox(MatrixStack matrices, VertexConsumer vertices, Entity entity, float tickDelta, float red, float green, float blue, CallbackInfo ci, Box box) {
         double v = Modules.get().get(Hitboxes.class).getEntityValue(entity);
         if (v != 0) ((IBox) box).expand(v);
@@ -53,9 +55,9 @@ private static void onRenderHitbox(MatrixStack matrices, VertexConsumer vertices
     // Player model rendering in main menu
 
     @Inject(method = "renderShadow", at = @At("HEAD"), cancellable = true)
-    private static void onRenderShadow(MatrixStack matrices, VertexConsumerProvider vertexConsumers, Entity entity, float opacity, float tickDelta, WorldView world, float radius, CallbackInfo info) {
+    private static void onRenderShadow(MatrixStack matrices, VertexConsumerProvider vertexConsumers, EntityRenderState renderState, float opacity, float tickDelta, WorldView world, float radius, CallbackInfo info) {
         if (PostProcessShaders.rendering) info.cancel();
-        if (Modules.get().get(NoRender.class).noDeadEntities() && entity instanceof LivingEntity && ((LivingEntity) entity).isDead()) info.cancel();
+        if (Modules.get().get(NoRender.class).noDeadEntities() && renderState instanceof LivingEntityRenderState livingEntityRenderState && livingEntityRenderState.deathTime > 0) info.cancel();
     }
 
     @Inject(method = "getSquaredDistanceToCamera(Lnet/minecraft/entity/Entity;)D", at = @At("HEAD"), cancellable = true)

src/main/java/meteordevelopment/meteorclient/mixin/HeldItemRendererMixin.java

@@ -76,7 +76,7 @@ private float modifyEquipProgressOffhand(float value) {
         return (showSwapping(offHand, mc.player.getOffHandStack()) ? 1 : 0) - equipProgressOffHand;
     }
 
-    @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V"))
+    @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V"))
     private void onRenderItem(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
         MeteorClient.EVENT_BUS.post(HeldItemRendererEvent.get(hand, matrices));
     }

src/main/java/meteordevelopment/meteorclient/mixin/ItemStackMixin.java

@@ -58,7 +58,7 @@ private boolean modifyContainsTooltip(boolean original) {
         return !(bt.isActive() && bt.tooltip.get()) && original;
     }
 
-    @ModifyExpressionValue(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;contains(Lnet/minecraft/component/ComponentType;)Z", ordinal = 3))
+    @ModifyExpressionValue(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;contains(Lnet/minecraft/component/ComponentType;)Z", ordinal = 2))
     private boolean modifyContainsAdditional(boolean original) {
         BetterTooltips bt = Modules.get().get(BetterTooltips.class);
         return !(bt.isActive() && bt.additional.get()) && original;

src/main/java/meteordevelopment/meteorclient/mixin/MapRendererMixin.java

@@ -8,7 +8,6 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.systems.modules.render.NoRender;
-import meteordevelopment.meteorclient.utils.misc.EmptyIterator;
 import net.minecraft.client.render.MapRenderState;
 import net.minecraft.client.render.MapRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
@@ -19,11 +18,13 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.List;
+
 @Mixin(MapRenderer.class)
 public abstract class MapRendererMixin {
-    @ModifyExpressionValue(method = "draw(Lnet/minecraft/client/render/MapRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ZI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/map/MapState;getDecorations()Ljava/lang/Iterable;"))
-    private Iterable<MapDecoration> getIconsProxy(Iterable<MapDecoration> original) {
-        return (Modules.get().get(NoRender.class).noMapMarkers()) ? EmptyIterator::new : original;
+    @ModifyExpressionValue(method = "draw(Lnet/minecraft/client/render/MapRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ZI)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/MapRenderState;decorations:Ljava/util/List;"))
+    private List<MapDecoration> getIconsProxy(List<MapDecoration> original) {
+        return (Modules.get().get(NoRender.class).noMapMarkers()) ? List.of() : original;
     }
 
     @Inject(method = "draw(Lnet/minecraft/client/render/MapRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ZI)V", at = @At("HEAD"), cancellable = true)

src/main/java/meteordevelopment/meteorclient/mixin/MiningToolItemMixin.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.mixin;
+
+import meteordevelopment.meteorclient.mixininterface.IMiningToolItem;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.MiningToolItem;
+import net.minecraft.item.ToolMaterial;
+import net.minecraft.registry.tag.TagKey;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MiningToolItem.class)
+public abstract class MiningToolItemMixin implements IMiningToolItem {
+    @Unique
+    private ToolMaterial material;
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void onInit(ToolMaterial material, TagKey<Block> effectiveBlocks, float attackDamage, float attackSpeed, Item.Settings settings, CallbackInfo info) {
+        this.material = material;
+    }
+
+    @Override
+    public ToolMaterial meteor$getMaterial() {
+        return material;
+    }
+}