From 5c488c900793676efd45c8d36331b7bae32dd4d7 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 15 Mar 2021 15:06:12 -0700 Subject: [PATCH] Fix AT order, missed exec line and bump for RB. --- patches/minecraft/net/minecraft/item/ItemStack.java.patch | 4 ++-- src/main/resources/META-INF/accesstransformer.cfg | 6 +++--- src/main/resources/forge.exc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index ec5bcb843b..f71324d267 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -79,8 +79,8 @@ + return onItemUse(p_196084_1_, (c) -> func_77973_b().func_195939_a(p_196084_1_)); + } + -+ public ActionResultType onItemUseFirst(ItemUseContext context) { -+ return onItemUse(context, (c) -> func_77973_b().onItemUseFirst(this, context)); ++ public ActionResultType onItemUseFirst(ItemUseContext p_196084_1_) { ++ return onItemUse(p_196084_1_, (c) -> func_77973_b().onItemUseFirst(this, p_196084_1_)); + } + + private ActionResultType onItemUse(ItemUseContext p_196084_1_, java.util.function.Function callback) { diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index aa1913715f..0d9295c4d5 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -93,9 +93,9 @@ public net.minecraft.block.WitherSkeletonWallSkullBlock (Lnet/minecraft/bl public net.minecraft.block.WoodButtonBlock (Lnet/minecraft/block/AbstractBlock$Properties;)V #endgroup public net.minecraft.block.Block func_180637_b(Lnet/minecraft/world/server/ServerWorld;Lnet/minecraft/util/math/BlockPos;I)V # dropXpOnBlockBreak -public net.minecraft.block.WoodType func_227047_a_(Lnet/minecraft/block/WoodType;)Lnet/minecraft/block/WoodType; # register public net.minecraft.block.FireBlock func_220274_q(Lnet/minecraft/block/BlockState;)I # func_220274_q public net.minecraft.block.FireBlock func_220275_r(Lnet/minecraft/block/BlockState;)I # func_220275_r +public net.minecraft.block.WoodType func_227047_a_(Lnet/minecraft/block/WoodType;)Lnet/minecraft/block/WoodType; # register public-f net.minecraft.client.GameSettings field_74324_K # keyBindings public net.minecraft.client.Minecraft field_71446_o # textureManager public net.minecraft.client.Minecraft func_184119_a(Lnet/minecraft/item/ItemStack;Lnet/minecraft/tileentity/TileEntity;)Lnet/minecraft/item/ItemStack; # storeTEInStack @@ -241,17 +241,17 @@ public net.minecraft.entity.player.ServerPlayerEntity func_71117_bO()V public net.minecraft.inventory.container.ContainerType (Lnet/minecraft/inventory/container/ContainerType$IFactory;)V public net.minecraft.inventory.container.ContainerType$IFactory public net.minecraft.inventory.container.RepairContainer field_82856_l #RepairContainer/stackSizeToBeUsedInRepair +public net.minecraft.item.BlockItemUseContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/BlockRayTraceResult;)V #group public net.minecraft.item.Item public net.minecraft.item.AxeItem (Lnet/minecraft/item/IItemTier;FFLnet/minecraft/item/Item$Properties;)V -public net.minecraft.item.BlockItemUseContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/BlockRayTraceResult;)V public net.minecraft.item.HoeItem (Lnet/minecraft/item/IItemTier;IFLnet/minecraft/item/Item$Properties;)V -public net.minecraft.item.ItemUseContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/BlockRayTraceResult;)V public net.minecraft.item.MusicDiscItem (ILnet/minecraft/util/SoundEvent;Lnet/minecraft/item/Item$Properties;)V public net.minecraft.item.PickaxeItem (Lnet/minecraft/item/IItemTier;IFLnet/minecraft/item/Item$Properties;)V public net.minecraft.item.ToolItem (FFLnet/minecraft/item/IItemTier;Ljava/util/Set;Lnet/minecraft/item/Item$Properties;)V #endgroup public-f net.minecraft.item.ItemGroup field_78032_a # group array public net.minecraft.item.ItemModelsProperties func_239418_a_(Lnet/minecraft/item/Item;Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/item/IItemPropertyGetter;)V +public net.minecraft.item.ItemUseContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/BlockRayTraceResult;)V public-f net.minecraft.item.crafting.Ingredient protected net.minecraft.item.crafting.Ingredient (Ljava/util/stream/Stream;)V public+f net.minecraft.item.crafting.Ingredient func_199564_a(Lnet/minecraft/network/PacketBuffer;)V diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index 0a9059969b..edb68ecd92 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -45,7 +45,7 @@ net/minecraft/item/FilledMapItem.getCustomMapData(Lnet/minecraft/item/ItemStack; net/minecraft/item/FishBucketItem.(Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/item/Item$Properties;)V=|fishTypeIn,p_i49022_2_,builder net/minecraft/item/HorseArmorItem.(ILnet/minecraft/util/ResourceLocation;Lnet/minecraft/item/Item$Properties;)V=|p_i50042_1_,texture,p_i50042_3_ net/minecraft/item/ItemStack.(Lnet/minecraft/util/IItemProvider;ILnet/minecraft/nbt/CompoundNBT;)V=|p_i48204_1_,p_i48204_2_,capNBT -net/minecraft/item/ItemStack.onItemUse(Lnet/minecraft/item/ItemUseContext;)Lnet/minecraft/util/ActionResultType;=|p_196084_1_ +net/minecraft/item/ItemStack.onItemUseFirst(Lnet/minecraft/item/ItemUseContext;)Lnet/minecraft/util/ActionResultType;=|p_196084_1_ net/minecraft/item/ItemStack.onItemUse(Lnet/minecraft/item/ItemUseContext;Ljava/util/function/Function;)Lnet/minecraft/util/ActionResultType;=|p_196084_1_,callback net/minecraft/network/PacketBuffer.writeItemStack(Lnet/minecraft/item/ItemStack;Z)Lnet/minecraft/network/PacketBuffer;=|p_150788_1_,limitedTag net/minecraft/potion/PotionBrewing$MixPredicate.(Lnet/minecraftforge/registries/ForgeRegistryEntry;Lnet/minecraft/item/crafting/Ingredient;Lnet/minecraftforge/registries/ForgeRegistryEntry;)V=|p_i47570_1_,p_i47570_2_,p_i47570_3_