diff --git a/build.gradle b/build.gradle index 870170e62e..fef12f3c25 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.18_experimental-snapshot-2" +def minecraft_version = "1.18_experimental-snapshot-3" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/util/function/ToFloatFunction.mapping b/mappings/net/minecraft/util/function/ToFloatFunction.mapping index 8d40458d17..38f8d90e80 100644 --- a/mappings/net/minecraft/util/function/ToFloatFunction.mapping +++ b/mappings/net/minecraft/util/function/ToFloatFunction.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_6468 net/minecraft/util/function/ToFloatFunction - METHOD apply (Ljava/lang/Object;)F METHOD method_37749 combine (Lnet/minecraft/class_6468;Lnet/minecraft/class_6462$class_6465;)Lnet/minecraft/class_6468; ARG 1 other diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 05d238ce8d..8547794aaa 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -30,14 +30,12 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 4 spawnEntry ARG 5 pos ARG 6 squaredDistance - METHOD method_27815 setupSpawn (ILjava/lang/Iterable;Lnet/minecraft/class_1948$class_5260;)Lnet/minecraft/class_1948$class_5262; + METHOD method_27815 setupSpawn (ILjava/lang/Iterable;Lnet/minecraft/class_1948$class_5260;Lnet/minecraft/class_6480;)Lnet/minecraft/class_1948$class_5262; ARG 0 spawningChunkCount ARG 1 entities ARG 2 chunkSource METHOD method_27816 (Lnet/minecraft/class_1311;)Z ARG 0 spawnGroup - METHOD method_27819 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_5263;Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Lnet/minecraft/class_1311;Lnet/minecraft/class_2818;)V - ARG 5 chunk METHOD method_27821 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;Lnet/minecraft/class_1948$class_5262;ZZZ)V ARG 0 world ARG 1 chunk @@ -52,8 +50,6 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 0 world ARG 1 structureAccessor ARG 2 chunkGenerator - ARG 3 spawnGroup - ARG 4 pos ARG 5 biome METHOD method_35238 (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z ARG 0 type @@ -66,9 +62,6 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 0 group ARG 1 world ARG 2 pos - METHOD method_8657 getSpawnPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;)Lnet/minecraft/class_2338; - ARG 0 world - ARG 1 chunk METHOD method_8658 getEntitySpawnPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_1299;II)Lnet/minecraft/class_2338; ARG 0 world ARG 1 entityType @@ -131,20 +124,16 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper FIELD field_24398 cachedPos Lnet/minecraft/class_2338; FIELD field_24399 cachedEntityType Lnet/minecraft/class_1299; FIELD field_24400 cachedDensityMass D - METHOD (ILit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Lnet/minecraft/class_5263;)V + METHOD (ILit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Lnet/minecraft/class_5263;Lnet/minecraft/class_6480;)V ARG 1 spawningChunkCount - ARG 2 groupToCount ARG 3 densityField METHOD method_27823 getSpawningChunkCount ()I METHOD method_27824 test (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z COMMENT @see SpawnHelper.Checker#test(EntityType, BlockPos, Chunk) ARG 1 type - ARG 2 pos - ARG 3 chunk METHOD method_27825 run (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V COMMENT @see SpawnHelper.Runner#run(MobEntity, Chunk) ARG 1 entity ARG 2 chunk - METHOD method_27826 isBelowCap (Lnet/minecraft/class_1311;)Z - ARG 1 group + METHOD method_27826 isBelowCap (Lnet/minecraft/class_1311;Lnet/minecraft/class_1923;)Z METHOD method_27830 getGroupToCount ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 5c5e10e0f8..33a796f4f1 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -14,11 +14,6 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 1 seed METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_28443 getBiomes ()Ljava/util/List; - METHOD method_37612 getTerrainParameters (II)[D - COMMENT {@return an array containing an {@code offset} and a {@code factor} value - COMMENT for terrain generation} - ARG 1 x - ARG 2 z METHOD method_37617 addDebugInfo (Ljava/util/List;Lnet/minecraft/class_2338;)V ARG 1 info ARG 2 pos diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping index 3eaf643912..46a952e57b 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping @@ -25,9 +25,6 @@ CLASS net/minecraft/class_6461 net/minecraft/world/biome/source/util/VanillaBiom ARG 1 temperature ARG 2 humidity ARG 3 weirdness - METHOD method_37704 getBiomeOrShatteredSavanna (ILnet/minecraft/class_5321;)Lnet/minecraft/class_5321; - ARG 1 temperature - ARG 2 biome METHOD method_37705 writeVanillaBiomeParameters (Lcom/google/common/collect/ImmutableList$Builder;)V ARG 1 parameters METHOD method_37706 writeMountainousBiomes (Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_6452$class_6454;)V @@ -79,9 +76,3 @@ CLASS net/minecraft/class_6461 net/minecraft/world/biome/source/util/VanillaBiom METHOD method_37718 writeRiverBiomes (Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_6452$class_6454;)V ARG 1 parameters ARG 2 weirdness - METHOD method_37827 writeBiomeAtShore (Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_6452$class_6454;Lnet/minecraft/class_6452$class_6454;Lnet/minecraft/class_6452$class_6454;Lnet/minecraft/class_5321;)V - ARG 1 parameters - ARG 2 temperature - ARG 3 humidity - ARG 4 weirdness - ARG 5 biome diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping index fa2f46f69b..ada6cdac5e 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping @@ -12,10 +12,6 @@ CLASS net/minecraft/class_3510 net/minecraft/world/gen/surfacebuilder/DefaultSur ARG 10 fluidBlock ARG 11 topBlock ARG 12 underBlock - METHOD method_37829 getSturdyBlockState (Lnet/minecraft/class_2680;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 chunk - ARG 2 pos METHOD method_37830 isPosAboveAirOrFluid (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)Z ARG 0 chunk ARG 1 pos