From a068df5d3ddfa930cb11e044f45ab7c26a088e56 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 25 Mar 2020 17:49:03 +0000 Subject: [PATCH] 20w13a --- build.gradle | 2 +- mappings/net/minecraft/block/AbstractBlock.mapping | 3 +-- mappings/net/minecraft/block/ComposterBlock.mapping | 4 ++-- mappings/net/minecraft/block/RespawnAnchorBlock.mapping | 4 +--- mappings/net/minecraft/block/VineLogic.mapping | 1 - .../block/entity/AbstractFurnaceBlockEntity.mapping | 2 -- mappings/net/minecraft/block/entity/BlockEntity.mapping | 5 ++--- mappings/net/minecraft/class_4981.mapping | 3 +++ .../client/gui/screen/ingame/JigsawBlockScreen.mapping | 2 -- .../entity/feature/PigSaddleFeatureRenderer.mapping | 2 +- .../minecraft/client/render/model/ModelRotation.mapping | 3 --- .../data/client/model/BlockStateModelGenerator.mapping | 3 --- mappings/net/minecraft/entity/FishingBobberEntity.mapping | 3 --- mappings/net/minecraft/entity/ShulkerBulletEntity.mapping | 3 --- .../minecraft/entity/ai/brain/task/FollowMobTask.mapping | 2 -- mappings/net/minecraft/entity/mob/MobEntity.mapping | 5 +---- mappings/net/minecraft/entity/passive/PigEntity.mapping | 3 --- .../net/minecraft/entity/passive/VillagerEntity.mapping | 1 - mappings/net/minecraft/entity/player/PlayerEntity.mapping | 2 +- .../minecraft/entity/projectile/ProjectileEntity.mapping | 2 +- mappings/net/minecraft/item/CompassItem.mapping | 5 ----- .../network/packet/c2s/play/UpdateJigsawC2SPacket.mapping | 3 +-- mappings/net/minecraft/realms/Realms.mapping | 2 +- .../minecraft/server/world/ServerTickScheduler.mapping | 5 +---- .../minecraft/server/world/SimpleTickScheduler.mapping | 6 ++---- mappings/net/minecraft/sound/BiomeAdditionsSound.mapping | 1 - mappings/net/minecraft/sound/BiomeMoodSound.mapping | 1 - mappings/net/minecraft/structure/Structure.mapping | 8 ++------ mappings/net/minecraft/structure/StructurePiece.mapping | 2 +- .../minecraft/structure/pool/StructurePoolElement.mapping | 2 +- .../structure/processor/StructureProcessor.mapping | 3 +-- .../structure/processor/StructureProcessorRule.mapping | 3 +-- mappings/net/minecraft/util/Util.mapping | 7 ------- mappings/net/minecraft/util/math/BlockPos.mapping | 2 -- mappings/net/minecraft/world/IWorld.mapping | 1 - mappings/net/minecraft/world/TickScheduler.mapping | 1 - mappings/net/minecraft/world/World.mapping | 1 + 37 files changed, 26 insertions(+), 82 deletions(-) create mode 100644 mappings/net/minecraft/class_4981.mapping diff --git a/build.gradle b/build.gradle index 2cdd79a4f2..1a6771a3cc 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "20w12a" +def minecraft_version = "20w13a" 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 b746c0b233..c595ea3c6a 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26160 asBlock ()Lnet/minecraft/class_2248; METHOD method_26161 hasBlockEntity ()Z METHOD method_26162 getDropTableID ()Lnet/minecraft/class_2960; - METHOD method_26163 getMaterialColor ()Ljava/util/function/Function; METHOD method_8389 asItem ()Lnet/minecraft/class_1792; METHOD method_9498 hasComparatorOutput (Lnet/minecraft/class_2680;)Z ARG 1 state @@ -303,7 +302,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23168 hasSidedTransparency Z FIELD field_23169 isAir Z FIELD field_23170 material Lnet/minecraft/class_3614; - FIELD field_23171 materialColor Ljava/util/function/Function; + FIELD field_23171 materialColor Lnet/minecraft/class_3620; FIELD field_23172 hardness F FIELD field_23173 opaque Z FIELD field_23174 solidBlockPredicate Lnet/minecraft/class_4970$class_4973; diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index 943b4252ad..1bb9371f31 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -6,13 +6,13 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock METHOD method_17753 registerCompostableItem (FLnet/minecraft/class_1935;)V ARG 0 levelIncreaseChance ARG 1 item - METHOD method_17756 addToComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z + METHOD method_17756 addToComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 world ARG 2 pos ARG 3 item METHOD method_17758 registerDefaultCompostableItems ()V - METHOD method_17759 emptyComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V + METHOD method_17759 emptyComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping index 5395733539..37b46eb735 100644 --- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping +++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock FIELD field_23153 CHARGES Lnet/minecraft/class_2758; - METHOD method_26156 findRespawnPosition (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Ljava/util/Optional; - ARG 0 world - ARG 1 pos + METHOD method_26156 findRespawnPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Ljava/util/Optional; METHOD method_26157 getLightLevel (Lnet/minecraft/class_2680;I)I ARG 0 state ARG 1 maxLevel diff --git a/mappings/net/minecraft/block/VineLogic.mapping b/mappings/net/minecraft/block/VineLogic.mapping index 376b045e36..16b8980c3c 100644 --- a/mappings/net/minecraft/block/VineLogic.mapping +++ b/mappings/net/minecraft/block/VineLogic.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_4949 net/minecraft/block/VineLogic - FIELD field_23081 STEM_OUTLINE_SHAPE Lnet/minecraft/class_265; METHOD method_25961 isValidForWeepingStem (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 9a1c5743fe..8efca95ca6 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -23,8 +23,6 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 1 fuel METHOD method_11201 isBurning ()Z METHOD method_11202 addFuel (Ljava/util/Map;Lnet/minecraft/class_1935;I)V - ARG 0 fuelTimes - ARG 1 item ARG 2 fuelTime METHOD method_11203 craftRecipe (Lnet/minecraft/class_1860;)V ARG 1 recipe diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 5670d976df..cbfffd3a39 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11002 hasWorld ()Z METHOD method_11003 populateCrashReport (Lnet/minecraft/class_129;)V METHOD method_11004 onBlockAction (II)Z - METHOD method_11005 createFromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; + METHOD method_11005 createFromTag (Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; METHOD method_11006 getSquaredRenderDistance ()D METHOD method_11007 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag @@ -31,8 +31,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11011 shouldNotCopyTagFromItem ()Z METHOD method_11012 markRemoved ()V METHOD method_11013 applyRotation (Lnet/minecraft/class_2470;)V - METHOD method_11014 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_11014 fromTag (Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)V METHOD method_11015 isRemoved ()Z METHOD method_11016 getPos ()Lnet/minecraft/class_2338; METHOD method_11017 getType ()Lnet/minecraft/class_2591; diff --git a/mappings/net/minecraft/class_4981.mapping b/mappings/net/minecraft/class_4981.mapping new file mode 100644 index 0000000000..fbd95eb30d --- /dev/null +++ b/mappings/net/minecraft/class_4981.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4981 + METHOD method_6575 isSaddled ()Z + METHOD method_6576 setSaddled (Z)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping index c18036df59..55666a1057 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3742 net/minecraft/client/gui/screen/ingame/JigsawBlockScreen - FIELD field_16518 targetPoolField Lnet/minecraft/class_342; FIELD field_16519 finalStateField Lnet/minecraft/class_342; - FIELD field_16520 attachmentTypeField Lnet/minecraft/class_342; FIELD field_16522 jigsaw Lnet/minecraft/class_3751; FIELD field_19103 doneButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_3751;)V diff --git a/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping index 7eccb08c05..36fac7bf1a 100644 --- a/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_992 net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer - FIELD field_4887 model Lnet/minecraft/class_587; + FIELD field_4887 model Lnet/minecraft/class_583; FIELD field_4888 SKIN Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/model/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/ModelRotation.mapping index 37b0919c2a..ce2966ab6b 100644 --- a/mappings/net/minecraft/client/render/model/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/ModelRotation.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_1086 net/minecraft/client/render/model/ModelRotation FIELD field_5357 BY_INDEX Ljava/util/Map; - FIELD field_5362 yRotations I - FIELD field_5363 xRotations I FIELD field_5364 index I - FIELD field_5368 quaternion Lnet/minecraft/class_1158; METHOD (Ljava/lang/String;III)V ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index abc06f42c0..2cf3388e38 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -228,9 +228,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe METHOD method_25642 registerCarpet (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 wool ARG 2 carpet - METHOD method_25643 registerUpDefaultFacing (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V - ARG 1 block - ARG 2 modelFactory METHOD method_25644 createSingletonBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4925; ARG 0 block ARG 1 modelId diff --git a/mappings/net/minecraft/entity/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/FishingBobberEntity.mapping index 7e8e1393b4..2368a230b0 100644 --- a/mappings/net/minecraft/entity/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/FishingBobberEntity.mapping @@ -29,9 +29,6 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity ARG 3 lureLevel ARG 4 luckOfTheSeaLevel METHOD method_26086 isOpenOrWaterAround (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_26087 isOpenOrWater (Lnet/minecraft/class_2338;)Z - ARG 1 pos METHOD method_26088 isInOpenWater ()Z METHOD method_6947 getOwner ()Lnet/minecraft/class_1657; METHOD method_6949 tickFishingLogic (Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/entity/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/ShulkerBulletEntity.mapping index b96dab768a..9d7e217b17 100644 --- a/mappings/net/minecraft/entity/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/ShulkerBulletEntity.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/ShulkerBulletEntity FIELD field_7626 target Lnet/minecraft/class_1297; FIELD field_7627 stepCount I FIELD field_7628 direction Lnet/minecraft/class_2350; - FIELD field_7629 ownerUuid Ljava/util/UUID; - FIELD field_7630 owner Lnet/minecraft/class_1297; FIELD field_7632 targetUuid Ljava/util/UUID; FIELD field_7633 targetY D FIELD field_7635 targetX D @@ -21,4 +19,3 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/ShulkerBulletEntity ARG 2 owner ARG 3 target METHOD method_7487 setDirection (Lnet/minecraft/class_2350;)V - METHOD method_7488 onHit (Lnet/minecraft/class_239;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index 83c7d9ae44..46ad348067 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask ARG 1 predicate ARG 2 maxDistance METHOD (Lnet/minecraft/class_1299;F)V - ARG 1 entityType ARG 2 maxDistance METHOD (Lnet/minecraft/class_1311;F)V - ARG 1 entityCategory ARG 2 maxDistance diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index fa325007aa..b912f1d754 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -105,10 +105,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 0 stack METHOD method_5954 attachLeash (Lnet/minecraft/class_1297;Z)V ARG 1 entity - METHOD method_5955 isBetterItemFor (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;)Z - ARG 1 current - ARG 2 previous - ARG 3 slot + METHOD method_5955 isBetterItemFor (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z METHOD method_5956 canBeControlledByRider ()Z METHOD method_5957 canSpawn (Lnet/minecraft/class_4538;)Z ARG 1 world diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 6586a51419..7b5f0add93 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity FIELD field_6816 SADDLED Lnet/minecraft/class_2940; FIELD field_6817 BREEDING_INGREDIENT Lnet/minecraft/class_1856; - METHOD method_6575 isSaddled ()Z - METHOD method_6576 setSaddled (Z)V - ARG 1 saddled diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index da57b816ce..cbaf1e6230 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -60,7 +60,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity ARG 1 time METHOD method_20694 hasSeenGolemRecently (J)Z ARG 1 currentTime - METHOD method_20695 craftBread ()V METHOD method_20696 decayGossip ()V METHOD method_20697 eatForBreeding ()V METHOD method_20698 lacksFood ()Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index e023460dee..8c70b44be0 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -63,7 +63,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_23668 checkFallFlying ()Z METHOD method_23669 startFallFlying ()V METHOD method_23670 stopFallFlying ()V - METHOD method_26091 findRespawnPosition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; + METHOD method_26091 findRespawnPosition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;ZZ)Ljava/util/Optional; ARG 0 world ARG 1 pos METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index a56ddbdf62..09d6501ef7 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -17,4 +17,4 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity ARG 5 z ARG 7 speed ARG 8 divergence - METHOD method_7492 onCollision (Lnet/minecraft/class_239;)V + METHOD method_7488 onCollision (Lnet/minecraft/class_239;)V diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index abf69c5806..d7f2953823 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -3,11 +3,6 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem FIELD field_7906 step D FIELD field_7907 angle D FIELD field_7908 lastTick J - METHOD method_7733 getYaw (Lnet/minecraft/class_1533;)D - ARG 1 entity - METHOD method_7734 getAngleToSpawn (Lnet/minecraft/class_1936;Lnet/minecraft/class_1297;)D - ARG 1 world - ARG 2 entity METHOD method_7735 getAngle (Lnet/minecraft/class_1937;D)D ARG 1 world ARG 2 entityYaw diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping index c50f8eb6b9..6243070163 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping @@ -3,11 +3,10 @@ CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsa FIELD field_16564 finalState Ljava/lang/String; FIELD field_16565 pos Lnet/minecraft/class_2338; FIELD field_16566 targetPool Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;)V + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_3751$class_4991;)V ARG 1 pos ARG 2 attachmentType ARG 3 targetPool - ARG 4 finalState METHOD method_16393 getFinalState ()Ljava/lang/String; METHOD method_16394 getTargetPool ()Lnet/minecraft/class_2960; METHOD method_16395 getAttachmentType ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/realms/Realms.mapping b/mappings/net/minecraft/realms/Realms.mapping index d84328c180..56003def2c 100644 --- a/mappings/net/minecraft/realms/Realms.mapping +++ b/mappings/net/minecraft/realms/Realms.mapping @@ -11,4 +11,4 @@ CLASS net/minecraft/class_4900 net/minecraft/realms/Realms METHOD method_25473 narrateRepeatedly (Ljava/lang/String;)V ARG 0 lines METHOD method_25474 fixNarrationNewlines (Ljava/lang/String;)Ljava/lang/String; - ARG 0 lines \ No newline at end of file + ARG 0 lines diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping index b11fbeb9db..6715544703 100644 --- a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler - FIELD field_19309 nameToId Ljava/util/function/Function; FIELD field_19338 consumedTickActions Ljava/util/List; FIELD field_19341 scheduledTickActionsInOrder Ljava/util/TreeSet; FIELD field_9294 idToName Ljava/util/function/Function; @@ -8,12 +7,10 @@ CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler FIELD field_9299 currentTickActions Ljava/util/Queue; FIELD field_9300 tickConsumer Ljava/util/function/Consumer; FIELD field_9301 world Lnet/minecraft/class_3218; - METHOD (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Consumer;)V ARG 1 world ARG 2 invalidObjPredicate ARG 3 idToName - ARG 4 nameToId - ARG 5 tickConsumer METHOD method_20469 serializeScheduledTicks (Ljava/util/function/Function;Ljava/lang/Iterable;J)Lnet/minecraft/class_2499; ARG 0 identifierProvider ARG 1 scheduledTicks diff --git a/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping b/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping index 9bca684ceb..777e3c0dc7 100644 --- a/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_4296 net/minecraft/server/world/SimpleTickScheduler - FIELD field_19275 scheduledTicks Ljava/util/Set; + FIELD field_19275 scheduledTicks Ljava/util/List; FIELD field_19276 identifierProvider Ljava/util/function/Function; - METHOD method_20462 stream ()Ljava/util/stream/Stream; - METHOD method_20463 toNbt (J)Lnet/minecraft/class_2499; - ARG 1 time + METHOD method_20463 toNbt ()Lnet/minecraft/class_2499; METHOD method_20512 fromNbt (Lnet/minecraft/class_2499;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_4296; ARG 0 ticks diff --git a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping index 1b269b3b75..8958027749 100644 --- a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping +++ b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4967 net/minecraft/sound/BiomeAdditionsSound FIELD field_23145 chance D METHOD (Lnet/minecraft/class_3414;D)V ARG 1 event - ARG 3 chance METHOD method_26098 getEvent ()Lnet/minecraft/class_3414; METHOD method_26099 getChance ()D COMMENT Returns the chance of this addition sound to play at any tick. diff --git a/mappings/net/minecraft/sound/BiomeMoodSound.mapping b/mappings/net/minecraft/sound/BiomeMoodSound.mapping index 7e2843bcef..0b26f098ee 100644 --- a/mappings/net/minecraft/sound/BiomeMoodSound.mapping +++ b/mappings/net/minecraft/sound/BiomeMoodSound.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_4968 net/minecraft/sound/BiomeMoodSound ARG 1 event ARG 2 cultivationTicks ARG 3 spawnRange - ARG 7 extraDistance METHOD method_26100 getEvent ()Lnet/minecraft/class_3414; METHOD method_26101 getCultivationTicks ()I COMMENT Returns the ticks it takes for entering the mood environment (a totally diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index d30c3020d6..dcc3999f93 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -26,11 +26,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15171 transform (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 placementData ARG 1 pos - METHOD method_15172 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;I)Z + METHOD method_15172 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;I)Z ARG 1 world ARG 2 pos - ARG 3 placementData - ARG 4 flags METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_2248;)V ARG 1 world ARG 2 start @@ -75,11 +73,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_16445 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;)Ljava/util/List; ARG 1 pos ARG 2 placementData - METHOD method_16446 process (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/List;)Ljava/util/List; + METHOD method_16446 process (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/List;)Ljava/util/List; ARG 0 world ARG 1 pos - ARG 2 placementData - ARG 3 blockInfos METHOD method_17916 getEntity (Lnet/minecraft/class_1936;Lnet/minecraft/class_2487;)Ljava/util/Optional; METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V ARG 0 world diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 89b51c3851..518a0b1699 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -67,7 +67,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 z ARG 7 facing ARG 8 lootTbaleId - METHOD method_14931 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)Z + METHOD method_14931 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 generator ARG 3 random diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index 7419468998..f3ffb01ac8 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 1 projection METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786; METHOD method_16625 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z + METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z ARG 1 structureManager ARG 2 world METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index b40f944546..29961fa2de 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProcessor - METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; + METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; ARG 2 pos - ARG 5 placementData METHOD method_16666 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16771 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16772 getType ()Lnet/minecraft/class_3828; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index caee1f51f8..18e84fc44e 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -4,10 +4,9 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces FIELD field_16874 outputState Lnet/minecraft/class_2680; FIELD field_16875 tag Lnet/minecraft/class_2487; METHOD method_16760 getTag ()Lnet/minecraft/class_2487; - METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Ljava/util/Random;)Z + METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 1 input ARG 2 location - ARG 3 random METHOD method_16763 getOutputState ()Lnet/minecraft/class_2680; METHOD method_16764 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16765 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3821; diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index df2e9b3dac..e126a79243 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -11,13 +11,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable; ARG 0 runnable ARG 1 messageSupplier - METHOD method_19481 readUuid (Ljava/lang/String;Lcom/mojang/datafixers/Dynamic;)Ljava/util/Optional; - ARG 0 name - ARG 1 dynamic - METHOD method_19482 writeUuid (Ljava/lang/String;Ljava/util/UUID;Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 name - ARG 1 uuid - ARG 2 dynamic METHOD method_19483 completeExceptionally (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture; METHOD method_20793 getLast (Ljava/util/List;)Ljava/lang/Object; ARG 0 list diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index fb2893fa32..64f7bf1d8d 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -150,13 +150,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_23095 xRange I FIELD field_23096 yRange I FIELD field_23097 zRange I - FIELD field_23098 center Lnet/minecraft/class_2338; FIELD field_23099 manhattanDistance I FIELD field_23100 limitX I FIELD field_23101 limitY I FIELD field_23102 dx I FIELD field_23103 dy I - FIELD field_23104 pendingOpposite Lnet/minecraft/class_2338; CLASS 2 FIELD field_23105 size I FIELD field_23106 sizeX I diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index fd03651da2..053dc69c2f 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld ARG 3 data METHOD method_8391 getMoonSize ()F METHOD method_8394 getMoonPhase ()I - METHOD method_8395 getSpawnPos ()Lnet/minecraft/class_2338; METHOD method_8396 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 player ARG 5 volume diff --git a/mappings/net/minecraft/world/TickScheduler.mapping b/mappings/net/minecraft/world/TickScheduler.mapping index ee23d498e8..d7a2749a9d 100644 --- a/mappings/net/minecraft/world/TickScheduler.mapping +++ b/mappings/net/minecraft/world/TickScheduler.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1951 net/minecraft/world/TickScheduler - METHOD method_20470 scheduleAll (Ljava/util/stream/Stream;)V METHOD method_8674 isScheduled (Lnet/minecraft/class_2338;Ljava/lang/Object;)Z ARG 1 pos ARG 2 object diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 57a7710fa3..4fb012601a 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -57,6 +57,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 2 oldBlock ARG 3 newBlock METHOD method_23886 isNight ()Z + METHOD method_8395 getSpawnPos ()Lnet/minecraft/class_2338; METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState