mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2025-01-03 18:48:00 +01:00
Handle bucket interaction change as well, update TODO
This commit is contained in:
parent
55b6c47a3c
commit
0ca4cae943
@ -57,12 +57,12 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
* - Mob interact
|
* - Mob interact
|
||||||
* - AxeItem playerHasShieldUseIntent new
|
* - AxeItem playerHasShieldUseIntent new
|
||||||
* - BucketItem, ChorusFruit, FoodOnAStickItem, KnowledgeBookItem, TridentItem,
|
* - BucketItem, ChorusFruit, FoodOnAStickItem, KnowledgeBookItem, TridentItem,
|
||||||
* - CakeBlock creative check in interaction
|
|
||||||
* - Jukebox overrides new interaction function
|
* - Jukebox overrides new interaction function
|
||||||
* - SignBlock, TntBlock creative check
|
* - SignBlock creative check
|
||||||
* - Check item rarity values
|
|
||||||
* - ItemStack count max changed in codec
|
|
||||||
* - SolidBucketItem useOn
|
* - SolidBucketItem useOn
|
||||||
|
* - HangingEntity bounding box calculation changes
|
||||||
|
* - BoatEntity#updateVelocity isSpaceEmpty condition new
|
||||||
|
* - LivingEntity#remove -> activeEffects.clear
|
||||||
*
|
*
|
||||||
* TODO | General
|
* TODO | General
|
||||||
* - Make recipe fixes dynamic instead of a data dump in java classes
|
* - Make recipe fixes dynamic instead of a data dump in java classes
|
||||||
|
@ -0,0 +1,44 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus
|
||||||
|
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
|
||||||
|
|
||||||
|
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||||
|
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.item.BucketItem;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.item.ItemUsage;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
|
@Mixin(BucketItem.class)
|
||||||
|
public abstract class MixinBucketItem {
|
||||||
|
|
||||||
|
@Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemUsage;exchangeStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;"))
|
||||||
|
private ItemStack dontExchangeStack(ItemStack inputStack, PlayerEntity player, ItemStack outputStack) {
|
||||||
|
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_5)) {
|
||||||
|
return inputStack;
|
||||||
|
} else {
|
||||||
|
return ItemUsage.exchangeStack(inputStack, player, outputStack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -97,6 +97,7 @@
|
|||||||
"fixes.minecraft.entity.MixinAbstractClientPlayerEntity",
|
"fixes.minecraft.entity.MixinAbstractClientPlayerEntity",
|
||||||
"fixes.minecraft.entity.MixinAbstractHorseEntity",
|
"fixes.minecraft.entity.MixinAbstractHorseEntity",
|
||||||
"fixes.minecraft.entity.MixinAnimalEntity",
|
"fixes.minecraft.entity.MixinAnimalEntity",
|
||||||
|
"fixes.minecraft.entity.MixinAxolotlEntity",
|
||||||
"fixes.minecraft.entity.MixinBipedEntityModel",
|
"fixes.minecraft.entity.MixinBipedEntityModel",
|
||||||
"fixes.minecraft.entity.MixinBoatEntity",
|
"fixes.minecraft.entity.MixinBoatEntity",
|
||||||
"fixes.minecraft.entity.MixinCamelEntity",
|
"fixes.minecraft.entity.MixinCamelEntity",
|
||||||
@ -202,7 +203,7 @@
|
|||||||
"viabedrock.MixinJoinPackets",
|
"viabedrock.MixinJoinPackets",
|
||||||
"vialegacy.MixinExtensionProtocolMetadataStorage",
|
"vialegacy.MixinExtensionProtocolMetadataStorage",
|
||||||
"vialegacy.MixinViaLegacyConfig",
|
"vialegacy.MixinViaLegacyConfig",
|
||||||
"fixes.minecraft.entity.MixinAxolotlEntity"
|
"fixes.minecraft.item.MixinBucketItem"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
Loading…
Reference in New Issue
Block a user