Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-28 12:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix item comparison in <= 1.8 swing hand fix

Browse Source
This commit is contained in:
FlorianMichael 2024-10-05 05:56:57 +02:00
parent fe3649b7aa
commit 316ee89a93
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java
View File

@ -62,6 +62,7 @@ import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.GameMode; import net.minecraft.world.GameMode;
import net.minecraft.world.World;
import net.raphimc.vialegacy.api.LegacyProtocolVersion; import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import org.apache.commons.lang3.mutable.MutableObject; import org.apache.commons.lang3.mutable.MutableObject;
import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.*;
@ -229,20 +230,24 @@ public abstract class MixinClientPlayerInteractionManager implements IClientPlay
} }
} }
@Redirect(method = "method_41929", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/TypedActionResult;getResult()Lnet/minecraft/util/ActionResult;")) @Redirect(method = "method_41929", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;use(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/TypedActionResult;"))
private ActionResult eitherSuccessOrPass(TypedActionResult<ItemStack> instance, @Local(ordinal = 0) ItemStack itemStack) { private TypedActionResult<ItemStack> eitherSuccessOrPass(ItemStack instance, World world, PlayerEntity user, Hand hand, @Local ItemStack itemStack) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) { if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
final int count = instance.getCount();
final TypedActionResult<ItemStack> action = instance.use(world, user, hand);
final ItemStack output = action.getValue();
// In <= 1.8, ActionResult weren't a thing and interactItem simply returned either true or false // In <= 1.8, ActionResult weren't a thing and interactItem simply returned either true or false
// depending on if the input and output item are equal or not // depending on if the input and output item are equal or not
final boolean accepted = instance.getValue() != itemStack; final boolean accepted = !output.isEmpty() && (output != itemStack || output.getCount() != count);
if (action.getResult().isAccepted() == accepted) {
if (instance.getResult().isAccepted() == accepted) { return action;
return instance.getResult();
} else { } else {
return accepted ? ActionResult.SUCCESS : ActionResult.PASS; return accepted ? TypedActionResult.success(output) : TypedActionResult.pass(output);
} }
} else { } else {
return instance.getResult(); return instance.use(world, user, hand);
} }
} }