From 85d87033daaf99231abb35170c685fc9220005cd Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 25 Nov 2019 19:17:49 +0000 Subject: [PATCH] 1.15-pre2 --- build.gradle | 2 +- .../net/minecraft/block/ChestBlock.mapping | 19 ++++--------------- mappings/net/minecraft/class_4732.mapping | 4 ++++ .../client/gui/screen/AddServerScreen.mapping | 3 --- .../gui/screen/DirectConnectScreen.mapping | 3 --- .../ElderGuardianAppearanceParticle.mapping | 1 - .../client/render/debug/DebugRenderer.mapping | 4 ++-- .../client/render/model/ModelLoader.mapping | 2 +- .../minecraft/client/texture/Sprite.mapping | 1 - .../client/texture/SpriteAtlasTexture.mapping | 10 +++------- .../entity/mob/ElderGuardianEntity.mapping | 1 - .../entity/passive/BeeEntity.mapping | 6 ------ .../entity/player/PlayerEntity.mapping | 3 +-- 13 files changed, 16 insertions(+), 43 deletions(-) create mode 100644 mappings/net/minecraft/class_4732.mapping diff --git a/build.gradle b/build.gradle index c31b616cd5..0f94f03301 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.15-pre1" +def minecraft_version = "1.15-pre2" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/ChestBlock.mapping b/mappings/net/minecraft/block/ChestBlock.mapping index ba29d9481b..2ccc2d4c84 100644 --- a/mappings/net/minecraft/block/ChestBlock.mapping +++ b/mappings/net/minecraft/block/ChestBlock.mapping @@ -3,12 +3,6 @@ CLASS net/minecraft/class_2281 net/minecraft/block/ChestBlock CLASS 1 METHOD createMenu (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId - CLASS class_3923 PropertyRetriever - METHOD method_17464 getFromSingleChest (Lnet/minecraft/class_2595;)Ljava/lang/Object; - ARG 1 chest - METHOD method_17465 getFromDoubleChest (Lnet/minecraft/class_2595;Lnet/minecraft/class_2595;)Ljava/lang/Object; - ARG 1 rightChest - ARG 2 leftChest FIELD field_10767 DOUBLE_NORTH_SHAPE Lnet/minecraft/class_265; FIELD field_10768 FACING Lnet/minecraft/class_2753; FIELD field_10769 DOUBLE_EAST_SHAPE Lnet/minecraft/class_265; @@ -17,16 +11,11 @@ CLASS net/minecraft/class_2281 net/minecraft/block/ChestBlock FIELD field_10772 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_10773 DOUBLE_WEST_SHAPE Lnet/minecraft/class_265; FIELD field_10774 SINGLE_SHAPE Lnet/minecraft/class_265; - FIELD field_17356 INVENTORY_RETRIEVER Lnet/minecraft/class_2281$class_3923; - FIELD field_17357 NAME_RETRIEVER Lnet/minecraft/class_2281$class_3923; - METHOD (Lnet/minecraft/class_2248$class_2251;)V + FIELD field_17356 INVENTORY_RETRIEVER Lnet/minecraft/class_4732$class_3923; + FIELD field_17357 NAME_RETRIEVER Lnet/minecraft/class_4732$class_3923; + METHOD (Lnet/minecraft/class_2248$class_2251;Ljava/util/function/Supplier;)V ARG 1 settings - METHOD method_17458 getInventory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1263; - METHOD method_17459 retrieve (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;ZLnet/minecraft/class_2281$class_3923;)Ljava/lang/Object; - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 allowBlockedChests + METHOD method_17458 getInventory (Lnet/minecraft/class_2281;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1263; METHOD method_9753 getNeighborChestDirection (Lnet/minecraft/class_1750;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; ARG 1 ctx ARG 2 dir diff --git a/mappings/net/minecraft/class_4732.mapping b/mappings/net/minecraft/class_4732.mapping new file mode 100644 index 0000000000..2eb35eba9c --- /dev/null +++ b/mappings/net/minecraft/class_4732.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4732 + CLASS class_3923 PropertyRetriever + METHOD method_17464 getFromSingleChest (Ljava/lang/Object;)Ljava/lang/Object; + METHOD method_17465 getFromDoubleChest (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping index 79dd5c898b..77a70060e6 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping @@ -6,9 +6,6 @@ CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen FIELD field_2473 resourcePackOptionButton Lnet/minecraft/class_4185; FIELD field_2474 addressField Lnet/minecraft/class_342; FIELD field_2475 addressTextFilter Ljava/util/function/Predicate; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_642;)V - ARG 1 callback - ARG 2 server METHOD method_2171 onClose (Ljava/lang/String;)V ARG 1 text METHOD method_2172 addAndClose ()V diff --git a/mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping index 601458598e..1320bf61c7 100644 --- a/mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DirectConnectScreen.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_420 net/minecraft/client/gui/screen/DirectConnectScree FIELD field_2460 serverEntry Lnet/minecraft/class_642; FIELD field_2462 selectServerButton Lnet/minecraft/class_4185; FIELD field_2463 addressField Lnet/minecraft/class_342; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_642;)V - ARG 1 callback - ARG 2 serverEntry METHOD method_19376 (Ljava/lang/String;)V ARG 1 text METHOD method_2167 saveAndClose ()V diff --git a/mappings/net/minecraft/client/particle/ElderGuardianAppearanceParticle.mapping b/mappings/net/minecraft/client/particle/ElderGuardianAppearanceParticle.mapping index 5d639d7cb7..79b57ecfa0 100644 --- a/mappings/net/minecraft/client/particle/ElderGuardianAppearanceParticle.mapping +++ b/mappings/net/minecraft/client/particle/ElderGuardianAppearanceParticle.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_700 net/minecraft/client/particle/ElderGuardianAppearanceParticle CLASS class_701 Factory - FIELD field_3829 guardian Lnet/minecraft/class_1309; METHOD (Lnet/minecraft/class_1937;DDD)V ARG 2 x ARG 4 y diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index 4186bb4c76..f61f1b05f8 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_20414 clear ()V - METHOD method_23109 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDJ)V + METHOD method_23109 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V FIELD field_18777 villageDebugRenderer Lnet/minecraft/class_4207; FIELD field_18778 goalSelectorDebugRenderer Lnet/minecraft/class_4205; FIELD field_19325 raidCenterDebugRenderer Lnet/minecraft/class_4304; @@ -33,7 +33,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer ARG 13 green ARG 14 blue ARG 15 alpha - METHOD method_23099 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;DDDJ)V + METHOD method_23099 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;DDD)V METHOD method_23101 getTargettedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional; ARG 0 entity ARG 1 maxDistance diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 01cf10c329..74cecc0bc8 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader ARG 1 resourceManager METHOD method_15878 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; ARG 2 settings - METHOD method_18177 upload (Lnet/minecraft/class_1060;ILnet/minecraft/class_3695;)Lnet/minecraft/class_4724; + METHOD method_18177 upload (Lnet/minecraft/class_1060;Lnet/minecraft/class_3695;)Lnet/minecraft/class_4724; METHOD method_21603 addStates (Ljava/lang/Iterable;)V ARG 1 states METHOD method_21605 getStateLookup ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index febf0a3af8..3aedab2613 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_5271 animationMetadata Lnet/minecraft/class_1079; FIELD field_5272 frameTicks I FIELD field_5273 frameIndex I - METHOD close destroy ()V METHOD method_23841 getFrameDeltaFactor ()F METHOD method_23842 getAnimationFrameDelta ()F METHOD method_4570 getFrameV (D)F diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 6a927c3940..cf9f94acd7 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -4,11 +4,10 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_17901 width I FIELD field_17902 height I FIELD field_17903 sprites Ljava/util/List; - METHOD (Ljava/util/Set;IILjava/util/List;)V + METHOD (Ljava/util/Set;IIILjava/util/List;)V ARG 1 spriteIds ARG 2 width ARG 3 height - ARG 4 sprites FIELD field_17898 PARTICLE_ATLAS_TEX Lnet/minecraft/class_2960; FIELD field_17899 maxTextureSize I FIELD field_5275 BLOCK_ATLAS_TEX Lnet/minecraft/class_2960; @@ -16,18 +15,15 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_5277 spritesToLoad Ljava/util/Set; FIELD field_5278 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5280 sprites Ljava/util/Map; - FIELD field_5281 mipLevel I METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V - METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;)Ljava/util/List; + METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;I)Ljava/util/List; ARG 1 resourceManager ARG 2 stitcher METHOD method_18163 stitch (Lnet/minecraft/class_3300;Ljava/util/stream/Stream;Lnet/minecraft/class_3695;I)Lnet/minecraft/class_1059$class_4007; METHOD method_18164 loadSprites (Lnet/minecraft/class_3300;Ljava/util/Set;)Ljava/util/Collection; METHOD method_4601 clear ()V METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIII)Lnet/minecraft/class_1058; + METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIIII)Lnet/minecraft/class_1058; ARG 1 container - METHOD method_4605 setMipLevel (I)V - ARG 1 mipLevel METHOD method_4608 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; METHOD method_4612 tickAnimatedSprites ()V diff --git a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping index ef3f8b8d2e..c90b5f5904 100644 --- a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_1550 net/minecraft/entity/mob/ElderGuardianEntity - METHOD method_7010 straightenTail ()V diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 6025650a02..28855066e8 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_21814 canBeeStart ()Z METHOD method_21815 canBeeContinue ()Z CLASS class_4468 StingGoal - METHOD (Lnet/minecraft/class_1314;DZ)V - ARG 1 mob - ARG 2 speed - ARG 4 pauseWhenIdle METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_1314;DZ)V ARG 2 mob ARG 3 speed @@ -40,8 +36,6 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity CLASS class_4476 FindHiveGoal METHOD method_23742 getNearbyFreeHives ()Ljava/util/List; CLASS class_4477 BeeLookControl - METHOD (Lnet/minecraft/class_1308;)V - ARG 1 bee METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_1308;)V ARG 2 entity CLASS class_4478 PollinateGoal diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 59ad6c95a7..526aa33eef 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -111,8 +111,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7287 interact (Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 entity ARG 2 hand - METHOD method_7289 setPlayerSpawn (Lnet/minecraft/class_2338;Z)V - ARG 1 pos + METHOD method_7289 setPlayerSpawn (Lnet/minecraft/class_2338;ZZ)V METHOD method_7290 dropSelectedItem (Z)Z ARG 1 dropEntireStack METHOD method_7291 openHorseInventory (Lnet/minecraft/class_1496;Lnet/minecraft/class_1263;)V