From 35c46fc6b79fd2c61e32d7646335f115d16a996d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 3 Nov 2021 18:39:11 +0000 Subject: [PATCH] 21w44a --- build.gradle | 2 +- .../net/minecraft/SharedConstants.mapping | 3 -- .../block/EntityShapeContext.mapping | 7 ++-- .../gui/screen/option/OptionsScreen.mapping | 3 -- .../client/network/ClientPlayerEntity.mapping | 3 -- .../AdventureTabAdvancementGenerator.mapping | 1 - mappings/net/minecraft/entity/Entity.mapping | 13 ++----- .../c2s/play/ClientSettingsC2SPacket.mapping | 30 +++++++-------- .../pool/StructurePoolBasedGenerator.mapping | 9 +---- .../util/collection/ReusableStream.mapping | 11 ------ .../util/profiling/jfr/FlightProfiler.mapping | 11 +----- .../util/profiling/jfr/JfrJsonReport.mapping | 2 +- .../util/profiling/jfr/JfrProfile.mapping | 8 ++-- .../profiling/jfr/JfrProfileRecorder.mapping | 4 +- .../util/profiling/jfr/JfrProfiler.mapping | 1 - .../profiling/jfr/event/PacketEvent.mapping | 5 --- .../profiling/jfr/sample/PacketSample.mapping | 35 ----------------- .../minecraft/util/shape/VoxelShapes.mapping | 9 ++--- .../world/BlockCollisionSpliterator.mapping | 27 +------------ .../net/minecraft/world/ChunkRegion.mapping | 2 +- .../net/minecraft/world/CollisionView.mapping | 30 ++------------- .../net/minecraft/world/EntityView.mapping | 6 +-- .../util/VanillaTerrainParameters.mapping | 4 -- .../world/chunk/BelowZeroRetrogen.mapping | 3 -- .../net/minecraft/world/chunk/Chunk.mapping | 2 - .../minecraft/world/chunk/ChunkStatus.mapping | 9 ----- .../entity/EntityTrackingSection.mapping | 12 ++---- .../world/entity/SectionedEntityCache.mapping | 2 - .../gen/LayerTransitionBlockSource.mapping | 12 ------ .../world/gen/NoiseColumnSampler.mapping | 2 - .../world/gen/carver/CarverContext.mapping | 3 +- .../world/gen/chunk/ChunkGenerator.mapping | 3 +- .../gen/chunk/ChunkGeneratorSettings.mapping | 23 +---------- .../gen/chunk/GenerationShapeConfig.mapping | 16 +------- .../gen/chunk/NoiseChunkGenerator.mapping | 4 +- .../gen/feature/LargeDripstoneFeature.mapping | 2 +- .../gen/surfacebuilder/MaterialRules.mapping | 38 +++---------------- .../gen/surfacebuilder/SurfaceBuilder.mapping | 20 +--------- 38 files changed, 62 insertions(+), 315 deletions(-) delete mode 100644 mappings/net/minecraft/util/collection/ReusableStream.mapping delete mode 100644 mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping delete mode 100644 mappings/net/minecraft/world/gen/LayerTransitionBlockSource.mapping diff --git a/build.gradle b/build.gradle index 56c0a3d410..fb85c08d00 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w43a" +def minecraft_version = "21w44a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index b755d3b5f9..b68fbdf6b0 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -28,9 +28,6 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V ARG 0 gameVersion METHOD method_36208 createGameVersion ()V - METHOD method_37896 (II)Z - ARG 0 x - ARG 1 z METHOD method_643 isValidChar (C)Z ARG 0 chr METHOD method_644 stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping index 1ea53a2ad7..3ab4180d79 100644 --- a/mappings/net/minecraft/block/EntityShapeContext.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -5,16 +5,15 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext FIELD field_17594 heldItem Lnet/minecraft/class_1799; FIELD field_24425 walkOnFluidPredicate Ljava/util/function/Predicate; FIELD field_27934 boots Lnet/minecraft/class_1799; - FIELD field_27935 entity Ljava/util/Optional; + FIELD field_27935 entity Lnet/minecraft/class_1297; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD (ZDLnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Ljava/util/Optional;)V + METHOD (ZDLnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_1297;)V ARG 1 descending ARG 2 minY ARG 4 boots ARG 5 heldItem ARG 6 walkOnFluidPredicate - ARG 7 entity METHOD method_27867 (Lnet/minecraft/class_3611;)Z ARG 0 fluid - METHOD method_32480 getEntity ()Ljava/util/Optional; + METHOD method_32480 getEntity ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index b66f91b7a5..21f79d6c6c 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -31,6 +31,3 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre ARG 1 difficultyLocked METHOD method_29975 refreshResourcePacks (Lnet/minecraft/class_3283;)V ARG 1 resourcePackManager - METHOD method_32632 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V - ARG 1 button - ARG 2 difficulty diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index ebcd34ba1b..90afe057c4 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -56,9 +56,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_26269 getMoodPercentage ()F COMMENT {@return the percentage for the biome mood sound for the debug HUD to COMMENT display} - METHOD method_30672 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z - ARG 1 state - ARG 2 pos METHOD method_30673 pushOutOfBlocks (DD)V ARG 1 x ARG 3 z diff --git a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping index 24142abf67..5846fe5677 100644 --- a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancementGenerator - FIELD field_11293 BIOMES Ljava/util/List; FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; FIELD field_35091 OVERWORLD_HEIGHT I FIELD field_35092 OVERWORLD_MAX_Y I diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 973c0d82a6..b496aebbf3 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -127,18 +127,16 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6038 lastRenderX D FIELD field_6039 prevHorizontalSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V - ARG 1 type ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_17681 getWidth ()F METHOD method_17682 getHeight ()F - METHOD method_17833 adjustSingleAxisMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; + METHOD method_17833 adjustSingleAxisMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;Lnet/minecraft/class_3726;Ljava/util/List;)Lnet/minecraft/class_243; ARG 0 movement ARG 1 entityBoundingBox ARG 2 world ARG 3 context - ARG 4 collisions METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 movement METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; @@ -204,17 +202,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 destX ARG 3 destY ARG 5 destZ - METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; - ARG 0 entity - ARG 1 movement + METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Ljava/util/List;)Lnet/minecraft/class_243; ARG 2 entityBoundingBox ARG 3 world ARG 4 context - ARG 5 collisions - METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; - ARG 0 movement + METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/List;)Lnet/minecraft/class_243; ARG 1 entityBoundingBox - ARG 2 collisions METHOD method_20802 getFireTicks ()I METHOD method_20803 setFireTicks (I)V ARG 1 ticks diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping index 06b21be0fa..50e6d54c0d 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket - FIELD field_12777 language Ljava/lang/String; - FIELD field_12778 playerModelBitMask I - FIELD field_12779 chatColors Z - FIELD field_12780 viewDistance I - FIELD field_12781 chatVisibility Lnet/minecraft/class_1659; - FIELD field_12782 mainArm Lnet/minecraft/class_1306; - FIELD field_28961 filterText Z + FIELD comp_266 language Ljava/lang/String; + FIELD comp_267 viewDistance I + FIELD comp_268 chatVisibility Lnet/minecraft/class_1659; + FIELD comp_269 chatColors Z + FIELD comp_270 playerModelBitMask I + FIELD comp_271 mainArm Lnet/minecraft/class_1306; + FIELD comp_272 filterText Z FIELD field_33360 MAX_LANGUAGE_LENGTH I - METHOD (Ljava/lang/String;ILnet/minecraft/class_1659;ZILnet/minecraft/class_1306;Z)V + METHOD (Ljava/lang/String;ILnet/minecraft/class_1659;ZILnet/minecraft/class_1306;ZZ)V ARG 1 language ARG 2 viewDistance ARG 3 chatVisibility @@ -17,10 +17,10 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSetti ARG 7 filterText METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12132 getMainArm ()Lnet/minecraft/class_1306; - METHOD method_12134 getChatVisibility ()Lnet/minecraft/class_1659; - METHOD method_12135 hasChatColors ()Z - METHOD method_12136 getPlayerModelBitMask ()I - METHOD method_33894 shouldFilterText ()Z - METHOD method_36166 getLanguage ()Ljava/lang/String; - METHOD method_36167 getViewDistance ()I + METHOD comp_266 language ()Ljava/lang/String; + METHOD comp_267 viewDistance ()I + METHOD comp_268 chatVisibility ()Lnet/minecraft/class_1659; + METHOD comp_269 chatColors ()Z + METHOD comp_270 playerModelBitMask ()I + METHOD comp_271 mainArm ()Lnet/minecraft/class_1306; + METHOD comp_272 filterText ()Z diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index 5de7afd2cd..b8c8de27a4 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -19,13 +19,11 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe CLASS class_4181 ShapedPoolStructurePiece FIELD field_18696 piece Lnet/minecraft/class_3790; FIELD field_18697 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject; - FIELD field_18698 minY I FIELD field_18699 currentSize I - METHOD (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;II)V + METHOD (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;I)V ARG 1 piece ARG 2 pieceShape ARG 3 minY - ARG 4 currentSize CLASS class_4182 StructurePoolGenerator FIELD field_18700 maxSize I FIELD field_18701 pieceFactory Lnet/minecraft/class_3778$class_3779; @@ -43,10 +41,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 5 structureManager ARG 6 children ARG 7 random - METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IIZLnet/minecraft/class_5539;)V + METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;)V ARG 1 piece ARG 2 pieceShape ARG 3 minY - ARG 4 currentSize - ARG 5 modifyBoundingBox - ARG 6 world diff --git a/mappings/net/minecraft/util/collection/ReusableStream.mapping b/mappings/net/minecraft/util/collection/ReusableStream.mapping deleted file mode 100644 index bde72f209b..0000000000 --- a/mappings/net/minecraft/util/collection/ReusableStream.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_3538 net/minecraft/util/collection/ReusableStream - COMMENT A wrapper that automatically flattens the original stream and provides duplicates iterating a copy of that stream's output. - FIELD field_15745 collectedElements Ljava/util/List; - FIELD field_15746 source Ljava/util/Spliterator; - METHOD (Ljava/util/stream/Stream;)V - ARG 1 stream - METHOD method_15418 stream ()Ljava/util/stream/Stream; - CLASS 1 - FIELD field_15747 pos I - METHOD tryAdvance (Ljava/util/function/Consumer;)Z - ARG 1 consumer diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index dfe2ad172d..704e6231ed 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -4,21 +4,14 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler METHOD method_37981 start (Lnet/minecraft/class_6506;)Z ARG 1 instanceType METHOD method_37984 isProfiling ()Z - METHOD method_38653 registerEvents ()V METHOD method_38654 onTick (F)V ARG 1 tickTime METHOD method_38655 startChunkGenerationProfiling (Lnet/minecraft/class_1923;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_6613; ARG 1 chunkPos ARG 2 world ARG 3 targetStatus - METHOD method_38656 onPacketReceived (Ljava/util/function/Supplier;Ljava/net/SocketAddress;I)V - ARG 1 packetNameSupplier - ARG 2 remoteAddress - ARG 3 bytes - METHOD method_38657 onPacketSent (Ljava/util/function/Supplier;Ljava/net/SocketAddress;I)V - ARG 1 packetNameSupplier - ARG 2 remoteAddress - ARG 3 bytes + METHOD method_38656 onPacketReceived (IILjava/net/SocketAddress;I)V + METHOD method_38657 onPacketSent (IILjava/net/SocketAddress;I)V METHOD method_38658 isAvailable ()Z METHOD method_38659 startWorldLoadProfiling ()Lnet/minecraft/class_6613; CLASS class_6612 NoopProfiler diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping index 7e7430b711..71d57ed49a 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport ARG 1 statistics METHOD method_38013 collectHeapSection (Lnet/minecraft/class_6525$class_6526;)Lcom/google/gson/JsonElement; ARG 1 statistics - METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6528$class_6529;)Lcom/google/gson/JsonElement; + METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;)Lcom/google/gson/JsonElement; ARG 1 statistics METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement; ARG 1 statistics diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping index 3c1fb47fc2..cc2e230615 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_6517 net/minecraft/util/profiling/jfr/JfrProfile FIELD comp_10 threadAllocationMap Lnet/minecraft/class_6530$class_6531; - FIELD comp_11 packetReadStatistics Lnet/minecraft/class_6528$class_6529; - FIELD comp_12 packetSentStatistics Lnet/minecraft/class_6528$class_6529; + FIELD comp_11 packetReadStatistics Lnet/minecraft/class_6767; + FIELD comp_12 packetSentStatistics Lnet/minecraft/class_6767; FIELD comp_13 fileWriteStatistics Lnet/minecraft/class_6523$class_6524; FIELD comp_14 fileReadStatistics Lnet/minecraft/class_6523$class_6524; FIELD comp_15 chunkGenerationSamples Ljava/util/List; @@ -13,8 +13,8 @@ CLASS net/minecraft/class_6517 net/minecraft/util/profiling/jfr/JfrProfile FIELD comp_8 cpuLoadSamples Ljava/util/List; FIELD comp_9 gcHeapSummaryStatistics Lnet/minecraft/class_6525$class_6526; METHOD comp_10 threadAllocationMap ()Lnet/minecraft/class_6530$class_6531; - METHOD comp_11 packetReadStatistics ()Lnet/minecraft/class_6528$class_6529; - METHOD comp_12 packetSentStatistics ()Lnet/minecraft/class_6528$class_6529; + METHOD comp_11 packetReadStatistics ()Lnet/minecraft/class_6767; + METHOD comp_12 packetSentStatistics ()Lnet/minecraft/class_6767; METHOD comp_13 fileWriteStatistics ()Lnet/minecraft/class_6523$class_6524; METHOD comp_14 fileReadStatistics ()Lnet/minecraft/class_6523$class_6524; METHOD comp_15 chunkGenerationSamples ()Ljava/util/List; diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping index 0a922f5b6e..74eaf8f581 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord FIELD field_34423 endTime Ljava/time/Instant; FIELD field_34424 chunkGenerationSamples Ljava/util/List; FIELD field_34425 cpuLoadSamples Ljava/util/List; - FIELD field_34426 packetReadSamples Ljava/util/List; - FIELD field_34427 packetSentSamples Ljava/util/List; + FIELD field_34426 packetReadSamples Ljava/util/Map; + FIELD field_34427 packetSentSamples Ljava/util/Map; FIELD field_34428 fileWriteSamples Ljava/util/List; FIELD field_34429 fileReadSamples Ljava/util/List; FIELD field_34430 gcCount I diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping index 3f3dc62c1c..0015b3a40b 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler FIELD field_34409 CONFIG_PATH Ljava/lang/String; FIELD field_34410 DATE_TIME_FORMAT Ljava/time/format/DateTimeFormatter; FIELD field_34411 currentRecording Ljdk/jfr/Recording; - FIELD field_34920 nextSampleTime J METHOD method_37982 (Lnet/minecraft/class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V ARG 2 recording METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6506;)Z diff --git a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping index eb83854afa..4568bf0c1e 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent - METHOD (Ljava/lang/String;Ljava/net/SocketAddress;I)V - ARG 1 packetName - ARG 2 remoteAddress - ARG 3 bytes CLASS class_6510 Names FIELD field_34419 REMOTE_ADDRESS Ljava/lang/String; - FIELD field_34420 PACKET_NAME Ljava/lang/String; FIELD field_34421 BYTES Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping deleted file mode 100644 index 46be10ecce..0000000000 --- a/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping +++ /dev/null @@ -1,35 +0,0 @@ -CLASS net/minecraft/class_6528 net/minecraft/util/profiling/jfr/sample/PacketSample - FIELD comp_41 time Ljava/time/Instant; - FIELD comp_42 packetName Ljava/lang/String; - FIELD comp_43 bytes I - METHOD comp_41 time ()Ljava/time/Instant; - METHOD comp_42 packetName ()Ljava/lang/String; - METHOD comp_43 bytes ()I - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_38046 (Lnet/minecraft/class_6528;)J - ARG 0 sample - METHOD method_38047 toStatistics (Ljava/time/Duration;Ljava/util/List;)Lnet/minecraft/class_6528$class_6529; - ARG 0 duration - ARG 1 samples - METHOD method_38048 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; - ARG 0 entry - METHOD method_38049 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6528; - ARG 0 event - METHOD method_38050 (Lnet/minecraft/class_6528;)Ljava/lang/String; - ARG 0 sample - METHOD method_38051 (Lnet/minecraft/class_6528;)I - ARG 0 sample - CLASS class_6529 Statistics - FIELD comp_44 count J - FIELD comp_45 totalBytes J - FIELD comp_46 topContributors Ljava/util/List; - FIELD comp_47 duration Ljava/time/Duration; - METHOD comp_44 count ()J - METHOD comp_45 totalBytes ()J - METHOD comp_46 topContributors ()Ljava/util/List; - METHOD comp_47 duration ()Ljava/time/Duration; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_38052 getCountPerSecond ()D - METHOD method_38053 getBytesPerSecond ()D diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 651863d611..6d1d55fc19 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -64,10 +64,9 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_1084 union (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 second - METHOD method_1085 calculateMaxOffset (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Ljava/util/stream/Stream;D)D + METHOD method_1085 calculateMaxOffset (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Ljava/lang/Iterable;D)D ARG 0 axis ARG 1 box - ARG 2 shapes ARG 3 maxDist METHOD method_1086 findRequiredBitResolution (DD)I ARG 0 min @@ -82,20 +81,18 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 0 value ARG 2 min ARG 4 max - METHOD method_17944 calculatePushVelocity (Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Lnet/minecraft/class_2335;Ljava/util/stream/Stream;)D + METHOD method_17944 calculatePushVelocity (Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Lnet/minecraft/class_2335;Ljava/lang/Iterable;)D ARG 0 box ARG 1 world ARG 2 initial ARG 4 context ARG 5 direction - ARG 6 shapes - METHOD method_17945 calculatePushVelocity (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/util/stream/Stream;)D + METHOD method_17945 calculatePushVelocity (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/lang/Iterable;)D ARG 0 axis ARG 1 box ARG 2 world ARG 3 initial ARG 5 context - ARG 6 shapes METHOD method_20713 unionCoversFullCube (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Z ARG 0 one ARG 1 two diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index 1bd6d1e1f1..e94e8322c6 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -1,42 +1,19 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator - FIELD field_25168 entity Lnet/minecraft/class_1297; FIELD field_25169 box Lnet/minecraft/class_238; FIELD field_25170 context Lnet/minecraft/class_3726; FIELD field_25171 blockIterator Lnet/minecraft/class_3980; FIELD field_25172 pos Lnet/minecraft/class_2338$class_2339; FIELD field_25173 boxShape Lnet/minecraft/class_265; FIELD field_25174 world Lnet/minecraft/class_1941; - FIELD field_25175 checkWorldBorder Z - FIELD field_25669 blockPredicate Ljava/util/function/BiPredicate; METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)V ARG 1 world ARG 2 entity ARG 3 box - METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)V + METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Z)V ARG 1 world ARG 2 entity ARG 3 box - ARG 4 blockPredicate METHOD method_29283 getChunk (II)Lnet/minecraft/class_1922; ARG 1 x ARG 2 z - METHOD method_29284 isIn (Lnet/minecraft/class_2784;Lnet/minecraft/class_238;)Z - ARG 0 border - ARG 1 box - METHOD method_29285 offerBlockShape (Ljava/util/function/Consumer;)Z - ARG 1 action - METHOD method_29286 offerWorldBorderShape (Ljava/util/function/Consumer;)Z - ARG 1 action - METHOD method_30031 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z - ARG 0 state - ARG 1 pos - METHOD method_30130 collidesSlightlyLarger (Lnet/minecraft/class_265;Lnet/minecraft/class_238;)Z - COMMENT {@return whether the world border collides with the slightly expanded entity bounding box} - ARG 0 worldBorderShape - ARG 1 entityBox - METHOD method_30131 collidesSlightlySmaller (Lnet/minecraft/class_265;Lnet/minecraft/class_238;)Z - COMMENT {@return whether the world border collides with the slightly shrinked entity bounding box} - ARG 0 worldBorderShape - ARG 1 entityBox - METHOD tryAdvance (Ljava/util/function/Consumer;)Z - ARG 1 action + METHOD method_29285 offerBlockShape ()Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 9d3376a927..fdab8cbcce 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_23788 lowerCorner Lnet/minecraft/class_1923; FIELD field_23789 upperCorner Lnet/minecraft/class_1923; FIELD field_26822 structureAccessor Lnet/minecraft/class_5138; - FIELD field_28557 centerPos Lnet/minecraft/class_1923; + FIELD field_28557 centerPos Lnet/minecraft/class_2791; FIELD field_33754 status Lnet/minecraft/class_2806; FIELD field_33755 placementRadius I COMMENT The number of neighboring chunks which can be accessed for block diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index 811524103e..c17eabee25 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -3,32 +3,15 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView ARG 1 entity METHOD method_18026 isSpaceEmpty (Lnet/minecraft/class_238;)Z ARG 1 box - METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; + METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entity ARG 2 box - ARG 3 predicate - METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/stream/Stream; + METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/lang/Iterable; ARG 1 entity ARG 2 box METHOD method_22338 getChunkAsView (II)Lnet/minecraft/class_1922; ARG 1 chunkX ARG 2 chunkZ - METHOD method_26968 (Lnet/minecraft/class_1297;)Z - ARG 0 e - METHOD method_26969 (Lnet/minecraft/class_1297;)Z - ARG 0 e - METHOD method_26970 (Lnet/minecraft/class_1297;)Z - ARG 0 e - METHOD method_30030 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)Ljava/util/stream/Stream; - ARG 1 entity - ARG 2 box - ARG 3 predicate - METHOD method_30635 hasBlockCollision (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)Z - ARG 1 entity - ARG 2 box - ARG 3 predicate - METHOD method_33593 (DDDLnet/minecraft/class_238;)Lnet/minecraft/class_238; - ARG 6 box METHOD method_33594 findClosestCollision (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;Lnet/minecraft/class_243;DDD)Ljava/util/Optional; ARG 1 entity ARG 2 shape @@ -36,19 +19,12 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView ARG 4 x ARG 6 y ARG 8 z - METHOD method_33595 (Lnet/minecraft/class_265;)Ljava/util/stream/Stream; - ARG 0 collision METHOD method_8587 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box - METHOD method_8590 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Z + METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/lang/Iterable; ARG 1 entity ARG 2 box - ARG 3 filter - METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; - ARG 1 entity - ARG 2 box - ARG 3 predicate METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 68a78d728e..571ca56f99 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -53,10 +53,8 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView ARG 8 z METHOD method_18470 getPlayerByUuid (Ljava/util/UUID;)Lnet/minecraft/class_1657; ARG 1 uuid - METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; + METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entity - ARG 2 box - ARG 3 predicate METHOD method_21726 getClosestEntity (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDDLnet/minecraft/class_238;)Lnet/minecraft/class_1309; ARG 1 entityClass ARG 2 targetPredicate @@ -85,8 +83,6 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView COMMENT the entity the box logically surrounds; this entity is ignored if it is inside the box ARG 2 box COMMENT the box in which to search for entities - METHOD method_8338 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z - ARG 1 e METHOD method_8390 getEntitiesByClass (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; COMMENT Computes a list of entities within some box whose runtime Java class is the same as or is COMMENT a subclass of the given class. diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index dc650e1649..1f8e34d0b1 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr FIELD field_34529 factorSpline Lnet/minecraft/class_6492; FIELD field_34530 peakSpline Lnet/minecraft/class_6492; FIELD field_34531 OFFSET_VALUE_OFFSET F - METHOD (Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;)V - ARG 1 offsetSpline - ARG 2 factorSpline - ARG 3 peakSpline METHOD method_38207 getOffsetSpline ()Lnet/minecraft/class_6492; METHOD method_38208 getNormalizedWeirdness (F)F ARG 0 weirdness diff --git a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping index 765a7510c3..0acf0e2341 100644 --- a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping +++ b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping @@ -9,8 +9,5 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen ARG 1 targetStatus ARG 2 missingBedrock METHOD method_39319 getTargetStatus ()Lnet/minecraft/class_2806; - METHOD method_39320 hasBedrock (II)Z - ARG 1 x - ARG 2 z METHOD method_39326 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_6746; ARG 0 nbt diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 1b2342fbfc..7fa2c90c99 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -87,8 +87,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 pos METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord - METHOD method_35319 sampleMaxHeightMap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2338; - ARG 1 type METHOD method_38255 getOrCreateChunkNoiseSampler (IIIIIILnet/minecraft/class_5818;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; ARG 1 minimumY ARG 2 height diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index bba42d1c7d..c98f5a835d 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -49,9 +49,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 heightMapTypes ARG 4 chunkType ARG 5 task - METHOD method_16556 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; - ARG 0 targetStatus - ARG 2 world METHOD method_16557 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;)Lnet/minecraft/class_2806; ARG 0 id ARG 1 previous @@ -94,12 +91,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 structureManager ARG 3 lightingProvider ARG 5 chunk - METHOD method_39302 (Lnet/minecraft/class_2826;Lnet/minecraft/class_2338;)V - ARG 1 pos - METHOD method_39303 (Lnet/minecraft/class_6746;Lnet/minecraft/class_2826;Lnet/minecraft/class_2338;)V - ARG 2 pos - METHOD method_39304 (Lnet/minecraft/class_6746;Lnet/minecraft/class_2826;Lnet/minecraft/class_2338;)V - ARG 2 pos CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping b/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping index 4a7d0a5c41..0e595f4b7a 100644 --- a/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping +++ b/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping @@ -7,19 +7,15 @@ CLASS net/minecraft/class_5572 net/minecraft/world/entity/EntityTrackingSection ARG 1 entityClass ARG 2 status METHOD method_31761 isEmpty ()Z - METHOD method_31762 forEach (Lnet/minecraft/class_5575;Ljava/util/function/Predicate;Ljava/util/function/Consumer;)V + METHOD method_31762 forEach (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V ARG 1 type - ARG 2 filter ARG 3 action METHOD method_31763 swapStatus (Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584; ARG 1 status - METHOD method_31764 add (Ljava/lang/Object;)V - ARG 1 obj - METHOD method_31765 forEach (Ljava/util/function/Predicate;Ljava/util/function/Consumer;)V - ARG 1 predicate + METHOD method_31764 add (Lnet/minecraft/class_5568;)V + METHOD method_31765 forEach (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V ARG 2 action METHOD method_31766 stream ()Ljava/util/stream/Stream; - METHOD method_31767 remove (Ljava/lang/Object;)Z - ARG 1 obj + METHOD method_31767 remove (Lnet/minecraft/class_5568;)Z METHOD method_31768 getStatus ()Lnet/minecraft/class_5584; METHOD method_31769 size ()I diff --git a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping index 1e8c92c35e..e8dd1d3573 100644 --- a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping +++ b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_5573 net/minecraft/world/entity/SectionedEntityCache ARG 1 filter ARG 2 box ARG 3 action - METHOD method_31775 intersecting (Lnet/minecraft/class_238;)Ljava/util/function/Predicate; - ARG 0 box METHOD method_31777 forEachInBox (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V COMMENT Runs the given action on each collection of entities in the chunk sections within the given box. ARG 1 box diff --git a/mappings/net/minecraft/world/gen/LayerTransitionBlockSource.mapping b/mappings/net/minecraft/world/gen/LayerTransitionBlockSource.mapping deleted file mode 100644 index 92c4b0d0dc..0000000000 --- a/mappings/net/minecraft/world/gen/LayerTransitionBlockSource.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_5842 net/minecraft/world/gen/LayerTransitionBlockSource - FIELD field_34587 randomDeriver Lnet/minecraft/class_6574; - FIELD field_35137 belowState Lnet/minecraft/class_2680; - FIELD field_35138 aboveState Lnet/minecraft/class_2680; - FIELD field_35139 minY I - FIELD field_35140 maxY I - METHOD (Lnet/minecraft/class_6574;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;II)V - ARG 1 randomDeriver - ARG 2 belowState - ARG 3 aboveState - ARG 4 minY - ARG 5 maxY diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index 749444f52a..69ec3d4c94 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_28753 noiseSizeY I FIELD field_28754 config Lnet/minecraft/class_5309; FIELD field_28756 islandNoise Lnet/minecraft/class_3541; - FIELD field_28764 densityFactor D - FIELD field_28765 densityOffset D FIELD field_34633 caveLayerNoise Lnet/minecraft/class_5216; FIELD field_34634 pillarNoise Lnet/minecraft/class_5216; FIELD field_34635 pillarRarenessNoise Lnet/minecraft/class_5216; diff --git a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping index 90b10b5c27..b28fc3073a 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_5873 net/minecraft/world/gen/carver/CarverContext ARG 1 chunkGenerator ARG 2 registryManager ARG 3 heightLimitView - METHOD method_39114 (Lnet/minecraft/class_1959;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; - ARG 1 biome + METHOD method_39114 (Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 2 chunk ARG 3 pos METHOD method_39115 getRegistryManager ()Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index b30fdb93ce..e1dc4c4adb 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -25,9 +25,8 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966; METHOD method_12100 getSpawnHeight (Lnet/minecraft/class_5539;)I ARG 1 world - METHOD method_12102 generateFeatures (Lnet/minecraft/class_5281;Lnet/minecraft/class_1923;Lnet/minecraft/class_5138;)V + METHOD method_12102 generateFeatures (Lnet/minecraft/class_5281;Lnet/minecraft/class_2791;Lnet/minecraft/class_5138;)V ARG 1 world - ARG 2 pos ARG 3 structureAccessor METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 764ca52321..5996ef5c8c 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_24780 CODEC Lcom/mojang/serialization/Codec; FIELD field_24781 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_24782 generationShapeConfig Lnet/minecraft/class_5309; - FIELD field_24783 bedrockCeilingY I - FIELD field_24784 bedrockFloorY I FIELD field_24785 seaLevel I FIELD field_24786 mobGenerationDisabled Z FIELD field_26355 OVERWORLD Lnet/minecraft/class_5321; @@ -18,36 +16,18 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_26707 INSTANCE Lnet/minecraft/class_5284; FIELD field_28846 aquifers Z FIELD field_28847 noiseCaves Z - FIELD field_28914 deepslate Z FIELD field_33587 oreVeins Z FIELD field_33651 noodleCaves Z FIELD field_35051 LARGE_BIOMES Lnet/minecraft/class_5321; FIELD field_35130 randomProvider Lnet/minecraft/class_2919$class_6675; FIELD field_35184 surfaceRule Lnet/minecraft/class_6686$class_6708; - METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6686$class_6708;IIIZZZZZZZ)V + METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6686$class_6708;IZZZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig ARG 3 defaultBlock ARG 4 defaultFluid ARG 5 surfaceRule ARG 6 bedrockCeilingY - ARG 7 bedrockFloorY - ARG 8 seaLevel - ARG 9 mobGenerationDisabled - ARG 10 aquifers - ARG 11 noiseCaves - ARG 12 deepslate - ARG 13 oreVeins - ARG 14 noodleCaves - ARG 15 legacy - METHOD method_16400 getBedrockCeilingY ()I - COMMENT Returns the Y level of the bedrock ceiling. - COMMENT - COMMENT

