From 3974dc09277f526d948472f62dc89dfd171dd891 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 15 Jun 2020 19:17:37 +0100 Subject: [PATCH] 1.16-pre6 --- build.gradle | 2 +- mappings/net/minecraft/block/AbstractBlock.mapping | 6 +++--- mappings/net/minecraft/block/Block.mapping | 2 +- .../minecraft/client/gui/screen/CommandSuggestor.mapping | 4 +--- .../client/render/TransformingVertexConsumer.mapping | 2 +- .../minecraft/client/render/debug/BeeDebugRenderer.mapping | 4 ---- mappings/net/minecraft/entity/mob/HoglinBrain.mapping | 6 ------ mappings/net/minecraft/entity/mob/HoglinEntity.mapping | 3 --- mappings/net/minecraft/entity/mob/PiglinBrain.mapping | 6 ------ mappings/net/minecraft/entity/mob/PiglinEntity.mapping | 6 ------ .../network/packet/s2c/play/GameJoinS2CPacket.mapping | 4 +--- .../server/network/ServerPlayerInteractionManager.mapping | 2 +- 12 files changed, 9 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 170871554c..79c6593e3e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "1.16-pre5" +def minecraft_version = "1.16-pre6" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index e6db974f93..2ee2680291 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos ARG 4 type - METHOD method_9517 prepare (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;I)V + METHOD method_9517 prepare (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;II)V ARG 1 state ARG 2 world ARG 3 pos @@ -395,7 +395,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos ARG 3 state ARG 4 notify - METHOD method_26183 updateNeighbors (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;I)V + METHOD method_26183 updateNeighbors (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;II)V ARG 1 world ARG 2 pos ARG 3 flags @@ -443,7 +443,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos ARG 3 state ARG 4 moved - METHOD method_26198 prepare (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;I)V + METHOD method_26198 prepare (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;II)V ARG 1 world ARG 2 pos ARG 3 flags diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 0f175be96b..7729e35201 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -181,7 +181,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 world ARG 2 pos ARG 3 blockEntity - METHOD method_9611 replaceBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;I)V + METHOD method_9611 replaceBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;II)V ARG 0 state ARG 1 newState ARG 2 world diff --git a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping index 88a523663c..8887711422 100644 --- a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping @@ -62,18 +62,16 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor METHOD method_23937 show ()V CLASS class_464 SuggestionWindow FIELD field_21630 lastNarrationIndex I - FIELD field_2764 suggestions Lcom/mojang/brigadier/suggestion/Suggestions; FIELD field_2765 completed Z FIELD field_2766 selection I FIELD field_2767 mouse Lnet/minecraft/class_241; FIELD field_2768 typedText Ljava/lang/String; FIELD field_2769 inWindowIndex I FIELD field_2771 area Lnet/minecraft/class_768; - METHOD (Lnet/minecraft/class_4717;IIILcom/mojang/brigadier/suggestion/Suggestions;Z)V + METHOD (Lnet/minecraft/class_4717;IIILjava/util/List;Z)V ARG 2 x ARG 3 y ARG 4 width - ARG 5 suggestions ARG 6 narrateFirstSuggestion METHOD method_2370 mouseScrolled (D)Z ARG 1 amount diff --git a/mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping b/mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping index 64f95c7820..1be63ea481 100644 --- a/mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/TransformingVertexCon FIELD field_20882 normalZ F FIELD field_21053 textureMatrix Lnet/minecraft/class_1159; FIELD field_21054 normalMatrix Lnet/minecraft/class_4581; - METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;)V + METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;)V ARG 1 vertexConsumer METHOD method_22891 init ()V diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index abe2c580e7..07f8b18925 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -62,10 +62,6 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere METHOD method_23830 getBeesByHive ()Ljava/util/Map; METHOD method_23832 updateTargetedEntity ()V METHOD method_23952 removeInvalidBees ()V - METHOD method_24081 addToMap (Ljava/util/Map;Lnet/minecraft/class_4703$class_5243;Lnet/minecraft/class_2338;)V - ARG 0 map - ARG 1 bee - ARG 2 pos METHOD method_24084 getBlacklistingBees ()Ljava/util/Map; CLASS class_4705 Hive FIELD field_21543 pos Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping index f6df518fc6..2da35c772e 100644 --- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 1 pos METHOD method_24670 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V ARG 1 hoglin - METHOD method_24671 playSoundAtChance (Lnet/minecraft/class_4760;)V - ARG 0 hoglin METHOD method_24672 onAttacked (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 attacker @@ -40,8 +38,6 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain METHOD method_24681 avoid (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 target - METHOD method_24682 hasIdleActivity (Lnet/minecraft/class_4760;)Z - ARG 0 hoglin METHOD method_24683 targetEnemy (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 target @@ -55,8 +51,6 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain METHOD method_24687 askAdultsForHelp (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 target - METHOD method_24688 playSound (Lnet/minecraft/class_4760;)V - ARG 0 hoglin METHOD method_24689 setAttackTargetIfCloser (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 targetCandidate diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index a82153ee75..ca48846a99 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -11,15 +11,12 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity ARG 2 spawnReason ARG 3 pos METHOD method_24658 isAdult ()Z - METHOD method_24659 playFightSound ()V - METHOD method_24661 playRetreatSound ()V METHOD method_26942 zombify (Lnet/minecraft/class_3218;)V ARG 1 word METHOD method_26943 createHoglinAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_26944 canConvert ()Z METHOD method_26945 canBeHunted ()Z METHOD method_26946 isImmuneToZombification ()Z - METHOD method_26947 playZombifySound ()V METHOD method_26948 setImmuneToZombification (Z)V ARG 1 immuneToZombification METHOD method_26949 setCannotBeHunted (Z)V diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 7b245ae0ee..5b73ba75cf 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -32,8 +32,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 piglin ARG 1 player ARG 2 hand - METHOD method_24729 (Lnet/minecraft/class_4836;Lnet/minecraft/class_4168;)V - ARG 1 activity METHOD method_24730 canGather (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)Z ARG 0 piglin ARG 1 stack @@ -63,8 +61,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24747 makeGoToZombifiedPiglinTask ()Lnet/minecraft/class_4809; METHOD method_24748 isHoldingCrossbow (Lnet/minecraft/class_1309;)Z ARG 0 piglin - METHOD method_24749 playSoundAtChance (Lnet/minecraft/class_4836;)V - ARG 0 piglin METHOD method_24750 angerAt (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target @@ -119,8 +115,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 piglin METHOD method_24777 getPreferredTarget (Lnet/minecraft/class_4836;)Ljava/util/Optional; ARG 0 piglin - METHOD method_24778 playSound (Lnet/minecraft/class_4836;)V - ARG 0 piglin METHOD method_24780 getNearbyVisiblePiglins (Lnet/minecraft/class_4836;)Ljava/util/List; ARG 0 piglin METHOD method_24781 stopWalking (Lnet/minecraft/class_4836;)V diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index e13b614d1b..c757908bcb 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -20,16 +20,10 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity METHOD method_24696 equipAtChance (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack - METHOD method_24697 playCelebrateSound ()V - METHOD method_24699 playRetreatSound ()V - METHOD method_24700 playJealousSound ()V - METHOD method_24701 playZombifySound ()V METHOD method_24702 makeInitialWeapon ()Lnet/minecraft/class_1799; METHOD method_24703 isCharging ()Z METHOD method_24704 canConvert ()Z METHOD method_24705 getActivity ()Lnet/minecraft/class_4836$class_4837; - METHOD method_24709 playAdmireItemSound ()V - METHOD method_24710 playAngrySound ()V METHOD method_24711 addItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 stack METHOD method_24712 isAdult ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 8c1053409e..108ae2f353 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -11,11 +11,9 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD field_24618 reducedDebugInfo Z FIELD field_24619 showDeathScreen Z FIELD field_25134 dimensionId Lnet/minecraft/class_5321; - METHOD (ILnet/minecraft/class_1934;JZLjava/util/Set;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;IIZZZZ)V + METHOD (ILnet/minecraft/class_1934;Lnet/minecraft/class_1934;JZLjava/util/Set;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;IIZZZZ)V ARG 1 playerEntityId ARG 2 gameMode - ARG 3 sha256Seed - ARG 5 hardcore METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11562 hasReducedDebugInfo ()Z METHOD method_11564 getEntityId ()I diff --git a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping index d92217d35e..93d9c5ab84 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract METHOD method_14259 setWorld (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14260 setGameModeIfNotPresent (Lnet/minecraft/class_1934;)V - METHOD method_14261 setGameMode (Lnet/minecraft/class_1934;)V + METHOD method_14261 setGameMode (Lnet/minecraft/class_1934;Lnet/minecraft/class_1934;)V METHOD method_14262 interactBlock (Lnet/minecraft/class_3222;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; ARG 2 world ARG 3 stack