From d11cca29cff93c9d3f0970203e54e34f94e6d50f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 11 Jun 2020 18:22:45 +0100 Subject: [PATCH] 1.16-pre4 --- build.gradle | 2 +- .../client/gui/widget/EntryListWidget.mapping | 3 +-- mappings/net/minecraft/item/BucketItem.mapping | 4 ---- .../net/minecraft/network/ServerAddress.mapping | 2 +- .../play/UpdatePlayerAbilitiesC2SPacket.mapping | 14 -------------- .../s2c/play/PlayerAbilitiesS2CPacket.mapping | 6 ------ .../net/minecraft/screen/ScreenHandler.mapping | 6 ------ mappings/net/minecraft/tag/TagContainer.mapping | 1 - 8 files changed, 3 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index f6c6a9b72c..f2ec1fa8b5 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "1.16-pre3" +def minecraft_version = "1.16-pre4" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 62709ab011..24c1913582 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -77,8 +77,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25333 setLeftPos (I)V ARG 1 left METHOD method_25334 getSelected ()Lnet/minecraft/class_350$class_351; - METHOD method_25335 moveSelection (I)V - ARG 1 amount + METHOD method_25335 moveSelection (Lnet/minecraft/class_350$class_5403;)V METHOD method_25337 getRowTop (I)I ARG 1 index METHOD method_25338 remove (I)Lnet/minecraft/class_350$class_351; diff --git a/mappings/net/minecraft/item/BucketItem.mapping b/mappings/net/minecraft/item/BucketItem.mapping index b9d7d9a3db..266db4da1a 100644 --- a/mappings/net/minecraft/item/BucketItem.mapping +++ b/mappings/net/minecraft/item/BucketItem.mapping @@ -11,10 +11,6 @@ CLASS net/minecraft/class_1755 net/minecraft/item/BucketItem ARG 1 world ARG 2 stack ARG 3 pos - METHOD method_7730 getFilledStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1799; - ARG 1 stack - ARG 2 player - ARG 3 filledBucket METHOD method_7731 placeFluid (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3965;)Z ARG 1 player ARG 2 world diff --git a/mappings/net/minecraft/network/ServerAddress.mapping b/mappings/net/minecraft/network/ServerAddress.mapping index 1e87e3f79e..a448ead6f8 100644 --- a/mappings/net/minecraft/network/ServerAddress.mapping +++ b/mappings/net/minecraft/network/ServerAddress.mapping @@ -9,6 +9,6 @@ CLASS net/minecraft/class_639 net/minecraft/network/ServerAddress ARG 0 port ARG 1 def METHOD method_2952 getAddress ()Ljava/lang/String; - METHOD method_2953 resolveSrv (Ljava/lang/String;)[Ljava/lang/String; + METHOD method_2953 resolveSrv (Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; ARG 0 address METHOD method_2954 getPort ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping index 7bbc48ea46..e335a764b1 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping @@ -1,19 +1,5 @@ CLASS net/minecraft/class_2842 net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket - FIELD field_12944 walkSpeed F - FIELD field_12945 flySpeed F - FIELD field_12946 creativeMode Z - FIELD field_12947 allowFlying Z FIELD field_12948 flying Z - FIELD field_12949 invulnerable Z METHOD (Lnet/minecraft/class_1656;)V ARG 1 abilities - METHOD method_12337 setAllowFlying (Z)V - METHOD method_12338 setFlySpeed (F)V - METHOD method_12340 setInvulnerable (Z)V - METHOD method_12341 setWalkSpeed (F)V - METHOD method_12342 setCreativeMode (Z)V - METHOD method_12343 setFlying (Z)V - METHOD method_12344 isInvulnerable ()Z - METHOD method_12345 isCreativeMode ()Z METHOD method_12346 isFlying ()Z - METHOD method_12347 isFlyingAllowed ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping index 8e06fd3948..2c6bb8da1a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping @@ -5,14 +5,8 @@ CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbili FIELD field_12337 allowFlying Z FIELD field_12338 flying Z FIELD field_12339 invulnerable Z - METHOD method_11687 setAllowFlying (Z)V - METHOD method_11688 setFlySpeed (F)V - METHOD method_11689 setInvulnerable (Z)V METHOD method_11690 getFlySpeed ()F METHOD method_11691 getWalkSpeed ()F - METHOD method_11692 setWalkSpeed (F)V - METHOD method_11693 setCreativeMode (Z)V - METHOD method_11694 setFlying (Z)V METHOD method_11695 isInvulnerable ()Z METHOD method_11696 isCreativeMode ()Z METHOD method_11698 isFlying ()Z diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index e05bd8d0a5..401478b72c 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -46,14 +46,8 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler METHOD method_7593 onSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; COMMENT Performs a slot click. This can behave in many different ways depending mainly on the action type. COMMENT @return The stack that was clicked on before anything changed, used mostly for verifying that the client and server are in sync - ARG 1 slotId - COMMENT The ID of the slot clicked on. -999 is a special value used for the cursor stack - ARG 2 clickData - COMMENT Metadata for the click. Usually equal to the button ID, but can have different meanings depending on the action type. Check the docs for each SlotActionType value ARG 3 actionType COMMENT The type of slot click. Check the docs for each SlotActionType value for details - ARG 4 player - COMMENT The player METHOD method_7594 unpackQuickCraftStage (I)I ARG 0 quickCraftData METHOD method_7595 close (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/tag/TagContainer.mapping b/mappings/net/minecraft/tag/TagContainer.mapping index 4b065d2ea9..197b890343 100644 --- a/mappings/net/minecraft/tag/TagContainer.mapping +++ b/mappings/net/minecraft/tag/TagContainer.mapping @@ -28,4 +28,3 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer ARG 1 tag METHOD method_26798 checkId (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2960; ARG 1 tag - METHOD method_27068 getEmpty ()Lnet/minecraft/class_3494;