diff --git a/mappings/net/minecraft/block/MapColor.mapping b/mappings/net/minecraft/block/MapColor.mapping index a8ba3a2ede..b2e9506584 100644 --- a/mappings/net/minecraft/block/MapColor.mapping +++ b/mappings/net/minecraft/block/MapColor.mapping @@ -2,6 +2,11 @@ CLASS net/minecraft/class_3620 net/minecraft/block/MapColor COMMENT Represents the surface color of a block when rendered from the {@link net.minecraft.client.render.MapRenderer}. COMMENT Color names refer to a material or an object which refers to their vanilla Minecraft textures, not their real-world counterparts, eg. "emerald green". COMMENT Names are in the form of either blockReference_baseColor or color. + COMMENT + COMMENT

When the map is rendered, the {@link MapColor.Brightness#brightness} value is added to the + COMMENT base color. The "rendered color" is internally represented as a byte; the first six bits + COMMENT indicate the base color, and the last two bits indicate the brightness. This value is returned + COMMENT from {@link MapColor#getRenderColorByte} and is passed to {@link MapColor#getRenderColor}. FIELD field_15976 LIGHT_BLUE_GRAY Lnet/minecraft/class_3620; FIELD field_15977 BROWN Lnet/minecraft/class_3620; FIELD field_15978 GRAY Lnet/minecraft/class_3620; @@ -71,3 +76,23 @@ CLASS net/minecraft/class_3620 net/minecraft/block/MapColor ARG 1 id ARG 2 color METHOD method_15820 getRenderColor (Lnet/minecraft/class_3620$class_6594;)I + ARG 1 brightness + METHOD method_38479 get (I)Lnet/minecraft/class_3620; + ARG 0 id + METHOD method_38480 getRenderColor (I)I + ARG 0 colorByte + METHOD method_38481 getRenderColorByte (Lnet/minecraft/class_3620$class_6594;)B + ARG 1 brightness + METHOD method_38482 getUnchecked (I)Lnet/minecraft/class_3620; + ARG 0 id + CLASS class_6594 Brightness + FIELD field_34763 id I + FIELD field_34764 brightness I + FIELD field_34765 VALUES [Lnet/minecraft/class_3620$class_6594; + METHOD (Ljava/lang/String;III)V + ARG 3 id + ARG 4 brightness + METHOD method_38484 validateAndGet (I)Lnet/minecraft/class_3620$class_6594; + ARG 0 id + METHOD method_38485 get (I)Lnet/minecraft/class_3620$class_6594; + ARG 0 id diff --git a/mappings/net/minecraft/class_6566.mapping b/mappings/net/minecraft/class_6566.mapping deleted file mode 100644 index ecc5f1510e..0000000000 --- a/mappings/net/minecraft/class_6566.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_6566 - METHOD method_33651 next (I)I diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 2333f90057..553098521f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -283,4 +283,5 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_25026 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_4866 Entry + METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; CLASS class_5220 HoverState diff --git a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping index 99c7c21bbc..5e239b28d9 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping @@ -23,3 +23,14 @@ CLASS net/minecraft/class_4446 net/minecraft/client/realms/util/RealmsTextureMan METHOD (Ljava/lang/String;I)V ARG 1 image ARG 2 textureId + CLASS class_6596 RealmsTextureImage + FIELD field_34775 width I + FIELD field_34776 height I + FIELD field_34777 buffer Ljava/nio/IntBuffer; + FIELD field_34778 FALLBACK Ljava/util/function/Supplier; + METHOD (IILjava/nio/IntBuffer;)V + ARG 1 width + ARG 2 height + ARG 3 buffer + METHOD method_38510 fromBase64 (Ljava/lang/String;)Lnet/minecraft/class_4446$class_6596; + ARG 0 string diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index bc65ce49d9..8f664cd0fe 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -118,6 +118,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_22782 cancel ()V METHOD method_22783 run (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; ARG 1 buffers + METHOD method_38556 getName ()Ljava/lang/String; CLASS class_4578 RebuildTask FIELD field_20838 region Lnet/minecraft/class_853; METHOD (Lnet/minecraft/class_846$class_851;DLnet/minecraft/class_853;)V diff --git a/mappings/net/minecraft/client/sound/SoundEngine.mapping b/mappings/net/minecraft/client/sound/SoundEngine.mapping index 5ad86c66eb..9bfec2ddf3 100644 --- a/mappings/net/minecraft/client/sound/SoundEngine.mapping +++ b/mappings/net/minecraft/client/sound/SoundEngine.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine FIELD field_19184 streamingSources Lnet/minecraft/class_4225$class_4276; FIELD field_19185 staticSources Lnet/minecraft/class_4225$class_4276; METHOD method_19661 init (Ljava/lang/String;)V + ARG 1 deviceSpecifier METHOD method_19662 release (Lnet/minecraft/class_4224;)V ARG 1 source METHOD method_19663 createSource (Lnet/minecraft/class_4225$class_4105;)Lnet/minecraft/class_4224; @@ -14,8 +15,12 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine METHOD method_19664 close ()V METHOD method_19665 getListener ()Lnet/minecraft/class_4227; METHOD method_20050 openDevice (Ljava/lang/String;)Ljava/util/OptionalLong; + ARG 0 deviceSpecifier METHOD method_20296 getDebugString ()Ljava/lang/String; METHOD method_20297 getMonoSourceCount ()I + METHOD method_38500 findAvailableDeviceSpecifier ()Ljava/lang/String; + METHOD method_38501 openDeviceOrFallback (Ljava/lang/String;)J + ARG 0 deviceSpecifier METHOD method_38502 getSoundDevices ()Ljava/util/List; CLASS class_4105 RunMode CLASS class_4226 SourceSetImpl diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 333f89bf06..5ab3f5978e 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -11,10 +11,12 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_27734 entityManager Lnet/minecraft/class_5582; FIELD field_32641 PARTICLE_Y_OFFSET D COMMENT A minor offset applied when spawning particles. + FIELD field_34804 chunkUpdaters Ljava/util/Deque; FIELD field_3727 netHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V + ARG 1 netHandler ARG 2 properties ARG 3 registryRef ARG 4 dimensionType @@ -43,6 +45,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_18647 tickPassenger (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V ARG 1 entity ARG 2 passenger + METHOD method_23778 (Lit/unimi/dsi/fastutil/objects/Object2ObjectArrayMap;)V + ARG 1 map METHOD method_23780 calculateColor (Lnet/minecraft/class_2338;Lnet/minecraft/class_6539;)I ARG 1 pos ARG 2 colorResolver @@ -115,6 +119,15 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_35753 putMapStates (Ljava/util/Map;)V ARG 1 mapStates METHOD method_35754 getMapStates ()Ljava/util/Map; + METHOD method_38534 runQueuedChunkUpdates ()V + METHOD method_38535 (Lnet/minecraft/class_2338;)I + ARG 1 pos + METHOD method_38536 enqueueChunkUpdate (Ljava/lang/Runnable;)V + ARG 1 updater + METHOD method_38537 (Lnet/minecraft/class_2338;)I + ARG 1 pos + METHOD method_38538 (Lnet/minecraft/class_2338;)I + ARG 1 pos METHOD method_8435 setTimeOfDay (J)V ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping index 93144a490b..e40385e844 100644 --- a/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping @@ -20,9 +20,11 @@ CLASS net/minecraft/class_2252 net/minecraft/command/argument/BlockPredicateArgu ARG 1 state ARG 2 properties ARG 3 nbt + METHOD method_38562 hasNbt ()Z METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_2254 BlockPredicate + METHOD method_38559 hasNbt ()Z METHOD method_38560 create (Lnet/minecraft/class_5415;)Ljava/util/function/Predicate; ARG 1 manager CLASS class_2255 TagPredicate diff --git a/mappings/net/minecraft/entity/ai/goal/FlyGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FlyGoal.mapping new file mode 100644 index 0000000000..976119c8e1 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/FlyGoal.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1395 net/minecraft/entity/ai/goal/FlyGoal diff --git a/mappings/net/minecraft/entity/ai/goal/FlyOntoTreeGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FlyOntoTreeGoal.mapping deleted file mode 100644 index 8d92f9c272..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/FlyOntoTreeGoal.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1395 net/minecraft/entity/ai/goal/FlyOntoTreeGoal diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index e73a8ad173..72b38691a2 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -58,6 +58,8 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation ARG 3 useHeadPos ARG 4 distance METHOD method_35143 getNodeReachProximity ()F + METHOD method_38065 adjustTargetY (Lnet/minecraft/class_243;)D + ARG 1 pos METHOD method_6333 isValidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_6334 startMovingAlong (Lnet/minecraft/class_11;D)Z diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index 5eb0ca85cd..eb0a0a0026 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -38,3 +38,5 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity CLASS 1 METHOD test (Ljava/lang/Object;)Z ARG 1 entity + CLASS class_6537 FlyOntoTreeGoal + METHOD method_38066 locateTree ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping new file mode 100644 index 0000000000..5ca1e147b9 --- /dev/null +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker + COMMENT Checks if a block predicate stored inside {@link ItemStack}'s NBT + COMMENT matches the block in a world. The predicate must be stored inside + COMMENT the {@code key} sub NBT of the item stack. + COMMENT + COMMENT

The result is cached to reduce cost for successive lookups + COMMENT on the same block. + COMMENT + COMMENT @apiNote This is used to implement checks for restrictions specified + COMMENT using {@code CanPlaceOn} or {@code CanDestroy}. + FIELD field_34448 BLOCK_PREDICATE Lnet/minecraft/class_2252; + FIELD field_34449 key Ljava/lang/String; + FIELD field_34450 cachedPos Lnet/minecraft/class_2694; + FIELD field_34451 lastResult Z + FIELD field_34452 nbtAware Z + METHOD (Ljava/lang/String;)V + ARG 1 key + COMMENT the sub NBT key that stores the predicate, for + COMMENT example {@code "CanPlaceOn"} + METHOD method_38070 check (Lnet/minecraft/class_1799;Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z + COMMENT {@return true if any of the predicates in the {@code stack}'s NBT + COMMENT matched against the block at {@code pos}, false otherwise} + ARG 1 stack + ARG 2 tagManager + ARG 3 pos + METHOD method_38071 canUseCache (Lnet/minecraft/class_2694;Lnet/minecraft/class_2694;Z)Z + ARG 0 pos + ARG 1 cachedPos + ARG 2 nbtAware diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index 372964107d..df89820c48 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -25,3 +25,9 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem ARG 2 removedStack METHOD method_32759 removeFirstStack (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 0 stack + METHOD method_38074 playRemoveOneSound (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_38076 playInsertSound (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_38077 playDropContentsSound (Lnet/minecraft/class_1297;)V + ARG 1 entity diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 2983b238d3..6f46b70c62 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -88,6 +88,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_30900 CAN_DESTROY_KEY Ljava/lang/String; FIELD field_30901 CAN_PLACE_ON_KEY Ljava/lang/String; FIELD field_30902 HIDE_FLAGS_KEY Ljava/lang/String; + FIELD field_34453 destroyChecker Lnet/minecraft/class_6538; + FIELD field_34454 placeChecker Lnet/minecraft/class_6538; FIELD field_8029 MODIFIER_FORMAT Ljava/text/DecimalFormat; FIELD field_8030 cooldown I FIELD field_8031 count I @@ -238,6 +240,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT the count of items METHOD method_7940 canDestroy (Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z ARG 1 tagManager + ARG 2 pos METHOD method_7941 getSubNbt (Ljava/lang/String;)Lnet/minecraft/class_2487; COMMENT {@return the NBT compound at the specified key in this item stack's custom NBT, may be {@code null}} COMMENT @@ -246,6 +249,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7942 hasEnchantments ()Z METHOD method_7944 canPlaceOn (Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z ARG 1 tagManager + ARG 2 pos METHOD method_7945 getFrame ()Lnet/minecraft/class_1533; METHOD method_7946 isStackable ()Z METHOD method_7947 getCount ()I diff --git a/mappings/net/minecraft/server/ServerNetworkIo.mapping b/mappings/net/minecraft/server/ServerNetworkIo.mapping index 453a147034..cd49c17d34 100644 --- a/mappings/net/minecraft/server/ServerNetworkIo.mapping +++ b/mappings/net/minecraft/server/ServerNetworkIo.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_3242 net/minecraft/server/ServerNetworkIo ARG 2 port METHOD method_14356 stop ()V METHOD method_14357 tick ()V + METHOD method_37909 getConnections ()Ljava/util/List; CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 8d50f12e5e..edb25ee955 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -138,6 +138,9 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 0 function METHOD method_37153 (Ljava/nio/file/spi/FileSystemProvider;)Z ARG 0 fileSystemProvider + METHOD method_37910 debugSupplier (Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 activeThreadName + ARG 1 supplier METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 iterable ARG 1 object diff --git a/mappings/net/minecraft/util/dynamic/Range.mapping b/mappings/net/minecraft/util/dynamic/Range.mapping new file mode 100644 index 0000000000..acf0a1d985 --- /dev/null +++ b/mappings/net/minecraft/util/dynamic/Range.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_6497 net/minecraft/util/dynamic/Range + FIELD comp_1 minInclusive Ljava/lang/Comparable; + FIELD comp_2 maxInclusive Ljava/lang/Comparable; + FIELD field_34390 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1 minInclusive ()Ljava/lang/Comparable; + METHOD comp_2 maxInclusive ()Ljava/lang/Comparable; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_37952 contains (Lnet/minecraft/class_6497;)Z + ARG 1 other + METHOD method_37953 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 elementCodec + METHOD method_37954 createRangedCodec (Lcom/mojang/serialization/Codec;Ljava/lang/Comparable;Ljava/lang/Comparable;)Lcom/mojang/serialization/Codec; + ARG 0 codec + ARG 1 minInclusive + ARG 2 maxInclusive + METHOD method_37955 contains (Ljava/lang/Comparable;)Z + ARG 1 value + METHOD method_37956 validate (Ljava/lang/Comparable;Ljava/lang/Comparable;)Lcom/mojang/serialization/DataResult; + ARG 0 minInclusive + ARG 1 maxInclusive + METHOD method_37957 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_6497;)Lcom/mojang/serialization/DataResult; + ARG 2 range diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index d5d916b394..8a73dba096 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -336,3 +336,19 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 start ARG 1 end ARG 2 delta + METHOD method_37958 clampedLerpFromProgress (FFFFF)F + ARG 0 lerpValue + ARG 1 lerpStart + ARG 2 lerpEnd + ARG 3 start + ARG 4 end + METHOD method_37959 lerpFromProgress (FFFFF)F + ARG 0 lerpValue + ARG 1 lerpStart + ARG 2 lerpEnd + ARG 3 start + ARG 4 end + METHOD method_37960 getLerpProgress (FFF)F + ARG 0 value + ARG 1 start + ARG 2 end diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index d99f3e726f..ec5fad3ad4 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -220,3 +220,6 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d COMMENT

Can be used for fast comparison between horizontal lengths. COMMENT COMMENT @see #horizontalLength() + METHOD method_38499 withAxis (Lnet/minecraft/class_2350$class_2351;D)Lnet/minecraft/class_243; + ARG 1 axis + ARG 2 value diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping index 626d799eab..008cb5d6e3 100644 --- a/mappings/net/minecraft/village/Merchant.mapping +++ b/mappings/net/minecraft/village/Merchant.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant METHOD method_19271 setExperienceFromServer (I)V ARG 1 experience METHOD method_20708 canRefreshTrades ()Z + METHOD method_38069 isClient ()Z METHOD method_8257 getCurrentCustomer ()Lnet/minecraft/class_1657; METHOD method_8258 onSellingItem (Lnet/minecraft/class_1799;)V ARG 1 stack diff --git a/mappings/net/minecraft/world/MobSpawnerEntry.mapping b/mappings/net/minecraft/world/MobSpawnerEntry.mapping index f049f9b3d8..c4b9efbdbc 100644 --- a/mappings/net/minecraft/world/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/world/MobSpawnerEntry.mapping @@ -1,2 +1,35 @@ CLASS net/minecraft/class_1952 net/minecraft/world/MobSpawnerEntry + FIELD comp_64 entity Lnet/minecraft/class_2487; + FIELD comp_65 customSpawnRules Ljava/util/Optional; FIELD field_30977 DEFAULT_ENTITY_ID Ljava/lang/String; + FIELD field_34460 CODEC Lcom/mojang/serialization/Codec; + FIELD field_34461 DATA_POOL_CODEC Lcom/mojang/serialization/Codec; + METHOD comp_64 entity ()Lnet/minecraft/class_2487; + METHOD comp_65 customSpawnRules ()Ljava/util/Optional; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_38093 getNbt ()Lnet/minecraft/class_2487; + METHOD method_38095 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_38096 (Lnet/minecraft/class_2487;)V + ARG 0 nbt + METHOD method_38097 getCustomSpawnRules ()Ljava/util/Optional; + METHOD method_38098 (Lnet/minecraft/class_1952;)Lnet/minecraft/class_2487; + ARG 0 entry + CLASS class_6542 CustomSpawnRules + FIELD comp_66 blockLightLimit Lnet/minecraft/class_6497; + FIELD comp_67 skyLightLimit Lnet/minecraft/class_6497; + FIELD field_34462 CODEC Lcom/mojang/serialization/Codec; + FIELD field_34463 DEFAULT Lnet/minecraft/class_6497; + METHOD comp_66 blockLightLimit ()Lnet/minecraft/class_6497; + METHOD comp_67 skyLightLimit ()Lnet/minecraft/class_6497; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_38099 validate (Lnet/minecraft/class_6497;)Lcom/mojang/serialization/DataResult; + ARG 0 provider + METHOD method_38100 (Lnet/minecraft/class_1952$class_6542;)Lnet/minecraft/class_6497; + ARG 0 rules + METHOD method_38101 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_38102 (Lnet/minecraft/class_1952$class_6542;)Lnet/minecraft/class_6497; + ARG 0 rules diff --git a/mappings/net/minecraft/world/gen/SimpleRandom.mapping b/mappings/net/minecraft/world/gen/SimpleRandom.mapping deleted file mode 100644 index 2f7a90ae1a..0000000000 --- a/mappings/net/minecraft/world/gen/SimpleRandom.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_5820 net/minecraft/world/gen/SimpleRandom - FIELD field_28766 seed Ljava/util/concurrent/atomic/AtomicLong; - METHOD (J)V - ARG 1 seed - METHOD method_33651 (I)I - ARG 1 bits diff --git a/mappings/net/minecraft/world/gen/WorldGenRandom.mapping b/mappings/net/minecraft/world/gen/WorldGenRandom.mapping deleted file mode 100644 index 8c394cd8d2..0000000000 --- a/mappings/net/minecraft/world/gen/WorldGenRandom.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_5819 net/minecraft/world/gen/WorldGenRandom - METHOD method_33650 skip (I)V - ARG 1 count - METHOD nextInt (I)I - ARG 1 bound - METHOD setSeed (J)V - ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 75fbfb70be..e732a39cd9 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -21,10 +21,13 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_28914 deepslate Z FIELD field_33587 oreVeins Z FIELD field_33651 noodleCaves Z + FIELD field_34625 biomeSource Lnet/minecraft/class_2088; METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2088;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIZZZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig - ARG 4 defaultFluid + ARG 3 biomeSource + ARG 4 defaultBlock + ARG 5 defaultFluid ARG 6 bedrockFloorY ARG 7 seaLevel ARG 8 minSurfaceLevel @@ -75,3 +78,4 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_33839 hasDeepslate ()Z METHOD method_36396 hasOreVeins ()Z METHOD method_36468 hasNoodleCaves ()Z + METHOD method_38364 getBiomeSource ()Lnet/minecraft/class_2088; diff --git a/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping b/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping index fb520fc163..b8b96370e7 100644 --- a/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping @@ -13,6 +13,10 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/StructuresConfig FIELD field_24825 stronghold Lnet/minecraft/class_5313; COMMENT Placement settings for the stronghold for this particular combination of settings, COMMENT may be null to disable placement of strongholds. + FIELD field_34696 configuredStructures Lcom/google/common/collect/ImmutableMap; + METHOD (Ljava/util/Map;Lnet/minecraft/class_5313;)V + ARG 1 structures + ARG 2 stronghold METHOD (Ljava/util/Optional;Ljava/util/Map;)V ARG 1 stronghold ARG 2 structures @@ -32,3 +36,12 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/StructuresConfig METHOD method_28602 getStronghold ()Lnet/minecraft/class_5313; METHOD method_28603 (Lnet/minecraft/class_5311;)Ljava/util/Optional; ARG 0 config + METHOD method_38422 (Ljava/util/HashMap;Lnet/minecraft/class_5312;Lnet/minecraft/class_5321;)V + ARG 1 feature + ARG 2 biome + METHOD method_38423 (Ljava/util/Map$Entry;)Lcom/google/common/collect/ImmutableMultimap; + ARG 0 entry + METHOD method_38424 getConfiguredStructureFeature (Lnet/minecraft/class_3195;)Lcom/google/common/collect/ImmutableMultimap; + ARG 1 feature + METHOD method_38425 (Lnet/minecraft/class_3195;)Lcom/google/common/collect/ImmutableMultimap$Builder; + ARG 0 feature diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping index d5d4a7c38c..484db1403c 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping @@ -2,3 +2,16 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructu METHOD method_30603 register (Ljava/lang/String;Lnet/minecraft/class_5312;)Lnet/minecraft/class_5312; ARG 0 id ARG 1 configuredStructureFeature + METHOD method_38569 getDefault ()Lnet/minecraft/class_5312; + METHOD method_38570 registerAll (Ljava/util/function/BiConsumer;)V + ARG 0 registrar + METHOD method_38571 register (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5312;Ljava/util/Set;)V + ARG 0 registrar + ARG 1 feature + ARG 2 biomes + METHOD method_38572 register (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5312;Lnet/minecraft/class_5321;)V + ARG 0 registrar + ARG 1 feature + ARG 2 biome + METHOD method_38573 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5312;Lnet/minecraft/class_5321;)V + ARG 2 biome diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index fb37b1974a..2d34c7ba89 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -86,12 +86,26 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature METHOD method_28664 init ()V METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_36420 getUndergroundWaterCreatureSpawns ()Lnet/minecraft/class_6012; + METHOD method_38428 getCornerInGroundHeights (Lnet/minecraft/class_2794;IIIILnet/minecraft/class_5539;)[I + ARG 0 generator + ARG 1 x + ARG 2 deltaX + ARG 3 z + ARG 4 deltaZ + ARG 5 world METHOD method_38429 getLowestCornerInGroundHeight (Lnet/minecraft/class_2794;IILnet/minecraft/class_1923;Lnet/minecraft/class_5539;)I ARG 0 generator ARG 1 deltaX ARG 2 deltaZ ARG 3 chunkPos ARG 4 world + METHOD method_38430 checkBiome (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;Lnet/minecraft/class_2902$class_2903;II)Z + ARG 0 generator + ARG 1 world + ARG 2 biomePredicate + ARG 3 heightmap + ARG 4 x + ARG 5 z CLASS class_3774 StructureStartFactory METHOD create (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449; ARG 1 feature diff --git a/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping b/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping new file mode 100644 index 0000000000..c412d45b96 --- /dev/null +++ b/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_5819 net/minecraft/world/gen/random/AbstractRandom + METHOD method_33650 skip (I)V + ARG 1 count + METHOD method_38420 derive ()Lnet/minecraft/class_5819; + METHOD method_38421 createBlockPosRandomDeriver ()Lnet/minecraft/class_6574; + METHOD nextInt (I)I + ARG 1 bound + METHOD setSeed (J)V + ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/random/AtomicSimpleRandom.mapping b/mappings/net/minecraft/world/gen/random/AtomicSimpleRandom.mapping new file mode 100644 index 0000000000..f9d97321f1 --- /dev/null +++ b/mappings/net/minecraft/world/gen/random/AtomicSimpleRandom.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_5820 net/minecraft/world/gen/random/AtomicSimpleRandom + FIELD field_28766 seed Ljava/util/concurrent/atomic/AtomicLong; + FIELD field_31471 INT_BITS I + FIELD field_31472 SEED_MASK J + FIELD field_31473 MULTIPLIER J + FIELD field_31474 INCREMENT J + FIELD field_31477 nextNextGaussian D + FIELD field_31478 hasNextGaussian Z + METHOD (J)V + ARG 1 seed + METHOD method_33651 (I)I + ARG 1 bits diff --git a/mappings/net/minecraft/world/gen/random/BaseSimpleRandom.mapping b/mappings/net/minecraft/world/gen/random/BaseSimpleRandom.mapping new file mode 100644 index 0000000000..113036cbe3 --- /dev/null +++ b/mappings/net/minecraft/world/gen/random/BaseSimpleRandom.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_6566 net/minecraft/world/gen/random/BaseSimpleRandom + FIELD field_34582 FLOAT_MULTIPLIER F + FIELD field_34583 DOUBLE_MULTIPLIER D + METHOD method_33651 next (I)I + ARG 1 bits diff --git a/mappings/net/minecraft/world/gen/random/BlockPosRandomDeriver.mapping b/mappings/net/minecraft/world/gen/random/BlockPosRandomDeriver.mapping new file mode 100644 index 0000000000..b2ca26b215 --- /dev/null +++ b/mappings/net/minecraft/world/gen/random/BlockPosRandomDeriver.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_6574 net/minecraft/world/gen/random/BlockPosRandomDeriver + FIELD field_34688 seed J + METHOD (J)V + ARG 1 seed + METHOD method_38418 createRandom (III)Lnet/minecraft/class_5820; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_38419 createRandom (Lnet/minecraft/class_2338;)Lnet/minecraft/class_5820; + ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/ChunkRandom.mapping b/mappings/net/minecraft/world/gen/random/ChunkRandom.mapping similarity index 97% rename from mappings/net/minecraft/world/gen/ChunkRandom.mapping rename to mappings/net/minecraft/world/gen/random/ChunkRandom.mapping index 3806c12eb3..3d43cf0828 100644 --- a/mappings/net/minecraft/world/gen/ChunkRandom.mapping +++ b/mappings/net/minecraft/world/gen/random/ChunkRandom.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom +CLASS net/minecraft/class_2919 net/minecraft/world/gen/random/ChunkRandom FIELD field_28768 sampleCount I METHOD (J)V ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/random/SimpleRandom.mapping b/mappings/net/minecraft/world/gen/random/SimpleRandom.mapping new file mode 100644 index 0000000000..ad1fb7fa29 --- /dev/null +++ b/mappings/net/minecraft/world/gen/random/SimpleRandom.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_6575 net/minecraft/world/gen/random/SimpleRandom + FIELD field_34689 INT_BITS I + FIELD field_34690 SEED_MASK J + FIELD field_34691 MULTIPLIER J + FIELD field_34692 INCREMENT J + FIELD field_34693 seed J + FIELD field_34694 nextNextGaussian D + FIELD field_34695 hasNextGaussian Z + METHOD (J)V + ARG 1 seed