From 071aba24e7dd6e44aea2ca6cd851913e0c476581 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 19 Nov 2021 16:35:58 +0000 Subject: [PATCH] 1.18-pre5 --- build.gradle | 2 +- .../entity/ai/goal/EscapeDangerGoal.mapping | 3 +-- .../collection/PackedIntegerArray.mapping | 6 ----- .../world/chunk/BelowZeroRetrogen.mapping | 5 ---- .../world/chunk/PalettedContainer.mapping | 10 ------- .../world/gen/chunk/AquiferSampler.mapping | 9 ++----- .../world/gen/chunk/BlendingData.mapping | 2 +- .../gen/chunk/ChunkGeneratorSettings.mapping | 17 +++--------- .../world/gen/chunk/ChunkNoiseSampler.mapping | 7 ----- .../gen/chunk/NoiseChunkGenerator.mapping | 9 ++----- .../gen/feature/RootSystemFeature.mapping | 26 ------------------- .../feature/RootSystemFeatureConfig.mapping | 2 +- .../gen/surfacebuilder/MaterialRules.mapping | 4 +-- .../gen/surfacebuilder/SurfaceBuilder.mapping | 3 --- 14 files changed, 13 insertions(+), 92 deletions(-) diff --git a/build.gradle b/build.gradle index 71c590d2f1..4d2d4707f8 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.18-pre4" +def minecraft_version = "1.18-pre5" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping index 06774a58ae..867e92302b 100644 --- a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping @@ -9,9 +9,8 @@ CLASS net/minecraft/class_1374 net/minecraft/entity/ai/goal/EscapeDangerGoal ARG 1 mob ARG 2 speed METHOD method_26337 isActive ()Z - METHOD method_6300 locateClosestWater (Lnet/minecraft/class_1922;Lnet/minecraft/class_1297;II)Lnet/minecraft/class_2338; + METHOD method_6300 locateClosestWater (Lnet/minecraft/class_1922;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_2338; ARG 1 blockView ARG 2 entity ARG 3 rangeX - ARG 4 rangeY METHOD method_6301 findTarget ()Z diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index e13935116b..99c3a715dc 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -21,18 +21,12 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD (II)V ARG 1 elementBits ARG 2 size - METHOD (IILjava/util/stream/IntStream;)V - ARG 1 elementBits - ARG 2 size - ARG 3 values METHOD (II[J)V ARG 1 elementBits ARG 2 size ARG 3 data METHOD method_27284 getStorageIndex (I)I ARG 1 index - METHOD method_37972 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V - ARG 2 value CLASS class_6685 InvalidLengthException METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping index 25ec6552f7..821080775e 100644 --- a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping +++ b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping @@ -26,8 +26,3 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen ARG 4 y ARG 5 z ARG 6 noise - METHOD method_39769 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V - ARG 1 pos - METHOD method_39770 hasNoBedrock ()Z - METHOD method_39771 fillChunkWithAir (Lnet/minecraft/class_2839;)V - ARG 0 chunk diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index cb18c43708..f1e7057240 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -144,19 +144,9 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer COMMENT {@return the size of this data, in bytes, when written to a packet} COMMENT COMMENT @see #writePacket(PacketByteBuf) - METHOD method_38307 set (ILjava/lang/Object;)V - COMMENT Sets an entry to the storage's given index. - ARG 1 index - COMMENT the index in the storage - ARG 2 value - COMMENT the entry to set METHOD method_38308 importFrom (Lnet/minecraft/class_2837;Lnet/minecraft/class_6490;)V COMMENT Imports the data from the other {@code storage} with the other COMMENT {@code palette}. - ARG 1 palette - COMMENT the other palette - ARG 2 storage - COMMENT the other storage METHOD method_38309 writePacket (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_6562 Serialized diff --git a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping index 14ccc28f29..f32c43413a 100644 --- a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler METHOD method_33742 needsFluidTick ()Z METHOD method_36381 seaLevel (Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; - METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;Lnet/minecraft/class_5818;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; + METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; ARG 0 chunkNoiseSampler ARG 1 chunkPos ARG 2 edgeDensityNoise ARG 5 fluidTypeNoise - ARG 7 columnSampler METHOD method_38317 apply (IIIDD)Lnet/minecraft/class_2680; ARG 1 x ARG 2 y @@ -16,7 +15,6 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler FIELD field_28816 waterLevels [Lnet/minecraft/class_6350$class_6351; FIELD field_28817 blockPositions [J FIELD field_28820 needsFluidTick Z - FIELD field_28821 columnSampler Lnet/minecraft/class_5818; FIELD field_28822 startX I FIELD field_28823 startY I FIELD field_28824 startZ I @@ -25,19 +23,16 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler FIELD field_33575 fluidTypeNoise Lnet/minecraft/class_5216; FIELD field_34578 chunkNoiseSampler Lnet/minecraft/class_6568; FIELD field_34580 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; - METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;Lnet/minecraft/class_5818;IILnet/minecraft/class_6350$class_6565;)V + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)V ARG 1 chunkNoiseSampler ARG 2 chunkPos ARG 3 edgeDensityNoise ARG 6 fluidTypeNoise - ARG 8 columnSampler - ARG 11 fluidLevelSampler METHOD method_33734 getLocalX (I)I ARG 1 x METHOD method_33735 calculateDensity (IIILorg/apache/commons/lang3/mutable/MutableDouble;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;)D METHOD method_33736 maxDistance (II)D ARG 1 a - ARG 2 b METHOD method_33738 getWaterLevel (J)Lnet/minecraft/class_6350$class_6351; ARG 1 pos METHOD method_33740 getLocalY (I)I diff --git a/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping b/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping index 6cc66d8511..0d803e2ca7 100644 --- a/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping +++ b/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData METHOD method_39350 isCollidableAndNotTreeAt (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z ARG 0 chunk ARG 1 pos - METHOD method_39354 (Lnet/minecraft/class_2791;II)[D + METHOD method_39354 (Lnet/minecraft/class_2791;III)[D ARG 0 chunk ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 45d3746e2d..56bf06b419 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_26358 END Lnet/minecraft/class_5321; FIELD field_26359 CAVES Lnet/minecraft/class_5321; FIELD field_26360 FLOATING_ISLANDS Lnet/minecraft/class_5321; - FIELD field_26707 INSTANCE Lnet/minecraft/class_5284; FIELD field_28846 aquifers Z FIELD field_28847 noiseCaves Z FIELD field_33587 oreVeins Z @@ -47,18 +46,10 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti COMMENT Whether entities will be generated during chunk population. COMMENT COMMENT

