From 6bcf8b8ce9f0dee51d07a7de3e4615c0a1b178a3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 5 Sep 2019 10:54:58 +0100 Subject: [PATCH] 19w36a --- build.gradle | 2 +- .../net/minecraft/block/BellBlock.mapping | 8 ++--- .../net/minecraft/block/PortalBlock.mapping | 2 -- .../block/entity/BeeHiveBlockEntity.mapping | 3 +- mappings/net/minecraft/class_4515.mapping | 2 -- mappings/net/minecraft/class_4517.mapping | 6 ---- mappings/net/minecraft/class_4537.mapping | 1 + mappings/net/minecraft/class_4543.mapping | 3 ++ mappings/net/minecraft/class_4548.mapping | 1 + .../client/gui/screen/StatsScreen.mapping | 10 ------ .../advancement/AdvancementTabType.mapping | 6 ---- .../MultiplayerServerListWidget.mapping | 3 -- .../network/packet/GameJoinS2CPacket.mapping | 9 +----- .../packet/PlayerRespawnS2CPacket.mapping | 3 +- .../FindTreeTutorialStepHandler.mapping | 2 -- .../net/minecraft/client/util/PngFile.mapping | 1 - .../client/world/ClientChunkManager.mapping | 8 +---- .../decoration/ArmorStandEntity.mapping | 2 -- .../minecraft/entity/mob/MobEntity.mapping | 2 -- .../entity/player/PlayerEntity.mapping | 3 +- .../server/command/TestCommand.mapping | 11 ++----- .../structure/StructureFeatures.mapping | 4 +-- .../structure/StructureStart.mapping | 5 ++- ...ilureLoggingTestCompletionListener.mapping | 4 --- .../minecraft/test/StructureTestUtil.mapping | 5 --- mappings/net/minecraft/test/TestUtil.mapping | 3 -- .../net/minecraft/util/math/ColumnPos.mapping | 4 --- .../noise/OctavePerlinNoiseSampler.mapping | 3 -- .../noise/OctaveSimplexNoiseSampler.mapping | 7 ----- .../village/PointOfInterestType.mapping | 6 ++-- .../village/VillagerProfession.mapping | 6 ++-- .../minecraft/world/ChunkSerializer.mapping | 4 +-- .../net/minecraft/world/PortalForcer.mapping | 17 ---------- .../biome/layer/BiomeLayerSampler.mapping | 5 --- .../world/biome/layer/BiomeLayers.mapping | 4 +-- .../biome/layer/CachingLayerContext.mapping | 3 -- .../world/biome/layer/CellScaleLayer.mapping | 1 - .../world/biome/source/BiomeSource.mapping | 24 ++------------ .../biome/source/TheEndBiomeSource.mapping | 2 +- .../source/VanillaLayeredBiomeSource.mapping | 3 +- .../net/minecraft/world/chunk/Chunk.mapping | 6 +--- .../minecraft/world/chunk/ProtoChunk.mapping | 1 - .../minecraft/world/chunk/WorldChunk.mapping | 7 +---- .../world/dimension/DimensionType.mapping | 2 +- .../minecraft/world/gen/carver/Carver.mapping | 31 ++----------------- .../world/gen/carver/CaveCarver.mapping | 28 ++--------------- .../world/gen/carver/ConfiguredCarver.mapping | 8 +---- .../world/gen/carver/RavineCarver.mapping | 16 +--------- .../world/gen/chunk/ChunkGenerator.mapping | 17 +++------- .../gen/feature/BuriedTreasureFeature.mapping | 2 +- .../gen/feature/DesertPyramidFeature.mapping | 2 +- .../world/gen/feature/EndCityFeature.mapping | 2 +- .../world/gen/feature/IglooFeature.mapping | 2 +- .../gen/feature/JungleTempleFeature.mapping | 2 +- .../gen/feature/MineshaftFeature.mapping | 2 +- .../gen/feature/NetherFortressFeature.mapping | 2 +- .../gen/feature/OceanMonumentFeature.mapping | 2 +- .../gen/feature/OceanRuinFeature.mapping | 2 +- .../feature/PillagerOutpostFeature.mapping | 2 +- .../gen/feature/ShipwreckFeature.mapping | 2 +- .../gen/feature/StrongholdFeature.mapping | 2 +- .../gen/feature/StructureFeature.mapping | 9 ++---- .../world/gen/feature/SwampHutFeature.mapping | 2 +- .../world/gen/feature/VillageFeature.mapping | 2 +- .../feature/WoodlandMansionFeature.mapping | 2 +- .../world/storage/RegionFile.mapping | 8 ++--- 66 files changed, 64 insertions(+), 297 deletions(-) delete mode 100644 mappings/net/minecraft/class_4515.mapping delete mode 100644 mappings/net/minecraft/class_4517.mapping create mode 100644 mappings/net/minecraft/class_4537.mapping create mode 100644 mappings/net/minecraft/class_4543.mapping create mode 100644 mappings/net/minecraft/class_4548.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/CellScaleLayer.mapping diff --git a/build.gradle b/build.gradle index 918e873d78..b87b1bfe0f 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "19w35a" +def minecraft_version = "19w36a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/BellBlock.mapping b/mappings/net/minecraft/block/BellBlock.mapping index c45d1c2a2c..303200e6e8 100644 --- a/mappings/net/minecraft/block/BellBlock.mapping +++ b/mappings/net/minecraft/block/BellBlock.mapping @@ -19,17 +19,13 @@ CLASS net/minecraft/class_3709 net/minecraft/block/BellBlock ARG 0 state METHOD method_16116 getShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 1 state - METHOD method_17026 ring (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_17026 ring (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 world ARG 2 pos METHOD method_17028 isPointOnBell (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;D)Z ARG 1 state ARG 2 side ARG 3 y - METHOD method_19285 ring (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;Lnet/minecraft/class_3965;Lnet/minecraft/class_1657;Z)Z + METHOD method_19285 ring (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_3965;Lnet/minecraft/class_1657;Z)Z ARG 1 world ARG 2 state - ARG 3 blockEntity - ARG 4 hitPosition - ARG 5 player - ARG 6 checkHitPosition diff --git a/mappings/net/minecraft/block/PortalBlock.mapping b/mappings/net/minecraft/block/PortalBlock.mapping index c34e3fde7f..a4ea4a05d7 100644 --- a/mappings/net/minecraft/block/PortalBlock.mapping +++ b/mappings/net/minecraft/block/PortalBlock.mapping @@ -30,8 +30,6 @@ CLASS net/minecraft/class_2423 net/minecraft/block/PortalBlock METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings METHOD method_10350 findPortal (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2700$class_2702; - ARG 1 world - ARG 2 pos METHOD method_10351 createAreaHelper (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2423$class_2424; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping index 66eb86d5d8..063e950a61 100644 --- a/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping @@ -4,11 +4,10 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeeHiveBlockEntity FIELD field_20426 ticksInHive I FIELD field_20427 minOccupationTIcks I METHOD (Lnet/minecraft/class_2487;II)V - ARG 1 entityData ARG 2 ticksInHive ARG 3 minOccupationTicks CLASS class_4484 BeeState - FIELD field_20423 bees Ljava/util/Map; + FIELD field_20423 bees Ljava/util/List; FIELD field_20424 flowerPos Lnet/minecraft/class_2338; METHOD method_21848 tryEnterHive (Lnet/minecraft/class_1297;Z)V ARG 2 hasNectar diff --git a/mappings/net/minecraft/class_4515.mapping b/mappings/net/minecraft/class_4515.mapping deleted file mode 100644 index 0825570a42..0000000000 --- a/mappings/net/minecraft/class_4515.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4515 - FIELD field_20546 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/class_4517.mapping b/mappings/net/minecraft/class_4517.mapping deleted file mode 100644 index c14971a540..0000000000 --- a/mappings/net/minecraft/class_4517.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4517 - FIELD field_20560 blockPos Lnet/minecraft/class_2338; - FIELD field_20561 world Lnet/minecraft/class_3218; - METHOD method_22172 getBlockPos ()Lnet/minecraft/class_2338; - METHOD method_22176 getWorld ()Lnet/minecraft/class_3218; - METHOD method_22185 getBlockEntity ()Lnet/minecraft/class_2633; diff --git a/mappings/net/minecraft/class_4537.mapping b/mappings/net/minecraft/class_4537.mapping new file mode 100644 index 0000000000..35d0a3d470 --- /dev/null +++ b/mappings/net/minecraft/class_4537.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4537 diff --git a/mappings/net/minecraft/class_4543.mapping b/mappings/net/minecraft/class_4543.mapping new file mode 100644 index 0000000000..c600cedad5 --- /dev/null +++ b/mappings/net/minecraft/class_4543.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4543 + CLASS class_4544 + METHOD method_16359 getBiome (III)Lnet/minecraft/class_1959; diff --git a/mappings/net/minecraft/class_4548.mapping b/mappings/net/minecraft/class_4548.mapping new file mode 100644 index 0000000000..2cdd7d6f40 --- /dev/null +++ b/mappings/net/minecraft/class_4548.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4548 diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 9cee8c28f8..9b3be5ec75 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -2,10 +2,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen CLASS class_4198 GeneralStatsListWidget CLASS class_4197 Entry FIELD field_18749 stat Lnet/minecraft/class_3445; - METHOD (Lnet/minecraft/class_3445;)V - ARG 1 stat - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client CLASS class_4200 ItemStatsListWidget CLASS class_450 ItemComparator CLASS class_4199 Entry @@ -21,8 +17,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen FIELD field_18757 items Ljava/util/List; FIELD field_18758 comparator Ljava/util/Comparator; FIELD field_18759 selectedStatType Lnet/minecraft/class_3448; - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561; ARG 1 item METHOD method_19407 render (Lnet/minecraft/class_2561;II)V @@ -41,16 +35,12 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen CLASS class_4202 EntityStatsListWidget CLASS class_4201 Entry FIELD field_18762 entityType Lnet/minecraft/class_1299; - METHOD (Lnet/minecraft/class_1299;)V - ARG 1 entityType METHOD method_19411 getKilledString (Ljava/lang/String;I)Ljava/lang/String; ARG 1 entityName ARG 2 killCount METHOD method_19412 getKilledByString (Ljava/lang/String;I)Ljava/lang/String; ARG 1 entityName ARG 2 killCount - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client FIELD field_2642 itemStats Lnet/minecraft/class_447$class_4200; FIELD field_2643 selectedList Lnet/minecraft/class_4280; FIELD field_2644 generalStats Lnet/minecraft/class_447$class_4198; diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index b2f4d9a009..91a51f3f94 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -4,12 +4,6 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2671 width I FIELD field_2672 v I FIELD field_2674 u I - METHOD (IIIII)V - ARG 1 u - ARG 2 v - ARG 3 width - ARG 4 height - ARG 5 tabCount METHOD method_2301 drawBackground (Lnet/minecraft/class_332;IIZI)V ARG 1 drawable ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 1875683eea..dc6d9155d3 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -26,9 +26,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen ARG 3 server - METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V - ARG 1 screen - ARG 2 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; METHOD method_20134 draw (IILnet/minecraft/class_2960;)V ARG 1 x diff --git a/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping index 8e9016256e..5b991489c9 100644 --- a/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping @@ -7,15 +7,8 @@ CLASS net/minecraft/class_2678 net/minecraft/client/network/packet/GameJoinS2CPa FIELD field_12282 gameMode Lnet/minecraft/class_1934; FIELD field_12284 dimension Lnet/minecraft/class_2874; FIELD field_19145 chunkLoadDistance I - METHOD (ILnet/minecraft/class_1934;ZLnet/minecraft/class_2874;ILnet/minecraft/class_1942;IZ)V + METHOD (ILnet/minecraft/class_1934;JZLnet/minecraft/class_2874;ILnet/minecraft/class_1942;IZZ)V ARG 1 playerEntityId - ARG 2 gameMode - ARG 3 hardcore - ARG 4 dimension - ARG 5 maxPlayers - ARG 6 generatorType - ARG 7 chunkLoadDistance - ARG 8 reducedDebugInfo METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11562 hasReducedDebugInfo ()Z METHOD method_11563 getGeneratorType ()Lnet/minecraft/class_1942; diff --git a/mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping index 4c1f01ad59..09e3b7e253 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping @@ -2,9 +2,8 @@ CLASS net/minecraft/class_2724 net/minecraft/client/network/packet/PlayerRespawn FIELD field_12431 dimension Lnet/minecraft/class_2874; FIELD field_12432 generatorType Lnet/minecraft/class_1942; FIELD field_12434 gameMode Lnet/minecraft/class_1934; - METHOD (Lnet/minecraft/class_2874;Lnet/minecraft/class_1942;Lnet/minecraft/class_1934;)V + METHOD (Lnet/minecraft/class_2874;JLnet/minecraft/class_1942;Lnet/minecraft/class_1934;)V ARG 1 dimension - ARG 2 generatorType METHOD method_11779 getDimension ()Lnet/minecraft/class_2874; METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11781 getGeneratorType ()Lnet/minecraft/class_1942; diff --git a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping index f0e6153397..d74f7e0def 100644 --- a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping @@ -9,5 +9,3 @@ CLASS net/minecraft/class_1152 net/minecraft/client/tutorial/FindTreeTutorialSte ARG 1 tutorialManager METHOD method_4896 hasBrokenTreeBlocks (Lnet/minecraft/class_746;)Z ARG 0 player - METHOD onSlotUpdate (Lnet/minecraft/class_1799;)V - ARG 1 item diff --git a/mappings/net/minecraft/client/util/PngFile.mapping b/mappings/net/minecraft/client/util/PngFile.mapping index 259290613e..edceae3fad 100644 --- a/mappings/net/minecraft/client/util/PngFile.mapping +++ b/mappings/net/minecraft/client/util/PngFile.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile CLASS class_1051 Reader METHOD method_4543 read (JJI)I METHOD method_4546 eof (J)I - METHOD method_4546 eof (J)I METHOD method_4547 skip (JI)V CLASS class_1052 ChannelReader CLASS class_1053 FileReader diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index e9c8d2f3dc..02fbaf9dbc 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager FIELD field_19143 loadedChunkCount I FIELD field_19204 centerChunkX I FIELD field_19205 centerChunkZ I - METHOD (I)V - ARG 1 radius METHOD (Lnet/minecraft/class_631;I)V ARG 2 loadDistance METHOD method_16027 getIndex (II)I @@ -33,14 +31,10 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager METHOD (Lnet/minecraft/class_638;I)V ARG 1 world ARG 2 loadDistance - METHOD method_16020 loadChunkFromPacket (Lnet/minecraft/class_1937;IILnet/minecraft/class_2540;Lnet/minecraft/class_2487;IZ)Lnet/minecraft/class_2818; + METHOD method_16020 loadChunkFromPacket (Lnet/minecraft/class_1937;IILnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2818; ARG 1 world ARG 2 chunkX ARG 3 chunkZ - ARG 4 data - ARG 5 nbt - ARG 6 updatedSectionsBits - ARG 7 clearOld METHOD method_20180 updateLoadDistance (I)V ARG 1 loadDistance METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 3e67251066..64e40967b0 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity FIELD field_7125 TRACKER_RIGHT_LEG_ROTATION Lnet/minecraft/class_2940; FIELD field_7126 leftArmRotation Lnet/minecraft/class_2379; FIELD field_7127 TRACKER_LEFT_LEG_ROTATION Lnet/minecraft/class_2940; - METHOD e (FF)F - ARG 1 yaw METHOD method_18059 canClip ()Z METHOD method_6900 getRightLegRotation ()Lnet/minecraft/class_2379; METHOD method_6901 shouldHideBasePlate ()Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index e261c2109b..324b4f241d 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6207 moveControl Lnet/minecraft/class_1335; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type - METHOD e (FF)F - ARG 1 yaw METHOD method_17326 cannotDespawn ()Z METHOD method_18407 isInWalkTargetRange (Lnet/minecraft/class_2338;)Z METHOD method_18408 setWalkTarget (Lnet/minecraft/class_2338;I)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1b3724278a..488b2101e6 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -195,5 +195,4 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7355 sendAbilitiesUpdate ()V METHOD method_7356 getShoulderEntityLeft ()Lnet/minecraft/class_2487; METHOD method_7357 getItemCooldownManager ()Lnet/minecraft/class_1796; - METHOD method_7358 wakeUp (ZZZ)V - ARG 3 setSpawn + METHOD method_7358 wakeUp (ZZ)V diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index a5ddd87dc4..2ae373fc9e 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -19,9 +19,9 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I ARG 0 source ARG 1 structure - ARG 2 width - ARG 3 height - ARG 4 depth + ARG 2 x + ARG 3 y + ARG 4 z METHOD method_22269 run (Lnet/minecraft/class_2168;Ljava/util/Collection;)V ARG 0 source ARG 1 testFunctions @@ -53,8 +53,3 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 structure - METHOD method_22268 (Lnet/minecraft/class_2168;Ljava/lang/String;III)I - ARG 0 source - ARG 2 x - ARG 3 y - ARG 4 z diff --git a/mappings/net/minecraft/structure/StructureFeatures.mapping b/mappings/net/minecraft/structure/StructureFeatures.mapping index ba264d7bf7..9e19989abe 100644 --- a/mappings/net/minecraft/structure/StructureFeatures.mapping +++ b/mappings/net/minecraft/structure/StructureFeatures.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/class_3420 net/minecraft/structure/StructureFeatures FIELD field_15262 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_14842 readStructureStart (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_1966;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3449; + METHOD method_14842 readStructureStart (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3449; ARG 0 chunkGenerator ARG 1 structureManager - ARG 2 biomeSource - ARG 3 tag METHOD method_14846 register (Ljava/lang/String;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3195; ARG 0 name ARG 1 feature diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index 2c13db2bdb..10b72f9088 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -1,18 +1,17 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart CLASS 1 - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ FIELD field_15325 children Ljava/util/List; FIELD field_15326 references I FIELD field_15327 chunkZ I - FIELD field_15328 biome Lnet/minecraft/class_1959; FIELD field_15329 chunkX I FIELD field_15330 boundingBox Lnet/minecraft/class_3341; FIELD field_16713 DEFAULT Lnet/minecraft/class_3449; FIELD field_16714 feature Lnet/minecraft/class_3195; FIELD field_16715 random Lnet/minecraft/class_2919; - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD method_14962 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/test/FailureLoggingTestCompletionListener.mapping b/mappings/net/minecraft/test/FailureLoggingTestCompletionListener.mapping index 6ce0a8a005..9e3d8cf755 100644 --- a/mappings/net/minecraft/test/FailureLoggingTestCompletionListener.mapping +++ b/mappings/net/minecraft/test/FailureLoggingTestCompletionListener.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_4523 net/minecraft/test/FailureLoggingTestCompletionListener FIELD field_20576 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_22304 (Lnet/minecraft/class_4517;)V - ARG 1 test - METHOD method_22305 (Lnet/minecraft/class_4517;)V - ARG 1 test diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 108eb3cc00..ada3992074 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -38,11 +38,6 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil METHOD method_22256 forceLoadNearbyChunks (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V ARG 0 pos ARG 1 world - METHOD method_22257 (Ljava/lang/String;Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2633; - ARG 0 structureName - ARG 1 pos - ARG 2 margin - ARG 3 world METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Collection; ARG 0 pos ARG 1 radius diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index a2f1c64153..c776546f06 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil - CLASS 1 - METHOD method_22190 (Lnet/minecraft/class_4517;)V - ARG 1 test METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_4521;)V ARG 0 test ARG 1 testManager diff --git a/mappings/net/minecraft/util/math/ColumnPos.mapping b/mappings/net/minecraft/util/math/ColumnPos.mapping index 923b821211..65bb0ff305 100644 --- a/mappings/net/minecraft/util/math/ColumnPos.mapping +++ b/mappings/net/minecraft/util/math/ColumnPos.mapping @@ -6,7 +6,3 @@ CLASS net/minecraft/class_2265 net/minecraft/util/math/ColumnPos ARG 2 z METHOD (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_20474 toLong (II)J - ARG 0 x - ARG 1 z - METHOD method_20475 toLong ()J diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index bc2dfd0f18..07ea5fe7e0 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSampler FIELD field_15744 octaveSamplers [Lnet/minecraft/class_3756; - METHOD (Ljava/util/Random;I)V - ARG 1 random - ARG 2 octaveCount METHOD method_15416 sample (DDD)D ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping index bc5973a0ea..9d5e7227b1 100644 --- a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping @@ -1,12 +1,5 @@ CLASS net/minecraft/class_3543 net/minecraft/util/math/noise/OctaveSimplexNoiseSampler - FIELD field_15769 octaveCount I FIELD field_15770 octaveSamplers [Lnet/minecraft/class_3541; - METHOD (Ljava/util/Random;I)V - ARG 1 random - ARG 2 octaveCount - METHOD method_15437 sample (DD)D - ARG 1 x - ARG 3 y METHOD method_16451 sample (DDZ)D ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/village/PointOfInterestType.mapping b/mappings/net/minecraft/village/PointOfInterestType.mapping index 8f4f7efc09..bcb4f9b9a8 100644 --- a/mappings/net/minecraft/village/PointOfInterestType.mapping +++ b/mappings/net/minecraft/village/PointOfInterestType.mapping @@ -3,19 +3,17 @@ CLASS net/minecraft/class_4158 net/minecraft/village/PointOfInterestType FIELD field_18501 ALWAYS_TRUE Ljava/util/function/Predicate; FIELD field_18519 id Ljava/lang/String; FIELD field_18521 ticketCount I - FIELD field_18522 sound Lnet/minecraft/class_3414; FIELD field_18523 completionCondition Ljava/util/function/Predicate; FIELD field_18849 BLOCK_STATE_TO_POINT_OF_INTEREST_TYPE Ljava/util/Map; FIELD field_18850 workStationStates Ljava/util/Set; FIELD field_19227 BED_STATES Ljava/util/Set; METHOD method_19161 getTicketCount ()I METHOD method_19164 getCompletionCondition ()Ljava/util/function/Predicate; - METHOD method_19166 getSound ()Lnet/minecraft/class_3414; METHOD method_19516 from (Lnet/minecraft/class_2680;)Ljava/util/Optional; METHOD method_19518 getAllAssociatedStates ()Ljava/util/stream/Stream; METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158; METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set; - METHOD method_20357 register (Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/class_3414;I)Lnet/minecraft/class_4158; + METHOD method_20357 register (Ljava/lang/String;Ljava/util/Set;II)Lnet/minecraft/class_4158; ARG 0 id - METHOD method_20358 register (Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/class_3414;Ljava/util/function/Predicate;I)Lnet/minecraft/class_4158; + METHOD method_20358 register (Ljava/lang/String;Ljava/util/Set;ILjava/util/function/Predicate;I)Lnet/minecraft/class_4158; ARG 0 id diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping index 6a96de04c1..4884596422 100644 --- a/mappings/net/minecraft/village/VillagerProfession.mapping +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -3,14 +3,14 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession FIELD field_18542 workStation Lnet/minecraft/class_4158; FIELD field_18543 gatherableItems Lcom/google/common/collect/ImmutableSet; FIELD field_18880 secondaryJobSites Lcom/google/common/collect/ImmutableSet; - METHOD (Ljava/lang/String;Lnet/minecraft/class_4158;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_4158;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)V ARG 1 id ARG 2 workStation ARG 3 gatherableItems ARG 4 secondaryJobSites - METHOD method_16926 register (Ljava/lang/String;Lnet/minecraft/class_4158;)Lnet/minecraft/class_3852; + METHOD method_16926 register (Ljava/lang/String;Lnet/minecraft/class_4158;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; ARG 0 key - METHOD method_19197 register (Ljava/lang/String;Lnet/minecraft/class_4158;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;)Lnet/minecraft/class_3852; + METHOD method_19197 register (Ljava/lang/String;Lnet/minecraft/class_4158;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; METHOD method_19198 getWorkStation ()Lnet/minecraft/class_4158; METHOD method_19199 getGatherableItems ()Lcom/google/common/collect/ImmutableSet; METHOD method_19630 getSecondaryJobSites ()Lcom/google/common/collect/ImmutableSet; diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index abff926efd..7f48ad05f9 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -11,11 +11,9 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 chunk METHOD method_12387 readStructureReferences (Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 tag - METHOD method_12392 readStructureStarts (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_1966;Lnet/minecraft/class_2487;)Ljava/util/Map; + METHOD method_12392 readStructureStarts (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 chunkGenerator ARG 1 structureManager - ARG 2 biomeSource - ARG 3 tag METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499; ARG 0 lists METHOD method_12395 deserialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_4153;Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2839; diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping index 856d6ee010..2d4438a07b 100644 --- a/mappings/net/minecraft/world/PortalForcer.mapping +++ b/mappings/net/minecraft/world/PortalForcer.mapping @@ -1,29 +1,12 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer - CLASS class_1947 TicketInfo - FIELD field_19279 pos Lnet/minecraft/class_2338; - FIELD field_9290 lastUsedTime J - METHOD (Lnet/minecraft/class_2338;J)V - ARG 1 pos - ARG 2 lastUsedTime - FIELD field_19277 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_19278 ticketInfos Ljava/util/Map; FIELD field_9286 world Lnet/minecraft/class_3218; - FIELD field_9287 activePortals Lit/unimi/dsi/fastutil/objects/Object2LongMap; - FIELD field_9288 PORTAL_BLOCK Lnet/minecraft/class_2423; FIELD field_9289 random Ljava/util/Random; METHOD (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_18475 getPortal (Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_2350;DDZ)Lnet/minecraft/class_2700$class_4297; - ARG 1 pos ARG 4 x ARG 6 y ARG 8 canActivate - METHOD method_20464 tick (J)V - ARG 1 time - METHOD method_20467 removeOldTickets (J)V - ARG 1 time METHOD method_8653 usePortal (Lnet/minecraft/class_1297;F)Z METHOD method_8654 createPortal (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_8656 removeOldActivePortals (J)V - ARG 1 time diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping index 1689379a39..66763db9ce 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping @@ -3,11 +3,6 @@ CLASS net/minecraft/class_3642 net/minecraft/world/biome/layer/BiomeLayerSampler FIELD field_16592 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_3627;)V ARG 1 layerFactory - METHOD method_15842 sample (IIII)[Lnet/minecraft/class_1959; - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height METHOD method_16341 sample (II)Lnet/minecraft/class_1959; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping b/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping index d43aecb07a..00dc6737fe 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping +++ b/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers FIELD field_16114 LUKEWARM_OCEAN_ID I FIELD field_16115 WARM_OCEAN_ID I FIELD field_16116 DEEP_FROZEN_OCEAN_ID I - METHOD method_15843 build (JLnet/minecraft/class_1942;Lnet/minecraft/class_2906;)[Lnet/minecraft/class_3642; + METHOD method_15843 build (JLnet/minecraft/class_1942;Lnet/minecraft/class_2906;)Lnet/minecraft/class_3642; ARG 0 seed ARG 2 generatorType ARG 3 settings @@ -20,7 +20,7 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers ARG 0 id METHOD method_15846 isShallowOcean (I)Z ARG 0 id - METHOD method_15847 build (Lnet/minecraft/class_1942;Lnet/minecraft/class_2906;Ljava/util/function/LongFunction;)Lcom/google/common/collect/ImmutableList; + METHOD method_15847 build (Lnet/minecraft/class_1942;Lnet/minecraft/class_2906;Ljava/util/function/LongFunction;)Lnet/minecraft/class_3627; ARG 0 generatorType ARG 1 settings ARG 2 contextProvider diff --git a/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping b/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping index 7938833bc4..fc13a801c3 100644 --- a/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping @@ -3,11 +3,8 @@ CLASS net/minecraft/class_3631 net/minecraft/world/biome/layer/CachingLayerConte FIELD field_16045 cache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; FIELD field_16729 localSeed J FIELD field_16730 worldSeed J - FIELD field_16731 initSeed J FIELD field_16732 noiseSampler Lnet/minecraft/class_3756; METHOD (IJJ)V ARG 1 cacheCapacity ARG 2 seed ARG 4 salt - METHOD method_16671 initWorldSeed (J)V - ARG 1 seed diff --git a/mappings/net/minecraft/world/biome/layer/CellScaleLayer.mapping b/mappings/net/minecraft/world/biome/layer/CellScaleLayer.mapping deleted file mode 100644 index 4ec5206df7..0000000000 --- a/mappings/net/minecraft/world/biome/layer/CellScaleLayer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3657 net/minecraft/world/biome/layer/CellScaleLayer diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index ce78cc9ec0..a69b9c236e 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -2,35 +2,15 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource FIELD field_9390 topMaterials Ljava/util/Set; FIELD field_9391 SPAWN_BIOMES Ljava/util/List; FIELD field_9392 structureFeatures Ljava/util/Map; - METHOD method_16359 getBiome (II)Lnet/minecraft/class_1959; - ARG 1 x - ARG 2 z - METHOD method_16360 getBiomeForNoiseGen (II)Lnet/minecraft/class_1959; - ARG 1 x - ARG 2 z METHOD method_8754 hasStructureFeature (Lnet/minecraft/class_3195;)Z ARG 1 feature - METHOD method_8756 sampleBiomes (IIII)[Lnet/minecraft/class_1959; - ARG 1 x - ARG 2 z - ARG 3 width - ARG 4 height - METHOD method_8758 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; - ARG 1 pos METHOD method_8759 getSpawnBiomes ()Ljava/util/List; - METHOD method_8760 sampleBiomes (IIIIZ)[Lnet/minecraft/class_1959; - ARG 1 x - ARG 2 z - ARG 3 width - ARG 4 height METHOD method_8761 getTopMaterials ()Ljava/util/Set; - METHOD method_8762 locateBiome (IIILjava/util/List;Ljava/util/Random;)Lnet/minecraft/class_2338; + METHOD method_8762 locateBiome (IIIILjava/util/List;Ljava/util/Random;)Lnet/minecraft/class_2338; ARG 1 x ARG 2 z ARG 3 radius - ARG 4 biomes - ARG 5 random - METHOD method_8763 getBiomesInArea (III)Ljava/util/Set; + METHOD method_8763 getBiomesInArea (IIII)Ljava/util/Set; ARG 1 x ARG 2 z ARG 3 radius diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index 76106c6f2f..88d1285968 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource FIELD field_9829 random Lnet/minecraft/class_2919; - FIELD field_9830 biomes [Lnet/minecraft/class_1959; + FIELD field_9830 biomes Ljava/util/Set; FIELD field_9831 noise Lnet/minecraft/class_3541; METHOD (Lnet/minecraft/class_2167;)V ARG 1 config diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping index 52d18a12b1..154591c20e 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource - FIELD field_9677 biomes [Lnet/minecraft/class_1959; - FIELD field_9679 biomeLayer Lnet/minecraft/class_3642; + FIELD field_9677 biomes Ljava/util/Set; FIELD field_9680 noiseLayer Lnet/minecraft/class_3642; METHOD (Lnet/minecraft/class_2084;)V ARG 1 config diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index a2e0b43225..73bb545eb7 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -26,8 +26,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12020 setLightOn (Z)V ARG 1 lightOn METHOD method_12021 getBlockEntityPositions ()Ljava/util/Set; - METHOD method_12022 setBiomeArray ([Lnet/minecraft/class_1959;)V - ARG 1 biomeArray METHOD method_12024 getBlockEntityTagAt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; @@ -43,7 +41,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 type METHOD method_12033 getInhabitedTime ()J METHOD method_12034 setStructureStarts (Ljava/util/Map;)V - METHOD method_12036 getBiomeArray ()[Lnet/minecraft/class_1959; + METHOD method_12036 getBiomeArray ()Lnet/minecraft/class_4548; METHOD method_12037 setHeightmap (Lnet/minecraft/class_2902$class_2903;[J)V ARG 1 type ARG 2 heightmap @@ -55,5 +53,3 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12043 setLastSaveTime (J)V ARG 1 lastSaveTime METHOD method_12044 needsSaving ()Z - METHOD method_16552 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; - ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index e86082b908..015562b810 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk FIELD field_12909 sections [Lnet/minecraft/class_2826; FIELD field_12911 blockTickScheduler Lnet/minecraft/class_2850; FIELD field_12912 heightmaps Ljava/util/Map; - FIELD field_12913 biomeArray [Lnet/minecraft/class_1959; FIELD field_12914 isLightOn Z FIELD field_12915 structureStarts Ljava/util/Map; FIELD field_12916 upgradeData Lnet/minecraft/class_2843; diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index c2df7c91f7..d3e6c9bc6e 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_12839 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_12840 sections [Lnet/minecraft/class_2826; FIELD field_12841 blockTickScheduler Lnet/minecraft/class_1951; - FIELD field_12842 biomeArray [Lnet/minecraft/class_1959; FIELD field_12843 inhabitedTime J FIELD field_12844 lastSaveTime J FIELD field_12845 structureReferences Ljava/util/Map; @@ -53,11 +52,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12220 markDirty ()V METHOD method_12221 runPostProcessing ()V METHOD method_12223 isEmpty ()Z - METHOD method_12224 loadFromPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;IZ)V - ARG 1 data - ARG 2 nbt - ARG 3 updatedSectionsBits - ARG 4 clearOld + METHOD method_12224 loadFromPacket (Lnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)V METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V METHOD method_12232 setUnsaved (Z)V diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 9c6830e961..cf861c6494 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_13075 factory Ljava/util/function/BiFunction; FIELD field_13077 suffix Ljava/lang/String; FIELD field_13079 saveDir Ljava/lang/String; - METHOD (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Z)V + METHOD (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZLnet/minecraft/class_4545;)V ARG 1 dimensionId ARG 2 suffix ARG 3 saveDir diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index c56e781d9c..f6dc103907 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -10,16 +10,12 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD (Ljava/util/function/Function;I)V ARG 1 configDeserializer ARG 2 heightLimit - METHOD method_12702 carve (Lnet/minecraft/class_2791;Ljava/util/Random;IIIIILjava/util/BitSet;Lnet/minecraft/class_2920;)Z + METHOD method_12702 carve (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;IIIIILjava/util/BitSet;Lnet/minecraft/class_2920;)Z ARG 1 chunk - ARG 2 random - ARG 3 seaLevel ARG 4 chunkX ARG 5 chunkZ ARG 6 mainChunkX ARG 7 mainChunkZ - ARG 8 mask - ARG 9 config METHOD method_12703 canCarveBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 1 state ARG 2 stateAbove @@ -56,32 +52,11 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 7 maxY ARG 8 relMinZ ARG 9 relMaxZ - METHOD method_16580 carveRegion (Lnet/minecraft/class_2791;JIIIDDDDDLjava/util/BitSet;)Z - ARG 2 seed - ARG 4 seaLevel - ARG 5 mainChunkX - ARG 6 mainChunkZ - ARG 7 centerX - ARG 9 centerY - ARG 11 centerZ - ARG 13 xzSize - ARG 15 ySize - ARG 17 mask - METHOD method_16581 carveAtPoint (Lnet/minecraft/class_2791;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;IIIIIIIILjava/util/concurrent/atomic/AtomicBoolean;)Z + METHOD method_16580 carveRegion (Lnet/minecraft/class_2791;Ljava/util/function/Function;JIIIDDDDDLjava/util/BitSet;)Z + METHOD method_16581 carveAtPoint (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;IIIIIIIILjava/util/concurrent/atomic/AtomicBoolean;)Z ARG 1 chunk - ARG 2 mask - ARG 3 random - ARG 4 pos1 - ARG 5 pos2 - ARG 6 pos3 - ARG 7 seaLevel ARG 8 mainChunkX ARG 9 mainChunkZ - ARG 10 x - ARG 11 z - ARG 12 relativeX - ARG 13 y - ARG 14 relativeZ METHOD method_16582 isPositionExcluded (DDDI)Z ARG 1 scaledRelativeX ARG 3 scaledRelativeY diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index bf0861dc05..5812319cd6 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -2,34 +2,10 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver METHOD (Ljava/util/function/Function;I)V ARG 1 configDeserializer ARG 2 heightLimit - METHOD method_12674 carveCave (Lnet/minecraft/class_2791;JIIIDDDFDLjava/util/BitSet;)V + METHOD method_12674 carveCave (Lnet/minecraft/class_2791;Ljava/util/function/Function;JIIIDDDFDLjava/util/BitSet;)V ARG 1 chunk - ARG 2 seed - ARG 4 seaLevel - ARG 5 mainChunkX - ARG 6 mainChunkZ - ARG 7 x - ARG 9 y - ARG 11 z - ARG 13 width - ARG 14 heightWidthRatio - ARG 16 mask - METHOD method_12675 carveTunnels (Lnet/minecraft/class_2791;JIIIDDDFFFIIDLjava/util/BitSet;)V + METHOD method_12675 carveTunnels (Lnet/minecraft/class_2791;Ljava/util/function/Function;JIIIDDDFFFIIDLjava/util/BitSet;)V ARG 1 chunk - ARG 2 seed - ARG 4 seaLevel - ARG 5 mainChunkX - ARG 6 mainChunkZ - ARG 7 x - ARG 9 y - ARG 11 z - ARG 13 baseWidth - ARG 14 xzAngle - ARG 15 yAngle - ARG 16 currentBranch - ARG 17 height - ARG 18 heightWidthRatio - ARG 20 mask METHOD method_16576 getTunnelSystemWidth (Ljava/util/Random;)F METHOD method_16577 getMaxCaveCount ()I METHOD method_16578 getTunnelSystemHeightWidthRatio ()D diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index 6a5ba02244..325ef3427a 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -4,13 +4,7 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver METHOD (Lnet/minecraft/class_2939;Lnet/minecraft/class_2920;)V ARG 1 carver ARG 2 config - METHOD method_12668 carve (Lnet/minecraft/class_2791;Ljava/util/Random;IIIIILjava/util/BitSet;)Z - ARG 3 seaLevel - ARG 4 chunkX - ARG 5 chunkZ - ARG 6 mainChunkX - ARG 7 mainChunkY - ARG 8 mask + METHOD method_12668 carve (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;IIIIILjava/util/BitSet;)Z METHOD method_12669 shouldCarve (Ljava/util/Random;II)Z ARG 2 chunkX ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index 3f4898d3ad..229b248b30 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -1,18 +1,4 @@ CLASS net/minecraft/class_2918 net/minecraft/world/gen/carver/RavineCarver FIELD field_13275 heightToHorizontalStretchFactor [F - METHOD method_12657 carveRavine (Lnet/minecraft/class_2791;JIIIDDDFFFIIDLjava/util/BitSet;)V + METHOD method_12657 carveRavine (Lnet/minecraft/class_2791;Ljava/util/function/Function;JIIIDDDFFFIIDLjava/util/BitSet;)V ARG 1 chunk - ARG 2 seed - ARG 4 seaLevel - ARG 5 mainChunkX - ARG 6 mainChunkZ - ARG 7 x - ARG 9 y - ARG 11 z - ARG 13 baseWidth - ARG 14 xzAngle - ARG 15 yAngle - ARG 16 branch - ARG 17 branchCount - ARG 18 heightWidthRatio - ARG 20 mask diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 99253fe475..685f7b80e4 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -31,19 +31,13 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 chunk METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V ARG 1 region - METHOD method_12108 carve (Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V - ARG 1 chunk - ARG 2 carverStep + METHOD method_12108 carve (Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V METHOD method_12109 getConfig ()Lnet/minecraft/class_2888; - METHOD method_12110 buildSurface (Lnet/minecraft/class_2791;)V - ARG 1 chunk + METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List; ARG 1 category ARG 2 pos - METHOD method_16129 setStructureStarts (Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;)V - ARG 1 chunk - ARG 2 chunkGenerator - ARG 3 structureManager + METHOD method_16129 setStructureStarts (Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;)V METHOD method_16130 addStructureReferences (Lnet/minecraft/class_1936;Lnet/minecraft/class_2791;)V ARG 1 world ARG 2 chunk @@ -52,9 +46,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 2 z ARG 3 heightmapType METHOD method_16398 getSeaLevel ()I - METHOD method_16553 getDecorationBiome (Lnet/minecraft/class_2791;)Lnet/minecraft/class_1959; - ARG 1 chunk - METHOD method_16554 getDecorationBiome (Lnet/minecraft/class_3233;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; - ARG 1 region + METHOD method_16554 getDecorationBiome (Lnet/minecraft/class_4543;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; ARG 2 pos METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;)I diff --git a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping index d07a2214e5..2ef4486add 100644 --- a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2956 net/minecraft/world/gen/feature/BuriedTreasureFeature CLASS class_2957 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping b/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping index 203a5c1a12..cd5f1c0295 100644 --- a/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3006 net/minecraft/world/gen/feature/DesertPyramidFeature CLASS class_3007 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping index b08f8a6b55..879c0d3f2a 100644 --- a/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3021 net/minecraft/world/gen/feature/EndCityFeature CLASS class_3022 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping b/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping index b7ee4a0bd0..42e7ecb766 100644 --- a/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IglooFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3071 net/minecraft/world/gen/feature/IglooFeature CLASS class_3072 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping b/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping index e1073c2cfa..ef778a2b1d 100644 --- a/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3076 net/minecraft/world/gen/feature/JungleTempleFeature CLASS class_3077 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping index e01d361b1b..9a10bbe0b7 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3098 net/minecraft/world/gen/feature/MineshaftFeature CLASS class_3099 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ CLASS class_3100 Type diff --git a/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping index c1ddfb2f5f..beb2db83dd 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3108 net/minecraft/world/gen/feature/NetherFortressFeature CLASS class_3109 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ FIELD field_13705 MONSTER_SPAWNS Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping index af0d8bb915..1ece51454c 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeature CLASS class_3117 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD method_16588 (II)V diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping index 4cfb9d63d0..db549be9e2 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3411 net/minecraft/world/gen/feature/OceanRuinFeature CLASS class_3412 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ CLASS class_3413 BiomeType diff --git a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping index 1ebf69df66..e9738f40f1 100644 --- a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3770 net/minecraft/world/gen/feature/PillagerOutpostFeature CLASS class_3771 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ FIELD field_16656 MONSTER_SPAWNS Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping b/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping index 38f05f6bc3..c2143f88fc 100644 --- a/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3170 net/minecraft/world/gen/feature/ShipwreckFeature CLASS class_3171 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping index 71bf52d994..800a41e298 100644 --- a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature CLASS class_3189 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ FIELD field_13851 stateStillValid Z diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index e797138a23..97880f8d48 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature CLASS class_3774 StructureStartFactory - METHOD create (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449; + METHOD create (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449; ARG 1 feature ARG 2 x ARG 3 z - ARG 4 biome - ARG 5 bounds FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory @@ -26,8 +24,5 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 1 world ARG 2 pos ARG 3 exact - METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Ljava/util/Random;II)Z - ARG 1 chunkGenerator - ARG 2 random - ARG 3 chunkX + METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;Ljava/util/Random;IILnet/minecraft/class_1959;)Z ARG 4 chunkZ diff --git a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping index cd62c42a65..1ffbbfec5d 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature CLASS class_3198 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ FIELD field_13882 MONSTER_SPAWNS Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping b/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping index ab8cac063f..a2c564aa72 100644 --- a/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3211 net/minecraft/world/gen/feature/VillageFeature CLASS class_3212 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping b/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping index ec872cb0d9..7dc4c7c3c6 100644 --- a/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3223 net/minecraft/world/gen/feature/WoodlandMansionFeature CLASS class_3224 Start - METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_1959;Lnet/minecraft/class_3341;IJ)V + METHOD (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)V ARG 2 chunkX ARG 3 chunkZ METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 5b81714969..6227d0daf4 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile CLASS class_2862 ChunkBuffer FIELD field_17656 pos Lnet/minecraft/class_1923; - METHOD (Lnet/minecraft/class_1923;)V - ARG 1 pos FIELD field_20434 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_20435 ZERO Ljava/nio/ByteBuffer; FIELD field_20436 channel Ljava/nio/channels/FileChannel; @@ -11,11 +9,10 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_20439 sectorData Ljava/nio/IntBuffer; FIELD field_20440 saveTimes Ljava/nio/IntBuffer; FIELD field_20441 sectors Lnet/minecraft/class_4485; - METHOD (Ljava/io/File;)V + METHOD (Ljava/io/File;Ljava/io/File;)V ARG 1 file - METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_4486;)V + METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;)V ARG 1 path - ARG 2 outputChunkStreamVersion METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z @@ -32,7 +29,6 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile ARG 1 pos METHOD method_21874 writeChunk (Lnet/minecraft/class_1923;Ljava/nio/ByteBuffer;)V ARG 1 pos - ARG 2 buffer METHOD method_21876 getInputStream (Ljava/nio/ByteBuffer;I)Ljava/io/ByteArrayInputStream; ARG 0 buffer ARG 1 length