From a2650733cc5d5690d3c98ed67b55df15a23a1d10 Mon Sep 17 00:00:00 2001
From: fayer3 <bayer.florian@aon.at>
Date: Mon, 13 Jan 2025 01:45:47 +0100
Subject: [PATCH] 1.20.4 fixes

---
 .../renderer/GameRendererVRMixin.java         | 11 +++++-----
 .../mixin/server/ServerPlayerMixin.java       | 21 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/GameRendererVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/GameRendererVRMixin.java
index 19598df2a..de25796f3 100644
--- a/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/GameRendererVRMixin.java
+++ b/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/GameRendererVRMixin.java
@@ -137,7 +137,8 @@ public abstract class GameRendererVRMixin
             RenderPassManager.setVanillaRenderPass();
         }
     }
-    @WrapMethod(method = "pick(F)V")
+
+    @WrapMethod(method = "pick")
     private void vivecraft$vrPick(float partialTick, Operation<Void> original) {
         if (VRState.VR_RUNNING) {
             // skip when data not available yet
@@ -161,7 +162,7 @@ public abstract class GameRendererVRMixin
         }
     }
 
-    @ModifyArg(method = "pick(Lnet/minecraft/world/entity/Entity;DDF)Lnet/minecraft/world/phys/HitResult;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;pick(DFZ)Lnet/minecraft/world/phys/HitResult;"), index = 0)
+    @ModifyArg(method = "pick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;pick(DFZ)Lnet/minecraft/world/phys/HitResult;"), index = 0)
     private double vivecraft$getCrossVec(double hitDistance) {
         if (VRState.VR_RUNNING) {
             // get the end of the reach point here, to have the correct reach distance
@@ -332,14 +333,12 @@ public abstract class GameRendererVRMixin
 
             PoseStack poseStack = new PoseStack();
             RenderHelper.applyVRModelView(vivecraft$DATA_HOLDER.currentPass, poseStack);
-            VREffectsHelper.renderGuiLayer(partialTick, true, poseStack);
-            DebugRenderHelper.renderDebug(poseStack, partialTick);
 
             vivecraft$resetProjectionMatrix(partialTick);
 
-            VREffectsHelper.renderGuiLayer(partialTick, true);
+            VREffectsHelper.renderGuiLayer(partialTick, true, poseStack);
 
-            DebugRenderHelper.renderDebug(partialTick);
+            DebugRenderHelper.renderDebug(poseStack, partialTick);
 
             if (KeyboardHandler.SHOWING) {
                 if (vivecraft$DATA_HOLDER.vrSettings.physicalKeyboard) {
diff --git a/common/src/main/java/org/vivecraft/mixin/server/ServerPlayerMixin.java b/common/src/main/java/org/vivecraft/mixin/server/ServerPlayerMixin.java
index edd8d3d01..2ae71291c 100644
--- a/common/src/main/java/org/vivecraft/mixin/server/ServerPlayerMixin.java
+++ b/common/src/main/java/org/vivecraft/mixin/server/ServerPlayerMixin.java
@@ -13,6 +13,7 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
@@ -21,7 +22,6 @@
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.alchemy.PotionUtils;
 import net.minecraft.world.item.alchemy.Potions;
-import net.minecraft.world.item.component.ItemAttributeModifiers;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Final;
@@ -31,7 +31,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.vivecraft.mixin.world.entity.PlayerMixin;
@@ -121,19 +120,13 @@ protected ServerPlayerMixin(EntityType<? extends LivingEntity> entityType, Level
                 !this.getItemBySlot(EquipmentSlot.FEET).isEmpty())
             {
                 float addedDamage = 0F;
-                ItemStack boots = this.getItemBySlot(EquipmentSlot.FEET);
-                ItemAttributeModifiers modifiers = boots.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
-                if (modifiers.modifiers().isEmpty()) {
-                    modifiers = boots.getItem().getDefaultAttributeModifiers();
-                }
 
-                for (ItemAttributeModifiers.Entry entry : modifiers.modifiers()) {
-                    if (entry.attribute().is(Attributes.ARMOR)) {
-                        float amount = (float) entry.modifier().amount();
-                        switch (entry.modifier().operation()) {
-                            case ADD_VALUE -> addedDamage += amount;
-                            case ADD_MULTIPLIED_TOTAL -> addedDamage += amount * addedDamage;
-                        }
+                for (AttributeModifier modifier : this.getItemBySlot(EquipmentSlot.FEET).getItem()
+                    .getDefaultAttributeModifiers(EquipmentSlot.FEET).get(Attributes.ARMOR)) {
+                    float amount = (float) modifier.getAmount();
+                    switch (modifier.getOperation()) {
+                        case ADDITION -> addedDamage += amount;
+                        case MULTIPLY_TOTAL -> addedDamage += amount * addedDamage;
                     }
                 }
                 return damage + addedDamage * ServerConfig.BOOTS_ARMOR_DAMAGE.get().floatValue();