diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java index ed6b9b09b..c4603f7b5 100644 --- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java +++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java @@ -33,13 +33,6 @@ import java.util.concurrent.CompletableFuture; /* - * TODO | Port 1.21.4 - * - PlayerEntity#tick -> hasVehicle check at the top - * - Entity#move - * - LivingEntity#baseTick - * - NameTagItem use - * - MooshroomEntity interaction changes relevant? - * * TODO | Port 1.21.3 * - VehicleMovePacket handling now has distance check in ClientPlayNetworkHandler * - Illusioner/Sniffer don't override visibility bounding box anymore diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java new file mode 100644 index 000000000..7931a9203 --- /dev/null +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java @@ -0,0 +1,66 @@ +/* + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2024 FlorianMichael/EnZaXD and RK_01/RaphiMC + * Copyright (C) 2023-2024 contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; + +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.entity.passive.CowEntity; +import net.minecraft.entity.passive.MooshroomEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(MooshroomEntity.class) +public abstract class MixinMooshroomEntity extends AnimalEntity { + + protected MixinMooshroomEntity(EntityType entityType, World world) { + super(entityType, world); + } + + @Inject(method = "interactMob", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/MooshroomEntity;getStewEffectFrom(Lnet/minecraft/item/ItemStack;)Ljava/util/Optional;"), cancellable = true) + public void checkForItemTags(PlayerEntity player, Hand hand, CallbackInfoReturnable cir) { + if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_21_2)) { + final ItemStack itemStack = player.getStackInHand(hand); + if (!itemStack.isIn(ItemTags.SMALL_FLOWERS)) { + cir.setReturnValue(super.interactMob(player, hand)); + } + } + } + + @Redirect(method = "interactMob", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/CowEntity;interactMob(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/ActionResult;", ordinal = 0)) + public ActionResult directPass(CowEntity instance, PlayerEntity player, Hand hand) { + if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_21_2)) { + return ActionResult.PASS; + } else { + return instance.interactMob(player, hand); + } + } + +} diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index 4aa9a889a..22ebeac84 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -129,6 +129,7 @@ "fixes.minecraft.item.MixinBowItem", "fixes.minecraft.item.MixinBrushItem", "fixes.minecraft.item.MixinBucketItem", + "fixes.minecraft.item.MixinBundleItem", "fixes.minecraft.item.MixinDrawContext", "fixes.minecraft.item.MixinEnderEyeItem", "fixes.minecraft.item.MixinEnderPearlItem", @@ -219,7 +220,7 @@ "viabedrock.MixinJoinPackets", "vialegacy.MixinExtensionProtocolMetadataStorage", "vialegacy.MixinViaLegacyConfig", - "fixes.minecraft.item.MixinBundleItem" + "fixes.minecraft.entity.MixinMooshroomEntity" ], "injectors": { "defaultRequire": 1