From 2d30b9c3f029aeb07e12a8ccdbcafc01e2bd4698 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 12 Dec 2018 21:35:12 +1100 Subject: [PATCH] I change shapes just to hide in this place but I'm still, I'm still an animal (#270) --- .../minecraft/server/PlayerManager.mapping | 2 +- .../state/AbstractPropertyContainer.mapping | 4 +-- .../util/shape/ArrayVoxelShape.mapping | 14 ++++++++ ...ping => BitSetVoxelShapeContainer.mapping} | 10 +++++- ...ping => OffsetVoxelShapeContainer.mapping} | 3 +- .../util/shape/SequentialDoubleList.mapping | 1 + .../util/shape/SimpleVoxelShape.mapping | 3 ++ .../minecraft/util/shape/VoxelShape.mapping | 35 +++++++------------ .../util/shape/VoxelShapeContainer.mapping | 10 ------ .../shape/VoxelShapeContainerPoints.mapping | 4 --- .../shape/VoxelShapeContainerSimple.mapping | 1 - .../minecraft/util/shape/VoxelShapes.mapping | 1 + .../world/border/WorldBorder.mapping | 14 ++++++-- .../world/border/WorldBorderListener.mapping | 2 +- .../world/dimension/Dimension.mapping | 2 ++ .../world/dimension/DimensionType.mapping | 2 +- .../dimension/OverworldDimension.mapping | 2 ++ .../world/dimension/TheEndDimension.mapping | 2 ++ .../dimension/TheNetherDimension.mapping | 2 ++ .../world/gen/GenerationStep.mapping | 8 +++-- .../net/minecraft/world/gen/Heightmap.mapping | 4 ++- .../minecraft/world/gen/carver/Carver.mapping | 2 ++ .../world/gen/carver/ConfiguredCarver.mapping | 1 + .../gen/config/ProbabilityConfig.mapping | 3 ++ .../CarvingMaskDecoratorConfig.mapping | 2 ++ .../decorator/ChanceDecoratorConfig.mapping | 3 ++ .../ChanceRangeDecoratorConfig.mapping | 2 ++ .../CountChanceDecoratorConfig.mapping | 2 ++ .../decorator/CountDecoratorConfig.mapping | 3 ++ .../CountDepthDecoratorConfig.mapping | 2 ++ .../CountExtraChanceDecoratorConfig.mapping | 2 ++ .../config/decorator/DecoratorConfig.mapping | 1 + .../decorator/DungeonDecoratorConfig.mapping | 3 ++ .../HeightmapRangeDecoratorConfig.mapping | 2 ++ .../decorator/LakeDecoratorConfig.mapping | 3 ++ .../NoiseHeightmapDecoratorConfig.mapping | 3 ++ ...ig.mapping => NopeDecoratorConfig.mapping} | 3 +- .../decorator/RangeDecoratorConfig.mapping | 2 ++ ...eightmapNoiseBiasedDecoratorConfig.mapping | 3 ++ .../feature/BlockClusterFeatureConfig.mapping | 2 ++ .../feature/BoulderFeatureConfig.mapping | 2 ++ .../BuriedTreasureFeatureConfig.mapping | 3 ++ .../config/feature/BushFeatureConfig.mapping | 3 ++ .../feature/DecoratedFeatureConfig.mapping | 3 ++ .../feature/DefaultFeatureConfig.mapping | 1 + .../feature/DoublePlantFeatureConfig.mapping | 3 ++ .../feature/EmeraldOreFeatureConfig.mapping | 2 ++ .../feature/EndGatewayFeatureConfig.mapping | 3 ++ .../feature/EndPillarFeatureConfig.mapping | 2 ++ .../gen/config/feature/FeatureConfig.mapping | 1 + .../config/feature/GrassFeatureConfig.mapping | 3 ++ .../feature/IcePatchFeatureConfig.mapping | 3 ++ .../feature/IcebergFeatureConfig.mapping | 3 ++ .../config/feature/LakeFeatureConfig.mapping | 3 ++ .../feature/MineshaftFeatureConfig.mapping | 2 ++ .../feature/NetherSpringFeatureConfig.mapping | 3 ++ .../feature/NewVillageFeatureConfig.mapping | 4 +++ .../feature/OceanRuinFeatureConfig.mapping | 2 ++ .../config/feature/OreFeatureConfig.mapping | 2 ++ .../PillagerOutpostFeatureConfig.mapping | 3 ++ .../RandomBooleanFeatureConfig.mapping | 2 ++ .../feature/RandomFeatureConfig.mapping | 2 ++ .../feature/RandomRandomFeatureConfig.mapping | 3 ++ .../feature/SeaPickleFeatureConfig.mapping | 3 ++ .../feature/SeagrassFeatureConfig.mapping | 2 ++ .../feature/ShipwreckFeatureConfig.mapping | 3 ++ .../feature/SimpleBlockFeatureConfig.mapping | 3 ++ .../feature/SimpleRandomFeatureConfig.mapping | 4 +++ .../feature/SpringFeatureConfig.mapping | 3 ++ .../feature/VillageFeatureConfig.mapping | 2 ++ .../TernarySurfaceConfig.mapping | 1 + .../world/gen/decorator/Decorator.mapping | 2 +- .../gen/decorator/EmptyDecorator.mapping | 1 - .../world/gen/decorator/NopeDecorator.mapping | 1 + .../gen/feature/BirchTreeFeature.mapping | 2 ++ .../gen/feature/ConfiguredFeature.mapping | 2 ++ .../gen/feature/DarkOakTreeFeature.mapping | 2 ++ .../gen/feature/DesertPyramidFeature.mapping | 2 ++ .../gen/feature/DesertTempleFeature.mapping | 2 -- .../world/gen/feature/DungeonFeature.mapping | 1 + ...eature.mapping => EndSpikeFeature.mapping} | 13 ++++--- .../world/gen/feature/FossilFeature.mapping | 18 ++++++++++ .../gen/feature/LargeOakTreeFeature.mapping | 2 ++ .../gen/feature/MegaPineTreeFeature.mapping | 3 ++ .../gen/feature/NetherSpringFeature.mapping | 1 + .../world/gen/feature/OakTreeFeature.mapping | 4 +-- .../world/gen/feature/PineTreeFeature.mapping | 2 ++ .../gen/feature/RandomFeatureEntry.mapping | 1 + .../gen/feature/SavannaTreeFeature.mapping | 2 ++ .../gen/feature/SpruceTreeFeature.mapping | 2 ++ .../world/gen/feature/SwampHutFeature.mapping | 2 ++ .../gen/feature/SwampTreeFeature.mapping | 2 ++ .../world/gen/feature/WitchHutFeature.mapping | 2 -- ...der.mapping => NopeSurfaceBuilder.mapping} | 2 +- .../gen/surfacebuilder/SurfaceBuilder.mapping | 2 +- .../world/level/LevelProperties.mapping | 8 ++--- mappings/ud.mapping | 2 +- 97 files changed, 260 insertions(+), 72 deletions(-) create mode 100644 mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping rename mappings/net/minecraft/util/shape/{VoxelShapeBits.mapping => BitSetVoxelShapeContainer.mapping} (70%) rename mappings/net/minecraft/util/shape/{VoxelShapeOffset.mapping => OffsetVoxelShapeContainer.mapping} (84%) create mode 100644 mappings/net/minecraft/util/shape/SimpleVoxelShape.mapping delete mode 100644 mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping delete mode 100644 mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping delete mode 100644 mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping rename mappings/net/minecraft/world/gen/config/decorator/{DefaultDecoratorConfig.mapping => NopeDecoratorConfig.mapping} (67%) delete mode 100644 mappings/net/minecraft/world/gen/decorator/EmptyDecorator.mapping create mode 100644 mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/DesertTempleFeature.mapping rename mappings/net/minecraft/world/gen/feature/{EndPillarFeature.mapping => EndSpikeFeature.mapping} (63%) create mode 100644 mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/WitchHutFeature.mapping rename mappings/net/minecraft/world/gen/surfacebuilder/{EmptySurfaceBuilder.mapping => NopeSurfaceBuilder.mapping} (51%) diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 2c69034b27..42e8a125a0 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -1,6 +1,6 @@ CLASS wn net/minecraft/server/PlayerManager CLASS wn$1 - METHOD a (Lbpx;D)V + METHOD a onSizeChange (Lbpx;D)V ARG 0 border ARG 1 size METHOD a onCenterChanged (Lbpx;DD)V diff --git a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping index ebb6a13acb..a57d65fd39 100644 --- a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping +++ b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping @@ -1,11 +1,11 @@ CLASS bol net/minecraft/state/AbstractPropertyContainer - FIELD a baseObject Ljava/lang/Object; + FIELD a owner Ljava/lang/Object; FIELD c PROPERTY_MAP_PRINTER Ljava/util/function/Function; FIELD d entries Lcom/google/common/collect/ImmutableMap; FIELD e computedHashCode I FIELD f entryWithTable Lcom/google/common/collect/Table; METHOD (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)V - ARG 1 baseObject + ARG 1 owner METHOD a getProperties ()Ljava/util/Collection; METHOD a with (Lbpo;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property diff --git a/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping b/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping new file mode 100644 index 0000000000..b1a9b56b67 --- /dev/null +++ b/mappings/net/minecraft/util/shape/ArrayVoxelShape.mapping @@ -0,0 +1,14 @@ +CLASS clb net/minecraft/util/shape/ArrayVoxelShape + FIELD b xPoints Lit/unimi/dsi/fastutil/doubles/DoubleList; + FIELD c yPoints Lit/unimi/dsi/fastutil/doubles/DoubleList; + FIELD d zPoints Lit/unimi/dsi/fastutil/doubles/DoubleList; + METHOD (Lcli;Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;)V + ARG 1 shape + ARG 2 xPoints + ARG 3 yPoints + ARG 4 zPoints + METHOD (Lcli;[D[D[D)V + ARG 1 shape + ARG 2 xPoints + ARG 3 yPoints + ARG 4 zPoints diff --git a/mappings/net/minecraft/util/shape/VoxelShapeBits.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelShapeContainer.mapping similarity index 70% rename from mappings/net/minecraft/util/shape/VoxelShapeBits.mapping rename to mappings/net/minecraft/util/shape/BitSetVoxelShapeContainer.mapping index 07a932d2d8..ec7a7afbd6 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapeBits.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelShapeContainer.mapping @@ -1,4 +1,4 @@ -CLASS clc net/minecraft/util/shape/VoxelShapeBits +CLASS clc net/minecraft/util/shape/BitSetVoxelShapeContainer FIELD d storage Ljava/util/BitSet; FIELD e xMin I FIELD f yMin I @@ -9,6 +9,14 @@ CLASS clc net/minecraft/util/shape/VoxelShapeBits METHOD (III)V ARG 1 xSize ARG 2 ySize + ARG 3 zSize + METHOD (IIIIIIIII)V + ARG 4 xMin + ARG 5 yMin + ARG 6 zMin + ARG 7 xMax + ARG 8 yMax + ARG 9 zMax METHOD a isEmpty ()Z METHOD a getIndex (III)I ARG 1 x diff --git a/mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping b/mappings/net/minecraft/util/shape/OffsetVoxelShapeContainer.mapping similarity index 84% rename from mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping rename to mappings/net/minecraft/util/shape/OffsetVoxelShapeContainer.mapping index fe667264b1..3e2cf4ab2e 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapeOffset.mapping +++ b/mappings/net/minecraft/util/shape/OffsetVoxelShapeContainer.mapping @@ -1,4 +1,4 @@ -CLASS cls net/minecraft/util/shape/VoxelShapeOffset +CLASS cls net/minecraft/util/shape/OffsetVoxelShapeContainer FIELD d parent Lcli; FIELD e xMin I FIELD f yMin I @@ -13,6 +13,7 @@ CLASS cls net/minecraft/util/shape/VoxelShapeOffset ARG 4 zMin ARG 5 xMax ARG 6 yMax + ARG 7 zMax METHOD a set (IIIZZ)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping b/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping index a4ad7a5f8b..cca4124be8 100644 --- a/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping +++ b/mappings/net/minecraft/util/shape/SequentialDoubleList.mapping @@ -3,3 +3,4 @@ CLASS cln net/minecraft/util/shape/SequentialDoubleList FIELD b offset I METHOD (II)V ARG 1 count + ARG 2 offset diff --git a/mappings/net/minecraft/util/shape/SimpleVoxelShape.mapping b/mappings/net/minecraft/util/shape/SimpleVoxelShape.mapping new file mode 100644 index 0000000000..9f584f41e9 --- /dev/null +++ b/mappings/net/minecraft/util/shape/SimpleVoxelShape.mapping @@ -0,0 +1,3 @@ +CLASS clg net/minecraft/util/shape/SimpleVoxelShape + METHOD (Lcli;)V + ARG 1 shape diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index ae2f4be762..212a2c3da5 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -1,23 +1,12 @@ -CLASS cli net/minecraft/util/shape/VoxelShape - FIELD a xSize I - FIELD b ySize I - FIELD c zSize I - FIELD d AXIS [Ley$a; - METHOD (III)V - ARG 1 xSize - ARG 2 ySize - METHOD a isEmpty ()Z - METHOD a set (IIIZZ)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 resize - METHOD a getMinimum (Ley$a;)I - METHOD b getXSize ()I - METHOD b contains (III)Z - ARG 1 x - ARG 2 y - METHOD b getMaximum (Ley$a;)I - METHOD c getYSize ()I - METHOD c getSize (Ley$a;)I - METHOD d getZSize ()I +CLASS clt net/minecraft/util/shape/VoxelShape + FIELD a shape Lcli; + METHOD (Lcli;)V + ARG 1 shape + METHOD a getBoundingBox ()Lckv; + METHOD a rayTrace (Lckz;Lckz;Let;)Lckw; + ARG 1 start + ARG 2 end + METHOD b isEmpty ()Z + METHOD b getMinimum (Ley$a;)D + METHOD c getMaximum (Ley$a;)D + METHOD d getBoundingBoxList ()Ljava/util/List; diff --git a/mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping b/mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping deleted file mode 100644 index c70c5e24b6..0000000000 --- a/mappings/net/minecraft/util/shape/VoxelShapeContainer.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS clt net/minecraft/util/shape/VoxelShapeContainer - FIELD a shape Lcli; - METHOD a getBoundingBox ()Lckv; - METHOD a rayTrace (Lckz;Lckz;Let;)Lckw; - ARG 1 start - ARG 2 end - METHOD b isEmpty ()Z - METHOD b getMinimum (Ley$a;)D - METHOD c getMaximum (Ley$a;)D - METHOD d getBoundingBoxList ()Ljava/util/List; diff --git a/mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping b/mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping deleted file mode 100644 index f699d58838..0000000000 --- a/mappings/net/minecraft/util/shape/VoxelShapeContainerPoints.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS clb net/minecraft/util/shape/VoxelShapeContainerPoints - FIELD b pointsX Lit/unimi/dsi/fastutil/doubles/DoubleList; - FIELD c pointsY Lit/unimi/dsi/fastutil/doubles/DoubleList; - FIELD d pointsZ Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping b/mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping deleted file mode 100644 index 72f4235cee..0000000000 --- a/mappings/net/minecraft/util/shape/VoxelShapeContainerSimple.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS clg net/minecraft/util/shape/VoxelShapeContainerSimple diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 178a208024..889cce06ac 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -7,5 +7,6 @@ CLASS clq net/minecraft/util/shape/VoxelShapes ARG 2 max METHOD a cube (DDDDDD)Lclt; ARG 0 xMin + METHOD a lcm (II)J METHOD a cube (Lckv;)Lclt; METHOD b fullCube ()Lclt; diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index 9a0b73c377..99acd58fd6 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -11,7 +11,7 @@ CLASS bpx net/minecraft/world/border/WorldBorder METHOD j onMaxWorldBorderRadiusChanged ()V METHOD k onCenterChanged ()V METHOD l getAreaInstance ()Lbpx$a; - CLASS bpx$b AreaResizing + CLASS bpx$b MovingArea FIELD b oldSize D FIELD c newSize D FIELD d timeEnd J @@ -28,7 +28,7 @@ CLASS bpx net/minecraft/world/border/WorldBorder METHOD j onMaxWorldBorderRadiusChanged ()V METHOD k onCenterChanged ()V METHOD l getAreaInstance ()Lbpx$a; - CLASS bpx$c AreaStatic + CLASS bpx$c StaticArea FIELD b size D FIELD c boundWest D FIELD d boundNorth D @@ -58,23 +58,31 @@ CLASS bpx net/minecraft/world/border/WorldBorder FIELD h maxWorldBorderRadius I FIELD i area Lbpx$a; METHOD a getStage ()Lbpw; + METHOD a setSize (D)V + ARG 1 size METHOD a (DDJ)V ARG 1 oldSize METHOD a setMaxWorldBorderRadius (I)V METHOD a contains (Lagk;)D METHOD a contains (Lbag;)Z METHOD a addListener (Lbpv;)V + ARG 1 listener METHOD a contains (Lckv;)Z METHOD a contains (Let;)Z METHOD b getBoundWest ()D METHOD b setSafeZone (D)V + ARG 1 safeZone METHOD b contains (DD)D METHOD b setWarningTime (I)V + ARG 1 warningTime METHOD c getBoundNorth ()D METHOD c setDamagePerBlock (D)V + ARG 1 damagePerBlock METHOD c setCenter (DD)V ARG 1 x + ARG 3 z METHOD c setWarningBlocks (I)V + ARG 1 warningBlocks METHOD d getBoundEast ()D METHOD e getBoundSouth ()D METHOD f getCenterX ()D @@ -82,7 +90,7 @@ CLASS bpx net/minecraft/world/border/WorldBorder METHOD h getSize ()D METHOD i getTargetRemainingTime ()J METHOD j getTargetSize ()D - METHOD k getListenerList ()Ljava/util/List; + METHOD k getListeners ()Ljava/util/List; METHOD l getMaxWorldBorderRadius ()I METHOD m getSafeZone ()D METHOD n getDamagePerBlock ()D diff --git a/mappings/net/minecraft/world/border/WorldBorderListener.mapping b/mappings/net/minecraft/world/border/WorldBorderListener.mapping index f56cc35abf..59891ec060 100644 --- a/mappings/net/minecraft/world/border/WorldBorderListener.mapping +++ b/mappings/net/minecraft/world/border/WorldBorderListener.mapping @@ -1,5 +1,5 @@ CLASS bpv net/minecraft/world/border/WorldBorderListener - METHOD a (Lbpx;D)V + METHOD a onSizeChange (Lbpx;D)V ARG 0 border ARG 1 size METHOD a onCenterChanged (Lbpx;DD)V diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping index f6bafefc9e..e7fd56659b 100644 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -3,7 +3,9 @@ CLASS bre net/minecraft/world/dimension/Dimension FIELD f type Lbrf; METHOD (Lbas;Lbrf;)V ARG 1 world + ARG 2 type METHOD d getForcedSpawnPoint ()Let; METHOD j createWorldBorder ()Lbpx; + METHOD m createChunkGenerator ()Lbqa; METHOD n hasVisibleSky ()Z METHOD p getType ()Lbrf; diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index cfff0e894a..08e8a9718e 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -8,7 +8,7 @@ CLASS brf net/minecraft/world/dimension/DimensionType ARG 2 suffix ARG 3 saveDir ARG 4 factory - METHOD a getRegistry ()Ljava/lang/Iterable; + METHOD a getAll ()Ljava/lang/Iterable; METHOD a byRawId (I)Lbrf; METHOD a create (Lbas;)Lbre; METHOD a getId (Lbrf;)Lpz; diff --git a/mappings/net/minecraft/world/dimension/OverworldDimension.mapping b/mappings/net/minecraft/world/dimension/OverworldDimension.mapping index e56c7998dc..d12354e645 100644 --- a/mappings/net/minecraft/world/dimension/OverworldDimension.mapping +++ b/mappings/net/minecraft/world/dimension/OverworldDimension.mapping @@ -1,5 +1,7 @@ CLASS brh net/minecraft/world/dimension/OverworldDimension METHOD (Lbas;Lbrf;)V ARG 1 world + ARG 2 type + METHOD m createChunkGenerator ()Lbqa; METHOD n hasVisibleSky ()Z METHOD p getType ()Lbrf; diff --git a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping index 3e3e90061d..928dfb4683 100644 --- a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping +++ b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping @@ -1,6 +1,8 @@ CLASS brk net/minecraft/world/dimension/TheEndDimension METHOD (Lbas;Lbrf;)V ARG 1 world + ARG 2 type METHOD d getForcedSpawnPoint ()Let; + METHOD m createChunkGenerator ()Lbqa; METHOD n hasVisibleSky ()Z METHOD p getType ()Lbrf; diff --git a/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping b/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping index 74da7aa08c..f617efecef 100644 --- a/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping +++ b/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping @@ -4,6 +4,8 @@ CLASS brg net/minecraft/world/dimension/TheNetherDimension METHOD g getCenterZ ()D METHOD (Lbas;Lbrf;)V ARG 1 world + ARG 2 type METHOD j createWorldBorder ()Lbpx; + METHOD m createChunkGenerator ()Lbqa; METHOD n hasVisibleSky ()Z METHOD p getType ()Lbrf; diff --git a/mappings/net/minecraft/world/gen/GenerationStep.mapping b/mappings/net/minecraft/world/gen/GenerationStep.mapping index f243c96c32..979d077961 100644 --- a/mappings/net/minecraft/world/gen/GenerationStep.mapping +++ b/mappings/net/minecraft/world/gen/GenerationStep.mapping @@ -1,9 +1,13 @@ CLASS brr net/minecraft/world/gen/GenerationStep CLASS brr$a Carver - FIELD c nameMap Ljava/util/Map; + FIELD c BY_NAME Ljava/util/Map; FIELD d name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD a getName ()Ljava/lang/String; CLASS brr$b Feature - FIELD i nameMap Ljava/util/Map; + FIELD i BY_NAME Ljava/util/Map; FIELD j name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/Heightmap.mapping b/mappings/net/minecraft/world/gen/Heightmap.mapping index caace83ea3..1cc906d1ea 100644 --- a/mappings/net/minecraft/world/gen/Heightmap.mapping +++ b/mappings/net/minecraft/world/gen/Heightmap.mapping @@ -7,12 +7,14 @@ CLASS brs net/minecraft/world/gen/Heightmap FIELD e MOTION_BLOCKING Lbrs$a; FIELD f MOTION_BLOCKING_NO_LEAVES Lbrs$a; FIELD g name Ljava/lang/String; - FIELD j nameMap Ljava/util/Map; + FIELD j BY_NAME Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;Lbrs$b;Ljava/util/function/Predicate;)V ARG 3 name METHOD a getName ()Ljava/lang/String; METHOD a byName (Ljava/lang/String;)Lbrs$a; ARG 0 name FIELD c storage Lyc; + METHOD (Lbpz;Lbrs$a;)V + ARG 2 type METHOD a asLongArray ()[J METHOD a fromLongArray ([J)V diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index d5dc4d98a1..ce050e4a97 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -4,6 +4,8 @@ CLASS bsl net/minecraft/world/gen/carver/Carver FIELD c RAVINE Lbsl; FIELD d UNDERWATER_RAVINE Lbsl; FIELD e UNDERWATER_CAVE Lbsl; + FIELD f AIR Lbom; + FIELD g CAVE_AIR Lbom; FIELD h WATER Lcdz; FIELD i LAVA Lcdz; METHOD a register (Ljava/lang/String;Lbsl;)Lbsl; diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index 8ae496b9d6..5f258371c8 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -3,3 +3,4 @@ CLASS bsg net/minecraft/world/gen/carver/ConfiguredCarver FIELD b config Lbse; METHOD (Lbsl;Lbse;)V ARG 1 carver + ARG 2 config diff --git a/mappings/net/minecraft/world/gen/config/ProbabilityConfig.mapping b/mappings/net/minecraft/world/gen/config/ProbabilityConfig.mapping index 234ff4a874..145314023a 100644 --- a/mappings/net/minecraft/world/gen/config/ProbabilityConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/ProbabilityConfig.mapping @@ -1,5 +1,8 @@ CLASS bwe net/minecraft/world/gen/config/ProbabilityConfig FIELD b probability F + METHOD (F)V + ARG 1 probability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwe; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/CarvingMaskDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/CarvingMaskDecoratorConfig.mapping index 356421ffff..4e46b0c888 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/CarvingMaskDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/CarvingMaskDecoratorConfig.mapping @@ -3,6 +3,8 @@ CLASS bzh net/minecraft/world/gen/config/decorator/CarvingMaskDecoratorConfig FIELD b probability F METHOD (Lbrr$a;F)V ARG 1 step + ARG 2 probability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzh; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/ChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/ChanceDecoratorConfig.mapping index 7978e150dc..7db7656d6d 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/ChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/ChanceDecoratorConfig.mapping @@ -1,5 +1,8 @@ CLASS bzi net/minecraft/world/gen/config/decorator/ChanceDecoratorConfig FIELD a chance I + METHOD (I)V + ARG 1 chance METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzi; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/ChanceRangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/ChanceRangeDecoratorConfig.mapping index 1ce8aadf12..8e1487f9e3 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/ChanceRangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/ChanceRangeDecoratorConfig.mapping @@ -7,6 +7,8 @@ CLASS bto net/minecraft/world/gen/config/decorator/ChanceRangeDecoratorConfig ARG 1 chance ARG 2 bottomOffset ARG 3 topOffset + ARG 4 top METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbto; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/CountChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/CountChanceDecoratorConfig.mapping index 5f60b8036d..8e039f7cf4 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/CountChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/CountChanceDecoratorConfig.mapping @@ -3,6 +3,8 @@ CLASS bzk net/minecraft/world/gen/config/decorator/CountChanceDecoratorConfig FIELD b chance F METHOD (IF)V ARG 1 count + ARG 2 chance METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzk; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/CountDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/CountDecoratorConfig.mapping index 70661f0833..533ed0f826 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/CountDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/CountDecoratorConfig.mapping @@ -1,5 +1,8 @@ CLASS bzj net/minecraft/world/gen/config/decorator/CountDecoratorConfig FIELD a count I + METHOD (I)V + ARG 1 count METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzj; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/CountDepthDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/CountDepthDecoratorConfig.mapping index c39881752f..90ff84e89d 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/CountDepthDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/CountDepthDecoratorConfig.mapping @@ -5,6 +5,8 @@ CLASS bzo net/minecraft/world/gen/config/decorator/CountDepthDecoratorConfig METHOD (III)V ARG 1 count ARG 2 baseline + ARG 3 spread METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzo; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/CountExtraChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/CountExtraChanceDecoratorConfig.mapping index 211c618b3a..eb7714be38 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/CountExtraChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/CountExtraChanceDecoratorConfig.mapping @@ -5,6 +5,8 @@ CLASS bzl net/minecraft/world/gen/config/decorator/CountExtraChanceDecoratorConf METHOD (IFI)V ARG 1 count ARG 2 extraChance + ARG 3 extraCount METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzl; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/DecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/DecoratorConfig.mapping index f062b63276..034e8bbb51 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/DecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/DecoratorConfig.mapping @@ -1,3 +1,4 @@ CLASS btp net/minecraft/world/gen/config/decorator/DecoratorConfig FIELD e DEFAULT Lbvt; METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/DungeonDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/DungeonDecoratorConfig.mapping index 02a3810958..fca6b92c34 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/DungeonDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/DungeonDecoratorConfig.mapping @@ -1,5 +1,8 @@ CLASS bzy net/minecraft/world/gen/config/decorator/DungeonDecoratorConfig FIELD a chance I + METHOD (I)V + ARG 1 chance METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzy; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/HeightmapRangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/HeightmapRangeDecoratorConfig.mapping index 7bece66b0a..901a7655c7 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/HeightmapRangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/HeightmapRangeDecoratorConfig.mapping @@ -3,6 +3,8 @@ CLASS bzn net/minecraft/world/gen/config/decorator/HeightmapRangeDecoratorConfig FIELD b max I METHOD (II)V ARG 1 min + ARG 2 max METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzn; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/LakeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/LakeDecoratorConfig.mapping index 4ebfbb86a1..77fc89b64f 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/LakeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/LakeDecoratorConfig.mapping @@ -1,5 +1,8 @@ CLASS bzv net/minecraft/world/gen/config/decorator/LakeDecoratorConfig FIELD a chance I + METHOD (I)V + ARG 1 chance METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzv; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/NoiseHeightmapDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/NoiseHeightmapDecoratorConfig.mapping index 31e7c4c831..4ea578d6e5 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/NoiseHeightmapDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/NoiseHeightmapDecoratorConfig.mapping @@ -4,6 +4,9 @@ CLASS btr net/minecraft/world/gen/config/decorator/NoiseHeightmapDecoratorConfig FIELD c aboveNoise I METHOD (DII)V ARG 1 noiseLevel + ARG 3 belowNoise + ARG 4 aboveNoise METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtr; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/DefaultDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/NopeDecoratorConfig.mapping similarity index 67% rename from mappings/net/minecraft/world/gen/config/decorator/DefaultDecoratorConfig.mapping rename to mappings/net/minecraft/world/gen/config/decorator/NopeDecoratorConfig.mapping index d151d89270..0e135f4e57 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/DefaultDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/NopeDecoratorConfig.mapping @@ -1,4 +1,5 @@ -CLASS bvt net/minecraft/world/gen/config/decorator/DefaultDecoratorConfig +CLASS bvt net/minecraft/world/gen/config/decorator/NopeDecoratorConfig METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbvt; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/RangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/RangeDecoratorConfig.mapping index d1b0e47a83..e7cdff7363 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/RangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/RangeDecoratorConfig.mapping @@ -7,6 +7,8 @@ CLASS btq net/minecraft/world/gen/config/decorator/RangeDecoratorConfig ARG 1 count ARG 2 bottomOffset ARG 3 topOffset + ARG 4 maximum METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtq; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/config/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping index 61477cbd10..e7c4f7d5d5 100644 --- a/mappings/net/minecraft/world/gen/config/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping @@ -6,6 +6,9 @@ CLASS bzm net/minecraft/world/gen/config/decorator/TopSolidHeightmapNoiseBiasedD METHOD (IDDLbrs$a;)V ARG 1 noiseToCountRatio ARG 2 noiseFactor + ARG 4 noiseOffset + ARG 6 heightmap METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzm; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/BlockClusterFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/BlockClusterFeatureConfig.mapping index 1cd0f626b3..4983268589 100644 --- a/mappings/net/minecraft/world/gen/config/feature/BlockClusterFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/BlockClusterFeatureConfig.mapping @@ -7,6 +7,8 @@ CLASS btv net/minecraft/world/gen/config/feature/BlockClusterFeatureConfig ARG 1 state ARG 2 radius ARG 3 ySize + ARG 4 targets METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtv; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/BoulderFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/BoulderFeatureConfig.mapping index 9960067b3f..45b1800660 100644 --- a/mappings/net/minecraft/world/gen/config/feature/BoulderFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/BoulderFeatureConfig.mapping @@ -3,6 +3,8 @@ CLASS bsr net/minecraft/world/gen/config/feature/BoulderFeatureConfig FIELD b startRadius I METHOD (Lbom;I)V ARG 1 state + ARG 2 startRadius METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbsr; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/BuriedTreasureFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/BuriedTreasureFeatureConfig.mapping index 3bc87c7571..826981cb14 100644 --- a/mappings/net/minecraft/world/gen/config/feature/BuriedTreasureFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/BuriedTreasureFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bsw net/minecraft/world/gen/config/feature/BuriedTreasureFeatureConfig FIELD a probability F + METHOD (F)V + ARG 1 probability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbsw; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/BushFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/BushFeatureConfig.mapping index ac9defb5f2..5044a5b0ad 100644 --- a/mappings/net/minecraft/world/gen/config/feature/BushFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/BushFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bsy net/minecraft/world/gen/config/feature/BushFeatureConfig FIELD a state Lbom; + METHOD (Lbom;)V + ARG 1 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbsy; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/DecoratedFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/DecoratedFeatureConfig.mapping index f0e47eb72a..cb1db4917d 100644 --- a/mappings/net/minecraft/world/gen/config/feature/DecoratedFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/DecoratedFeatureConfig.mapping @@ -3,10 +3,13 @@ CLASS btm net/minecraft/world/gen/config/feature/DecoratedFeatureConfig FIELD b decorator Lbyu; METHOD (Lbtd;Lbyu;)V ARG 1 feature + ARG 2 decorator METHOD (Lbue;Lbuf;Lbzs;Lbtp;)V ARG 1 feature ARG 2 featureConfig ARG 3 decorator + ARG 4 decoratorConfig METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtm; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/DefaultFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/DefaultFeatureConfig.mapping index bdd6bb9bfc..b9cbf9fca1 100644 --- a/mappings/net/minecraft/world/gen/config/feature/DefaultFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/DefaultFeatureConfig.mapping @@ -2,3 +2,4 @@ CLASS bvu net/minecraft/world/gen/config/feature/DefaultFeatureConfig METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbvu; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/DoublePlantFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/DoublePlantFeatureConfig.mapping index bc1bbfb8ea..7e43dfad94 100644 --- a/mappings/net/minecraft/world/gen/config/feature/DoublePlantFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/DoublePlantFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS btx net/minecraft/world/gen/config/feature/DoublePlantFeatureConfig FIELD a state Lbom; + METHOD (Lbom;)V + ARG 1 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtx; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/EmeraldOreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/EmeraldOreFeatureConfig.mapping index e9ce9a9684..1797949535 100644 --- a/mappings/net/minecraft/world/gen/config/feature/EmeraldOreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/EmeraldOreFeatureConfig.mapping @@ -3,6 +3,8 @@ CLASS bwn net/minecraft/world/gen/config/feature/EmeraldOreFeatureConfig FIELD b state Lbom; METHOD (Lbom;Lbom;)V ARG 1 target + ARG 2 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwn; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/EndGatewayFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/EndGatewayFeatureConfig.mapping index 1245afdced..2cbb456577 100644 --- a/mappings/net/minecraft/world/gen/config/feature/EndGatewayFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/EndGatewayFeatureConfig.mapping @@ -1,6 +1,9 @@ CLASS bua net/minecraft/world/gen/config/feature/EndGatewayFeatureConfig FIELD a exitsAtSpawn Z + METHOD (Z)V + ARG 1 exitsAtSpawn METHOD a exitsAtSpawn ()Z METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbua; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/EndPillarFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/EndPillarFeatureConfig.mapping index 4f17d505bb..54e1f31146 100644 --- a/mappings/net/minecraft/world/gen/config/feature/EndPillarFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/EndPillarFeatureConfig.mapping @@ -5,9 +5,11 @@ CLASS bxe net/minecraft/world/gen/config/feature/EndPillarFeatureConfig METHOD (ZLjava/util/List;Let;)V ARG 1 crystalInvulnerable ARG 2 spikes + ARG 3 crystalBeamTarget METHOD a isCrystalInvulerable ()Z METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbxe; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops METHOD b getSpikes ()Ljava/util/List; METHOD c getPos ()Let; diff --git a/mappings/net/minecraft/world/gen/config/feature/FeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/FeatureConfig.mapping index 1ccd4422fa..bd904c0985 100644 --- a/mappings/net/minecraft/world/gen/config/feature/FeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/FeatureConfig.mapping @@ -1,3 +1,4 @@ CLASS buf net/minecraft/world/gen/config/feature/FeatureConfig FIELD e DEFAULT Lbvu; METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/GrassFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/GrassFeatureConfig.mapping index 9c925993e7..1f0636e8d4 100644 --- a/mappings/net/minecraft/world/gen/config/feature/GrassFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/GrassFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bum net/minecraft/world/gen/config/feature/GrassFeatureConfig FIELD a state Lbom; + METHOD (Lbom;)V + ARG 1 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbum; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/IcePatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/IcePatchFeatureConfig.mapping index f3734dc4e3..06b5557d3f 100644 --- a/mappings/net/minecraft/world/gen/config/feature/IcePatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/IcePatchFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bug net/minecraft/world/gen/config/feature/IcePatchFeatureConfig FIELD a radius I + METHOD (I)V + ARG 1 radius METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbug; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/IcebergFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/IcebergFeatureConfig.mapping index c733983f61..a47bca2f9f 100644 --- a/mappings/net/minecraft/world/gen/config/feature/IcebergFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/IcebergFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bux net/minecraft/world/gen/config/feature/IcebergFeatureConfig FIELD a state Lbom; + METHOD (Lbom;)V + ARG 1 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbux; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/LakeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/LakeFeatureConfig.mapping index 9d0282bab2..a86c9770f2 100644 --- a/mappings/net/minecraft/world/gen/config/feature/LakeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/LakeFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bve net/minecraft/world/gen/config/feature/LakeFeatureConfig FIELD a state Lbom; + METHOD (Lbom;)V + ARG 1 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbve; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/MineshaftFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/MineshaftFeatureConfig.mapping index 00e3c57b75..26b2c99c80 100644 --- a/mappings/net/minecraft/world/gen/config/feature/MineshaftFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/MineshaftFeatureConfig.mapping @@ -3,6 +3,8 @@ CLASS bvl net/minecraft/world/gen/config/feature/MineshaftFeatureConfig FIELD b type Lbvm$b; METHOD (DLbvm$b;)V ARG 1 probability + ARG 3 type METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbvl; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/NetherSpringFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/NetherSpringFeatureConfig.mapping index 94cceb1db1..56ccd22ab1 100644 --- a/mappings/net/minecraft/world/gen/config/feature/NetherSpringFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/NetherSpringFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bur net/minecraft/world/gen/config/feature/NetherSpringFeatureConfig FIELD a insideRock Z + METHOD (Z)V + ARG 1 insideRock METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbur; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping index 5d1558e93b..7a9ded3552 100644 --- a/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping @@ -1,4 +1,8 @@ CLASS bvq net/minecraft/world/gen/config/feature/NewVillageFeatureConfig FIELD a startPool Lpz; FIELD b size I + METHOD (Ljava/lang/String;I)V + ARG 1 startPool + ARG 2 size METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/OceanRuinFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/OceanRuinFeatureConfig.mapping index c08e4d15d6..e84034bec1 100644 --- a/mappings/net/minecraft/world/gen/config/feature/OceanRuinFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/OceanRuinFeatureConfig.mapping @@ -5,6 +5,8 @@ CLASS bvw net/minecraft/world/gen/config/feature/OceanRuinFeatureConfig METHOD (Lcaz$b;FF)V ARG 1 biomeTemperature ARG 2 largeProbability + ARG 3 clusterProbability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbvw; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/OreFeatureConfig.mapping index 3c5a0a289f..f0fdff8760 100644 --- a/mappings/net/minecraft/world/gen/config/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/OreFeatureConfig.mapping @@ -17,6 +17,8 @@ CLASS bvx net/minecraft/world/gen/config/feature/OreFeatureConfig METHOD (Lbvx$a;Lbom;I)V ARG 1 target ARG 2 state + ARG 3 size METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbvx; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/PillagerOutpostFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/PillagerOutpostFeatureConfig.mapping index 9b18bff0f6..9519c53053 100644 --- a/mappings/net/minecraft/world/gen/config/feature/PillagerOutpostFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/PillagerOutpostFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bvz net/minecraft/world/gen/config/feature/PillagerOutpostFeatureConfig FIELD a probability D + METHOD (D)V + ARG 1 probability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbvz; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/RandomBooleanFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/RandomBooleanFeatureConfig.mapping index 7b73e6d891..2c5d8fe437 100644 --- a/mappings/net/minecraft/world/gen/config/feature/RandomBooleanFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/RandomBooleanFeatureConfig.mapping @@ -3,6 +3,7 @@ CLASS bwf net/minecraft/world/gen/config/feature/RandomBooleanFeatureConfig FIELD b featureFalse Lbtd; METHOD (Lbtd;Lbtd;)V ARG 1 featureTrue + ARG 2 featureFalse METHOD (Lbue;Lbuf;Lbue;Lbuf;)V ARG 1 featureTrue ARG 2 featureConfigTrue @@ -13,3 +14,4 @@ CLASS bwf net/minecraft/world/gen/config/feature/RandomBooleanFeatureConfig METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwf; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/RandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/RandomFeatureConfig.mapping index 62ac967476..8b6ce8754e 100644 --- a/mappings/net/minecraft/world/gen/config/feature/RandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/RandomFeatureConfig.mapping @@ -3,6 +3,7 @@ CLASS bwh net/minecraft/world/gen/config/feature/RandomFeatureConfig FIELD b defaultFeature Lbtd; METHOD (Ljava/util/List;Lbtd;)V ARG 1 features + ARG 2 defaultFeature METHOD ([Lbue;[Lbuf;[FLbue;Lbuf;)V ARG 1 features ARG 2 configs @@ -18,3 +19,4 @@ CLASS bwh net/minecraft/world/gen/config/feature/RandomFeatureConfig METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwh; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/RandomRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/RandomRandomFeatureConfig.mapping index 9ea2a7b7fa..9c4034a92a 100644 --- a/mappings/net/minecraft/world/gen/config/feature/RandomRandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/RandomRandomFeatureConfig.mapping @@ -3,12 +3,15 @@ CLASS bwj net/minecraft/world/gen/config/feature/RandomRandomFeatureConfig FIELD b count I METHOD (Ljava/util/List;I)V ARG 1 features + ARG 2 count METHOD ([Lbue;[Lbuf;I)V ARG 1 features ARG 2 configs + ARG 3 count METHOD a configure (Lbue;Lbuf;)Lbtd; ARG 0 feature ARG 1 config METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwj; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/SeaPickleFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/SeaPickleFeatureConfig.mapping index c1e5781e3c..108be138d3 100644 --- a/mappings/net/minecraft/world/gen/config/feature/SeaPickleFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/SeaPickleFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bti net/minecraft/world/gen/config/feature/SeaPickleFeatureConfig FIELD a count I + METHOD (I)V + ARG 1 count METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbti; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/SeagrassFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/SeagrassFeatureConfig.mapping index 254a62216d..471fb4e8f6 100644 --- a/mappings/net/minecraft/world/gen/config/feature/SeagrassFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/SeagrassFeatureConfig.mapping @@ -3,6 +3,8 @@ CLASS bwt net/minecraft/world/gen/config/feature/SeagrassFeatureConfig FIELD b tallSeagrassProbability D METHOD (ID)V ARG 1 count + ARG 2 tallSeagrassProbability METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwt; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/ShipwreckFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/ShipwreckFeatureConfig.mapping index 54d193ca74..2a0952c8dd 100644 --- a/mappings/net/minecraft/world/gen/config/feature/ShipwreckFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/ShipwreckFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bwu net/minecraft/world/gen/config/feature/ShipwreckFeatureConfig FIELD a isBeached Z + METHOD (Z)V + ARG 1 isBeached METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwu; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/SimpleBlockFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/SimpleBlockFeatureConfig.mapping index 048535ee51..bede099a4c 100644 --- a/mappings/net/minecraft/world/gen/config/feature/SimpleBlockFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/SimpleBlockFeatureConfig.mapping @@ -7,10 +7,13 @@ CLASS bww net/minecraft/world/gen/config/feature/SimpleBlockFeatureConfig ARG 1 toPlace ARG 2 placeOn ARG 3 placeIn + ARG 4 placeUnder METHOD (Lbom;[Lbom;[Lbom;[Lbom;)V ARG 1 toPlace ARG 2 placeOn ARG 3 placeIn + ARG 4 placeUnder METHOD a make (Lcom/mojang/datafixers/Dynamic;)Lbww; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/SimpleRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/SimpleRandomFeatureConfig.mapping index 9edb1834b6..8ea87955e4 100644 --- a/mappings/net/minecraft/world/gen/config/feature/SimpleRandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/SimpleRandomFeatureConfig.mapping @@ -1,10 +1,14 @@ CLASS bwy net/minecraft/world/gen/config/feature/SimpleRandomFeatureConfig FIELD a features Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 features METHOD ([Lbue;[Lbuf;)V ARG 1 features + ARG 2 configs METHOD a configure (Lbue;Lbuf;)Lbtd; ARG 0 feature ARG 1 config METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwy; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/SpringFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/SpringFeatureConfig.mapping index 67288f2cd6..ef49b64124 100644 --- a/mappings/net/minecraft/world/gen/config/feature/SpringFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/SpringFeatureConfig.mapping @@ -1,5 +1,8 @@ CLASS bxg net/minecraft/world/gen/config/feature/SpringFeatureConfig FIELD a state Lcdz; + METHOD (Lcdz;)V + ARG 1 state METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbxg; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/feature/VillageFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/VillageFeatureConfig.mapping index b8693cb54d..b94cb861fd 100644 --- a/mappings/net/minecraft/world/gen/config/feature/VillageFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/feature/VillageFeatureConfig.mapping @@ -3,6 +3,8 @@ CLASS bxr net/minecraft/world/gen/config/feature/VillageFeatureConfig FIELD b type Lcbn$n; METHOD (ILcbn$n;)V ARG 1 sizeModifier + ARG 2 type METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbxr; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/config/surfacebuilder/TernarySurfaceConfig.mapping b/mappings/net/minecraft/world/gen/config/surfacebuilder/TernarySurfaceConfig.mapping index 9567650bd0..7f102af93a 100644 --- a/mappings/net/minecraft/world/gen/config/surfacebuilder/TernarySurfaceConfig.mapping +++ b/mappings/net/minecraft/world/gen/config/surfacebuilder/TernarySurfaceConfig.mapping @@ -5,6 +5,7 @@ CLASS ccx net/minecraft/world/gen/config/surfacebuilder/TernarySurfaceConfig METHOD (Lbom;Lbom;Lbom;)V ARG 1 topMaterial ARG 2 underMaterial + ARG 3 underwaterMaterial METHOD a getTopMaterial ()Lbom; METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lccx; ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping index 084f7e6c94..8ed04eb0bc 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping @@ -1,6 +1,6 @@ CLASS bzs net/minecraft/world/gen/decorator/Decorator FIELD M factory Ljava/util/function/Function; - FIELD h EMPTY Lbzs; + FIELD h NOPE Lbzs; METHOD a (Lbat;Lbqa;Ljava/util/Random;Lbtp;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator diff --git a/mappings/net/minecraft/world/gen/decorator/EmptyDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/EmptyDecorator.mapping deleted file mode 100644 index 292d782609..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/EmptyDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cac net/minecraft/world/gen/decorator/EmptyDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping new file mode 100644 index 0000000000..34974154b1 --- /dev/null +++ b/mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping @@ -0,0 +1 @@ +CLASS cac net/minecraft/world/gen/decorator/NopeDecorator diff --git a/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping index c4ae3bdca8..39917b7487 100644 --- a/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BirchTreeFeature.mapping @@ -1 +1,3 @@ CLASS bsq net/minecraft/world/gen/feature/BirchTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 3d89b69f74..d0073b38d5 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -3,6 +3,7 @@ CLASS btd net/minecraft/world/gen/feature/ConfiguredFeature FIELD b config Lbuf; METHOD (Lbue;Lbuf;)V ARG 1 feature + ARG 2 config METHOD (Lbue;Lcom/mojang/datafixers/Dynamic;)V ARG 1 feature METHOD a generate (Lbat;Lbqa;Ljava/util/Random;Let;)Z @@ -12,3 +13,4 @@ CLASS btd net/minecraft/world/gen/feature/ConfiguredFeature METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbtd; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping index 8a2e14e951..2910815ffa 100644 --- a/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping @@ -1 +1,3 @@ CLASS btj net/minecraft/world/gen/feature/DarkOakTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping b/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping new file mode 100644 index 0000000000..c52ccf427d --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping @@ -0,0 +1,2 @@ +CLASS btt net/minecraft/world/gen/feature/DesertPyramidFeature + METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/DesertTempleFeature.mapping b/mappings/net/minecraft/world/gen/feature/DesertTempleFeature.mapping deleted file mode 100644 index 3c10f7be6f..0000000000 --- a/mappings/net/minecraft/world/gen/feature/DesertTempleFeature.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS btt net/minecraft/world/gen/feature/DesertTempleFeature - METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping b/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping index 5d4c097263..ed3c6cb72d 100644 --- a/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping @@ -1,4 +1,5 @@ CLASS bvn net/minecraft/world/gen/feature/DungeonFeature + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a generate (Lbat;Lbqa;Ljava/util/Random;Let;Lbuf;)Z ARG 1 world ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping similarity index 63% rename from mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping rename to mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping index 3227e7617c..a321c7073a 100644 --- a/mappings/net/minecraft/world/gen/feature/EndPillarFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping @@ -1,10 +1,10 @@ -CLASS bxf net/minecraft/world/gen/feature/EndPillarFeature - CLASS bxf$a Pillar +CLASS bxf net/minecraft/world/gen/feature/EndSpikeFeature + CLASS bxf$a Spike FIELD a centerX I FIELD b centerZ I FIELD c radius I FIELD d height I - FIELD e caged Z + FIELD e guarded Z FIELD f boundingBox Lckv; METHOD (IIIIZ)V ARG 1 centerX @@ -12,14 +12,17 @@ CLASS bxf net/minecraft/world/gen/feature/EndPillarFeature ARG 3 radius ARG 4 height METHOD a getCenterX ()I - METHOD a (Lcom/mojang/datafixers/Dynamic;)Lbxf$a; + METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbxf$a; ARG 0 dynamic METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD b getCenterZ ()I METHOD c getRadius ()I METHOD d getHeight ()I - METHOD e isCaged ()Z + METHOD e isGuarded ()Z METHOD f getBoundingBox ()Lckv; + CLASS bxf$b SpikeCache + FIELD a CACHE Lcom/google/common/cache/LoadingCache; + METHOD a getSpikes (Lbat;)Ljava/util/List; METHOD a generate (Lbat;Lbqa;Ljava/util/Random;Let;Lbuf;)Z ARG 1 world ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping b/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping index 866cfa87b6..5b5a27bb63 100644 --- a/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping @@ -1,4 +1,22 @@ CLASS buj net/minecraft/world/gen/feature/FossilFeature + FIELD a SPINE_1 Lpz; + FIELD aR SPINE_2 Lpz; + FIELD aS SPINE_3 Lpz; + FIELD aT SPINE_4 Lpz; + FIELD aU SPINE_1_COAL Lpz; + FIELD aV SPINE_2_COAL Lpz; + FIELD aW SPINE_3_COAL Lpz; + FIELD aX SPINE_4_COAL Lpz; + FIELD aY SKULL_1 Lpz; + FIELD aZ SKULL_2 Lpz; + FIELD ba SKULL_3 Lpz; + FIELD bb SKULL_4 Lpz; + FIELD bc SKULL_1_COAL Lpz; + FIELD bd SKULL_2_COAL Lpz; + FIELD be SKULL_3_COAL Lpz; + FIELD bf SKULL_4_COAL Lpz; + FIELD bg FOSSILS [Lpz; + FIELD bh COAL_FOSSILS [Lpz; METHOD a generate (Lbat;Lbqa;Ljava/util/Random;Let;Lbuf;)Z ARG 1 world ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping index f8fda48a88..2ceda47ad8 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping @@ -1 +1,3 @@ CLASS bsp net/minecraft/world/gen/feature/LargeOakTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping index fefc373ad6..d16d930595 100644 --- a/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping @@ -1 +1,4 @@ CLASS bvh net/minecraft/world/gen/feature/MegaPineTreeFeature + FIELD aU LOG Lbom; + FIELD aV LEAVES Lbom; + FIELD aW PODZOL Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping index e96eb04548..25e510c82a 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherSpringFeature.mapping @@ -1,4 +1,5 @@ CLASS bvp net/minecraft/world/gen/feature/NetherSpringFeature + FIELD a NETHERRACK Lbom; METHOD a generate (Lbat;Lbqa;Ljava/util/Random;Let;Lbuf;)Z ARG 1 world ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping index 15547387c8..1967e2cfdc 100644 --- a/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping @@ -1,7 +1,7 @@ CLASS bxq net/minecraft/world/gen/feature/OakTreeFeature FIELD a height I - FIELD aR OAK_LOG Lbom; - FIELD aS OAK_LEAVES Lbom; + FIELD aR LOG Lbom; + FIELD aS LEAVES Lbom; FIELD aU log Lbom; FIELD aV leaves Lbom; METHOD (Ljava/util/function/Function;ZILbom;Lbom;Z)V diff --git a/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping index 085484df4b..1315e0e9a1 100644 --- a/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PineTreeFeature.mapping @@ -1 +1,3 @@ CLASS bwb net/minecraft/world/gen/feature/PineTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index 83f4bc3ce1..99576ce204 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -5,6 +5,7 @@ CLASS bxw net/minecraft/world/gen/feature/RandomFeatureEntry METHOD (Lbue;Lbuf;Ljava/lang/Float;)V ARG 1 feature ARG 2 config + ARG 3 chance METHOD (Lbue;Lcom/mojang/datafixers/Dynamic;F)V ARG 1 feature ARG 2 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping index 76c0b0dd3f..1b0c1eb22d 100644 --- a/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping @@ -1 +1,3 @@ CLASS bwp net/minecraft/world/gen/feature/SavannaTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping index 40199d8a69..b645e3cc14 100644 --- a/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpruceTreeFeature.mapping @@ -1 +1,3 @@ CLASS bxi net/minecraft/world/gen/feature/SpruceTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping new file mode 100644 index 0000000000..f67c02256a --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping @@ -0,0 +1,2 @@ +CLASS bxo net/minecraft/world/gen/feature/SwampHutFeature + METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping index 488822848c..85e0eaf363 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping @@ -1 +1,3 @@ CLASS bxn net/minecraft/world/gen/feature/SwampTreeFeature + FIELD a LOG Lbom; + FIELD aR LEAVES Lbom; diff --git a/mappings/net/minecraft/world/gen/feature/WitchHutFeature.mapping b/mappings/net/minecraft/world/gen/feature/WitchHutFeature.mapping deleted file mode 100644 index 9c6b071031..0000000000 --- a/mappings/net/minecraft/world/gen/feature/WitchHutFeature.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bxo net/minecraft/world/gen/feature/WitchHutFeature - METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/EmptySurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/NopeSurfaceBuilder.mapping similarity index 51% rename from mappings/net/minecraft/world/gen/surfacebuilder/EmptySurfaceBuilder.mapping rename to mappings/net/minecraft/world/gen/surfacebuilder/NopeSurfaceBuilder.mapping index a979bf3bb5..0e1bc18c9a 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/EmptySurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/NopeSurfaceBuilder.mapping @@ -1,2 +1,2 @@ -CLASS ccu net/minecraft/world/gen/surfacebuilder/EmptySurfaceBuilder +CLASS ccu net/minecraft/world/gen/surfacebuilder/NopeSurfaceBuilder METHOD a generate (Ljava/util/Random;Lbpz;Lbbr;IIIDLbom;Lbom;IJLccy;)V diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index d884e16b59..45a8034024 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -16,7 +16,7 @@ CLASS ccw net/minecraft/world/gen/surfacebuilder/SurfaceBuilder FIELD O ERODED_BADLANDS Lccw; FIELD P FROZEN_OCEAN Lccw; FIELD Q NETHER Lccw; - FIELD R EMPTY Lccw; + FIELD R NOPE Lccw; FIELD a factory Ljava/util/function/Function; FIELD f AIR Lbom; FIELD g DIRT Lbom; diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index d1084ff686..06ccfdda48 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -16,8 +16,8 @@ CLASS chd net/minecraft/world/level/LevelProperties FIELD O borderDamagePerBlock D FIELD P borderWarningBlocks I FIELD Q borderWarningTime I - FIELD R dataPacksDisabled Ljava/util/Set; - FIELD S dataPacksEnabled Ljava/util/Set; + FIELD R disabledDataPacks Ljava/util/Set; + FIELD S enabledDataPacks Ljava/util/Set; FIELD T worldData Ljava/util/Map; FIELD U customBossEvents Lhq; FIELD V gameRules Lbao; @@ -61,8 +61,8 @@ CLASS chd net/minecraft/world/level/LevelProperties METHOD L getVersionId ()I METHOD M isVersionSnapshot ()Z METHOD N getVersionName ()Ljava/lang/String; - METHOD O getDataPacksDisabled ()Ljava/util/Set; - METHOD P getDataPacksEnabled ()Ljava/util/Set; + METHOD O getDisabledDataPacks ()Ljava/util/Set; + METHOD P getEnabledDataPacks ()Ljava/util/Set; METHOD Q getCustomBossEvents ()Lhq; METHOD R loadPlayerData ()V METHOD a getSeed ()J diff --git a/mappings/ud.mapping b/mappings/ud.mapping index bfcad15017..7c7337ee0d 100644 --- a/mappings/ud.mapping +++ b/mappings/ud.mapping @@ -1,6 +1,6 @@ CLASS ud CLASS ud$1 - METHOD a (Lbpx;D)V + METHOD a onSizeChange (Lbpx;D)V ARG 0 border ARG 1 size METHOD a onCenterChanged (Lbpx;DD)V