From cf0ef0a6bd36b57372ec77c2e36abaefbecbc7a7 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 8 Apr 2020 15:44:19 +0100 Subject: [PATCH] 20w15a --- build.gradle | 2 +- .../net/minecraft/block/GoldBlock.mapping | 1 - .../block/dispenser/DispenserBehavior.mapping | 2 +- mappings/net/minecraft/class_5146.mapping | 4 ++++ mappings/net/minecraft/class_5147.mapping | 2 ++ .../minecraft/client/gui/hud/ChatHud.mapping | 2 -- .../client/texture/LayeredTexture.mapping | 5 ----- .../client/texture/NativeImage.mapping | 4 ---- .../model/BlockStateModelGenerator.mapping | 1 - .../data/client/model/TexturedModel.mapping | 2 -- .../data/server/AbstractTagProvider.mapping | 8 ++++++- .../datafixer/fix/EntityUuidFix.mapping | 14 ------------ .../enchantment/ProtectionEnchantment.mapping | 2 -- mappings/net/minecraft/entity/Entity.mapping | 1 - .../minecraft/entity/ItemSteerable.mapping | 8 ------- .../minecraft/entity/ai/brain/Brain.mapping | 4 ---- .../ai/pathing/LandPathNodeMaker.mapping | 19 +++------------- .../entity/attribute/Attributes.mapping | 4 ---- .../entity/passive/HorseBaseEntity.mapping | 5 +---- .../entity/passive/HorseEntity.mapping | 14 +----------- .../entity/passive/SheepEntity.mapping | 1 - .../net/minecraft/item/SpawnEggItem.mapping | 6 +---- .../net/minecraft/structure/Structure.mapping | 1 - .../structure/StructurePlacementData.mapping | 2 +- .../minecraft/tag/GlobalTagAccessor.mapping | 3 +-- mappings/net/minecraft/tag/Tag.mapping | 22 ++++--------------- .../net/minecraft/util/math/BlockPos.mapping | 4 ++-- .../net/minecraft/world/EntityView.mapping | 4 ---- .../net/minecraft/world/biome/Biome.mapping | 2 -- .../SoulSandValleySurfaceBuilder.mapping | 1 - 30 files changed, 29 insertions(+), 121 deletions(-) delete mode 100644 mappings/net/minecraft/block/GoldBlock.mapping create mode 100644 mappings/net/minecraft/class_5146.mapping create mode 100644 mappings/net/minecraft/class_5147.mapping delete mode 100644 mappings/net/minecraft/client/texture/LayeredTexture.mapping delete mode 100644 mappings/net/minecraft/entity/attribute/Attributes.mapping diff --git a/build.gradle b/build.gradle index 91aef23d37..868127e361 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w14a" +def minecraft_version = "20w15a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/GoldBlock.mapping b/mappings/net/minecraft/block/GoldBlock.mapping deleted file mode 100644 index 24cbd10422..0000000000 --- a/mappings/net/minecraft/block/GoldBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4839 net/minecraft/block/GoldBlock diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 1a8db309af..c9d05480d1 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 2 stack METHOD method_16812 doDispense (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; METHOD method_18346 registerDefaults ()V - CLASS 14 + CLASS 17 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 diff --git a/mappings/net/minecraft/class_5146.mapping b/mappings/net/minecraft/class_5146.mapping new file mode 100644 index 0000000000..9a5a3fae09 --- /dev/null +++ b/mappings/net/minecraft/class_5146.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5146 + METHOD method_6576 setSaddled (Lnet/minecraft/class_3419;)V + METHOD method_6725 isSaddled ()Z + METHOD method_6765 canBeSaddled ()Z diff --git a/mappings/net/minecraft/class_5147.mapping b/mappings/net/minecraft/class_5147.mapping new file mode 100644 index 0000000000..1dfc757c4b --- /dev/null +++ b/mappings/net/minecraft/class_5147.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5147 + METHOD method_6636 dropItems (Lnet/minecraft/class_3419;)V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 19dd5eae1e..74871105b8 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_2065 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2066 scrolledLines I FIELD field_2067 hasUnreadNewMessages Z - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client METHOD method_1802 scroll (D)V ARG 1 amount METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/texture/LayeredTexture.mapping b/mappings/net/minecraft/client/texture/LayeredTexture.mapping deleted file mode 100644 index ce7156e25f..0000000000 --- a/mappings/net/minecraft/client/texture/LayeredTexture.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1048 net/minecraft/client/texture/LayeredTexture - FIELD field_5222 locations Ljava/util/List; - FIELD field_5223 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Ljava/lang/String;)V - ARG 1 locations diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 69abc74cae..daa794bc66 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -129,10 +129,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4327 loadFromTextureImage (IZ)V ARG 1 level ARG 2 removeAlpha - METHOD method_4328 blendPixel (III)V - ARG 1 x - ARG 2 y - ARG 3 radius CLASS class_1012 Format FIELD field_4993 pixelDataFormat I FIELD field_4994 channelCount I diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index e74a481e52..3cfd349dd0 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -329,7 +329,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe METHOD method_25687 registerGrindstone ()V METHOD method_25688 registerStraightRail (Lnet/minecraft/class_2248;)V ARG 1 rail - METHOD method_25689 registerCampfire ()V METHOD method_25690 registerCommandBlock (Lnet/minecraft/class_2248;)V ARG 1 commandBlock METHOD method_25691 registerBookshelf ()V diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/model/TexturedModel.mapping index 242a37944a..fd880091e0 100644 --- a/mappings/net/minecraft/data/client/model/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/model/TexturedModel.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel FIELD field_23049 LEAVES Lnet/minecraft/class_4946$class_4947; FIELD field_23050 TEMPLATE_LANTERN Lnet/minecraft/class_4946$class_4947; FIELD field_23051 TEMPLATE_HANGING_LANTERN Lnet/minecraft/class_4946$class_4947; - FIELD field_23052 TEMPLATE_TORCH Lnet/minecraft/class_4946$class_4947; - FIELD field_23053 TEMPLATE_TORCH_WALL Lnet/minecraft/class_4946$class_4947; FIELD field_23054 TEMPLATE_SEAGRASS Lnet/minecraft/class_4946$class_4947; FIELD field_23055 END_FOR_TOP_CUBE_COLUMN Lnet/minecraft/class_4946$class_4947; FIELD field_23056 END_FOR_TOP_CUBE_COLUMN_HORIZONTAL Lnet/minecraft/class_4946$class_4947; diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index 603bd497b8..83b0be9108 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -7,5 +7,11 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V ARG 1 root METHOD method_10510 getOutput (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; - METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_3494$class_5124; + METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; METHOD method_10514 configure ()V + CLASS class_5124 ObjectBuilder + METHOD method_26792 addTag (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; + ARG 1 identifiedTag + METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124; + ARG 1 element + METHOD method_26795 add ([Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124; diff --git a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping index 59847280fc..1f6620243a 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping @@ -8,30 +8,16 @@ CLASS net/minecraft/class_4960 net/minecraft/datafixer/fix/EntityUuidFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_26022 updateAngryAtMemory (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 dynamic METHOD method_26024 updateEvokerFangs (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26026 updateZombieVillager (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26028 updateAreaEffectCloud (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26030 updateShulkerBullet (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26031 updateItemEntity (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26032 updateFox (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26033 updateZombifiedPiglin (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26034 updateTameable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26035 updateBreedable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26036 updateLeashable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26037 updateLiving (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26038 updateProjectile (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root METHOD method_26039 updateSelfUuid (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index 3dd5839abb..9a6041d170 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment FIELD field_9133 protectionType Lnet/minecraft/class_1900$class_1901; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1900$class_1901;[Lnet/minecraft/class_1304;)V ARG 1 weight - ARG 2 type - ARG 3 slotTypes METHOD method_8237 transformExplosionKnockback (Lnet/minecraft/class_1309;D)D ARG 0 entity ARG 1 velocity diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 68ec746e89..d24b848960 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -78,7 +78,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6030 EMPTY_STACK_LIST Ljava/util/List; FIELD field_6031 yaw F FIELD field_6032 AIR Lnet/minecraft/class_2940; - FIELD field_6033 inanimate Z FIELD field_6034 vehicle Lnet/minecraft/class_1297; FIELD field_6036 prevY D FIELD field_6037 velocityModified Z diff --git a/mappings/net/minecraft/entity/ItemSteerable.mapping b/mappings/net/minecraft/entity/ItemSteerable.mapping index 7d140de360..d83d0291aa 100644 --- a/mappings/net/minecraft/entity/ItemSteerable.mapping +++ b/mappings/net/minecraft/entity/ItemSteerable.mapping @@ -3,15 +3,7 @@ CLASS net/minecraft/class_4981 net/minecraft/entity/ItemSteerable ARG 1 entity ARG 2 saddledEntity ARG 3 movementInput - METHOD method_26314 interactMob (Lnet/minecraft/class_1308;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Z)Z - ARG 1 entity - ARG 2 player - ARG 3 hand - ARG 4 childRideable METHOD method_26315 setMovementInput (Lnet/minecraft/class_243;)V ARG 1 movementInput METHOD method_26316 getSaddledSpeed ()F - METHOD method_6575 isSaddled ()Z - METHOD method_6576 setSaddled (Z)V - ARG 1 saddled METHOD method_6577 consumeOnAStickItem ()Z diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 1fa2468a68..d32a53bc38 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -13,8 +13,6 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain COMMENT completed. METHOD (Ljava/util/Collection;Ljava/util/Collection;Lcom/mojang/datafixers/Dynamic;)V ARG 1 memoryTypes - ARG 2 sensors - ARG 3 data METHOD method_18871 refreshActivities (JJ)V ARG 1 timeOfDay ARG 3 time @@ -47,7 +45,6 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_18896 hasMemoryModule (Lnet/minecraft/class_4140;)Z ARG 1 type METHOD method_18897 setDefaultActivity (Lnet/minecraft/class_4168;)V - METHOD method_18899 streamRunningTasks ()Ljava/util/stream/Stream; METHOD method_18900 stopAllTasks (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V METHOD method_18904 getOptionalMemory (Lnet/minecraft/class_4140;)Ljava/util/Optional; ARG 1 type @@ -72,7 +69,6 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 2 indexedTasks ARG 3 requiredMemories METHOD method_24530 setTaskList (Lnet/minecraft/class_4168;Lcom/google/common/collect/ImmutableList;Ljava/util/Set;Ljava/util/Set;)V - ARG 1 activity ARG 2 indexedTasks ARG 3 requiredMemories ARG 4 forgettingMemories diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index a575b22d05..ecd0431307 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -5,27 +5,14 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 2 successor1 ARG 3 successor2 ARG 4 diagonalSuccessor - METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; - ARG 0 world - ARG 1 x - ARG 2 y - ARG 3 z + METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7; METHOD method_57 getNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; ARG 1 entity ARG 2 x ARG 3 y ARG 4 z - METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; - ARG 0 world - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_59 getNodeTypeFromNeighbors (Lnet/minecraft/class_1922;IIILnet/minecraft/class_7;)Lnet/minecraft/class_7; - ARG 0 world - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 type + METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + METHOD method_59 getNodeTypeFromNeighbors (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; METHOD method_60 getFeetY (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/entity/attribute/Attributes.mapping b/mappings/net/minecraft/entity/attribute/Attributes.mapping deleted file mode 100644 index 86dd21c056..0000000000 --- a/mappings/net/minecraft/entity/attribute/Attributes.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5134 net/minecraft/entity/attribute/Attributes - METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1320; - ARG 0 id - ARG 1 object diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index 3e74cfb144..ae020e1b2e 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity ARG 1 player METHOD method_6723 playJumpSound ()V METHOD method_6724 isEatingGrass ()Z - METHOD method_6725 isSaddled ()Z METHOD method_6726 putPlayerOnBack (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_6727 isTame ()Z @@ -65,8 +64,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity ARG 1 bred METHOD method_6752 bondWithPlayer (Lnet/minecraft/class_1657;)Z ARG 1 player - METHOD method_6753 setSaddled (Z)V - ARG 1 saddled + METHOD method_6753 setSaddled ()Z METHOD method_6754 getChildHealthBonus ()F METHOD method_6755 getMaxTemper ()I METHOD method_6757 playAngrySound ()V @@ -79,7 +77,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity METHOD method_6762 eatsGrass ()Z METHOD method_6763 isInAir ()Z METHOD method_6764 initCustomGoals ()V - METHOD method_6765 canBeSaddled ()Z METHOD method_6766 setTame (Z)V ARG 1 tame METHOD method_6767 getAngryAnimationProgress (F)F diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index 90c9c5560a..c7c844a8c4 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,25 +1,13 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity FIELD field_6985 HORSE_ARMOR_BONUS_UUID Ljava/util/UUID; - FIELD field_6986 HORSE_MARKING_TEX [Ljava/lang/String; - FIELD field_6987 textureLocation Ljava/lang/String; - FIELD field_6988 textureLayers [Ljava/lang/String; - FIELD field_6989 HORSE_MARKING_TEX_ID [Ljava/lang/String; FIELD field_6990 VARIANT Lnet/minecraft/class_2940; - FIELD field_6991 HORSE_TEX_ID [Ljava/lang/String; - FIELD field_6992 HORSE_TEX [Ljava/lang/String; METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_6783 setVariant (I)V ARG 1 variant - METHOD method_6784 getTextureLocation ()Ljava/lang/String; - METHOD method_6785 clearTextureInfo ()V METHOD method_6786 getArmorType ()Lnet/minecraft/class_1799; - METHOD method_6787 getTextureLayers ()[Ljava/lang/String; METHOD method_6788 getVariant ()I - METHOD method_6789 initTextureInfo ()V METHOD method_6790 setArmorTypeFromStack (Lnet/minecraft/class_1799;)V ARG 1 stack CLASS class_1499 HorseData - FIELD field_6994 variant I - METHOD (I)V - ARG 1 variant + FIELD field_6994 variant Lnet/minecraft/class_5149; diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 0a91ff2b24..de4815e893 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -17,5 +17,4 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity ARG 0 dyeColor METHOD method_6635 setSheared (Z)V ARG 1 sheared - METHOD method_6636 dropItems ()V METHOD method_6639 getChildColor (Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;)Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/item/SpawnEggItem.mapping b/mappings/net/minecraft/item/SpawnEggItem.mapping index c6d6f7604d..0266db2670 100644 --- a/mappings/net/minecraft/item/SpawnEggItem.mapping +++ b/mappings/net/minecraft/item/SpawnEggItem.mapping @@ -8,12 +8,8 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem ARG 2 primaryColor ARG 3 secondaryColor ARG 4 settings - METHOD method_24793 spawnBaby (Lnet/minecraft/class_1657;Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)Ljava/util/Optional; + METHOD method_24793 spawnBaby (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 user - ARG 2 type - ARG 3 world - ARG 4 pos - ARG 5 stack METHOD method_8015 getEntityType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1299; ARG 1 tag METHOD method_8016 getColor (I)I diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index dcc3999f93..7b45df34d1 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 3 secondCorner METHOD method_15165 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;Z)Ljava/util/List; ARG 1 pos - ARG 2 placementData ARG 4 transformed METHOD method_15166 getRotatedSize (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; METHOD method_15167 offsetByTransformedSize (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/structure/StructurePlacementData.mapping b/mappings/net/minecraft/structure/StructurePlacementData.mapping index e0c3a15940..6e449228e6 100644 --- a/mappings/net/minecraft/structure/StructurePlacementData.mapping +++ b/mappings/net/minecraft/structure/StructurePlacementData.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_3492 net/minecraft/structure/StructurePlacementData METHOD method_15119 setPosition (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3492; ARG 1 position METHOD method_15120 shouldPlaceFluids ()Z - METHOD method_15121 getRandomBlockInfos (Ljava/util/List;Lnet/minecraft/class_2338;)Ljava/util/List; + METHOD method_15121 getRandomBlockInfos (Ljava/util/List;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3499$class_5162; METHOD method_15123 setRotation (Lnet/minecraft/class_2470;)Lnet/minecraft/class_3492; ARG 1 rotation METHOD method_15124 getBoundingBox ()Lnet/minecraft/class_3341; diff --git a/mappings/net/minecraft/tag/GlobalTagAccessor.mapping b/mappings/net/minecraft/tag/GlobalTagAccessor.mapping index 781b7441ca..9c8f214f6a 100644 --- a/mappings/net/minecraft/tag/GlobalTagAccessor.mapping +++ b/mappings/net/minecraft/tag/GlobalTagAccessor.mapping @@ -13,6 +13,5 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/GlobalTagAccessor FIELD field_23685 currentTag Lnet/minecraft/class_3494; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_26775 updateContainer (Lnet/minecraft/class_3503;)V - ARG 1 container + METHOD method_26775 updateContainer (Ljava/util/function/Function;)V METHOD method_26776 get ()Lnet/minecraft/class_3494; diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 9304e6aec2..8942165406 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -19,22 +19,20 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag CLASS class_3495 Builder COMMENT A builder class to ease the creation of tags. It can also be used as a COMMENT mutable form of a tag. - FIELD field_23688 entries Ljava/util/Set; + FIELD field_23688 entries Ljava/util/List; METHOD method_26778 create ()Lnet/minecraft/class_3494$class_3495; - METHOD method_26779 add (Lnet/minecraft/class_3494$class_3496;)Lnet/minecraft/class_3494$class_3495; - ARG 1 entry - METHOD method_26780 read (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3494$class_3495; + METHOD method_26780 read (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495; ARG 1 json METHOD method_26782 build (Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/Optional; ARG 1 tagGetter ARG 2 objectGetter - METHOD method_26784 add (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494$class_3495; + METHOD method_26784 add (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495; ARG 1 id METHOD method_26785 streamEntries ()Ljava/util/stream/Stream; METHOD method_26786 streamUnresolvedEntries (Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/stream/Stream; ARG 1 tagGetter ARG 2 objectGetter - METHOD method_26787 addTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494$class_3495; + METHOD method_26787 addTag (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495; ARG 1 id METHOD method_26788 toJson ()Lcom/google/gson/JsonObject; CLASS class_3496 Entry @@ -54,15 +52,3 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag ARG 1 id CLASS class_5123 Identified METHOD method_26791 getId ()Lnet/minecraft/class_2960; - CLASS class_5124 ObjectBuilder - FIELD field_23690 idGetter Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 idGetter - METHOD method_26792 addTag (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_3494$class_5124; - ARG 1 identifiedTag - METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_3494$class_5124; - ARG 1 element - METHOD method_26794 add (Ljava/util/Collection;)Lnet/minecraft/class_3494$class_5124; - ARG 1 elements - METHOD method_26795 add ([Ljava/lang/Object;)Lnet/minecraft/class_3494$class_5124; - ARG 1 elements diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index 64f7bf1d8d..d01a3c4e18 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -145,7 +145,7 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos ARG 1 maxX ARG 2 maxY ARG 3 maxZ - CLASS 1 + CLASS 2 FIELD field_23094 maxDistance I FIELD field_23095 xRange I FIELD field_23096 yRange I @@ -155,7 +155,7 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_23101 limitY I FIELD field_23102 dx I FIELD field_23103 dy I - CLASS 2 + CLASS 3 FIELD field_23105 size I FIELD field_23106 sizeX I FIELD field_23107 sizeY I diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 2bb7a466f3..76d7633ee7 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView - METHOD method_18020 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z - ARG 1 e METHOD method_18456 getPlayers ()Ljava/util/List; METHOD method_18458 isPlayerInRange (DDDD)Z ARG 1 x @@ -97,5 +95,3 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView ARG 7 maxDistance ARG 9 targetPredicate METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z - ARG 1 except - ARG 2 shape diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 2dcf534662..8b528ae749 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -201,5 +201,3 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome COMMENT biome that offers a closest point to its arbitrary point. ARG 1 other COMMENT the other noise point - METHOD method_26457 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SoulSandValleySurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SoulSandValleySurfaceBuilder.mapping index 317a71e665..17db51076f 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SoulSandValleySurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SoulSandValleySurfaceBuilder.mapping @@ -2,4 +2,3 @@ CLASS net/minecraft/class_4790 net/minecraft/world/gen/surfacebuilder/SoulSandVa FIELD field_22204 GRAVEL Lnet/minecraft/class_2680; FIELD field_22209 SOUL_SAND Lnet/minecraft/class_2680; FIELD field_22210 SOUL_SOIL Lnet/minecraft/class_2680; - FIELD field_22211 seed J