If a number less than 1 is returned, the ceiling will not be generated. - METHOD method_16401 getBedrockFloorY ()I - COMMENT Returns the Y level of the bedrock floor. - COMMENT - COMMENT

If a number greater than 255 is returned, the floor will not be generated. METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680; METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680; METHOD method_28007 getStructuresConfig ()Lnet/minecraft/class_5311; @@ -78,7 +58,6 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_31111 getInstance ()Lnet/minecraft/class_5284; METHOD method_33757 hasAquifers ()Z METHOD method_33758 hasNoiseCaves ()Z - METHOD method_33839 hasDeepslate ()Z METHOD method_36396 hasOreVeins ()Z METHOD method_36468 hasNoodleCaves ()Z METHOD method_38997 createRandom (J)Lnet/minecraft/class_5819; diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index 0dc51a8cf1..b039a93af6 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -6,12 +6,10 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf FIELD comp_177 bottomSlide Lnet/minecraft/class_5310; FIELD comp_178 horizontalSize I FIELD comp_179 verticalSize I - FIELD comp_180 densityFactor D - FIELD comp_181 densityOffset D FIELD comp_182 islandNoiseOverride Z FIELD comp_183 amplified Z FIELD field_24804 CODEC Lcom/mojang/serialization/Codec; - METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZLnet/minecraft/class_6555;)V + METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIZZZLnet/minecraft/class_6555;)V ARG 1 minimumY ARG 2 height ARG 3 sampling @@ -19,10 +17,6 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 5 bottomSlide ARG 6 horizontalSize ARG 7 verticalSize - ARG 8 densityFactor - ARG 10 densityOffset - ARG 12 simplexSurfaceNoise - ARG 13 randomDensityOffset METHOD comp_173 minimumY ()I METHOD comp_174 height ()I METHOD comp_175 sampling ()Lnet/minecraft/class_5308; @@ -30,13 +24,11 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf METHOD comp_177 bottomSlide ()Lnet/minecraft/class_5310; METHOD comp_178 horizontalSize ()I METHOD comp_179 verticalSize ()I - METHOD comp_180 densityFactor ()D - METHOD comp_181 densityOffset ()D METHOD comp_182 islandNoiseOverride ()Z METHOD comp_183 amplified ()Z METHOD method_28582 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZLnet/minecraft/class_6555;)Lnet/minecraft/class_5309; + METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIZZZLnet/minecraft/class_6555;)Lnet/minecraft/class_5309; ARG 0 minimumY ARG 1 height ARG 2 sampling @@ -44,9 +36,5 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 4 bottomSlide ARG 5 horizontalSize ARG 6 verticalSize - ARG 7 densityFactor - ARG 9 densityOffset - ARG 11 simplexSurfaceNoise - ARG 12 randomDensityOffset METHOD method_32995 checkHeight (Lnet/minecraft/class_5309;)Lcom/mojang/serialization/DataResult; ARG 0 config diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 9f2ac7a1b9..19720da1a5 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -46,8 +46,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 0 x ARG 1 y ARG 2 z - METHOD method_39041 (Lnet/minecraft/class_5873;Lnet/minecraft/class_1959;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; - ARG 1 context - ARG 2 biome + METHOD method_39041 (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 3 chunk ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping index 32d2a9f7ce..2321b7d03c 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFeature - METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLjava/util/Random;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;)Lnet/minecraft/class_5727$class_5728; + METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLjava/util/Random;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;I)Lnet/minecraft/class_5727$class_5728; ARG 0 pos ARG 1 isStalagmite ARG 2 random diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 9f5980187e..3d72757371 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35226 RULE_CODEC Lcom/mojang/serialization/Codec; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context - CLASS class_6688 SurfaceContext CLASS class_6689 BiomeMaterialCondition FIELD field_35228 CONDITION_CODEC Lcom/mojang/serialization/Codec; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; @@ -58,55 +57,33 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu METHOD method_39070 registerAndGetDefault ()Lcom/mojang/serialization/Codec; CLASS class_6694 MaterialRuleContext FIELD field_35233 surfaceBuilder Lnet/minecraft/class_6724; - FIELD field_35234 biomeTemperaturePredicate Lnet/minecraft/class_6686$class_6719; - FIELD field_35235 steepSlopePredicate Lnet/minecraft/class_6686$class_6719; - FIELD field_35236 negativeRunDepthPredicate Lnet/minecraft/class_6686$class_6719; - FIELD field_35237 biomeDependentPredicates Ljava/util/List; - FIELD field_35238 positionalPredicates Ljava/util/List; - FIELD field_35239 contextDependentPredicates Ljava/util/List; + FIELD field_35234 biomeTemperaturePredicate Lnet/minecraft/class_6686$class_6692; + FIELD field_35235 steepSlopePredicate Lnet/minecraft/class_6686$class_6692; + FIELD field_35236 negativeRunDepthPredicate Lnet/minecraft/class_6686$class_6692; FIELD field_35241 heightContext Lnet/minecraft/class_5868; - METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_5868;)V + METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V ARG 1 surfaceBuilder - ARG 2 heightContext - METHOD method_39072 initWorldDependentPredicates (Lnet/minecraft/class_2791;III)V - ARG 1 chunk + METHOD method_39072 initWorldDependentPredicates (III)V ARG 2 x ARG 3 z - ARG 4 runDepth - METHOD method_39073 initContextDependentPredicates (Lnet/minecraft/class_5321;Lnet/minecraft/class_1959;IIIIIII)V - ARG 1 biomeKey - ARG 2 biome + METHOD method_39073 initContextDependentPredicates (IIIIIII)V ARG 3 runDepth ARG 4 stoneDepthAbove ARG 5 stoneDepthBelow ARG 6 waterHeight - ARG 7 x - ARG 8 y - ARG 9 z CLASS class_6695 NegativePredicate CLASS class_6696 SteepSlopePredicate - CLASS class_6697 SteepSlopeContext - CLASS class_6698 BiomeTemperaturePredicate - CLASS class_6699 BiomeTemperatureContext - CLASS class_6700 AbstractPredicate - FIELD field_35242 result Z - METHOD method_39066 test (Ljava/lang/Object;)Z - ARG 1 context CLASS class_6701 HoleMaterialCondition FIELD field_35244 CONDITION_CODEC Lcom/mojang/serialization/Codec; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context CLASS class_6702 LazyAbstractPredicate FIELD field_35246 result Ljava/lang/Boolean; - FIELD field_35247 context Ljava/lang/Object; - METHOD method_39076 test (Ljava/lang/Object;)Z - ARG 1 object CLASS class_6703 NoiseThresholdMaterialCondition FIELD field_35248 CONDITION_CODEC Lcom/mojang/serialization/Codec; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 context CLASS class_6704 NoiseThresholdPredicate - CLASS class_6705 MaterialRulePos CLASS class_6706 InvertedBooleanSupplier CLASS class_6707 NotMaterialCondition FIELD field_35251 CONDITION_CODEC Lcom/mojang/serialization/Codec; @@ -145,9 +122,6 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu COMMENT {@code null} otherwise. CLASS class_6718 ConditionMaterialRule FIELD field_35263 RULE_CODEC Lcom/mojang/serialization/Codec; - CLASS class_6719 Predicate - METHOD method_39078 init (Ljava/lang/Object;)V - ARG 1 context CLASS class_6720 WaterMaterialCondition FIELD field_35264 CONDITION_CODEC Lcom/mojang/serialization/Codec; METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index e2916980bd..960ee6e09c 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -16,23 +16,12 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35291 noiseSamplers Ljava/util/Map; FIELD field_35292 randomDeriver Lnet/minecraft/class_6574; FIELD field_35293 surfaceNoise Lnet/minecraft/class_5216; - METHOD (Lnet/minecraft/class_5818;Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V - ARG 1 noiseColumnSampler - METHOD method_39102 (IDLnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V - ARG 4 chunk - ARG 5 x - ARG 6 z METHOD method_39103 getTerracottaBlock (III)Lnet/minecraft/class_2680; ARG 1 x ARG 2 y ARG 3 z - METHOD method_39104 (ILnet/minecraft/class_1959;DLnet/minecraft/class_6557;Lnet/minecraft/class_2338$class_2339;III)V + METHOD method_39104 (ILnet/minecraft/class_1959;Lnet/minecraft/class_6557;Lnet/minecraft/class_2338$class_2339;III)V ARG 2 biome - ARG 5 chunk - ARG 6 mutablePos - ARG 7 x - ARG 8 z - ARG 9 surfaceY METHOD method_39106 buildSurface (Lnet/minecraft/class_4543;Lnet/minecraft/class_2378;ZLnet/minecraft/class_5868;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_6686$class_6708;)V ARG 1 biomeAccess ARG 2 biomeRegistry @@ -48,11 +37,6 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 1 terracottaBands ARG 2 minBandSize ARG 3 state - METHOD method_39110 (Lnet/minecraft/class_6686$class_6708;Lnet/minecraft/class_5873;Lnet/minecraft/class_1959;Lnet/minecraft/class_5321;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; + METHOD method_39110 (Lnet/minecraft/class_6686$class_6708;Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 1 rule - ARG 2 context - ARG 3 biome - ARG 4 biomeKey - ARG 5 chunk - ARG 6 pos METHOD method_39112 getNoiseSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216;