From b8403e7661122b2e81507c420dec904ddc46a8de Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 16 Oct 2019 18:09:47 +0100 Subject: [PATCH] 19w42a --- build.gradle | 2 +- mappings/net/minecraft/block/Block.mapping | 2 +- mappings/net/minecraft/block/BlockState.mapping | 2 +- mappings/net/minecraft/block/CakeBlock.mapping | 2 +- .../block/dispenser/DispenserBehavior.mapping | 6 +++--- .../block/entity/PistonBlockEntity.mapping | 15 --------------- .../ClientPlayerInteractionManager.mapping | 2 +- .../client/render/FirstPersonRenderer.mapping | 6 +++--- .../minecraft/client/render/RenderLayer.mapping | 2 -- .../block/entity/ChestBlockEntityRenderer.mapping | 3 --- .../minecraft/client/util/math/Vector3f.mapping | 5 ----- .../minecraft/client/util/math/Vector4f.mapping | 2 -- mappings/net/minecraft/item/LeadItem.mapping | 5 +---- .../net/minecraft/util/TypedActionResult.mapping | 5 +---- 14 files changed, 13 insertions(+), 46 deletions(-) diff --git a/build.gradle b/build.gradle index dd546a5ab3..de1a1eab7f 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "19w41a" +def minecraft_version = "19w42a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index c3f7ea45d1..b6c038db66 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -210,7 +210,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 0 stateId METHOD method_9533 shouldDropItemsOnExplosion (Lnet/minecraft/class_1927;)Z ARG 1 explosion - METHOD method_9534 onUse (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z + METHOD method_9534 onUse (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; ARG 1 state ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 6c6d3ca820..18686ea909 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -148,7 +148,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 1 world ARG 2 pos METHOD method_11628 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; - METHOD method_11629 onUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z + METHOD method_11629 onUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; ARG 1 world ARG 2 player ARG 3 hand diff --git a/mappings/net/minecraft/block/CakeBlock.mapping b/mappings/net/minecraft/block/CakeBlock.mapping index 78f182de34..270adf030d 100644 --- a/mappings/net/minecraft/block/CakeBlock.mapping +++ b/mappings/net/minecraft/block/CakeBlock.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2272 net/minecraft/block/CakeBlock FIELD field_10739 BITES Lnet/minecraft/class_2758; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings - METHOD method_9719 tryEat (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Z + METHOD method_9719 tryEat (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; ARG 1 world ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 57c9df3a5b..a8f4cc82dc 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior - CLASS 13 + CLASS 14 METHOD method_22141 (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 2 emptyBottleStack ARG 3 filledBottleStack - CLASS 19 + CLASS 20 METHOD dispense (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 location ARG 2 stack - CLASS 20 + CLASS 21 METHOD dispense (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 location ARG 2 stack diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index 74b2bd7eb0..01668c30cd 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -11,18 +11,11 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity ARG 2 facing ARG 3 extending ARG 4 source - METHOD method_11493 getXIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D - ARG 0 box1 - ARG 1 direction - ARG 2 box2 METHOD method_11494 getRenderOffsetX (F)F ARG 1 tickDelta METHOD method_11495 getPushedBlock ()Lnet/minecraft/class_2680; METHOD method_11496 getHeadBlockState ()Lnet/minecraft/class_2680; METHOD method_11497 getIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D - ARG 1 box1 - ARG 2 direction - ARG 3 box2 METHOD method_11498 getFacing ()Lnet/minecraft/class_2350; METHOD method_11499 getProgress (F)F ARG 1 tickDelta @@ -33,20 +26,12 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity ARG 1 nextProgress METHOD method_11504 getAmountExtended (F)F ARG 1 progress - METHOD method_11505 getZIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D - ARG 0 box1 - ARG 1 direction - ARG 2 box2 METHOD method_11506 getMovementDirection ()Lnet/minecraft/class_2350; METHOD method_11507 getRenderOffsetZ (F)F ARG 1 tickDelta METHOD method_11508 getSavedWorldTime ()J METHOD method_11509 getApproximateHeadBox (Ljava/util/List;)Lnet/minecraft/class_238; ARG 1 boxes - METHOD method_11510 getYIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D - ARG 0 box1 - ARG 1 direction - ARG 2 box2 METHOD method_11511 getRenderOffsetY (F)F ARG 1 tickDelta METHOD method_11512 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 70dcc12f02..6e8e827718 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -69,7 +69,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_1271; + METHOD method_2919 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1934; METHOD method_2921 breakBlockOrFire (Lnet/minecraft/class_310;Lnet/minecraft/class_636;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V METHOD method_2922 isCurrentlyBreaking (Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping index 1de49784cb..927e7572dd 100644 --- a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping +++ b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping @@ -15,8 +15,8 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer METHOD method_3218 applyEatOrDrinkTransformation (Lnet/minecraft/class_4587;FLnet/minecraft/class_1306;Lnet/minecraft/class_1799;)V METHOD method_3219 renderArmHoldingItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FFLnet/minecraft/class_1306;)V METHOD method_3220 updateHeldItems ()V - METHOD method_3222 renderMapInOneHand (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FLnet/minecraft/class_1306;FLnet/minecraft/class_1799;)V - METHOD method_3223 renderFirstPersonMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1799;)V + METHOD method_3222 renderMapInOneHand (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFLnet/minecraft/class_1306;FLnet/minecraft/class_1799;)V + METHOD method_3223 renderFirstPersonMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;)V METHOD method_3224 applyHandOffset (Lnet/minecraft/class_4587;Lnet/minecraft/class_1306;F)V METHOD method_3227 getMapAngle (F)F METHOD method_3228 renderFirstPersonItem (Lnet/minecraft/class_742;FFLnet/minecraft/class_1268;FLnet/minecraft/class_1799;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V @@ -26,5 +26,5 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer ARG 4 hand ARG 6 item ARG 7 equipProgress - METHOD method_3231 renderMapInBothHands (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FFF)V + METHOD method_3231 renderMapInBothHands (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFFF)V METHOD method_3233 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index d81eddca76..5b765615f0 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer - FIELD field_20803 blockHandler Ljava/util/Map; - FIELD field_20804 fluidHandler Ljava/util/Map; FIELD field_20806 expectedBufferSize I FIELD field_20964 LEASH Lnet/minecraft/class_1921; FIELD field_20965 WATER_MASK Lnet/minecraft/class_1921; diff --git a/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping index 88a45fb78f..3c996b30da 100644 --- a/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_826 net/minecraft/client/render/block/entity/ChestBlockEntityRenderer FIELD field_4357 TRAPPED_TEX Lnet/minecraft/class_2960; - FIELD field_4359 NORMAL_DOUBLE_TEX Lnet/minecraft/class_2960; - FIELD field_4360 TRAPPED_DOUBLE_TEX Lnet/minecraft/class_2960; - FIELD field_4362 CHRISTMAS_DOUBLE_TEX Lnet/minecraft/class_2960; FIELD field_4363 CHRISTMAS_TEX Lnet/minecraft/class_2960; FIELD field_4364 NORMAL_TEX Lnet/minecraft/class_2960; FIELD field_4365 isChristmas Z diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/client/util/math/Vector3f.mapping index 5532b27590..49292faaa0 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3f.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f FIELD field_20705 POSITIVE_Y Lnet/minecraft/class_1160; FIELD field_20706 NEGATIVE_Z Lnet/minecraft/class_1160; FIELD field_20707 POSITIVE_Z Lnet/minecraft/class_1160; - FIELD field_5658 components [F METHOD (FFF)V ARG 1 x ARG 2 y @@ -17,7 +16,6 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f ARG 2 max METHOD method_23214 getRotationQuaternion (F)Lnet/minecraft/class_1158; METHOD method_23215 multiply (Lnet/minecraft/class_4581;)V - ARG 1 matrix METHOD method_4942 scale (F)V METHOD method_4943 getX ()F METHOD method_4944 subtract (Lnet/minecraft/class_1160;)V @@ -29,9 +27,6 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f ARG 1 x ARG 2 y METHOD method_4949 set (FFF)V - ARG 1 x - ARG 2 y - ARG 3 z METHOD method_4950 dot (Lnet/minecraft/class_1160;)F METHOD method_4951 cross (Lnet/minecraft/class_1160;)V ARG 1 vector diff --git a/mappings/net/minecraft/client/util/math/Vector4f.mapping b/mappings/net/minecraft/client/util/math/Vector4f.mapping index 6b4745fe49..28a849b391 100644 --- a/mappings/net/minecraft/client/util/math/Vector4f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector4f.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f - FIELD field_5662 components [F METHOD (FFFF)V ARG 1 x ARG 2 y @@ -8,7 +7,6 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_22674 multiply (Lnet/minecraft/class_1159;)V - ARG 1 matrix METHOD method_4953 getX ()F METHOD method_4954 multiply (Lnet/minecraft/class_1160;)V METHOD method_4956 getY ()F diff --git a/mappings/net/minecraft/item/LeadItem.mapping b/mappings/net/minecraft/item/LeadItem.mapping index 98e97d7c86..f210dfc7a7 100644 --- a/mappings/net/minecraft/item/LeadItem.mapping +++ b/mappings/net/minecraft/item/LeadItem.mapping @@ -1,5 +1,2 @@ CLASS net/minecraft/class_1804 net/minecraft/item/LeadItem - METHOD method_7994 attachHeldMobsToBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z - ARG 0 player - ARG 1 world - ARG 2 pos + METHOD method_7994 attachHeldMobsToBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; diff --git a/mappings/net/minecraft/util/TypedActionResult.mapping b/mappings/net/minecraft/util/TypedActionResult.mapping index 2540bc5039..8ed97d7565 100644 --- a/mappings/net/minecraft/util/TypedActionResult.mapping +++ b/mappings/net/minecraft/util/TypedActionResult.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_1271 net/minecraft/util/TypedActionResult - FIELD field_20683 swingArm Z FIELD field_5815 result Lnet/minecraft/class_1269; FIELD field_5816 value Ljava/lang/Object; - METHOD (Lnet/minecraft/class_1269;Ljava/lang/Object;Z)V + METHOD (Lnet/minecraft/class_1269;Ljava/lang/Object;)V ARG 1 result ARG 2 value - ARG 3 swingArm METHOD method_22427 successWithSwing (Ljava/lang/Object;)Lnet/minecraft/class_1271; ARG 0 data METHOD method_22428 successWithoutSwing (Ljava/lang/Object;)Lnet/minecraft/class_1271; ARG 0 data - METHOD method_22429 shouldSwingArm ()Z METHOD method_22430 pass (Ljava/lang/Object;)Lnet/minecraft/class_1271; ARG 0 data METHOD method_22431 fail (Ljava/lang/Object;)Lnet/minecraft/class_1271;