From 9114bec81d2bb705f8dbaa0ab70e4673fbfbb288 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 12 Jun 2020 17:28:05 -0700 Subject: [PATCH] Fix dedicated server issue in some implementations of Block.getPickBlock. Closes #6566 --- .../java/net/minecraftforge/client/event/GuiScreenEvent.java | 1 + src/main/resources/forge.sas | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java b/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java index 53c99c220..34facf58d 100644 --- a/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java +++ b/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java @@ -214,6 +214,7 @@ public class GuiScreenEvent extends Event } } + @Deprecated // Remove in 1.16 public static class ActionPerformedEvent extends GuiScreenEvent { private Button button; diff --git a/src/main/resources/forge.sas b/src/main/resources/forge.sas index c81cba3b5..12bacaebb 100644 --- a/src/main/resources/forge.sas +++ b/src/main/resources/forge.sas @@ -25,6 +25,11 @@ net/minecraft/block/Block func_185473_a(Lnet/minecraft/world/IBlockReader;Lnet/m net/minecraft/block/StemBlock func_185473_a(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack; net/minecraft/block/SweetBerryBushBlock func_185473_a(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack; net/minecraft/block/TallSeaGrassBlock func_185473_a(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack; +# Vanilla blocks calling these sided methods in getItem +net/minecraft/tileentity/BannerTileEntity func_190615_l(Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack; +net/minecraft/block/AttachedStemBlock func_196279_O_()Lnet/minecraft/item/Item; +net/minecraft/block/StemBlock func_176481_j()Lnet/minecraft/item/Item; +#===================================== net/minecraft/block/CropsBlock func_199772_f()Lnet/minecraft/util/IItemProvider; # getSeedsItem net/minecraft/block/BeetrootBlock func_199772_f()Lnet/minecraft/util/IItemProvider; net/minecraft/block/CarrotBlock func_199772_f()Lnet/minecraft/util/IItemProvider;