From f4da454c812a886e8a7a00bfd41cda91773b5fa6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 11 Sep 2019 16:28:06 +0100 Subject: [PATCH] 19w37a --- build.gradle | 2 +- .../client/network/ClientPlayerInteractionManager.mapping | 5 +---- mappings/net/minecraft/enchantment/EnchantmentHelper.mapping | 1 - mappings/net/minecraft/entity/passive/FoxEntity.mapping | 3 --- mappings/net/minecraft/entity/passive/OcelotEntity.mapping | 1 - mappings/net/minecraft/entity/passive/PandaEntity.mapping | 1 - .../net/minecraft/entity/passive/PolarBearEntity.mapping | 1 - mappings/net/minecraft/entity/player/PlayerEntity.mapping | 2 +- mappings/net/minecraft/predicate/item/ItemPredicate.mapping | 3 +-- mappings/net/minecraft/world/GameRules.mapping | 3 --- 10 files changed, 4 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index b87b1bfe0f..db57edbc51 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "19w36a" +def minecraft_version = "19w37a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index a27983a4ba..8f21c37fc3 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -51,10 +51,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2918 attackEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 target - METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; - ARG 1 player - ARG 2 world - ARG 3 hand + METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1934; METHOD method_2922 isCurrentlyBreaking (Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 659b4b04ae..7353312152 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -52,7 +52,6 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8221 hasVanishingCurse (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8222 getEnchantments (Lnet/minecraft/class_1799;)Ljava/util/Map; - ARG 0 stack METHOD method_8223 getLuckOfTheSea (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8224 hasBindingCurse (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index a402a31d36..414f0f0602 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -30,9 +30,6 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity CLASS class_4026 FoxSwimGoal CLASS class_4027 FoxData FIELD field_17977 type Lnet/minecraft/class_4019$class_4039; - FIELD field_17978 uses I - METHOD (Lnet/minecraft/class_4019$class_4039;)V - ARG 1 type CLASS class_4028 FoxLookControl CLASS class_4029 AttackGoal METHOD (Lnet/minecraft/class_4019;DZ)V diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index e869db14ca..c5be542e67 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -24,4 +24,3 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity METHOD method_16102 setTrusting (Z)V ARG 1 trusting METHOD method_16103 updateFleeing ()V - METHOD method_16105 spawnKittens ()V diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 6cd5808f78..1b6f5b7e14 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -67,7 +67,6 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD (Lnet/minecraft/class_1440;DZ)V ARG 1 panda ARG 2 speed - CLASS class_4055 SpawnData CLASS class_4056 LookAtEntityGoal FIELD field_18116 panda Lnet/minecraft/class_1440; METHOD (Lnet/minecraft/class_1440;Ljava/lang/Class;F)V diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping index c72c2d3516..7b54c512f8 100644 --- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity CLASS class_1457 FollowPlayersGoal - CLASS class_1458 PolarBearEntityData CLASS class_1459 PolarBearRevengeGoal CLASS class_1460 AttackGoal CLASS class_1461 PolarBearEscapeDangerGoal diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 488b2101e6..27b4a4f84f 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -110,7 +110,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 hand METHOD method_7289 setPlayerSpawn (Lnet/minecraft/class_2338;Z)V ARG 1 pos - METHOD method_7290 dropSelectedItem (Z)Lnet/minecraft/class_1542; + METHOD method_7290 dropSelectedItem (Z)Z ARG 1 dropEntireStack METHOD method_7291 openHorseInventory (Lnet/minecraft/class_1496;Lnet/minecraft/class_1263;)V METHOD method_7292 getLuck ()F diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index e239757447..31ac3f5b26 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -23,13 +23,12 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_9645 nbt Lnet/minecraft/class_2105; FIELD field_9646 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9647 enchantments [Lnet/minecraft/class_2035; - METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_1792;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V + METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_1792;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V ARG 1 tag ARG 2 item ARG 3 count ARG 4 durability ARG 5 enchantments - ARG 6 potion METHOD method_8969 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2073; ARG 0 el METHOD method_8970 test (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index a93095e8cf..c5e7b4f842 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -86,9 +86,6 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules ARG 2 type METHOD method_20746 get (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1928$class_4315; ARG 1 key - METHOD method_20747 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928$class_4315;)V - ARG 1 key - ARG 2 rule METHOD method_20748 (Ljava/util/Map$Entry;)Lnet/minecraft/class_1928$class_4315; ARG 0 e METHOD method_20750 (Lnet/minecraft/class_1928$class_4311;Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928$class_4314;)V