From 9ac44da9dba413c0719d20868938fe1f9e2d70e7 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 14 Apr 2021 18:18:43 +0100 Subject: [PATCH] 21w15a --- build.gradle | 2 +- .../block/entity/SignBlockEntity.mapping | 7 +++---- .../AreaEffectCloudEntityRenderer.mapping | 1 - .../minecraft/command/EntitySelector.mapping | 2 +- .../ai/brain/task/LeapingChargeTask.mapping | 2 +- .../entity/ai/brain/task/LongJumpTask.mapping | 2 +- .../entity/passive/GoatEntity.mapping | 1 - .../play/ResourcePackSendS2CPacket.mapping | 2 +- .../server/function/CommandFunction.mapping | 2 +- .../function/CommandFunctionManager.mapping | 12 ++---------- .../server/network/ServerPlayerEntity.mapping | 2 +- mappings/net/minecraft/text/NbtText.mapping | 19 ++++++++----------- .../net/minecraft/text/SelectorText.mapping | 2 +- mappings/net/minecraft/text/Texts.mapping | 2 +- .../ClampedNormalFloatProvider.mapping | 2 -- .../ConstantFloatProvider.mapping | 2 -- .../TrapezoidFloatProvider.mapping | 2 -- .../UniformFloatProvider.mapping | 2 -- .../intprovider/ConstantIntProvider.mapping | 2 -- .../intprovider/UniformIntProvider.mapping | 2 -- .../world/gen/BlockInterpolator.mapping | 3 +-- .../world/gen/DeepslateInterpolator.mapping | 2 +- .../AbstractBiasedRangeDecorator.mapping | 7 ------- .../decorator/AbstractRangeDecorator.mapping | 2 +- .../gen/decorator/BaseRangeDecorator.mapping | 6 ------ .../decorator/BiasedRangeDecorator.mapping | 1 - .../BiasedRangedDecoratorConfig.mapping | 12 ------------ .../world/gen/decorator/Decoratable.mapping | 6 ------ .../decorator/DepthAverageDecorator.mapping | 1 - .../DepthAverageDecoratorConfig.mapping | 9 --------- .../gen/decorator/GlowstoneDecorator.mapping | 1 - .../decorator/RangeDecoratorConfig.mapping | 7 ------- .../VeryBiasedRangeDecoratorConfig.mapping | 1 - .../gen/feature/GeodeFeatureConfig.mapping | 15 +-------------- .../world/gen/placer/ColumnPlacer.mapping | 9 --------- 35 files changed, 26 insertions(+), 126 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/entity/AreaEffectCloudEntityRenderer.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/AbstractBiasedRangeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/BaseRangeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/BiasedRangeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/BiasedRangedDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/DepthAverageDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/GlowstoneDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/VeryBiasedRangeDecoratorConfig.mapping diff --git a/build.gradle b/build.gradle index 4caa4fc82e..a63d73585d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.2.0' } -def minecraft_version = "21w14a" +def minecraft_version = "21w15a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index cb75a89ebe..7405b2074b 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity - FIELD field_12046 editor Lnet/minecraft/class_1657; + FIELD field_12046 editor Ljava/util/UUID; FIELD field_12048 editable Z FIELD field_12049 textsBeingEdited [Lnet/minecraft/class_5481; FIELD field_12050 texts [Lnet/minecraft/class_2561; @@ -21,9 +21,8 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity ARG 1 editable METHOD method_11304 getCommandSource (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2168; ARG 1 player - METHOD method_11305 getEditor ()Lnet/minecraft/class_1657; - METHOD method_11306 setEditor (Lnet/minecraft/class_1657;)V - ARG 1 player + METHOD method_11305 getEditor ()Ljava/util/UUID; + METHOD method_11306 setEditor (Ljava/util/UUID;)V METHOD method_11307 isEditable ()Z METHOD method_16126 getTextColor ()Lnet/minecraft/class_1767; METHOD method_16127 setTextColor (Lnet/minecraft/class_1767;)Z diff --git a/mappings/net/minecraft/client/render/entity/AreaEffectCloudEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/AreaEffectCloudEntityRenderer.mapping deleted file mode 100644 index da24288d4a..0000000000 --- a/mappings/net/minecraft/client/render/entity/AreaEffectCloudEntityRenderer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_874 net/minecraft/client/render/entity/AreaEffectCloudEntityRenderer diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 702e8b9807..5d50bea054 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -39,5 +39,5 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector METHOD method_9819 includesNonPlayers ()Z METHOD method_9820 isSenderOnly ()Z METHOD method_9821 isLocalWorldOnly ()Z - METHOD method_9822 getNames (Ljava/util/List;)Lnet/minecraft/class_5250; + METHOD method_9822 getNames (Ljava/util/List;)Lnet/minecraft/class_2561; METHOD method_9823 appendEntitiesFromWorld (Ljava/util/List;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Ljava/util/function/Predicate;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping index babbe6e73f..df074f04f4 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6029 net/minecraft/entity/ai/brain/task/LeapingChargeTask FIELD field_30132 RUN_TIME I FIELD field_30133 cooldownRange Lnet/minecraft/class_6019; - METHOD (Lnet/minecraft/class_6019;)V + METHOD (Lnet/minecraft/class_6019;Lnet/minecraft/class_3414;)V ARG 1 cooldownRange diff --git a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping index 169ab6af20..1add163f56 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask FIELD field_30144 lastTarget Ljava/util/Optional; FIELD field_30145 cooldown I FIELD field_30146 targetTime J - METHOD (Lnet/minecraft/class_6019;IIF)V + METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;)V ARG 1 cooldownRange ARG 2 verticalRange ARG 3 horizontalRange diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping index c61daa6bf0..ccc34f73a9 100644 --- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity FIELD field_30401 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_30402 FALL_DAMAGE_SUBTRACTOR I FIELD field_30403 SCREAMING_CHANCE D - FIELD field_30404 screaming Z METHOD method_35178 isScreaming ()Z METHOD method_35179 createGoatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_35180 getMilkingSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping index e1e7e226eb..593a0f8c3e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePac FIELD field_12428 hash Ljava/lang/String; FIELD field_27844 required Z FIELD field_33340 MAX_HASH_LENGTH I - METHOD (Ljava/lang/String;Ljava/lang/String;Z)V + METHOD (Ljava/lang/String;Ljava/lang/String;ZLnet/minecraft/class_2561;)V ARG 1 url ARG 2 hash ARG 3 required diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index ee64d6dbfe..9623addc53 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD (Lcom/mojang/brigadier/ParseResults;)V ARG 1 parsed CLASS class_2161 Element - METHOD method_9198 execute (Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Ljava/util/Deque;I)V + METHOD method_9198 execute (Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Ljava/util/Deque;IILnet/minecraft/class_2991$class_6346;)V ARG 1 manager ARG 2 source ARG 3 entries diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 6795375db1..95d5d7a2b6 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionManager - FIELD field_13411 executing Z FIELD field_13412 LOAD_FUNCTION Lnet/minecraft/class_2960; - FIELD field_13413 chain Ljava/util/ArrayDeque; FIELD field_13417 TICK_FUNCTION Lnet/minecraft/class_2960; FIELD field_13418 tickFunctions Ljava/util/List; FIELD field_13419 server Lnet/minecraft/server/MinecraftServer; FIELD field_13422 needToRunLoadFunctions Z - FIELD field_19332 pending Ljava/util/List; FIELD field_25333 loader Lnet/minecraft/class_5349; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5349;)V ARG 1 server @@ -34,13 +31,8 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana METHOD method_29773 initialize (Lnet/minecraft/class_5349;)V ARG 1 loader CLASS class_2992 Entry - FIELD field_13423 manager Lnet/minecraft/class_2991; FIELD field_13424 source Lnet/minecraft/class_2168; FIELD field_13425 element Lnet/minecraft/class_2158$class_2161; - METHOD (Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Lnet/minecraft/class_2158$class_2161;)V - ARG 1 manager - ARG 2 source + METHOD (Lnet/minecraft/class_2168;ILnet/minecraft/class_2158$class_2161;)V ARG 3 element - METHOD method_12914 execute (Ljava/util/ArrayDeque;I)V - ARG 1 stack - ARG 2 maxChainLength + METHOD method_12914 execute (Lnet/minecraft/class_2991;Ljava/util/Deque;ILnet/minecraft/class_2991$class_6346;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index f71be58aad..65f8a4255f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -135,7 +135,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 message ARG 2 type ARG 3 sender - METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;Z)V + METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;ZLnet/minecraft/class_2561;)V ARG 1 url ARG 2 hash ARG 3 required diff --git a/mappings/net/minecraft/text/NbtText.mapping b/mappings/net/minecraft/text/NbtText.mapping index 7c9cea2802..a9a4419837 100644 --- a/mappings/net/minecraft/text/NbtText.mapping +++ b/mappings/net/minecraft/text/NbtText.mapping @@ -3,11 +3,11 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText FIELD field_11777 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11778 interpret Z FIELD field_11779 path Lnet/minecraft/class_2203$class_2209; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;Z)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/util/Optional;)V ARG 1 rawPath ARG 2 path ARG 3 interpret - METHOD (Ljava/lang/String;Z)V + METHOD (Ljava/lang/String;ZLjava/util/Optional;)V ARG 1 rawPath ARG 2 interpret METHOD method_10916 toNbt (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream; @@ -20,19 +20,16 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText ARG 0 rawPath METHOD method_10920 getPath ()Ljava/lang/String; METHOD method_10921 shouldInterpret ()Z - METHOD method_15880 (Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; - ARG 0 a - ARG 1 b CLASS class_2575 BlockNbtText FIELD field_11780 rawPos Ljava/lang/String; FIELD field_16408 pos Lnet/minecraft/class_2267; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/lang/String;Lnet/minecraft/class_2267;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/lang/String;Lnet/minecraft/class_2267;Ljava/util/Optional;)V ARG 1 rawPath ARG 2 path ARG 3 interpret ARG 4 rawPos ARG 5 pos - METHOD (Ljava/lang/String;ZLjava/lang/String;)V + METHOD (Ljava/lang/String;ZLjava/lang/String;Ljava/util/Optional;)V ARG 1 rawPath ARG 2 rawJson ARG 3 rawPos @@ -42,13 +39,13 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText CLASS class_2576 EntityNbtText FIELD field_11781 selector Lnet/minecraft/class_2300; FIELD field_11782 rawSelector Ljava/lang/String; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/lang/String;Lnet/minecraft/class_2300;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/lang/String;Lnet/minecraft/class_2300;Ljava/util/Optional;)V ARG 1 rawPath ARG 2 path ARG 3 interpret ARG 4 rawSelector ARG 5 selector - METHOD (Ljava/lang/String;ZLjava/lang/String;)V + METHOD (Ljava/lang/String;ZLjava/lang/String;Ljava/util/Optional;)V ARG 1 rawPath ARG 2 interpret ARG 3 rawSelector @@ -57,12 +54,12 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText METHOD method_10924 getSelector ()Ljava/lang/String; CLASS class_4616 StorageNbtText FIELD field_21049 id Lnet/minecraft/class_2960; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLnet/minecraft/class_2960;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLnet/minecraft/class_2960;Ljava/util/Optional;)V ARG 1 rawPath ARG 2 path ARG 3 interpret ARG 4 id - METHOD (Ljava/lang/String;ZLnet/minecraft/class_2960;)V + METHOD (Ljava/lang/String;ZLnet/minecraft/class_2960;Ljava/util/Optional;)V ARG 1 rawPath ARG 2 interpret ARG 3 id diff --git a/mappings/net/minecraft/text/SelectorText.mapping b/mappings/net/minecraft/text/SelectorText.mapping index 362e4568c1..81356722d4 100644 --- a/mappings/net/minecraft/text/SelectorText.mapping +++ b/mappings/net/minecraft/text/SelectorText.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2579 net/minecraft/text/SelectorText FIELD field_11789 pattern Ljava/lang/String; FIELD field_11790 selector Lnet/minecraft/class_2300; FIELD field_11791 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/lang/String;)V + METHOD (Ljava/lang/String;Ljava/util/Optional;)V ARG 1 pattern METHOD method_10932 getPattern ()Ljava/lang/String; METHOD method_36138 getSelector ()Lnet/minecraft/class_2300; diff --git a/mappings/net/minecraft/text/Texts.mapping b/mappings/net/minecraft/text/Texts.mapping index 98691286ce..50286c5b19 100644 --- a/mappings/net/minecraft/text/Texts.mapping +++ b/mappings/net/minecraft/text/Texts.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts ARG 0 profile METHOD method_10883 toText (Lcom/mojang/brigadier/Message;)Lnet/minecraft/class_2561; ARG 0 message - METHOD method_10884 join (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_5250; + METHOD method_10884 join (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_2561; ARG 0 elements ARG 1 transformer METHOD method_10885 bracketed (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping index 1434a78358..f38303d40c 100644 --- a/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_5861 net/minecraft/util/math/floatprovider/ClampedNorm ARG 2 deviation ARG 3 min ARG 4 max - METHOD equals (Ljava/lang/Object;)Z - ARG 1 object METHOD method_33900 create (FFFF)Lnet/minecraft/class_5861; ARG 0 mean ARG 1 deviation diff --git a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping index 6e5de7e485..fd950193c8 100644 --- a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_5862 net/minecraft/util/math/floatprovider/ConstantFlo FIELD field_29005 value F METHOD (F)V ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 object METHOD method_33908 create (F)Lnet/minecraft/class_5862; ARG 0 value METHOD method_33914 getValue ()F diff --git a/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping index 7807b34c5c..e50abe9a6b 100644 --- a/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/TrapezoidFloatProvider.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_5865 net/minecraft/util/math/floatprovider/TrapezoidFl ARG 1 min ARG 2 max ARG 3 plateau - METHOD equals (Ljava/lang/Object;)Z - ARG 1 object METHOD method_33926 create (FFF)Lnet/minecraft/class_5865; ARG 0 min ARG 1 max diff --git a/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping index 4c8e5a262f..4cb5ba7ca7 100644 --- a/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/UniformFloatProvider.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_5866 net/minecraft/util/math/floatprovider/UniformFloa METHOD (FF)V ARG 1 min ARG 2 max - METHOD equals (Ljava/lang/Object;)Z - ARG 1 object METHOD method_33934 create (FF)Lnet/minecraft/class_5866; ARG 0 min ARG 1 max diff --git a/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping index 78979d72f0..e8e560d2d7 100644 --- a/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_6016 net/minecraft/util/math/intprovider/ConstantIntPr FIELD field_29944 value I METHOD (I)V ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 object METHOD method_34997 getValue ()I METHOD method_34998 create (I)Lnet/minecraft/class_6016; ARG 0 value diff --git a/mappings/net/minecraft/util/math/intprovider/UniformIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/UniformIntProvider.mapping index c003289fde..b45a1f28d3 100644 --- a/mappings/net/minecraft/util/math/intprovider/UniformIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/UniformIntProvider.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_6019 net/minecraft/util/math/intprovider/UniformIntPro METHOD (II)V ARG 1 min ARG 2 max - METHOD equals (Ljava/lang/Object;)Z - ARG 1 object METHOD method_35015 (Lnet/minecraft/class_6019;)Lcom/mojang/serialization/DataResult; ARG 0 provider METHOD method_35017 create (II)Lnet/minecraft/class_6019; diff --git a/mappings/net/minecraft/world/gen/BlockInterpolator.mapping b/mappings/net/minecraft/world/gen/BlockInterpolator.mapping index d702d4463f..b2f5601e75 100644 --- a/mappings/net/minecraft/world/gen/BlockInterpolator.mapping +++ b/mappings/net/minecraft/world/gen/BlockInterpolator.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5840 net/minecraft/world/gen/BlockInterpolator - METHOD method_33831 sample (IIILnet/minecraft/class_5284;)Lnet/minecraft/class_2680; + METHOD method_33831 sample (III)Lnet/minecraft/class_2680; ARG 1 x ARG 2 y ARG 3 z - ARG 4 settings diff --git a/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping b/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping index b19eb9666a..f6b2b85805 100644 --- a/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping +++ b/mappings/net/minecraft/world/gen/DeepslateInterpolator.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateInterpolator FIELD field_28910 seed J FIELD field_28911 defaultBlock Lnet/minecraft/class_2680; FIELD field_28912 deepslateState Lnet/minecraft/class_2680; - METHOD (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + METHOD (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Ljava/util/function/Supplier;)V ARG 1 seed ARG 3 defaultBlock ARG 4 deepslateState diff --git a/mappings/net/minecraft/world/gen/decorator/AbstractBiasedRangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/AbstractBiasedRangeDecorator.mapping deleted file mode 100644 index b02a69a67d..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/AbstractBiasedRangeDecorator.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_5849 net/minecraft/world/gen/decorator/AbstractBiasedRangeDecorator - FIELD field_28932 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_33859 getY (Ljava/util/Random;III)I - ARG 1 random - ARG 2 bottom - ARG 3 top - ARG 4 cutoff diff --git a/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping index 19de14d4fa..af710494b1 100644 --- a/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5858 net/minecraft/world/gen/decorator/AbstractRangeDecorator - METHOD method_33875 getY (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2998;I)I + METHOD method_33861 getY (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2998;I)I ARG 1 context ARG 2 random ARG 3 config diff --git a/mappings/net/minecraft/world/gen/decorator/BaseRangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/BaseRangeDecorator.mapping deleted file mode 100644 index 27a728d7e1..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/BaseRangeDecorator.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_5850 net/minecraft/world/gen/decorator/BaseRangeDecorator - FIELD field_28933 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_33861 getY (Ljava/util/Random;II)I - ARG 1 random - ARG 2 bottomY - ARG 3 topY diff --git a/mappings/net/minecraft/world/gen/decorator/BiasedRangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/BiasedRangeDecorator.mapping deleted file mode 100644 index 27f8832316..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/BiasedRangeDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5854 net/minecraft/world/gen/decorator/BiasedRangeDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/BiasedRangedDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/BiasedRangedDecoratorConfig.mapping deleted file mode 100644 index 642476f9a3..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/BiasedRangedDecoratorConfig.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_5848 net/minecraft/world/gen/decorator/BiasedRangedDecoratorConfig - FIELD field_28926 CODEC Lcom/mojang/serialization/Codec; - FIELD field_28927 bottom Lnet/minecraft/class_5843; - FIELD field_28928 top Lnet/minecraft/class_5843; - FIELD field_28929 cutoff I - METHOD (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;I)V - ARG 1 bottom - ARG 2 top - ARG 3 cutoff - METHOD method_33851 getBottom ()Lnet/minecraft/class_5843; - METHOD method_33853 getCutoff ()I - METHOD method_33854 getTop ()Lnet/minecraft/class_5843; diff --git a/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping b/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping index 82983fb1e2..af2c251aa9 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping @@ -24,11 +24,5 @@ CLASS net/minecraft/class_5432 net/minecraft/world/gen/decorator/Decoratable COMMENT the input positions by a random number between 0 and {@code maxCount}. ARG 1 maxCount COMMENT the maximum repetition count - METHOD method_30377 rangeOf (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Ljava/lang/Object; - ARG 1 bottom - ARG 2 top - METHOD method_33837 averageDepth (Lnet/minecraft/class_5843;I)Ljava/lang/Object; - ARG 1 baseline - ARG 2 spread METHOD method_33838 range (Lnet/minecraft/class_2997;)Ljava/lang/Object; ARG 1 config diff --git a/mappings/net/minecraft/world/gen/decorator/DepthAverageDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/DepthAverageDecorator.mapping deleted file mode 100644 index 13987ada19..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/DepthAverageDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3252 net/minecraft/world/gen/decorator/DepthAverageDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping deleted file mode 100644 index 53dc203029..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_3277 net/minecraft/world/gen/decorator/DepthAverageDecoratorConfig - FIELD field_14212 spread I - FIELD field_24982 CODEC Lcom/mojang/serialization/Codec; - FIELD field_28936 baseline Lnet/minecraft/class_5843; - METHOD (Lnet/minecraft/class_5843;I)V - ARG 1 baseline - ARG 2 spread - METHOD method_33869 getBaseline ()Lnet/minecraft/class_5843; - METHOD method_33870 getSpread ()I diff --git a/mappings/net/minecraft/world/gen/decorator/GlowstoneDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/GlowstoneDecorator.mapping deleted file mode 100644 index f87284b8e4..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/GlowstoneDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5453 net/minecraft/world/gen/decorator/GlowstoneDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping index 2c949f5ace..812d60ca9d 100644 --- a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping @@ -1,9 +1,2 @@ CLASS net/minecraft/class_2997 net/minecraft/world/gen/decorator/RangeDecoratorConfig FIELD field_24879 CODEC Lcom/mojang/serialization/Codec; - FIELD field_28930 bottom Lnet/minecraft/class_5843; - FIELD field_28931 top Lnet/minecraft/class_5843; - METHOD (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)V - ARG 1 bottom - ARG 2 top - METHOD method_33855 getBottom ()Lnet/minecraft/class_5843; - METHOD method_33857 getTop ()Lnet/minecraft/class_5843; diff --git a/mappings/net/minecraft/world/gen/decorator/VeryBiasedRangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/VeryBiasedRangeDecoratorConfig.mapping deleted file mode 100644 index edab50a577..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/VeryBiasedRangeDecoratorConfig.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5856 net/minecraft/world/gen/decorator/VeryBiasedRangeDecoratorConfig diff --git a/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping index 9cf101f3ed..50fb214347 100644 --- a/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/GeodeFeatureConfig.mapping @@ -7,30 +7,17 @@ CLASS net/minecraft/class_5589 net/minecraft/world/gen/feature/GeodeFeatureConfi FIELD field_27319 usePotentialPlacementsChance D FIELD field_27320 useAlternateLayer0Chance D FIELD field_27321 placementsRequireLayer0Alternate Z - FIELD field_27322 minOuterWallDistance I - FIELD field_27323 maxOuterWallDistance I - FIELD field_27324 minDistributionPoints I - FIELD field_27325 maxDistributionPoints I - FIELD field_27326 minPointOffset I - FIELD field_27327 maxPointOffset I FIELD field_27328 minGenOffset I FIELD field_27329 maxGenOffset I FIELD field_27330 noiseMultiplier D FIELD field_29062 invalidBlocksThreshold I - METHOD (Lnet/minecraft/class_5585;Lnet/minecraft/class_5587;Lnet/minecraft/class_5586;DDZIIIIIIIIDI)V + METHOD (Lnet/minecraft/class_5585;Lnet/minecraft/class_5587;Lnet/minecraft/class_5586;DDZLnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;IIDI)V ARG 1 layerConfig ARG 2 layerThicknessConfig ARG 3 crackConfig ARG 4 usePotentialPlacementsChance ARG 6 useAlternateLayer0Chance ARG 8 placementsRequireLayer0Alternate - ARG 9 minOuterWallDistance - ARG 10 maxOuterWallDistance - ARG 11 minDistributionPoints ARG 12 maxDistributionPoints ARG 13 minPointOffset - ARG 14 maxPointOffset - ARG 15 minGenOffset ARG 16 maxGenOffset - ARG 17 noiseMultiplier - ARG 19 invalidBlocksThreshold diff --git a/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping b/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping index db1121f4a8..65c2d0c935 100644 --- a/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping +++ b/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_4631 net/minecraft/world/gen/placer/ColumnPlacer - FIELD field_21227 minSize I - FIELD field_21228 extraSize I FIELD field_24867 CODEC Lcom/mojang/serialization/Codec; - METHOD (II)V - ARG 1 minSize - ARG 2 extraSize - METHOD method_28675 (Lnet/minecraft/class_4631;)Ljava/lang/Integer; - ARG 0 placer METHOD method_28676 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28677 (Lnet/minecraft/class_4631;)Ljava/lang/Integer; - ARG 0 placer