It does not control whether spawns will occur during gameplay. - METHOD method_30641 createUndergroundSettings (Lnet/minecraft/class_5311;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Lnet/minecraft/class_5284; - ARG 0 structuresConfig - ARG 1 defaultBlock - ARG 2 defaultFluid - METHOD method_30642 createIslandSettings (Lnet/minecraft/class_5311;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)Lnet/minecraft/class_5284; - ARG 0 structuresConfig - ARG 1 defaultBlock - ARG 2 defaultFluid - METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_5311;ZZ)Lnet/minecraft/class_5284; - ARG 0 structuresConfig - ARG 1 amplified - METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)Lnet/minecraft/class_5284; + METHOD method_30641 createUndergroundSettings ()Lnet/minecraft/class_5284; + METHOD method_30642 createIslandSettings ()Lnet/minecraft/class_5284; + METHOD method_30643 createSurfaceSettings (ZZ)Lnet/minecraft/class_5284; + METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)V ARG 0 registryKey ARG 1 settings METHOD method_31111 getInstance ()Lnet/minecraft/class_5284; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 88017d7edd..ec0ac95fd1 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_34603 biomeX I FIELD field_34604 biomeZ I FIELD field_34605 interpolators Ljava/util/List; - FIELD field_34612 terrainNoisePoints Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; FIELD field_34614 initialNoiseBlockStateSampler Lnet/minecraft/class_6568$class_6569; FIELD field_34615 oreVeinSampler Lnet/minecraft/class_6568$class_6569; @@ -47,17 +46,11 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler ARG 1 x ARG 2 y ARG 3 z - METHOD method_38353 getTerrainNoisePoint (Lnet/minecraft/class_5818;II)Lnet/minecraft/class_6576; - ARG 2 x - ARG 3 z METHOD method_38354 getAquiferSampler ()Lnet/minecraft/class_6350; METHOD method_38355 sampleNoise (D)V ARG 1 deltaZ METHOD method_38356 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38361 getInterpolatedTerrainNoisePoint (II)Lnet/minecraft/class_6576; - ARG 1 x - ARG 2 z METHOD method_38362 sampleNoiseCorners (II)V ARG 1 noiseY ARG 2 noiseZ diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index a445c9552a..e6649ba174 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 biomeSource ARG 3 seed METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V - ARG 1 noiseRegistry ARG 4 seed METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; ARG 3 states @@ -26,14 +25,10 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD method_28550 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33754 populateNoise (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791; - METHOD method_38323 (IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; - ARG 1 y + METHOD method_38323 (Lnet/minecraft/class_6568;IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 2 x ARG 3 z - ARG 4 block - METHOD method_38325 (Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;III)Lnet/minecraft/class_6350$class_6351; - ARG 3 x - ARG 4 y + METHOD method_38325 (Lnet/minecraft/class_6350$class_6351;ILnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;III)Lnet/minecraft/class_6350$class_6351; ARG 5 z METHOD method_38326 (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_6544$class_6553; ARG 3 y diff --git a/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping b/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping index 508e8ebc88..15f1fd1cd2 100644 --- a/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping @@ -1,34 +1,8 @@ CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature METHOD method_34308 generateTreeAndRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5926;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 generator - ARG 3 config - ARG 4 random - ARG 5 mutablePos - ARG 6 pos - METHOD method_34309 generateFeature (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5926;Ljava/util/Random;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 generator - ARG 3 config - ARG 4 random - ARG 5 pos METHOD method_34310 hasSpaceForTree (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 config - ARG 3 pos METHOD method_34311 generateRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Ljava/util/Random;IILnet/minecraft/class_2338$class_2339;)V - ARG 1 world - ARG 2 config - ARG 3 random - ARG 4 x - ARG 5 z - ARG 6 mutablePos METHOD method_34312 generateHangingRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;)V - ARG 1 world - ARG 2 config - ARG 3 random - ARG 4 pos - ARG 5 mutablePos METHOD method_36419 isAirOrWater (Lnet/minecraft/class_2680;II)Z ARG 0 state ARG 1 height diff --git a/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping index b6148fa65f..38cb39be57 100644 --- a/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_5926 net/minecraft/world/gen/feature/RootSystemFeature FIELD field_29277 hangingRootStateProvider Lnet/minecraft/class_4651; FIELD field_29278 hangingRootPlacementAttempts I FIELD field_33616 allowedVerticalWaterForTree I - METHOD (Ljava/util/function/Supplier;IILnet/minecraft/class_2960;Lnet/minecraft/class_4651;IIIILnet/minecraft/class_4651;II)V + METHOD (Ljava/util/function/Supplier;IILnet/minecraft/class_2960;Lnet/minecraft/class_4651;IIIILnet/minecraft/class_4651;IILnet/minecraft/class_6646;)V ARG 1 feature ARG 2 requiredVerticalSpaceForTree ARG 3 rootRadius diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index aefc67f4f6..02f90f2bbd 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -13,9 +13,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu METHOD method_39049 condition (Lnet/minecraft/class_6686$class_6693;Lnet/minecraft/class_6686$class_6708;)Lnet/minecraft/class_6686$class_6708; ARG 0 condition ARG 1 rule - METHOD method_39050 sequence (Lnet/minecraft/class_6686$class_6708;[Lnet/minecraft/class_6686$class_6708;)Lnet/minecraft/class_6686$class_6708; - ARG 0 firstRule - ARG 1 rules + METHOD method_39050 sequence ([Lnet/minecraft/class_6686$class_6708;)Lnet/minecraft/class_6686$class_6708; METHOD method_39051 aboveY (Lnet/minecraft/class_5843;I)Lnet/minecraft/class_6686$class_6693; ARG 0 anchor ARG 1 runDepthMultiplier diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index 2968d9f415..e71e2c8938 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35281 LIGHT_GRAY_TERRACOTTA Lnet/minecraft/class_2680; FIELD field_35282 PACKED_ICE Lnet/minecraft/class_2680; FIELD field_35283 SNOW_BLOCK Lnet/minecraft/class_2680; - FIELD field_35284 noiseColumnSampler Lnet/minecraft/class_5818; FIELD field_35285 defaultBlock Lnet/minecraft/class_2680; FIELD field_35286 seaLevel I FIELD field_35287 terracottaBands [Lnet/minecraft/class_2680; @@ -16,8 +15,6 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35291 noiseSamplers Ljava/util/Map; FIELD field_35292 randomDeriver Lnet/minecraft/class_6574; FIELD field_35293 surfaceNoise Lnet/minecraft/class_5216; - METHOD (Lnet/minecraft/class_5818;Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V - ARG 1 noiseColumnSampler METHOD method_39102 (Lnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V ARG 2 x ARG 3 z