From 0bf1d06344433db06b106c7abe1c77d166b8fc43 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Thu, 28 Dec 2023 09:58:26 -0600 Subject: [PATCH] patches work --- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 63721 bytes .../api/0006-Add-World-Instance-flag.patch | 4 +- patches/api/0010-Smooth-Teleports.patch | 4 +- patches/api/0011-AntiXray-Bypass.patch | 10 +- .../0012-Add-PlayerPreChunkLoadEvent.patch | 4 +- .../api/0013-Equipment-Packet-Caching.patch | 4 +- patches/api/0021-Non-saveable-entities.patch | 30 + patches/server/0001-Initial.patch | 2936 +++++++++++++++++ ...Changes.patch => 0002-Build-Changes.patch} | 12 +- ...Set-BlockData-without-light-updates.patch} | 182 +- ...4-Add-BlockDestroyedByNeighborEvent.patch} | 30 +- ...5-Add-provided-Material-to-getDrops.patch} | 6 +- ...006-Add-Player-to-SpongeAbsorbEvent.patch} | 4 +- ...tch => 0007-Add-World-Instance-flag.patch} | 8 +- ...patch => 0008-Add-PlayerData-Events.patch} | 22 +- ...9-Add-PlayerGetRespawnLocationEvent.patch} | 4 +- ...-Set-multiple-team-settings-at-once.patch} | 2 +- ...orts.patch => 0011-Smooth-Teleports.patch} | 14 +- ...ility-changes-for-equipment-updates.patch} | 4 +- ...h => 0013-Disable-Azalea-generation.patch} | 6 +- ...ypass.patch => 0014-AntiXray-Bypass.patch} | 14 +- ...=> 0015-Add-PlayerPreChunkLoadEvent.patch} | 4 +- ...> 0016-Allow-opening-covered-chests.patch} | 8 +- ...-send-fire-packets-if-player-has-FR.patch} | 4 +- ...=> 0018-Allow-access-to-LightEngine.patch} | 4 +- ...eode-and-monsterspawners-generation.patch} | 0 ...-Set-Mutton-nutrition-equal-to-beef.patch} | 0 ...-Crit-to-PlayerPreAttackEntityEvent.patch} | 32 +- ...-Bonus-to-PlayerPreAttackEntityEven.patch} | 4 +- ... 0024-noEntityCollisions-for-Entity.patch} | 15 +- ...> 0025-Do-not-freeze-MappedRegistry.patch} | 6 +- ...d-jackson.patch => 0026-Add-jackson.patch} | 2 +- ....patch => 0027-Maybe-can-t-tostring.patch} | 8 +- ...Allow-inventory-clicks-in-Spectator.patch} | 4 +- ...29-Packet-obfuscation-and-reduction.patch} | 16 +- ...atch => 0030-Long-distance-tracking.patch} | 12 +- .../server/0038-Non-saveable-entities.patch | 61 + ...able-sending-Entity-Movement-Packets.patch | 49 + .../server/0041-Player-spawnsOwnMobs.patch | 32 + ...2-Set-location-on-a-Custom-Inventory.patch | 42 + patches/server/0043-Affinity-Test.patch | 20 + 41 files changed, 3367 insertions(+), 256 deletions(-) create mode 100644 patches/api/0021-Non-saveable-entities.patch create mode 100644 patches/server/0001-Initial.patch rename patches/server/{0001-Build-Changes.patch => 0002-Build-Changes.patch} (88%) rename patches/server/{0002-Set-BlockData-without-light-updates.patch => 0003-Set-BlockData-without-light-updates.patch} (58%) rename patches/server/{0003-Add-BlockDestroyedByNeighborEvent.patch => 0004-Add-BlockDestroyedByNeighborEvent.patch} (87%) rename patches/server/{0004-Add-provided-Material-to-getDrops.patch => 0005-Add-provided-Material-to-getDrops.patch} (85%) rename patches/server/{0005-Add-Player-to-SpongeAbsorbEvent.patch => 0006-Add-Player-to-SpongeAbsorbEvent.patch} (88%) rename patches/server/{0006-Add-World-Instance-flag.patch => 0007-Add-World-Instance-flag.patch} (84%) rename patches/server/{0007-Add-PlayerData-Events.patch => 0008-Add-PlayerData-Events.patch} (89%) rename patches/server/{0008-Add-PlayerGetRespawnLocationEvent.patch => 0009-Add-PlayerGetRespawnLocationEvent.patch} (97%) rename patches/server/{0009-Set-multiple-team-settings-at-once.patch => 0010-Set-multiple-team-settings-at-once.patch} (98%) rename patches/server/{0010-Smooth-Teleports.patch => 0011-Smooth-Teleports.patch} (86%) rename patches/server/{0011-Ignore-durability-changes-for-equipment-updates.patch => 0012-Ignore-durability-changes-for-equipment-updates.patch} (83%) rename patches/server/{0012-Disable-Azalea-generation.patch => 0013-Disable-Azalea-generation.patch} (92%) rename patches/server/{0013-AntiXray-Bypass.patch => 0014-AntiXray-Bypass.patch} (76%) rename patches/server/{0014-Add-PlayerPreChunkLoadEvent.patch => 0015-Add-PlayerPreChunkLoadEvent.patch} (91%) rename patches/server/{0015-Allow-opening-covered-chests.patch => 0016-Allow-opening-covered-chests.patch} (87%) rename patches/server/{0016-Don-t-send-fire-packets-if-player-has-FR.patch => 0017-Don-t-send-fire-packets-if-player-has-FR.patch} (83%) rename patches/server/{0017-Allow-access-to-LightEngine.patch => 0018-Allow-access-to-LightEngine.patch} (81%) rename patches/server/{0018-Disable-geode-and-monsterspawners-generation.patch => 0019-Disable-geode-and-monsterspawners-generation.patch} (100%) rename patches/server/{0019-Set-Mutton-nutrition-equal-to-beef.patch => 0020-Set-Mutton-nutrition-equal-to-beef.patch} (100%) rename patches/server/{0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch => 0022-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch} (57%) rename patches/server/{0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch => 0023-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch} (88%) rename patches/server/{0023-noEntityCollisions-for-Entity.patch => 0024-noEntityCollisions-for-Entity.patch} (71%) rename patches/server/{0024-Do-not-freeze-MappedRegistry.patch => 0025-Do-not-freeze-MappedRegistry.patch} (87%) rename patches/server/{0025-Add-jackson.patch => 0026-Add-jackson.patch} (89%) rename patches/server/{0026-Maybe-can-t-tostring.patch => 0027-Maybe-can-t-tostring.patch} (86%) rename patches/server/{0027-Allow-inventory-clicks-in-Spectator.patch => 0028-Allow-inventory-clicks-in-Spectator.patch} (88%) rename patches/server/{0028-Packet-obfuscation-and-reduction.patch => 0029-Packet-obfuscation-and-reduction.patch} (92%) rename patches/server/{0029-Long-distance-tracking.patch => 0030-Long-distance-tracking.patch} (90%) create mode 100644 patches/server/0038-Non-saveable-entities.patch create mode 100644 patches/server/0040-Disable-sending-Entity-Movement-Packets.patch create mode 100644 patches/server/0041-Player-spawnsOwnMobs.patch create mode 100644 patches/server/0042-Set-location-on-a-Custom-Inventory.patch create mode 100644 patches/server/0043-Affinity-Test.patch diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 44391 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%0D+ym=_w*d`k$@iM%aZm>(FB zFT}u)TP%ySs`RyJx#=oxe&Idagc(F$Sv(5*pWd?HYll`LXi*p`s9;8=FNKjA$zuDap z1iJ4_{GzB&FY7I^Z=V2WPV}duAN#+$7*g>}M-8M^ZIIB>-^X-D90KS2pYi;cJpI2t z9+!d$Z~~_e2!65t2V*tx>VN>IOBPZ~3v6t}2DR0RaAz+Y0&>nb^fj?~75%>lATlV_DagaSI48TP5e#m z`NUsBkeiDL|BMZ$&97r4JO2|SVnYrr+W2*{e!H;xn_8U}Ah!z{@Mwehm%07(!p~pV geSU+(twG={1R5&vkYyYSN)YnO$AzrH2Y-C~e^Sofwg3PC delta 40281 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 +Date: Thu, 28 Dec 2023 09:11:49 -0600 +Subject: [PATCH] Non-saveable-entities + + +diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java +index 1d0fd7ff8449f815a7d980af0b378181ea8bf8d8..0b057d6be0d55c275867bd1cb98387bc3237d881 100644 +--- a/src/main/java/org/bukkit/entity/Entity.java ++++ b/src/main/java/org/bukkit/entity/Entity.java +@@ -1107,4 +1107,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent + */ + @NotNull String getScoreboardEntryName(); + // Paper end - entity scoreboard name ++ ++ // Slice start ++ /** ++ * Returns true if the entity can be saved. If false, the entity will never be serialized or saved. ++ */ ++ boolean isSaveable(); ++ ++ /** ++ * Sets whether the entity can be serialized and saved to disk. ++ * ++ * @param saveable the saveable status ++ * @see #isSaveable() ++ */ ++ void setSaveable(boolean saveable); ++ // Slice end + } diff --git a/patches/server/0001-Initial.patch b/patches/server/0001-Initial.patch new file mode 100644 index 000000000..e6434cc11 --- /dev/null +++ b/patches/server/0001-Initial.patch @@ -0,0 +1,2936 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Initial Source +Date: Thu, 28 Dec 2023 09:38:04 -0600 +Subject: [PATCH] Initial + + +diff --git a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java +new file mode 100644 +index 0000000000000000000000000000000000000000..b9b7d2e668d9f7f36ac3cf1e1716460c4ad5ed3a +--- /dev/null ++++ b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java +@@ -0,0 +1,486 @@ ++package net.minecraft.data.worldgen; ++ ++import net.minecraft.data.worldgen.placement.AquaticPlacements; ++import net.minecraft.data.worldgen.placement.CavePlacements; ++import net.minecraft.data.worldgen.placement.MiscOverworldPlacements; ++import net.minecraft.data.worldgen.placement.OrePlacements; ++import net.minecraft.data.worldgen.placement.VegetationPlacements; ++import net.minecraft.world.entity.EntityType; ++import net.minecraft.world.entity.MobCategory; ++import net.minecraft.world.level.biome.BiomeGenerationSettings; ++import net.minecraft.world.level.biome.MobSpawnSettings; ++import net.minecraft.world.level.levelgen.GenerationStep; ++ ++public class BiomeDefaultFeatures { ++ public static void addDefaultCarversAndLakes(BiomeGenerationSettings.Builder builder) { ++ builder.addCarver(GenerationStep.Carving.AIR, Carvers.CAVE); ++ builder.addCarver(GenerationStep.Carving.AIR, Carvers.CAVE_EXTRA_UNDERGROUND); ++ builder.addCarver(GenerationStep.Carving.AIR, Carvers.CANYON); ++ builder.addFeature(GenerationStep.Decoration.LAKES, MiscOverworldPlacements.LAKE_LAVA_UNDERGROUND); ++ builder.addFeature(GenerationStep.Decoration.LAKES, MiscOverworldPlacements.LAKE_LAVA_SURFACE); ++ } ++ ++ public static void addDefaultMonsterRoom(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, CavePlacements.MONSTER_ROOM); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, CavePlacements.MONSTER_ROOM_DEEP); ++ } ++ ++ public static void addDefaultUndergroundVariety(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIRT); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GRAVEL); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GRANITE_UPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GRANITE_LOWER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIORITE_UPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIORITE_LOWER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_ANDESITE_UPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_ANDESITE_LOWER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_TUFF); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.GLOW_LICHEN); ++ } ++ ++ public static void addDripstone(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, CavePlacements.LARGE_DRIPSTONE); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, CavePlacements.DRIPSTONE_CLUSTER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, CavePlacements.POINTED_DRIPSTONE); ++ } ++ ++ public static void addSculk(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, CavePlacements.SCULK_VEIN); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, CavePlacements.SCULK_PATCH_DEEP_DARK); ++ } ++ ++ public static void addDefaultOres(BiomeGenerationSettings.Builder builder) { ++ addDefaultOres(builder, false); ++ } ++ ++ public static void addDefaultOres(BiomeGenerationSettings.Builder builder, boolean largeCopperOreBlob) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_COAL_UPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_COAL_LOWER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_IRON_UPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_IRON_MIDDLE); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_IRON_SMALL); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GOLD); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GOLD_LOWER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_REDSTONE); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_REDSTONE_LOWER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND_MEDIUM); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND_LARGE); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND_BURIED); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_LAPIS); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_LAPIS_BURIED); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, largeCopperOreBlob ? OrePlacements.ORE_COPPER_LARGE : OrePlacements.ORE_COPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, CavePlacements.UNDERWATER_MAGMA); ++ } ++ ++ public static void addExtraGold(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GOLD_EXTRA); ++ } ++ ++ public static void addExtraEmeralds(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_EMERALD); ++ } ++ ++ public static void addInfestedStone(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_INFESTED); ++ } ++ ++ public static void addDefaultSoftDisks(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_SAND); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_CLAY); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_GRAVEL); ++ } ++ ++ public static void addSwampClayDisk(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_CLAY); ++ } ++ ++ public static void addMangroveSwampDisks(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_GRASS); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_CLAY); ++ } ++ ++ public static void addMossyStoneBlock(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, MiscOverworldPlacements.FOREST_ROCK); ++ } ++ ++ public static void addFerns(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_LARGE_FERN); ++ } ++ ++ public static void addRareBerryBushes(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_BERRY_RARE); ++ } ++ ++ public static void addCommonBerryBushes(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_BERRY_COMMON); ++ } ++ ++ public static void addLightBambooVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BAMBOO_LIGHT); ++ } ++ ++ public static void addBambooVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BAMBOO); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BAMBOO_VEGETATION); ++ } ++ ++ public static void addTaigaTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_TAIGA); ++ } ++ ++ public static void addGroveTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_GROVE); ++ } ++ ++ public static void addWaterTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_WATER); ++ } ++ ++ public static void addBirchTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_BIRCH); ++ } ++ ++ public static void addOtherBirchTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_BIRCH_AND_OAK); ++ } ++ ++ public static void addTallBirchTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BIRCH_TALL); ++ } ++ ++ public static void addSavannaTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_SAVANNA); ++ } ++ ++ public static void addShatteredSavannaTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_WINDSWEPT_SAVANNA); ++ } ++ ++ public static void addLushCavesVegetationFeatures(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_CEILING_VEGETATION); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CAVE_VINES); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_CLAY); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_VEGETATION); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.SPORE_BLOSSOM); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CLASSIC_VINES); ++ } ++ ++ public static void addLushCavesSpecialOres(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_CLAY); ++ } ++ ++ public static void addMountainTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_WINDSWEPT_HILLS); ++ } ++ ++ public static void addMountainForestTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_WINDSWEPT_FOREST); ++ } ++ ++ public static void addJungleTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_JUNGLE); ++ } ++ ++ public static void addSparseJungleTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_SPARSE_JUNGLE); ++ } ++ ++ public static void addBadlandsTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_BADLANDS); ++ } ++ ++ public static void addSnowyTrees(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_SNOWY); ++ } ++ ++ public static void addJungleGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_JUNGLE); ++ } ++ ++ public static void addSavannaGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_TALL_GRASS); ++ } ++ ++ public static void addShatteredSavannaGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_NORMAL); ++ } ++ ++ public static void addSavannaExtraGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_SAVANNA); ++ } ++ ++ public static void addBadlandGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_BADLANDS); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_DEAD_BUSH_BADLANDS); ++ } ++ ++ public static void addForestFlowers(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FOREST_FLOWERS); ++ } ++ ++ public static void addForestGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_FOREST); ++ } ++ ++ public static void addSwampVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_SWAMP); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_SWAMP); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_NORMAL); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_DEAD_BUSH); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_WATERLILY); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BROWN_MUSHROOM_SWAMP); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.RED_MUSHROOM_SWAMP); ++ } ++ ++ public static void addMangroveSwampVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_MANGROVE); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_NORMAL); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_DEAD_BUSH); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_WATERLILY); ++ } ++ ++ public static void addMushroomFieldVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.MUSHROOM_ISLAND_VEGETATION); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BROWN_MUSHROOM_TAIGA); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.RED_MUSHROOM_TAIGA); ++ } ++ ++ public static void addPlainVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_PLAINS); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_PLAINS); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_PLAIN); ++ } ++ ++ public static void addDesertVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_DEAD_BUSH_2); ++ } ++ ++ public static void addGiantTaigaVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_TAIGA); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_DEAD_BUSH); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BROWN_MUSHROOM_OLD_GROWTH); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.RED_MUSHROOM_OLD_GROWTH); ++ } ++ ++ public static void addDefaultFlowers(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_DEFAULT); ++ } ++ ++ public static void addCherryGroveVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_PLAIN); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_CHERRY); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_CHERRY); ++ } ++ ++ public static void addMeadowVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_PLAIN); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_MEADOW); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_MEADOW); ++ } ++ ++ public static void addWarmFlowers(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_WARM); ++ } ++ ++ public static void addDefaultGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_BADLANDS); ++ } ++ ++ public static void addTaigaGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_GRASS_TAIGA_2); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BROWN_MUSHROOM_TAIGA); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.RED_MUSHROOM_TAIGA); ++ } ++ ++ public static void addPlainGrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_TALL_GRASS_2); ++ } ++ ++ public static void addDefaultMushrooms(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.BROWN_MUSHROOM_NORMAL); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.RED_MUSHROOM_NORMAL); ++ } ++ ++ public static void addDefaultExtraVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN); ++ } ++ ++ public static void addBadlandExtraVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE_BADLANDS); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_CACTUS_DECORATED); ++ } ++ ++ public static void addJungleMelons(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_MELON); ++ } ++ ++ public static void addSparseJungleMelons(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_MELON_SPARSE); ++ } ++ ++ public static void addJungleVines(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.VINES); ++ } ++ ++ public static void addDesertExtraVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE_DESERT); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_CACTUS_DESERT); ++ } ++ ++ public static void addSwampExtraVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE_SWAMP); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN); ++ } ++ ++ public static void addDesertExtraDecoration(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, MiscOverworldPlacements.DESERT_WELL); ++ } ++ ++ public static void addFossilDecoration(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, CavePlacements.FOSSIL_UPPER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_STRUCTURES, CavePlacements.FOSSIL_LOWER); ++ } ++ ++ public static void addColdOceanExtraVegetation(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.KELP_COLD); ++ } ++ ++ public static void addDefaultSeagrass(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEAGRASS_SIMPLE); ++ } ++ ++ public static void addLukeWarmKelp(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.KELP_WARM); ++ } ++ ++ public static void addDefaultSprings(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.FLUID_SPRINGS, MiscOverworldPlacements.SPRING_WATER); ++ builder.addFeature(GenerationStep.Decoration.FLUID_SPRINGS, MiscOverworldPlacements.SPRING_LAVA); ++ } ++ ++ public static void addFrozenSprings(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.FLUID_SPRINGS, MiscOverworldPlacements.SPRING_LAVA_FROZEN); ++ } ++ ++ public static void addIcebergs(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, MiscOverworldPlacements.ICEBERG_PACKED); ++ builder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, MiscOverworldPlacements.ICEBERG_BLUE); ++ } ++ ++ public static void addBlueIce(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, MiscOverworldPlacements.BLUE_ICE); ++ } ++ ++ public static void addSurfaceFreezing(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, MiscOverworldPlacements.FREEZE_TOP_LAYER); ++ } ++ ++ public static void addNetherDefaultOres(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_GRAVEL_NETHER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_BLACKSTONE); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_GOLD_NETHER); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_QUARTZ_NETHER); ++ addAncientDebris(builder); ++ } ++ ++ public static void addAncientDebris(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_ANCIENT_DEBRIS_LARGE); ++ builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_ANCIENT_DEBRIS_SMALL); ++ } ++ ++ public static void addDefaultCrystalFormations(BiomeGenerationSettings.Builder builder) { ++ builder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, CavePlacements.AMETHYST_GEODE); ++ } ++ ++ public static void farmAnimals(MobSpawnSettings.Builder builder) { ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.SHEEP, 12, 4, 4)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.PIG, 10, 4, 4)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.CHICKEN, 10, 4, 4)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.COW, 8, 4, 4)); ++ } ++ ++ public static void caveSpawns(MobSpawnSettings.Builder builder) { ++ builder.addSpawn(MobCategory.AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.BAT, 10, 8, 8)); ++ builder.addSpawn(MobCategory.UNDERGROUND_WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.GLOW_SQUID, 10, 4, 6)); ++ } ++ ++ public static void commonSpawns(MobSpawnSettings.Builder builder) { ++ caveSpawns(builder); ++ monsters(builder, 95, 5, 100, false); ++ } ++ ++ public static void oceanSpawns(MobSpawnSettings.Builder builder, int squidWeight, int squidMaxGroupSize, int codWeight) { ++ builder.addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.SQUID, squidWeight, 1, squidMaxGroupSize)); ++ builder.addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.COD, codWeight, 3, 6)); ++ commonSpawns(builder); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.DROWNED, 5, 1, 1)); ++ } ++ ++ public static void warmOceanSpawns(MobSpawnSettings.Builder builder, int squidWeight, int squidMinGroupSize) { ++ builder.addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.SQUID, squidWeight, squidMinGroupSize, 4)); ++ builder.addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8)); ++ builder.addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.DOLPHIN, 2, 1, 2)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.DROWNED, 5, 1, 1)); ++ commonSpawns(builder); ++ } ++ ++ public static void plainsSpawns(MobSpawnSettings.Builder builder) { ++ farmAnimals(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.HORSE, 5, 2, 6)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.DONKEY, 1, 1, 3)); ++ commonSpawns(builder); ++ } ++ ++ public static void snowySpawns(MobSpawnSettings.Builder builder) { ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 10, 2, 3)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.POLAR_BEAR, 1, 1, 2)); ++ caveSpawns(builder); ++ monsters(builder, 95, 5, 20, false); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.STRAY, 80, 4, 4)); ++ } ++ ++ public static void desertSpawns(MobSpawnSettings.Builder builder) { ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3)); ++ caveSpawns(builder); ++ monsters(builder, 19, 1, 100, false); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.HUSK, 80, 4, 4)); ++ } ++ ++ public static void dripstoneCavesSpawns(MobSpawnSettings.Builder builder) { ++ caveSpawns(builder); ++ int i = 95; ++ monsters(builder, 95, 5, 100, false); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.DROWNED, 95, 4, 4)); ++ } ++ ++ public static void monsters(MobSpawnSettings.Builder builder, int zombieWeight, int zombieVillagerWeight, int skeletonWeight, boolean drowned) { ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SPIDER, 100, 4, 4)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(drowned ? EntityType.DROWNED : EntityType.ZOMBIE, zombieWeight, 4, 4)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.ZOMBIE_VILLAGER, zombieVillagerWeight, 1, 1)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SKELETON, skeletonWeight, 4, 4)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.CREEPER, 100, 4, 4)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SLIME, 100, 4, 4)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.ENDERMAN, 10, 1, 4)); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.WITCH, 5, 1, 1)); ++ } ++ ++ public static void mooshroomSpawns(MobSpawnSettings.Builder builder) { ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.MOOSHROOM, 8, 4, 8)); ++ caveSpawns(builder); ++ } ++ ++ public static void baseJungleSpawns(MobSpawnSettings.Builder builder) { ++ farmAnimals(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.CHICKEN, 10, 4, 4)); ++ commonSpawns(builder); ++ } ++ ++ public static void endSpawns(MobSpawnSettings.Builder builder) { ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.ENDERMAN, 10, 4, 4)); ++ } ++} +diff --git a/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java b/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java +new file mode 100644 +index 0000000000000000000000000000000000000000..84aa56cbcaa5539b556f42eb284d3dd2e200e358 +--- /dev/null ++++ b/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java +@@ -0,0 +1,705 @@ ++package net.minecraft.data.worldgen.biome; ++ ++import javax.annotation.Nullable; ++import net.minecraft.core.HolderGetter; ++import net.minecraft.data.worldgen.BiomeDefaultFeatures; ++import net.minecraft.data.worldgen.Carvers; ++import net.minecraft.data.worldgen.placement.AquaticPlacements; ++import net.minecraft.data.worldgen.placement.MiscOverworldPlacements; ++import net.minecraft.data.worldgen.placement.VegetationPlacements; ++import net.minecraft.sounds.Music; ++import net.minecraft.sounds.Musics; ++import net.minecraft.sounds.SoundEvents; ++import net.minecraft.util.Mth; ++import net.minecraft.world.entity.EntityType; ++import net.minecraft.world.entity.MobCategory; ++import net.minecraft.world.level.biome.AmbientMoodSettings; ++import net.minecraft.world.level.biome.Biome; ++import net.minecraft.world.level.biome.BiomeGenerationSettings; ++import net.minecraft.world.level.biome.BiomeSpecialEffects; ++import net.minecraft.world.level.biome.MobSpawnSettings; ++import net.minecraft.world.level.levelgen.GenerationStep; ++import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver; ++import net.minecraft.world.level.levelgen.placement.PlacedFeature; ++ ++public class OverworldBiomes { ++ protected static final int NORMAL_WATER_COLOR = 4159204; ++ protected static final int NORMAL_WATER_FOG_COLOR = 329011; ++ private static final int OVERWORLD_FOG_COLOR = 12638463; ++ @Nullable ++ private static final Music NORMAL_MUSIC = null; ++ ++ protected static int calculateSkyColor(float temperature) { ++ float f = temperature / 3.0F; ++ f = Mth.clamp(f, -1.0F, 1.0F); ++ return Mth.hsvToRgb(0.62222224F - f * 0.05F, 0.5F + f * 0.1F, 1.0F); ++ } ++ ++ private static Biome biome(boolean precipitation, float temperature, float downfall, MobSpawnSettings.Builder spawnSettings, BiomeGenerationSettings.Builder generationSettings, @Nullable Music music) { ++ return biome(precipitation, temperature, downfall, 4159204, 329011, (Integer)null, (Integer)null, spawnSettings, generationSettings, music); ++ } ++ ++ private static Biome biome(boolean precipitation, float temperature, float downfall, int waterColor, int waterFogColor, @Nullable Integer grassColor, @Nullable Integer foliageColor, MobSpawnSettings.Builder spawnSettings, BiomeGenerationSettings.Builder generationSettings, @Nullable Music music) { ++ BiomeSpecialEffects.Builder builder = (new BiomeSpecialEffects.Builder()).waterColor(waterColor).waterFogColor(waterFogColor).fogColor(12638463).skyColor(calculateSkyColor(temperature)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).backgroundMusic(music); ++ if (grassColor != null) { ++ builder.grassColorOverride(grassColor); ++ } ++ ++ if (foliageColor != null) { ++ builder.foliageColorOverride(foliageColor); ++ } ++ ++ return (new Biome.BiomeBuilder()).hasPrecipitation(precipitation).temperature(temperature).downfall(downfall).specialEffects(builder.build()).mobSpawnSettings(spawnSettings.build()).generationSettings(generationSettings.build()).build(); ++ } ++ ++ private static void globalOverworldGeneration(BiomeGenerationSettings.Builder generationSettings) { ++ BiomeDefaultFeatures.addDefaultCarversAndLakes(generationSettings); ++ BiomeDefaultFeatures.addDefaultCrystalFormations(generationSettings); ++ BiomeDefaultFeatures.addDefaultMonsterRoom(generationSettings); ++ BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings); ++ BiomeDefaultFeatures.addDefaultSprings(generationSettings); ++ BiomeDefaultFeatures.addSurfaceFreezing(generationSettings); ++ } ++ ++ public static Biome oldGrowthTaiga(HolderGetter featureLookup, HolderGetter> carverLookup, boolean spruce) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 8, 4, 4)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FOX, 8, 2, 4)); ++ if (spruce) { ++ BiomeDefaultFeatures.commonSpawns(builder); ++ } else { ++ BiomeDefaultFeatures.caveSpawns(builder); ++ BiomeDefaultFeatures.monsters(builder, 100, 25, 100, false); ++ } ++ ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addMossyStoneBlock(builder2); ++ BiomeDefaultFeatures.addFerns(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, spruce ? VegetationPlacements.TREES_OLD_GROWTH_SPRUCE_TAIGA : VegetationPlacements.TREES_OLD_GROWTH_PINE_TAIGA); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addGiantTaigaVegetation(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ BiomeDefaultFeatures.addCommonBerryBushes(builder2); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_OLD_GROWTH_TAIGA); ++ return biome(true, spruce ? 0.25F : 0.3F, 0.8F, builder, builder2, music); ++ } ++ ++ public static Biome sparseJungle(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.baseJungleSpawns(builder); ++ return baseJungle(featureLookup, carverLookup, 0.8F, false, true, false, builder, Musics.createGameMusic(SoundEvents.MUSIC_BIOME_SPARSE_JUNGLE)); ++ } ++ ++ public static Biome jungle(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.baseJungleSpawns(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.PARROT, 40, 1, 2)).addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.OCELOT, 2, 1, 3)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.PANDA, 1, 1, 2)); ++ return baseJungle(featureLookup, carverLookup, 0.9F, false, false, true, builder, Musics.createGameMusic(SoundEvents.MUSIC_BIOME_JUNGLE)); ++ } ++ ++ public static Biome bambooJungle(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.baseJungleSpawns(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.PARROT, 40, 1, 2)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.PANDA, 80, 1, 2)).addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.OCELOT, 2, 1, 1)); ++ return baseJungle(featureLookup, carverLookup, 0.9F, true, false, true, builder, Musics.createGameMusic(SoundEvents.MUSIC_BIOME_BAMBOO_JUNGLE)); ++ } ++ ++ private static Biome baseJungle(HolderGetter featureLookup, HolderGetter> carverLookup, float depth, boolean bamboo, boolean sparse, boolean unmodified, MobSpawnSettings.Builder spawnSettings, Music music) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ if (bamboo) { ++ BiomeDefaultFeatures.addBambooVegetation(builder); ++ } else { ++ if (unmodified) { ++ BiomeDefaultFeatures.addLightBambooVegetation(builder); ++ } ++ ++ if (sparse) { ++ BiomeDefaultFeatures.addSparseJungleTrees(builder); ++ } else { ++ BiomeDefaultFeatures.addJungleTrees(builder); ++ } ++ } ++ ++ BiomeDefaultFeatures.addWarmFlowers(builder); ++ BiomeDefaultFeatures.addJungleGrass(builder); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder); ++ BiomeDefaultFeatures.addJungleVines(builder); ++ if (sparse) { ++ BiomeDefaultFeatures.addSparseJungleMelons(builder); ++ } else { ++ BiomeDefaultFeatures.addJungleMelons(builder); ++ } ++ ++ return biome(true, 0.95F, depth, spawnSettings, builder, music); ++ } ++ ++ public static Biome windsweptHills(HolderGetter featureLookup, HolderGetter> carverLookup, boolean forest) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.LLAMA, 5, 4, 6)); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ if (forest) { ++ BiomeDefaultFeatures.addMountainForestTrees(builder2); ++ } else { ++ BiomeDefaultFeatures.addMountainTrees(builder2); ++ } ++ ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultGrass(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ BiomeDefaultFeatures.addExtraEmeralds(builder2); ++ BiomeDefaultFeatures.addInfestedStone(builder2); ++ return biome(true, 0.2F, 0.3F, builder, builder2, NORMAL_MUSIC); ++ } ++ ++ public static Biome desert(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.desertSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ BiomeDefaultFeatures.addFossilDecoration(builder2); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultGrass(builder2); ++ BiomeDefaultFeatures.addDesertVegetation(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDesertExtraVegetation(builder2); ++ BiomeDefaultFeatures.addDesertExtraDecoration(builder2); ++ return biome(false, 2.0F, 0.0F, builder, builder2, Musics.createGameMusic(SoundEvents.MUSIC_BIOME_DESERT)); ++ } ++ ++ public static Biome plains(HolderGetter featureLookup, HolderGetter> carverLookup, boolean sunflower, boolean snowy, boolean iceSpikes) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ if (snowy) { ++ builder.creatureGenerationProbability(0.07F); ++ BiomeDefaultFeatures.snowySpawns(builder); ++ if (iceSpikes) { ++ builder2.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, MiscOverworldPlacements.ICE_SPIKE); ++ builder2.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, MiscOverworldPlacements.ICE_PATCH); ++ } ++ } else { ++ BiomeDefaultFeatures.plainsSpawns(builder); ++ BiomeDefaultFeatures.addPlainGrass(builder2); ++ if (sunflower) { ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUNFLOWER); ++ } ++ } ++ ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ if (snowy) { ++ BiomeDefaultFeatures.addSnowyTrees(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultGrass(builder2); ++ } else { ++ BiomeDefaultFeatures.addPlainVegetation(builder2); ++ } ++ ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ if (sunflower) { ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN); ++ } else { ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ } ++ ++ float f = snowy ? 0.0F : 0.8F; ++ return biome(true, f, snowy ? 0.5F : 0.4F, builder, builder2, NORMAL_MUSIC); ++ } ++ ++ public static Biome mushroomFields(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.mooshroomSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addMushroomFieldVegetation(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ return biome(true, 0.9F, 1.0F, builder, builder2, NORMAL_MUSIC); ++ } ++ ++ public static Biome savanna(HolderGetter featureLookup, HolderGetter> carverLookup, boolean windswept, boolean plateau) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder); ++ if (!windswept) { ++ BiomeDefaultFeatures.addSavannaGrass(builder); ++ } ++ ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ if (windswept) { ++ BiomeDefaultFeatures.addShatteredSavannaTrees(builder); ++ BiomeDefaultFeatures.addDefaultFlowers(builder); ++ BiomeDefaultFeatures.addShatteredSavannaGrass(builder); ++ } else { ++ BiomeDefaultFeatures.addSavannaTrees(builder); ++ BiomeDefaultFeatures.addWarmFlowers(builder); ++ BiomeDefaultFeatures.addSavannaExtraGrass(builder); ++ } ++ ++ BiomeDefaultFeatures.addDefaultMushrooms(builder); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder2); ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.HORSE, 1, 2, 6)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.DONKEY, 1, 1, 1)); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ if (plateau) { ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.LLAMA, 8, 4, 4)); ++ } ++ ++ return biome(false, 2.0F, 0.0F, builder2, builder, NORMAL_MUSIC); ++ } ++ ++ public static Biome badlands(HolderGetter featureLookup, HolderGetter> carverLookup, boolean plateau) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addExtraGold(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ if (plateau) { ++ BiomeDefaultFeatures.addBadlandsTrees(builder2); ++ } ++ ++ BiomeDefaultFeatures.addBadlandGrass(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addBadlandExtraVegetation(builder2); ++ return (new Biome.BiomeBuilder()).hasPrecipitation(false).temperature(2.0F).downfall(0.0F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(2.0F)).foliageColorOverride(10387789).grassColorOverride(9470285).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).backgroundMusic(Musics.createGameMusic(SoundEvents.MUSIC_BIOME_BADLANDS)).build()).mobSpawnSettings(builder.build()).generationSettings(builder2.build()).build(); ++ } ++ ++ private static Biome baseOcean(MobSpawnSettings.Builder spawnSettings, int waterColor, int waterFogColor, BiomeGenerationSettings.Builder generationSettings) { ++ return biome(true, 0.5F, 0.5F, waterColor, waterFogColor, (Integer)null, (Integer)null, spawnSettings, generationSettings, NORMAL_MUSIC); ++ } ++ ++ private static BiomeGenerationSettings.Builder baseOceanGeneration(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ BiomeDefaultFeatures.addWaterTrees(builder); ++ BiomeDefaultFeatures.addDefaultFlowers(builder); ++ BiomeDefaultFeatures.addDefaultGrass(builder); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder); ++ return builder; ++ } ++ ++ public static Biome coldOcean(HolderGetter featureLookup, HolderGetter> carverLookup, boolean deep) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.oceanSpawns(builder, 3, 4, 15); ++ builder.addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.SALMON, 15, 1, 5)); ++ BiomeGenerationSettings.Builder builder2 = baseOceanGeneration(featureLookup, carverLookup); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, deep ? AquaticPlacements.SEAGRASS_DEEP_COLD : AquaticPlacements.SEAGRASS_COLD); ++ BiomeDefaultFeatures.addDefaultSeagrass(builder2); ++ BiomeDefaultFeatures.addColdOceanExtraVegetation(builder2); ++ return baseOcean(builder, 4020182, 329011, builder2); ++ } ++ ++ public static Biome ocean(HolderGetter featureLookup, HolderGetter> carverLookup, boolean deep) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.oceanSpawns(builder, 1, 4, 10); ++ builder.addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.DOLPHIN, 1, 1, 2)); ++ BiomeGenerationSettings.Builder builder2 = baseOceanGeneration(featureLookup, carverLookup); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, deep ? AquaticPlacements.SEAGRASS_DEEP : AquaticPlacements.SEAGRASS_NORMAL); ++ BiomeDefaultFeatures.addDefaultSeagrass(builder2); ++ BiomeDefaultFeatures.addColdOceanExtraVegetation(builder2); ++ return baseOcean(builder, 4159204, 329011, builder2); ++ } ++ ++ public static Biome lukeWarmOcean(HolderGetter featureLookup, HolderGetter> carverLookup, boolean deep) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ if (deep) { ++ BiomeDefaultFeatures.oceanSpawns(builder, 8, 4, 8); ++ } else { ++ BiomeDefaultFeatures.oceanSpawns(builder, 10, 2, 15); ++ } ++ ++ builder.addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.PUFFERFISH, 5, 1, 3)).addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8)).addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.DOLPHIN, 2, 1, 2)); ++ BiomeGenerationSettings.Builder builder2 = baseOceanGeneration(featureLookup, carverLookup); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, deep ? AquaticPlacements.SEAGRASS_DEEP_WARM : AquaticPlacements.SEAGRASS_WARM); ++ if (deep) { ++ BiomeDefaultFeatures.addDefaultSeagrass(builder2); ++ } ++ ++ BiomeDefaultFeatures.addLukeWarmKelp(builder2); ++ return baseOcean(builder, 4566514, 267827, builder2); ++ } ++ ++ public static Biome warmOcean(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = (new MobSpawnSettings.Builder()).addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.PUFFERFISH, 15, 1, 3)); ++ BiomeDefaultFeatures.warmOceanSpawns(builder, 10, 4); ++ BiomeGenerationSettings.Builder builder2 = baseOceanGeneration(featureLookup, carverLookup).addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.WARM_OCEAN_VEGETATION).addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEAGRASS_WARM).addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEA_PICKLE); ++ return baseOcean(builder, 4445678, 270131, builder2); ++ } ++ ++ public static Biome frozenOcean(HolderGetter featureLookup, HolderGetter> carverLookup, boolean deep) { ++ MobSpawnSettings.Builder builder = (new MobSpawnSettings.Builder()).addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.SQUID, 1, 1, 4)).addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.SALMON, 15, 1, 5)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.POLAR_BEAR, 1, 1, 2)); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.DROWNED, 5, 1, 1)); ++ float f = deep ? 0.5F : 0.0F; ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ BiomeDefaultFeatures.addIcebergs(builder2); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addBlueIce(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addWaterTrees(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultGrass(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ return (new Biome.BiomeBuilder()).hasPrecipitation(true).temperature(f).temperatureAdjustment(Biome.TemperatureModifier.FROZEN).downfall(0.5F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(3750089).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(f)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).mobSpawnSettings(builder.build()).generationSettings(builder2.build()).build(); ++ } ++ ++ public static Biome forest(HolderGetter featureLookup, HolderGetter> carverLookup, boolean birch, boolean oldGrowth, boolean flower) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder); ++ Music music; ++ if (flower) { ++ music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_FLOWER_FOREST); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_FOREST_FLOWERS); ++ } else { ++ music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_FOREST); ++ BiomeDefaultFeatures.addForestFlowers(builder); ++ } ++ ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ if (flower) { ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.TREES_FLOWER_FOREST); ++ builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.FLOWER_FLOWER_FOREST); ++ BiomeDefaultFeatures.addDefaultGrass(builder); ++ } else { ++ if (birch) { ++ if (oldGrowth) { ++ BiomeDefaultFeatures.addTallBirchTrees(builder); ++ } else { ++ BiomeDefaultFeatures.addBirchTrees(builder); ++ } ++ } else { ++ BiomeDefaultFeatures.addOtherBirchTrees(builder); ++ } ++ ++ BiomeDefaultFeatures.addDefaultFlowers(builder); ++ BiomeDefaultFeatures.addForestGrass(builder); ++ } ++ ++ BiomeDefaultFeatures.addDefaultMushrooms(builder); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder2); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ if (flower) { ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3)); ++ } else if (!birch) { ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 5, 4, 4)); ++ } ++ ++ float f = birch ? 0.6F : 0.7F; ++ return biome(true, f, birch ? 0.6F : 0.8F, builder2, builder, music); ++ } ++ ++ public static Biome taiga(HolderGetter featureLookup, HolderGetter> carverLookup, boolean snowy) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 8, 4, 4)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FOX, 8, 2, 4)); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ float f = snowy ? -0.5F : 0.25F; ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addFerns(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addTaigaTrees(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addTaigaGrass(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ if (snowy) { ++ BiomeDefaultFeatures.addRareBerryBushes(builder2); ++ } else { ++ BiomeDefaultFeatures.addCommonBerryBushes(builder2); ++ } ++ ++ return biome(true, f, snowy ? 0.4F : 0.8F, snowy ? 4020182 : 4159204, 329011, (Integer)null, (Integer)null, builder, builder2, NORMAL_MUSIC); ++ } ++ ++ public static Biome darkForest(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.DARK_FOREST_VEGETATION); ++ BiomeDefaultFeatures.addForestFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addForestGrass(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_FOREST); ++ return (new Biome.BiomeBuilder()).hasPrecipitation(true).temperature(0.7F).downfall(0.8F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(0.7F)).grassColorModifier(BiomeSpecialEffects.GrassColorModifier.DARK_FOREST).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).backgroundMusic(music).build()).mobSpawnSettings(builder.build()).generationSettings(builder2.build()).build(); ++ } ++ ++ public static Biome swamp(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SLIME, 1, 1, 1)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FROG, 10, 2, 5)); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ BiomeDefaultFeatures.addFossilDecoration(builder2); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addSwampClayDisk(builder2); ++ BiomeDefaultFeatures.addSwampVegetation(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addSwampExtraVegetation(builder2); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEAGRASS_SWAMP); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_SWAMP); ++ return (new Biome.BiomeBuilder()).hasPrecipitation(true).temperature(0.8F).downfall(0.9F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(6388580).waterFogColor(2302743).fogColor(12638463).skyColor(calculateSkyColor(0.8F)).foliageColorOverride(6975545).grassColorModifier(BiomeSpecialEffects.GrassColorModifier.SWAMP).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).backgroundMusic(music).build()).mobSpawnSettings(builder.build()).generationSettings(builder2.build()).build(); ++ } ++ ++ public static Biome mangroveSwamp(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SLIME, 1, 1, 1)); ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FROG, 10, 2, 5)); ++ builder.addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8)); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ BiomeDefaultFeatures.addFossilDecoration(builder2); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addMangroveSwampDisks(builder2); ++ BiomeDefaultFeatures.addMangroveSwampVegetation(builder2); ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEAGRASS_SWAMP); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_SWAMP); ++ return (new Biome.BiomeBuilder()).hasPrecipitation(true).temperature(0.8F).downfall(0.9F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(3832426).waterFogColor(5077600).fogColor(12638463).skyColor(calculateSkyColor(0.8F)).foliageColorOverride(9285927).grassColorModifier(BiomeSpecialEffects.GrassColorModifier.SWAMP).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).backgroundMusic(music).build()).mobSpawnSettings(builder.build()).generationSettings(builder2.build()).build(); ++ } ++ ++ public static Biome river(HolderGetter featureLookup, HolderGetter> carverLookup, boolean frozen) { ++ MobSpawnSettings.Builder builder = (new MobSpawnSettings.Builder()).addSpawn(MobCategory.WATER_CREATURE, new MobSpawnSettings.SpawnerData(EntityType.SQUID, 2, 1, 4)).addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.SALMON, 5, 1, 5)); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ builder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.DROWNED, frozen ? 1 : 100, 1, 1)); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addWaterTrees(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultGrass(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ if (!frozen) { ++ builder2.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEAGRASS_RIVER); ++ } ++ ++ float f = frozen ? 0.0F : 0.5F; ++ return biome(true, f, 0.5F, frozen ? 3750089 : 4159204, 329011, (Integer)null, (Integer)null, builder, builder2, NORMAL_MUSIC); ++ } ++ ++ public static Biome beach(HolderGetter featureLookup, HolderGetter> carverLookup, boolean snowy, boolean stony) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ boolean bl = !stony && !snowy; ++ if (bl) { ++ builder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.TURTLE, 5, 2, 5)); ++ } ++ ++ BiomeDefaultFeatures.commonSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addDefaultFlowers(builder2); ++ BiomeDefaultFeatures.addDefaultGrass(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ float f; ++ if (snowy) { ++ f = 0.05F; ++ } else if (stony) { ++ f = 0.2F; ++ } else { ++ f = 0.8F; ++ } ++ ++ return biome(true, f, bl ? 0.4F : 0.3F, snowy ? 4020182 : 4159204, 329011, (Integer)null, (Integer)null, builder, builder2, NORMAL_MUSIC); ++ } ++ ++ public static Biome theVoid(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ builder.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, MiscOverworldPlacements.VOID_START_PLATFORM); ++ return biome(false, 0.5F, 0.5F, new MobSpawnSettings.Builder(), builder, NORMAL_MUSIC); ++ } ++ ++ public static Biome meadowOrCherryGrove(HolderGetter featureLookup, HolderGetter> carverLookup, boolean cherryGrove) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(cherryGrove ? EntityType.PIG : EntityType.DONKEY, 1, 1, 2)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 2, 2, 6)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.SHEEP, 2, 2, 4)); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addPlainGrass(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ if (cherryGrove) { ++ BiomeDefaultFeatures.addCherryGroveVegetation(builder); ++ } else { ++ BiomeDefaultFeatures.addMeadowVegetation(builder); ++ } ++ ++ BiomeDefaultFeatures.addExtraEmeralds(builder); ++ BiomeDefaultFeatures.addInfestedStone(builder); ++ Music music = Musics.createGameMusic(cherryGrove ? SoundEvents.MUSIC_BIOME_CHERRY_GROVE : SoundEvents.MUSIC_BIOME_MEADOW); ++ return cherryGrove ? biome(true, 0.5F, 0.8F, 6141935, 6141935, 11983713, 11983713, builder2, builder, music) : biome(true, 0.5F, 0.8F, 937679, 329011, (Integer)null, (Integer)null, builder2, builder, music); ++ } ++ ++ public static Biome frozenPeaks(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.GOAT, 5, 1, 3)); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addFrozenSprings(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ BiomeDefaultFeatures.addExtraEmeralds(builder); ++ BiomeDefaultFeatures.addInfestedStone(builder); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_FROZEN_PEAKS); ++ return biome(true, -0.7F, 0.9F, builder2, builder, music); ++ } ++ ++ public static Biome jaggedPeaks(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.GOAT, 5, 1, 3)); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addFrozenSprings(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ BiomeDefaultFeatures.addExtraEmeralds(builder); ++ BiomeDefaultFeatures.addInfestedStone(builder); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_JAGGED_PEAKS); ++ return biome(true, -0.7F, 0.9F, builder2, builder, music); ++ } ++ ++ public static Biome stonyPeaks(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ BiomeDefaultFeatures.addExtraEmeralds(builder); ++ BiomeDefaultFeatures.addInfestedStone(builder); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_STONY_PEAKS); ++ return biome(true, 1.0F, 0.3F, builder2, builder, music); ++ } ++ ++ public static Biome snowySlopes(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.GOAT, 5, 1, 3)); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addFrozenSprings(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder); ++ BiomeDefaultFeatures.addExtraEmeralds(builder); ++ BiomeDefaultFeatures.addInfestedStone(builder); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_SNOWY_SLOPES); ++ return biome(true, -0.3F, 0.9F, builder2, builder, music); ++ } ++ ++ public static Biome grove(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ BiomeGenerationSettings.Builder builder = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ MobSpawnSettings.Builder builder2 = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.farmAnimals(builder2); ++ builder2.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 8, 4, 4)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3)).addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FOX, 8, 2, 4)); ++ BiomeDefaultFeatures.commonSpawns(builder2); ++ globalOverworldGeneration(builder); ++ BiomeDefaultFeatures.addFrozenSprings(builder); ++ BiomeDefaultFeatures.addDefaultOres(builder); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder); ++ BiomeDefaultFeatures.addGroveTrees(builder); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder); ++ BiomeDefaultFeatures.addExtraEmeralds(builder); ++ BiomeDefaultFeatures.addInfestedStone(builder); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_GROVE); ++ return biome(true, -0.2F, 0.8F, builder2, builder, music); ++ } ++ ++ public static Biome lushCaves(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ builder.addSpawn(MobCategory.AXOLOTLS, new MobSpawnSettings.SpawnerData(EntityType.AXOLOTL, 10, 4, 6)); ++ builder.addSpawn(MobCategory.WATER_AMBIENT, new MobSpawnSettings.SpawnerData(EntityType.TROPICAL_FISH, 25, 8, 8)); ++ BiomeDefaultFeatures.commonSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addPlainGrass(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addLushCavesSpecialOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addLushCavesVegetationFeatures(builder2); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_LUSH_CAVES); ++ return biome(true, 0.5F, 0.5F, builder, builder2, music); ++ } ++ ++ public static Biome dripstoneCaves(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeDefaultFeatures.dripstoneCavesSpawns(builder); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ globalOverworldGeneration(builder2); ++ BiomeDefaultFeatures.addPlainGrass(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2, true); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addPlainVegetation(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ BiomeDefaultFeatures.addDripstone(builder2); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_DRIPSTONE_CAVES); ++ return biome(true, 0.8F, 0.4F, builder, builder2, music); ++ } ++ ++ public static Biome deepDark(HolderGetter featureLookup, HolderGetter> carverLookup) { ++ MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); ++ BiomeGenerationSettings.Builder builder2 = new BiomeGenerationSettings.Builder(featureLookup, carverLookup); ++ builder2.addCarver(GenerationStep.Carving.AIR, Carvers.CAVE); ++ builder2.addCarver(GenerationStep.Carving.AIR, Carvers.CAVE_EXTRA_UNDERGROUND); ++ builder2.addCarver(GenerationStep.Carving.AIR, Carvers.CANYON); ++ BiomeDefaultFeatures.addDefaultCrystalFormations(builder2); ++ BiomeDefaultFeatures.addDefaultMonsterRoom(builder2); ++ BiomeDefaultFeatures.addDefaultUndergroundVariety(builder2); ++ BiomeDefaultFeatures.addSurfaceFreezing(builder2); ++ BiomeDefaultFeatures.addPlainGrass(builder2); ++ BiomeDefaultFeatures.addDefaultOres(builder2); ++ BiomeDefaultFeatures.addDefaultSoftDisks(builder2); ++ BiomeDefaultFeatures.addPlainVegetation(builder2); ++ BiomeDefaultFeatures.addDefaultMushrooms(builder2); ++ BiomeDefaultFeatures.addDefaultExtraVegetation(builder2); ++ BiomeDefaultFeatures.addSculk(builder2); ++ Music music = Musics.createGameMusic(SoundEvents.MUSIC_BIOME_DEEP_DARK); ++ return biome(true, 0.8F, 0.4F, builder, builder2, music); ++ } ++} +diff --git a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java +new file mode 100644 +index 0000000000000000000000000000000000000000..c1f4a722b57bdc1ee516951c9341b146eb0fb34e +--- /dev/null ++++ b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java +@@ -0,0 +1,128 @@ ++package net.minecraft.data.worldgen.features; ++ ++import java.util.List; ++import net.minecraft.core.Direction; ++import net.minecraft.core.Holder; ++import net.minecraft.core.HolderGetter; ++import net.minecraft.core.HolderSet; ++import net.minecraft.core.registries.Registries; ++import net.minecraft.data.worldgen.BootstapContext; ++import net.minecraft.data.worldgen.ProcessorLists; ++import net.minecraft.data.worldgen.placement.PlacementUtils; ++import net.minecraft.resources.ResourceKey; ++import net.minecraft.resources.ResourceLocation; ++import net.minecraft.tags.BlockTags; ++import net.minecraft.util.random.SimpleWeightedRandomList; ++import net.minecraft.util.valueproviders.ClampedNormalFloat; ++import net.minecraft.util.valueproviders.ConstantInt; ++import net.minecraft.util.valueproviders.IntProvider; ++import net.minecraft.util.valueproviders.UniformFloat; ++import net.minecraft.util.valueproviders.UniformInt; ++import net.minecraft.util.valueproviders.WeightedListInt; ++import net.minecraft.world.level.block.Block; ++import net.minecraft.world.level.block.Blocks; ++import net.minecraft.world.level.block.CaveVines; ++import net.minecraft.world.level.block.CaveVinesBlock; ++import net.minecraft.world.level.block.MultifaceBlock; ++import net.minecraft.world.level.block.SmallDripleafBlock; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.block.state.properties.BlockStateProperties; ++import net.minecraft.world.level.levelgen.GeodeBlockSettings; ++import net.minecraft.world.level.levelgen.GeodeCrackSettings; ++import net.minecraft.world.level.levelgen.GeodeLayerSettings; ++import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate; ++import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; ++import net.minecraft.world.level.levelgen.feature.Feature; ++import net.minecraft.world.level.levelgen.feature.FossilFeatureConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.BlockColumnConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.DripstoneClusterConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.GeodeConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.LargeDripstoneConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.MultifaceGrowthConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.PointedDripstoneConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.RootSystemConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.SculkPatchConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFeatureConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.UnderwaterMagmaConfiguration; ++import net.minecraft.world.level.levelgen.feature.configurations.VegetationPatchConfiguration; ++import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; ++import net.minecraft.world.level.levelgen.feature.stateproviders.RandomizedIntStateProvider; ++import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider; ++import net.minecraft.world.level.levelgen.placement.CaveSurface; ++import net.minecraft.world.level.levelgen.placement.EnvironmentScanPlacement; ++import net.minecraft.world.level.levelgen.placement.PlacedFeature; ++import net.minecraft.world.level.levelgen.placement.RandomOffsetPlacement; ++import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList; ++ ++public class CaveFeatures { ++ public static final ResourceKey> MONSTER_ROOM = FeatureUtils.createKey("monster_room"); ++ public static final ResourceKey> FOSSIL_COAL = FeatureUtils.createKey("fossil_coal"); ++ public static final ResourceKey> FOSSIL_DIAMONDS = FeatureUtils.createKey("fossil_diamonds"); ++ public static final ResourceKey> DRIPSTONE_CLUSTER = FeatureUtils.createKey("dripstone_cluster"); ++ public static final ResourceKey> LARGE_DRIPSTONE = FeatureUtils.createKey("large_dripstone"); ++ public static final ResourceKey> POINTED_DRIPSTONE = FeatureUtils.createKey("pointed_dripstone"); ++ public static final ResourceKey> UNDERWATER_MAGMA = FeatureUtils.createKey("underwater_magma"); ++ public static final ResourceKey> GLOW_LICHEN = FeatureUtils.createKey("glow_lichen"); ++ public static final ResourceKey> ROOTED_AZALEA_TREE = FeatureUtils.createKey("rooted_azalea_tree"); ++ public static final ResourceKey> CAVE_VINE = FeatureUtils.createKey("cave_vine"); ++ public static final ResourceKey> CAVE_VINE_IN_MOSS = FeatureUtils.createKey("cave_vine_in_moss"); ++ public static final ResourceKey> MOSS_VEGETATION = FeatureUtils.createKey("moss_vegetation"); ++ public static final ResourceKey> MOSS_PATCH = FeatureUtils.createKey("moss_patch"); ++ public static final ResourceKey> MOSS_PATCH_BONEMEAL = FeatureUtils.createKey("moss_patch_bonemeal"); ++ public static final ResourceKey> DRIPLEAF = FeatureUtils.createKey("dripleaf"); ++ public static final ResourceKey> CLAY_WITH_DRIPLEAVES = FeatureUtils.createKey("clay_with_dripleaves"); ++ public static final ResourceKey> CLAY_POOL_WITH_DRIPLEAVES = FeatureUtils.createKey("clay_pool_with_dripleaves"); ++ public static final ResourceKey> LUSH_CAVES_CLAY = FeatureUtils.createKey("lush_caves_clay"); ++ public static final ResourceKey> MOSS_PATCH_CEILING = FeatureUtils.createKey("moss_patch_ceiling"); ++ public static final ResourceKey> SPORE_BLOSSOM = FeatureUtils.createKey("spore_blossom"); ++ public static final ResourceKey> AMETHYST_GEODE = FeatureUtils.createKey("amethyst_geode"); ++ public static final ResourceKey> SCULK_PATCH_DEEP_DARK = FeatureUtils.createKey("sculk_patch_deep_dark"); ++ public static final ResourceKey> SCULK_PATCH_ANCIENT_CITY = FeatureUtils.createKey("sculk_patch_ancient_city"); ++ public static final ResourceKey> SCULK_VEIN = FeatureUtils.createKey("sculk_vein"); ++ ++ private static Holder makeDripleaf(Direction direction) { ++ return PlacementUtils.inlinePlaced(Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 4), 2).add(ConstantInt.of(0), 1).build()), BlockStateProvider.simple(Blocks.BIG_DRIPLEAF_STEM.defaultBlockState().setValue(BlockStateProperties.HORIZONTAL_FACING, direction))), BlockColumnConfiguration.layer(ConstantInt.of(1), BlockStateProvider.simple(Blocks.BIG_DRIPLEAF.defaultBlockState().setValue(BlockStateProperties.HORIZONTAL_FACING, direction)))), Direction.UP, BlockPredicate.ONLY_IN_AIR_OR_WATER_PREDICATE, true)); ++ } ++ ++ private static Holder makeSmallDripleaf() { ++ return PlacementUtils.inlinePlaced(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.SMALL_DRIPLEAF.defaultBlockState().setValue(SmallDripleafBlock.FACING, Direction.EAST), 1).add(Blocks.SMALL_DRIPLEAF.defaultBlockState().setValue(SmallDripleafBlock.FACING, Direction.WEST), 1).add(Blocks.SMALL_DRIPLEAF.defaultBlockState().setValue(SmallDripleafBlock.FACING, Direction.NORTH), 1).add(Blocks.SMALL_DRIPLEAF.defaultBlockState().setValue(SmallDripleafBlock.FACING, Direction.SOUTH), 1)))); ++ } ++ ++ public static void bootstrap(BootstapContext> featureRegisterable) { ++ HolderGetter> holderGetter = featureRegisterable.lookup(Registries.CONFIGURED_FEATURE); ++ HolderGetter holderGetter2 = featureRegisterable.lookup(Registries.PROCESSOR_LIST); ++ FeatureUtils.register(featureRegisterable, MONSTER_ROOM, Feature.MONSTER_ROOM); ++ List list = List.of(new ResourceLocation("fossil/spine_1"), new ResourceLocation("fossil/spine_2"), new ResourceLocation("fossil/spine_3"), new ResourceLocation("fossil/spine_4"), new ResourceLocation("fossil/skull_1"), new ResourceLocation("fossil/skull_2"), new ResourceLocation("fossil/skull_3"), new ResourceLocation("fossil/skull_4")); ++ List list2 = List.of(new ResourceLocation("fossil/spine_1_coal"), new ResourceLocation("fossil/spine_2_coal"), new ResourceLocation("fossil/spine_3_coal"), new ResourceLocation("fossil/spine_4_coal"), new ResourceLocation("fossil/skull_1_coal"), new ResourceLocation("fossil/skull_2_coal"), new ResourceLocation("fossil/skull_3_coal"), new ResourceLocation("fossil/skull_4_coal")); ++ Holder holder = holderGetter2.getOrThrow(ProcessorLists.FOSSIL_ROT); ++ FeatureUtils.register(featureRegisterable, FOSSIL_COAL, Feature.FOSSIL, new FossilFeatureConfiguration(list, list2, holder, holderGetter2.getOrThrow(ProcessorLists.FOSSIL_COAL), 4)); ++ FeatureUtils.register(featureRegisterable, FOSSIL_DIAMONDS, Feature.FOSSIL, new FossilFeatureConfiguration(list, list2, holder, holderGetter2.getOrThrow(ProcessorLists.FOSSIL_DIAMONDS), 4)); ++ FeatureUtils.register(featureRegisterable, DRIPSTONE_CLUSTER, Feature.DRIPSTONE_CLUSTER, new DripstoneClusterConfiguration(12, UniformInt.of(3, 6), UniformInt.of(2, 8), 1, 3, UniformInt.of(2, 4), UniformFloat.of(0.3F, 0.7F), ClampedNormalFloat.of(0.1F, 0.3F, 0.1F, 0.9F), 0.1F, 3, 8)); ++ FeatureUtils.register(featureRegisterable, LARGE_DRIPSTONE, Feature.LARGE_DRIPSTONE, new LargeDripstoneConfiguration(30, UniformInt.of(3, 19), UniformFloat.of(0.4F, 2.0F), 0.33F, UniformFloat.of(0.3F, 0.9F), UniformFloat.of(0.4F, 1.0F), UniformFloat.of(0.0F, 0.3F), 4, 0.6F)); ++ FeatureUtils.register(featureRegisterable, POINTED_DRIPSTONE, Feature.SIMPLE_RANDOM_SELECTOR, new SimpleRandomFeatureConfiguration(HolderSet.direct(PlacementUtils.inlinePlaced(Feature.POINTED_DRIPSTONE, new PointedDripstoneConfiguration(0.2F, 0.7F, 0.5F, 0.5F), EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.solid(), BlockPredicate.ONLY_IN_AIR_OR_WATER_PREDICATE, 12), RandomOffsetPlacement.vertical(ConstantInt.of(1))), PlacementUtils.inlinePlaced(Feature.POINTED_DRIPSTONE, new PointedDripstoneConfiguration(0.2F, 0.7F, 0.5F, 0.5F), EnvironmentScanPlacement.scanningFor(Direction.UP, BlockPredicate.solid(), BlockPredicate.ONLY_IN_AIR_OR_WATER_PREDICATE, 12), RandomOffsetPlacement.vertical(ConstantInt.of(-1)))))); ++ FeatureUtils.register(featureRegisterable, UNDERWATER_MAGMA, Feature.UNDERWATER_MAGMA, new UnderwaterMagmaConfiguration(5, 1, 0.5F)); ++ MultifaceBlock multifaceBlock = (MultifaceBlock)Blocks.GLOW_LICHEN; ++ FeatureUtils.register(featureRegisterable, GLOW_LICHEN, Feature.MULTIFACE_GROWTH, new MultifaceGrowthConfiguration(multifaceBlock, 20, false, true, true, 0.5F, HolderSet.direct(Block::builtInRegistryHolder, Blocks.STONE, Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.DRIPSTONE_BLOCK, Blocks.CALCITE, Blocks.TUFF, Blocks.DEEPSLATE))); ++ FeatureUtils.register(featureRegisterable, ROOTED_AZALEA_TREE, Feature.ROOT_SYSTEM, new RootSystemConfiguration(PlacementUtils.inlinePlaced(holderGetter.getOrThrow(TreeFeatures.AZALEA_TREE)), 3, 3, BlockTags.AZALEA_ROOT_REPLACEABLE, BlockStateProvider.simple(Blocks.ROOTED_DIRT), 20, 100, 3, 2, BlockStateProvider.simple(Blocks.HANGING_ROOTS), 20, 2, BlockPredicate.allOf(BlockPredicate.anyOf(BlockPredicate.matchesBlocks(List.of(Blocks.AIR, Blocks.CAVE_AIR, Blocks.VOID_AIR)), BlockPredicate.matchesTag(BlockTags.REPLACEABLE_BY_TREES)), BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.AZALEA_GROWS_ON)))); ++ WeightedStateProvider weightedStateProvider = new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.CAVE_VINES_PLANT.defaultBlockState(), 4).add(Blocks.CAVE_VINES_PLANT.defaultBlockState().setValue(CaveVines.BERRIES, Boolean.valueOf(true)), 1)); ++ RandomizedIntStateProvider randomizedIntStateProvider = new RandomizedIntStateProvider(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.CAVE_VINES.defaultBlockState(), 4).add(Blocks.CAVE_VINES.defaultBlockState().setValue(CaveVines.BERRIES, Boolean.valueOf(true)), 1)), CaveVinesBlock.AGE, UniformInt.of(23, 25)); ++ FeatureUtils.register(featureRegisterable, CAVE_VINE, Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 19), 2).add(UniformInt.of(0, 2), 3).add(UniformInt.of(0, 6), 10).build()), weightedStateProvider), BlockColumnConfiguration.layer(ConstantInt.of(1), randomizedIntStateProvider)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true)); ++ FeatureUtils.register(featureRegisterable, CAVE_VINE_IN_MOSS, Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 3), 5).add(UniformInt.of(1, 7), 1).build()), weightedStateProvider), BlockColumnConfiguration.layer(ConstantInt.of(1), randomizedIntStateProvider)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true)); ++ FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.FLOWERING_AZALEA.defaultBlockState(), 4).add(Blocks.AZALEA.defaultBlockState(), 7).add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.SHORT_GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); ++ FeatureUtils.register(featureRegisterable, MOSS_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.8F, UniformInt.of(4, 7), 0.3F)); ++ FeatureUtils.register(featureRegisterable, MOSS_PATCH_BONEMEAL, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F)); ++ FeatureUtils.register(featureRegisterable, DRIPLEAF, Feature.SIMPLE_RANDOM_SELECTOR, new SimpleRandomFeatureConfiguration(HolderSet.direct(makeSmallDripleaf(), makeDripleaf(Direction.EAST), makeDripleaf(Direction.WEST), makeDripleaf(Direction.SOUTH), makeDripleaf(Direction.NORTH)))); ++ FeatureUtils.register(featureRegisterable, CLAY_WITH_DRIPLEAVES, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.LUSH_GROUND_REPLACEABLE, BlockStateProvider.simple(Blocks.CLAY), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(DRIPLEAF)), CaveSurface.FLOOR, ConstantInt.of(3), 0.8F, 2, 0.05F, UniformInt.of(4, 7), 0.7F)); ++ FeatureUtils.register(featureRegisterable, CLAY_POOL_WITH_DRIPLEAVES, Feature.WATERLOGGED_VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.LUSH_GROUND_REPLACEABLE, BlockStateProvider.simple(Blocks.CLAY), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(DRIPLEAF)), CaveSurface.FLOOR, ConstantInt.of(3), 0.8F, 5, 0.1F, UniformInt.of(4, 7), 0.7F)); ++ FeatureUtils.register(featureRegisterable, LUSH_CAVES_CLAY, Feature.RANDOM_BOOLEAN_SELECTOR, new RandomBooleanFeatureConfiguration(PlacementUtils.inlinePlaced(holderGetter.getOrThrow(CLAY_WITH_DRIPLEAVES)), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(CLAY_POOL_WITH_DRIPLEAVES)))); ++ FeatureUtils.register(featureRegisterable, MOSS_PATCH_CEILING, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(CAVE_VINE_IN_MOSS)), CaveSurface.CEILING, UniformInt.of(1, 2), 0.0F, 5, 0.08F, UniformInt.of(4, 7), 0.3F)); ++ FeatureUtils.register(featureRegisterable, SPORE_BLOSSOM, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(Blocks.SPORE_BLOSSOM))); ++ FeatureUtils.register(featureRegisterable, AMETHYST_GEODE, Feature.GEODE, new GeodeConfiguration(new GeodeBlockSettings(BlockStateProvider.simple(Blocks.AIR), BlockStateProvider.simple(Blocks.AMETHYST_BLOCK), BlockStateProvider.simple(Blocks.BUDDING_AMETHYST), BlockStateProvider.simple(Blocks.CALCITE), BlockStateProvider.simple(Blocks.SMOOTH_BASALT), List.of(Blocks.SMALL_AMETHYST_BUD.defaultBlockState(), Blocks.MEDIUM_AMETHYST_BUD.defaultBlockState(), Blocks.LARGE_AMETHYST_BUD.defaultBlockState(), Blocks.AMETHYST_CLUSTER.defaultBlockState()), BlockTags.FEATURES_CANNOT_REPLACE, BlockTags.GEODE_INVALID_BLOCKS), new GeodeLayerSettings(1.7D, 2.2D, 3.2D, 4.2D), new GeodeCrackSettings(0.95D, 2.0D, 2), 0.35D, 0.083D, true, UniformInt.of(4, 6), UniformInt.of(3, 4), UniformInt.of(1, 2), -16, 16, 0.05D, 1)); ++ FeatureUtils.register(featureRegisterable, SCULK_PATCH_DEEP_DARK, Feature.SCULK_PATCH, new SculkPatchConfiguration(10, 32, 64, 0, 1, ConstantInt.of(0), 0.5F)); ++ FeatureUtils.register(featureRegisterable, SCULK_PATCH_ANCIENT_CITY, Feature.SCULK_PATCH, new SculkPatchConfiguration(10, 32, 64, 0, 1, UniformInt.of(1, 3), 0.5F)); ++ MultifaceBlock multifaceBlock2 = (MultifaceBlock)Blocks.SCULK_VEIN; ++ FeatureUtils.register(featureRegisterable, SCULK_VEIN, Feature.MULTIFACE_GROWTH, new MultifaceGrowthConfiguration(multifaceBlock2, 20, true, true, true, 1.0F, HolderSet.direct(Block::builtInRegistryHolder, Blocks.STONE, Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.DRIPSTONE_BLOCK, Blocks.CALCITE, Blocks.TUFF, Blocks.DEEPSLATE))); ++ } ++} +diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java +new file mode 100644 +index 0000000000000000000000000000000000000000..5a8f850b447fc3a4bd0eb0c505bbdfc8be7115e8 +--- /dev/null ++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java +@@ -0,0 +1,64 @@ ++package net.minecraft.network.protocol.game; ++ ++import com.google.common.collect.Lists; ++import com.mojang.datafixers.util.Pair; ++import java.util.List; ++import net.minecraft.network.FriendlyByteBuf; ++import net.minecraft.network.protocol.Packet; ++import net.minecraft.world.entity.EquipmentSlot; ++import net.minecraft.world.item.ItemStack; ++ ++public class ClientboundSetEquipmentPacket implements Packet { ++ private static final byte CONTINUE_MASK = -128; ++ private final int entity; ++ private final List> slots; ++ ++ public ClientboundSetEquipmentPacket(int id, List> equipmentList) { ++ this.entity = id; ++ this.slots = equipmentList; ++ } ++ ++ public ClientboundSetEquipmentPacket(FriendlyByteBuf buf) { ++ this.entity = buf.readVarInt(); ++ EquipmentSlot[] equipmentSlots = EquipmentSlot.values(); ++ this.slots = Lists.newArrayList(); ++ ++ int i; ++ do { ++ i = buf.readByte(); ++ EquipmentSlot equipmentSlot = equipmentSlots[i & 127]; ++ ItemStack itemStack = buf.readItem(); ++ this.slots.add(Pair.of(equipmentSlot, itemStack)); ++ } while((i & -128) != 0); ++ ++ } ++ ++ @Override ++ public void write(FriendlyByteBuf buf) { ++ buf.writeVarInt(this.entity); ++ int i = this.slots.size(); ++ ++ for(int j = 0; j < i; ++j) { ++ Pair pair = this.slots.get(j); ++ EquipmentSlot equipmentSlot = pair.getFirst(); ++ boolean bl = j != i - 1; ++ int k = equipmentSlot.ordinal(); ++ buf.writeByte(bl ? k | -128 : k); ++ buf.writeItem(pair.getSecond()); ++ } ++ ++ } ++ ++ @Override ++ public void handle(ClientGamePacketListener listener) { ++ listener.handleSetEquipment(this); ++ } ++ ++ public int getEntity() { ++ return this.entity; ++ } ++ ++ public List> getSlots() { ++ return this.slots; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java b/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java +new file mode 100644 +index 0000000000000000000000000000000000000000..03f16a5541de6bc95407aaa24741570c1993dc9e +--- /dev/null ++++ b/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java +@@ -0,0 +1,156 @@ ++package net.minecraft.world.entity.monster.warden; ++ ++import com.google.common.collect.ImmutableList; ++import com.google.common.collect.ImmutableMap; ++import com.google.common.collect.ImmutableSet; ++import com.mojang.datafixers.util.Pair; ++import com.mojang.serialization.Dynamic; ++import java.util.List; ++import net.minecraft.core.BlockPos; ++import net.minecraft.util.Mth; ++import net.minecraft.util.Unit; ++import net.minecraft.world.entity.LivingEntity; ++import net.minecraft.world.entity.ai.Brain; ++import net.minecraft.world.entity.ai.attributes.Attributes; ++import net.minecraft.world.entity.ai.behavior.BehaviorControl; ++import net.minecraft.world.entity.ai.behavior.BlockPosTracker; ++import net.minecraft.world.entity.ai.behavior.DoNothing; ++import net.minecraft.world.entity.ai.behavior.GoToTargetLocation; ++import net.minecraft.world.entity.ai.behavior.LookAtTargetSink; ++import net.minecraft.world.entity.ai.behavior.MeleeAttack; ++import net.minecraft.world.entity.ai.behavior.MoveToTargetSink; ++import net.minecraft.world.entity.ai.behavior.RandomStroll; ++import net.minecraft.world.entity.ai.behavior.RunOne; ++import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget; ++import net.minecraft.world.entity.ai.behavior.SetWalkTargetFromAttackTargetIfTargetOutOfReach; ++import net.minecraft.world.entity.ai.behavior.StopAttackingIfTargetInvalid; ++import net.minecraft.world.entity.ai.behavior.Swim; ++import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder; ++import net.minecraft.world.entity.ai.behavior.warden.Digging; ++import net.minecraft.world.entity.ai.behavior.warden.Emerging; ++import net.minecraft.world.entity.ai.behavior.warden.ForceUnmount; ++import net.minecraft.world.entity.ai.behavior.warden.Roar; ++import net.minecraft.world.entity.ai.behavior.warden.SetRoarTarget; ++import net.minecraft.world.entity.ai.behavior.warden.SetWardenLookTarget; ++import net.minecraft.world.entity.ai.behavior.warden.Sniffing; ++import net.minecraft.world.entity.ai.behavior.warden.SonicBoom; ++import net.minecraft.world.entity.ai.behavior.warden.TryToSniff; ++import net.minecraft.world.entity.ai.memory.MemoryModuleType; ++import net.minecraft.world.entity.ai.memory.MemoryStatus; ++import net.minecraft.world.entity.ai.sensing.Sensor; ++import net.minecraft.world.entity.ai.sensing.SensorType; ++import net.minecraft.world.entity.schedule.Activity; ++ ++public class WardenAi { ++ private static final float SPEED_MULTIPLIER_WHEN_IDLING = 0.5F; ++ private static final float SPEED_MULTIPLIER_WHEN_INVESTIGATING = 0.7F; ++ private static final float SPEED_MULTIPLIER_WHEN_FIGHTING = 1.2F; ++ private static final int MELEE_ATTACK_COOLDOWN = 18; ++ private static final int DIGGING_DURATION = Mth.ceil(100.0F); ++ public static final int EMERGE_DURATION = Mth.ceil(133.59999F); ++ public static final int ROAR_DURATION = Mth.ceil(84.0F); ++ private static final int SNIFFING_DURATION = Mth.ceil(83.2F); ++ public static final int DIGGING_COOLDOWN = 1200; ++ private static final int DISTURBANCE_LOCATION_EXPIRY_TIME = 100; ++ private static final List>> SENSOR_TYPES = List.of(SensorType.NEAREST_PLAYERS, SensorType.WARDEN_ENTITY_SENSOR); ++ private static final List> MEMORY_TYPES = List.of(MemoryModuleType.NEAREST_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_NEMESIS, MemoryModuleType.LOOK_TARGET, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN, MemoryModuleType.NEAREST_ATTACKABLE, MemoryModuleType.ROAR_TARGET, MemoryModuleType.DISTURBANCE_LOCATION, MemoryModuleType.RECENT_PROJECTILE, MemoryModuleType.IS_SNIFFING, MemoryModuleType.IS_EMERGING, MemoryModuleType.ROAR_SOUND_DELAY, MemoryModuleType.DIG_COOLDOWN, MemoryModuleType.ROAR_SOUND_COOLDOWN, MemoryModuleType.SNIFF_COOLDOWN, MemoryModuleType.TOUCH_COOLDOWN, MemoryModuleType.VIBRATION_COOLDOWN, MemoryModuleType.SONIC_BOOM_COOLDOWN, MemoryModuleType.SONIC_BOOM_SOUND_COOLDOWN, MemoryModuleType.SONIC_BOOM_SOUND_DELAY); ++ private static final BehaviorControl DIG_COOLDOWN_SETTER = BehaviorBuilder.create((context) -> { ++ return context.group(context.registered(MemoryModuleType.DIG_COOLDOWN)).apply(context, (digCooldown) -> { ++ return (world, entity, time) -> { ++ if (context.tryGet(digCooldown).isPresent()) { ++ digCooldown.setWithExpiry(Unit.INSTANCE, 1200L); ++ } ++ ++ return true; ++ }; ++ }); ++ }); ++ ++ public static void updateActivity(Warden warden) { ++ warden.getBrain().setActiveActivityToFirstValid(ImmutableList.of(Activity.EMERGE, Activity.DIG, Activity.ROAR, Activity.FIGHT, Activity.INVESTIGATE, Activity.SNIFF, Activity.IDLE)); ++ } ++ ++ protected static Brain makeBrain(Warden warden, Dynamic dynamic) { ++ Brain.Provider provider = Brain.provider(MEMORY_TYPES, SENSOR_TYPES); ++ Brain brain = provider.makeBrain(dynamic); ++ initCoreActivity(brain); ++ initEmergeActivity(brain); ++ initDiggingActivity(brain); ++ initIdleActivity(brain); ++ initRoarActivity(brain); ++ initFightActivity(warden, brain); ++ initInvestigateActivity(brain); ++ initSniffingActivity(brain); ++ brain.setCoreActivities(ImmutableSet.of(Activity.CORE)); ++ brain.setDefaultActivity(Activity.IDLE); ++ brain.useDefaultActivity(); ++ return brain; ++ } ++ ++ private static void initCoreActivity(Brain brain) { ++ brain.addActivity(Activity.CORE, 0, ImmutableList.of(new Swim(0.8F), SetWardenLookTarget.create(), new LookAtTargetSink(45, 90), new MoveToTargetSink())); ++ } ++ ++ private static void initEmergeActivity(Brain brain) { ++ brain.addActivityAndRemoveMemoryWhenStopped(Activity.EMERGE, 5, ImmutableList.of(new Emerging<>(EMERGE_DURATION)), MemoryModuleType.IS_EMERGING); ++ } ++ ++ private static void initDiggingActivity(Brain brain) { ++ brain.addActivityWithConditions(Activity.DIG, ImmutableList.of(Pair.of(0, new ForceUnmount()), Pair.of(1, new Digging<>(DIGGING_DURATION))), ImmutableSet.of(Pair.of(MemoryModuleType.ROAR_TARGET, MemoryStatus.VALUE_ABSENT), Pair.of(MemoryModuleType.DIG_COOLDOWN, MemoryStatus.VALUE_ABSENT))); ++ } ++ ++ private static void initIdleActivity(Brain brain) { ++ brain.addActivity(Activity.IDLE, 10, ImmutableList.of(SetRoarTarget.create(Warden::getEntityAngryAt), TryToSniff.create(), new RunOne<>(ImmutableMap.of(MemoryModuleType.IS_SNIFFING, MemoryStatus.VALUE_ABSENT), ImmutableList.of(Pair.of(RandomStroll.stroll(0.5F), 2), Pair.of(new DoNothing(30, 60), 1))))); ++ } ++ ++ private static void initInvestigateActivity(Brain brain) { ++ brain.addActivityAndRemoveMemoryWhenStopped(Activity.INVESTIGATE, 5, ImmutableList.of(SetRoarTarget.create(Warden::getEntityAngryAt), GoToTargetLocation.create(MemoryModuleType.DISTURBANCE_LOCATION, 2, 0.7F)), MemoryModuleType.DISTURBANCE_LOCATION); ++ } ++ ++ private static void initSniffingActivity(Brain brain) { ++ brain.addActivityAndRemoveMemoryWhenStopped(Activity.SNIFF, 5, ImmutableList.of(SetRoarTarget.create(Warden::getEntityAngryAt), new Sniffing<>(SNIFFING_DURATION)), MemoryModuleType.IS_SNIFFING); ++ } ++ ++ private static void initRoarActivity(Brain brain) { ++ brain.addActivityAndRemoveMemoryWhenStopped(Activity.ROAR, 10, ImmutableList.of(new Roar()), MemoryModuleType.ROAR_TARGET); ++ } ++ ++ private static void initFightActivity(Warden warden, Brain brain) { ++ brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(DIG_COOLDOWN_SETTER, StopAttackingIfTargetInvalid.create((entity) -> { ++ return !warden.getAngerLevel().isAngry() || !warden.canTargetEntity(entity); ++ }, WardenAi::onTargetInvalid, false), SetEntityLookTarget.create((entity) -> { ++ return isTarget(warden, entity); ++ }, (float)warden.getAttributeValue(Attributes.FOLLOW_RANGE)), SetWalkTargetFromAttackTargetIfTargetOutOfReach.create(1.2F), new SonicBoom(), MeleeAttack.create(18)), MemoryModuleType.ATTACK_TARGET); ++ } ++ ++ private static boolean isTarget(Warden warden, LivingEntity entity) { ++ return warden.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).filter((entityx) -> { ++ return entityx == entity; ++ }).isPresent(); ++ } ++ ++ private static void onTargetInvalid(Warden warden, LivingEntity suspect) { ++ if (!warden.canTargetEntity(suspect)) { ++ warden.clearAnger(suspect); ++ } ++ ++ setDigCooldown(warden); ++ } ++ ++ public static void setDigCooldown(LivingEntity warden) { ++ if (warden.getBrain().hasMemoryValue(MemoryModuleType.DIG_COOLDOWN)) { ++ warden.getBrain().setMemoryWithExpiry(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE, 1200L); ++ } ++ ++ } ++ ++ public static void setDisturbanceLocation(Warden warden, BlockPos pos) { ++ if (warden.level().getWorldBorder().isWithinBounds(pos) && !warden.getEntityAngryAt().isPresent() && !warden.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).isPresent()) { ++ setDigCooldown(warden); ++ warden.getBrain().setMemoryWithExpiry(MemoryModuleType.SNIFF_COOLDOWN, Unit.INSTANCE, 100L); ++ warden.getBrain().setMemoryWithExpiry(MemoryModuleType.LOOK_TARGET, new BlockPosTracker(pos), 100L); ++ warden.getBrain().setMemoryWithExpiry(MemoryModuleType.DISTURBANCE_LOCATION, pos, 100L); ++ warden.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET); ++ } ++ } ++} +diff --git a/src/main/java/net/minecraft/world/food/Foods.java b/src/main/java/net/minecraft/world/food/Foods.java +new file mode 100644 +index 0000000000000000000000000000000000000000..b16d9e2eaa589f19c563ee70b1a56d67dbcdecb0 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/food/Foods.java +@@ -0,0 +1,51 @@ ++package net.minecraft.world.food; ++ ++import net.minecraft.world.effect.MobEffectInstance; ++import net.minecraft.world.effect.MobEffects; ++ ++public class Foods { ++ public static final FoodProperties APPLE = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.3F).build(); ++ public static final FoodProperties BAKED_POTATO = (new FoodProperties.Builder()).nutrition(5).saturationMod(0.6F).build(); ++ public static final FoodProperties BEEF = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).meat().build(); ++ public static final FoodProperties BEETROOT = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.6F).build(); ++ public static final FoodProperties BEETROOT_SOUP = stew(6).build(); ++ public static final FoodProperties BREAD = (new FoodProperties.Builder()).nutrition(5).saturationMod(0.6F).build(); ++ public static final FoodProperties CARROT = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.6F).build(); ++ public static final FoodProperties CHICKEN = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).effect(new MobEffectInstance(MobEffects.HUNGER, 600, 0), 0.3F).meat().build(); ++ public static final FoodProperties CHORUS_FRUIT = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.3F).alwaysEat().build(); ++ public static final FoodProperties COD = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build(); ++ public static final FoodProperties COOKED_BEEF = (new FoodProperties.Builder()).nutrition(8).saturationMod(0.8F).meat().build(); ++ public static final FoodProperties COOKED_CHICKEN = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.6F).meat().build(); ++ public static final FoodProperties COOKED_COD = (new FoodProperties.Builder()).nutrition(5).saturationMod(0.6F).build(); ++ public static final FoodProperties COOKED_MUTTON = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.8F).meat().build(); ++ public static final FoodProperties COOKED_PORKCHOP = (new FoodProperties.Builder()).nutrition(8).saturationMod(0.8F).meat().build(); ++ public static final FoodProperties COOKED_RABBIT = (new FoodProperties.Builder()).nutrition(5).saturationMod(0.6F).meat().build(); ++ public static final FoodProperties COOKED_SALMON = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.8F).build(); ++ public static final FoodProperties COOKIE = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build(); ++ public static final FoodProperties DRIED_KELP = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.3F).fast().build(); ++ public static final FoodProperties ENCHANTED_GOLDEN_APPLE = (new FoodProperties.Builder()).nutrition(4).saturationMod(1.2F).effect(new MobEffectInstance(MobEffects.REGENERATION, 400, 1), 1.0F).effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 6000, 0), 1.0F).effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, 6000, 0), 1.0F).effect(new MobEffectInstance(MobEffects.ABSORPTION, 2400, 3), 1.0F).alwaysEat().build(); ++ public static final FoodProperties GOLDEN_APPLE = (new FoodProperties.Builder()).nutrition(4).saturationMod(1.2F).effect(new MobEffectInstance(MobEffects.REGENERATION, 100, 1), 1.0F).effect(new MobEffectInstance(MobEffects.ABSORPTION, 2400, 0), 1.0F).alwaysEat().build(); ++ public static final FoodProperties GOLDEN_CARROT = (new FoodProperties.Builder()).nutrition(6).saturationMod(1.2F).build(); ++ public static final FoodProperties HONEY_BOTTLE = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.1F).build(); ++ public static final FoodProperties MELON_SLICE = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).build(); ++ public static final FoodProperties MUSHROOM_STEW = stew(6).build(); ++ public static final FoodProperties MUTTON = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).meat().build(); ++ public static final FoodProperties POISONOUS_POTATO = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).effect(new MobEffectInstance(MobEffects.POISON, 100, 0), 0.6F).build(); ++ public static final FoodProperties PORKCHOP = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).meat().build(); ++ public static final FoodProperties POTATO = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.3F).build(); ++ public static final FoodProperties PUFFERFISH = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).effect(new MobEffectInstance(MobEffects.POISON, 1200, 1), 1.0F).effect(new MobEffectInstance(MobEffects.HUNGER, 300, 2), 1.0F).effect(new MobEffectInstance(MobEffects.CONFUSION, 300, 0), 1.0F).build(); ++ public static final FoodProperties PUMPKIN_PIE = (new FoodProperties.Builder()).nutrition(8).saturationMod(0.3F).build(); ++ public static final FoodProperties RABBIT = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).meat().build(); ++ public static final FoodProperties RABBIT_STEW = stew(10).build(); ++ public static final FoodProperties ROTTEN_FLESH = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.1F).effect(new MobEffectInstance(MobEffects.HUNGER, 600, 0), 0.8F).meat().build(); ++ public static final FoodProperties SALMON = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build(); ++ public static final FoodProperties SPIDER_EYE = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.8F).effect(new MobEffectInstance(MobEffects.POISON, 100, 0), 1.0F).build(); ++ public static final FoodProperties SUSPICIOUS_STEW = stew(6).alwaysEat().build(); ++ public static final FoodProperties SWEET_BERRIES = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build(); ++ public static final FoodProperties GLOW_BERRIES = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build(); ++ public static final FoodProperties TROPICAL_FISH = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).build(); ++ ++ private static FoodProperties.Builder stew(int hunger) { ++ return (new FoodProperties.Builder()).nutrition(hunger).saturationMod(0.6F); ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java +new file mode 100644 +index 0000000000000000000000000000000000000000..4f9187d9d640618c40a2fa528f36b845017b4777 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/level/biome/Biome.java +@@ -0,0 +1,392 @@ ++package net.minecraft.world.level.biome; ++ ++import com.google.common.collect.ImmutableList; ++import com.mojang.serialization.Codec; ++import com.mojang.serialization.MapCodec; ++import com.mojang.serialization.codecs.RecordCodecBuilder; ++import it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap; ++import java.util.Optional; ++import javax.annotation.Nullable; ++import net.minecraft.Util; ++import net.minecraft.core.BlockPos; ++import net.minecraft.core.Holder; ++import net.minecraft.core.HolderSet; ++import net.minecraft.core.RegistryCodecs; ++import net.minecraft.core.registries.Registries; ++import net.minecraft.resources.RegistryFileCodec; ++import net.minecraft.sounds.Music; ++import net.minecraft.sounds.SoundEvent; ++import net.minecraft.util.Mth; ++import net.minecraft.util.StringRepresentable; ++import net.minecraft.world.level.FoliageColor; ++import net.minecraft.world.level.GrassColor; ++import net.minecraft.world.level.LevelReader; ++import net.minecraft.world.level.LightLayer; ++import net.minecraft.world.level.block.Blocks; ++import net.minecraft.world.level.block.LiquidBlock; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.levelgen.LegacyRandomSource; ++import net.minecraft.world.level.levelgen.WorldgenRandom; ++import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise; ++import net.minecraft.world.level.material.FluidState; ++import net.minecraft.world.level.material.Fluids; ++ ++public final class Biome { ++ public static final Codec DIRECT_CODEC = RecordCodecBuilder.create((instance) -> { ++ return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> { ++ return biome.climateSettings; ++ }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> { ++ return biome.specialEffects; ++ }), BiomeGenerationSettings.CODEC.forGetter((biome) -> { ++ return biome.generationSettings; ++ }), MobSpawnSettings.CODEC.forGetter((biome) -> { ++ return biome.mobSettings; ++ })).apply(instance, Biome::new); ++ }); ++ public static final Codec NETWORK_CODEC = RecordCodecBuilder.create((instance) -> { ++ return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> { ++ return biome.climateSettings; ++ }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> { ++ return biome.specialEffects; ++ })).apply(instance, (weather, effects) -> { ++ return new Biome(weather, effects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY); ++ }); ++ }); ++ public static final Codec> CODEC = RegistryFileCodec.create(Registries.BIOME, DIRECT_CODEC); ++ public static final Codec> LIST_CODEC = RegistryCodecs.homogeneousList(Registries.BIOME, DIRECT_CODEC); ++ private static final PerlinSimplexNoise TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(1234L)), ImmutableList.of(0)); ++ static final PerlinSimplexNoise FROZEN_TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(3456L)), ImmutableList.of(-2, -1, 0)); ++ /** @deprecated */ ++ @Deprecated( ++ forRemoval = true ++ ) ++ public static final PerlinSimplexNoise BIOME_INFO_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(2345L)), ImmutableList.of(0)); ++ private static final int TEMPERATURE_CACHE_SIZE = 1024; ++ public final Biome.ClimateSettings climateSettings; ++ private final BiomeGenerationSettings generationSettings; ++ private final MobSpawnSettings mobSettings; ++ private final BiomeSpecialEffects specialEffects; ++ private final ThreadLocal temperatureCache = ThreadLocal.withInitial(() -> { ++ return Util.make(() -> { ++ Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) { ++ protected void rehash(int i) { ++ } ++ }; ++ long2FloatLinkedOpenHashMap.defaultReturnValue(Float.NaN); ++ return long2FloatLinkedOpenHashMap; ++ }); ++ }); ++ ++ Biome(Biome.ClimateSettings weather, BiomeSpecialEffects effects, BiomeGenerationSettings generationSettings, MobSpawnSettings spawnSettings) { ++ this.climateSettings = weather; ++ this.generationSettings = generationSettings; ++ this.mobSettings = spawnSettings; ++ this.specialEffects = effects; ++ } ++ ++ public int getSkyColor() { ++ return this.specialEffects.getSkyColor(); ++ } ++ ++ public MobSpawnSettings getMobSettings() { ++ return this.mobSettings; ++ } ++ ++ public boolean hasPrecipitation() { ++ return this.climateSettings.hasPrecipitation(); ++ } ++ ++ public Biome.Precipitation getPrecipitationAt(BlockPos pos) { ++ if (!this.hasPrecipitation()) { ++ return Biome.Precipitation.NONE; ++ } else { ++ return this.coldEnoughToSnow(pos) ? Biome.Precipitation.SNOW : Biome.Precipitation.RAIN; ++ } ++ } ++ ++ private float getHeightAdjustedTemperature(BlockPos pos) { ++ float f = this.climateSettings.temperatureModifier.modifyTemperature(pos, this.getBaseTemperature()); ++ if (pos.getY() > 80) { ++ float g = (float)(TEMPERATURE_NOISE.getValue((double)((float)pos.getX() / 8.0F), (double)((float)pos.getZ() / 8.0F), false) * 8.0D); ++ return f - (g + (float)pos.getY() - 80.0F) * 0.05F / 40.0F; ++ } else { ++ return f; ++ } ++ } ++ ++ /** @deprecated */ ++ @Deprecated ++ public float getTemperature(BlockPos blockPos) { ++ long l = blockPos.asLong(); ++ Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = this.temperatureCache.get(); ++ float f = long2FloatLinkedOpenHashMap.get(l); ++ if (!Float.isNaN(f)) { ++ return f; ++ } else { ++ float g = this.getHeightAdjustedTemperature(blockPos); ++ if (long2FloatLinkedOpenHashMap.size() == 1024) { ++ long2FloatLinkedOpenHashMap.removeFirstFloat(); ++ } ++ ++ long2FloatLinkedOpenHashMap.put(l, g); ++ return g; ++ } ++ } ++ ++ public boolean shouldFreeze(LevelReader world, BlockPos blockPos) { ++ return this.shouldFreeze(world, blockPos, true); ++ } ++ ++ public boolean shouldFreeze(LevelReader world, BlockPos pos, boolean doWaterCheck) { ++ if (this.warmEnoughToRain(pos)) { ++ return false; ++ } else { ++ if (pos.getY() >= world.getMinBuildHeight() && pos.getY() < world.getMaxBuildHeight() && world.getBrightness(LightLayer.BLOCK, pos) < 10) { ++ BlockState blockState = world.getBlockState(pos); ++ FluidState fluidState = world.getFluidState(pos); ++ if (fluidState.getType() == Fluids.WATER && blockState.getBlock() instanceof LiquidBlock) { ++ if (!doWaterCheck) { ++ return true; ++ } ++ ++ boolean bl = world.isWaterAt(pos.west()) && world.isWaterAt(pos.east()) && world.isWaterAt(pos.north()) && world.isWaterAt(pos.south()); ++ if (!bl) { ++ return true; ++ } ++ } ++ } ++ ++ return false; ++ } ++ } ++ ++ public boolean coldEnoughToSnow(BlockPos pos) { ++ return !this.warmEnoughToRain(pos); ++ } ++ ++ public boolean warmEnoughToRain(BlockPos pos) { ++ return this.getTemperature(pos) >= 0.15F; ++ } ++ ++ public boolean shouldMeltFrozenOceanIcebergSlightly(BlockPos pos) { ++ return this.getTemperature(pos) > 0.1F; ++ } ++ ++ public boolean shouldSnow(LevelReader world, BlockPos pos) { ++ if (this.warmEnoughToRain(pos)) { ++ return false; ++ } else { ++ if (pos.getY() >= world.getMinBuildHeight() && pos.getY() < world.getMaxBuildHeight() && world.getBrightness(LightLayer.BLOCK, pos) < 10) { ++ BlockState blockState = world.getBlockState(pos); ++ if ((blockState.isAir() || blockState.is(Blocks.SNOW)) && Blocks.SNOW.defaultBlockState().canSurvive(world, pos)) { ++ return true; ++ } ++ } ++ ++ return false; ++ } ++ } ++ ++ public BiomeGenerationSettings getGenerationSettings() { ++ return this.generationSettings; ++ } ++ ++ public int getFogColor() { ++ return this.specialEffects.getFogColor(); ++ } ++ ++ public int getGrassColor(double x, double z) { ++ int i = this.specialEffects.getGrassColorOverride().orElseGet(this::getGrassColorFromTexture); ++ return this.specialEffects.getGrassColorModifier().modifyColor(x, z, i); ++ } ++ ++ private int getGrassColorFromTexture() { ++ double d = (double)Mth.clamp(this.climateSettings.temperature, 0.0F, 1.0F); ++ double e = (double)Mth.clamp(this.climateSettings.downfall, 0.0F, 1.0F); ++ return GrassColor.get(d, e); ++ } ++ ++ public int getFoliageColor() { ++ return this.specialEffects.getFoliageColorOverride().orElseGet(this::getFoliageColorFromTexture); ++ } ++ ++ private int getFoliageColorFromTexture() { ++ double d = (double)Mth.clamp(this.climateSettings.temperature, 0.0F, 1.0F); ++ double e = (double)Mth.clamp(this.climateSettings.downfall, 0.0F, 1.0F); ++ return FoliageColor.get(d, e); ++ } ++ ++ public float getBaseTemperature() { ++ return this.climateSettings.temperature; ++ } ++ ++ public BiomeSpecialEffects getSpecialEffects() { ++ return this.specialEffects; ++ } ++ ++ public int getWaterColor() { ++ return this.specialEffects.getWaterColor(); ++ } ++ ++ public int getWaterFogColor() { ++ return this.specialEffects.getWaterFogColor(); ++ } ++ ++ public Optional getAmbientParticle() { ++ return this.specialEffects.getAmbientParticleSettings(); ++ } ++ ++ public Optional> getAmbientLoop() { ++ return this.specialEffects.getAmbientLoopSoundEvent(); ++ } ++ ++ public Optional getAmbientMood() { ++ return this.specialEffects.getAmbientMoodSettings(); ++ } ++ ++ public Optional getAmbientAdditions() { ++ return this.specialEffects.getAmbientAdditionsSettings(); ++ } ++ ++ public Optional getBackgroundMusic() { ++ return this.specialEffects.getBackgroundMusic(); ++ } ++ ++ public static class BiomeBuilder { ++ private boolean hasPrecipitation = true; ++ @Nullable ++ private Float temperature; ++ private Biome.TemperatureModifier temperatureModifier = Biome.TemperatureModifier.NONE; ++ @Nullable ++ private Float downfall; ++ @Nullable ++ private BiomeSpecialEffects specialEffects; ++ @Nullable ++ private MobSpawnSettings mobSpawnSettings; ++ @Nullable ++ private BiomeGenerationSettings generationSettings; ++ ++ public Biome.BiomeBuilder hasPrecipitation(boolean precipitation) { ++ this.hasPrecipitation = precipitation; ++ return this; ++ } ++ ++ public Biome.BiomeBuilder temperature(float temperature) { ++ this.temperature = temperature; ++ return this; ++ } ++ ++ public Biome.BiomeBuilder downfall(float downfall) { ++ this.downfall = downfall; ++ return this; ++ } ++ ++ public Biome.BiomeBuilder specialEffects(BiomeSpecialEffects effects) { ++ this.specialEffects = effects; ++ return this; ++ } ++ ++ public Biome.BiomeBuilder mobSpawnSettings(MobSpawnSettings spawnSettings) { ++ this.mobSpawnSettings = spawnSettings; ++ return this; ++ } ++ ++ public Biome.BiomeBuilder generationSettings(BiomeGenerationSettings generationSettings) { ++ this.generationSettings = generationSettings; ++ return this; ++ } ++ ++ public Biome.BiomeBuilder temperatureAdjustment(Biome.TemperatureModifier temperatureModifier) { ++ this.temperatureModifier = temperatureModifier; ++ return this; ++ } ++ ++ public Biome build() { ++ if (this.temperature != null && this.downfall != null && this.specialEffects != null && this.mobSpawnSettings != null && this.generationSettings != null) { ++ return new Biome(new Biome.ClimateSettings(this.hasPrecipitation, this.temperature, this.temperatureModifier, this.downfall), this.specialEffects, this.generationSettings, this.mobSpawnSettings); ++ } else { ++ throw new IllegalStateException("You are missing parameters to build a proper biome\n" + this); ++ } ++ } ++ ++ @Override ++ public String toString() { ++ return "BiomeBuilder{\nhasPrecipitation=" + this.hasPrecipitation + ",\ntemperature=" + this.temperature + ",\ntemperatureModifier=" + this.temperatureModifier + ",\ndownfall=" + this.downfall + ",\nspecialEffects=" + this.specialEffects + ",\nmobSpawnSettings=" + this.mobSpawnSettings + ",\ngenerationSettings=" + this.generationSettings + ",\n}"; ++ } ++ } ++ ++ public static record ClimateSettings(boolean hasPrecipitation, float temperature, Biome.TemperatureModifier temperatureModifier, float downfall) { ++ public static final MapCodec CODEC = RecordCodecBuilder.mapCodec((instance) -> { ++ return instance.group(Codec.BOOL.fieldOf("has_precipitation").forGetter((weather) -> { ++ return weather.hasPrecipitation; ++ }), Codec.FLOAT.fieldOf("temperature").forGetter((weather) -> { ++ return weather.temperature; ++ }), Biome.TemperatureModifier.CODEC.optionalFieldOf("temperature_modifier", Biome.TemperatureModifier.NONE).forGetter((weather) -> { ++ return weather.temperatureModifier; ++ }), Codec.FLOAT.fieldOf("downfall").forGetter((weather) -> { ++ return weather.downfall; ++ })).apply(instance, Biome.ClimateSettings::new); ++ }); ++ } ++ ++ public static enum Precipitation implements StringRepresentable { ++ NONE("none"), ++ RAIN("rain"), ++ SNOW("snow"); ++ ++ public static final Codec CODEC = StringRepresentable.fromEnum(Biome.Precipitation::values); ++ private final String name; ++ ++ private Precipitation(String name) { ++ this.name = name; ++ } ++ ++ @Override ++ public String getSerializedName() { ++ return this.name; ++ } ++ } ++ ++ public static enum TemperatureModifier implements StringRepresentable { ++ NONE("none") { ++ @Override ++ public float modifyTemperature(BlockPos pos, float temperature) { ++ return temperature; ++ } ++ }, ++ FROZEN("frozen") { ++ @Override ++ public float modifyTemperature(BlockPos pos, float temperature) { ++ double d = Biome.FROZEN_TEMPERATURE_NOISE.getValue((double)pos.getX() * 0.05D, (double)pos.getZ() * 0.05D, false) * 7.0D; ++ double e = Biome.BIOME_INFO_NOISE.getValue((double)pos.getX() * 0.2D, (double)pos.getZ() * 0.2D, false); ++ double f = d + e; ++ if (f < 0.3D) { ++ double g = Biome.BIOME_INFO_NOISE.getValue((double)pos.getX() * 0.09D, (double)pos.getZ() * 0.09D, false); ++ if (g < 0.8D) { ++ return 0.2F; ++ } ++ } ++ ++ return temperature; ++ } ++ }; ++ ++ private final String name; ++ public static final Codec CODEC = StringRepresentable.fromEnum(Biome.TemperatureModifier::values); ++ ++ public abstract float modifyTemperature(BlockPos pos, float temperature); ++ ++ TemperatureModifier(String name) { ++ this.name = name; ++ } ++ ++ public String getName() { ++ return this.name; ++ } ++ ++ @Override ++ public String getSerializedName() { ++ return this.name; ++ } ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +new file mode 100644 +index 0000000000000000000000000000000000000000..ddca14f1224327a738415fb8b37398d8df0aa9c8 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +@@ -0,0 +1,175 @@ ++package net.minecraft.world.level.block; ++ ++import com.mojang.serialization.MapCodec; ++import javax.annotation.Nullable; ++import net.minecraft.core.BlockPos; ++import net.minecraft.core.Direction; ++import net.minecraft.core.particles.ParticleTypes; ++import net.minecraft.network.chat.Component; ++import net.minecraft.server.level.ServerLevel; ++import net.minecraft.stats.Stats; ++import net.minecraft.util.RandomSource; ++import net.minecraft.world.InteractionHand; ++import net.minecraft.world.InteractionResult; ++import net.minecraft.world.SimpleMenuProvider; ++import net.minecraft.world.entity.monster.piglin.PiglinAi; ++import net.minecraft.world.entity.player.Player; ++import net.minecraft.world.inventory.ChestMenu; ++import net.minecraft.world.inventory.PlayerEnderChestContainer; ++import net.minecraft.world.item.context.BlockPlaceContext; ++import net.minecraft.world.level.BlockGetter; ++import net.minecraft.world.level.Level; ++import net.minecraft.world.level.LevelAccessor; ++import net.minecraft.world.level.block.entity.BlockEntity; ++import net.minecraft.world.level.block.entity.BlockEntityTicker; ++import net.minecraft.world.level.block.entity.BlockEntityType; ++import net.minecraft.world.level.block.entity.ChestBlockEntity; ++import net.minecraft.world.level.block.entity.EnderChestBlockEntity; ++import net.minecraft.world.level.block.state.BlockBehaviour; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.block.state.StateDefinition; ++import net.minecraft.world.level.block.state.properties.BlockStateProperties; ++import net.minecraft.world.level.block.state.properties.BooleanProperty; ++import net.minecraft.world.level.block.state.properties.DirectionProperty; ++import net.minecraft.world.level.material.FluidState; ++import net.minecraft.world.level.material.Fluids; ++import net.minecraft.world.level.pathfinder.PathComputationType; ++import net.minecraft.world.phys.BlockHitResult; ++import net.minecraft.world.phys.shapes.CollisionContext; ++import net.minecraft.world.phys.shapes.VoxelShape; ++ ++public class EnderChestBlock extends AbstractChestBlock implements SimpleWaterloggedBlock { ++ public static final MapCodec CODEC = simpleCodec(EnderChestBlock::new); ++ public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; ++ public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; ++ protected static final VoxelShape SHAPE = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 14.0D, 15.0D); ++ private static final Component CONTAINER_TITLE = Component.translatable("container.enderchest"); ++ ++ @Override ++ public MapCodec codec() { ++ return CODEC; ++ } ++ ++ protected EnderChestBlock(BlockBehaviour.Properties settings) { ++ super(settings, () -> { ++ return BlockEntityType.ENDER_CHEST; ++ }); ++ this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, Boolean.valueOf(false))); ++ } ++ ++ @Override ++ public DoubleBlockCombiner.NeighborCombineResult combine(BlockState state, Level world, BlockPos pos, boolean ignoreBlocked) { ++ return DoubleBlockCombiner.Combiner::acceptNone; ++ } ++ ++ @Override ++ public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { ++ return SHAPE; ++ } ++ ++ @Override ++ public RenderShape getRenderShape(BlockState state) { ++ return RenderShape.ENTITYBLOCK_ANIMATED; ++ } ++ ++ @Override ++ public BlockState getStateForPlacement(BlockPlaceContext ctx) { ++ FluidState fluidState = ctx.getLevel().getFluidState(ctx.getClickedPos()); ++ return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite()).setValue(WATERLOGGED, Boolean.valueOf(fluidState.getType() == Fluids.WATER)); ++ } ++ ++ @Override ++ public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ++ PlayerEnderChestContainer playerEnderChestContainer = player.getEnderChestInventory(); ++ BlockEntity blockEntity = world.getBlockEntity(pos); ++ if (playerEnderChestContainer != null && blockEntity instanceof EnderChestBlockEntity) { ++ BlockPos blockPos = pos.above(); ++ if (world.getBlockState(blockPos).isRedstoneConductor(world, blockPos)) { ++ return InteractionResult.sidedSuccess(world.isClientSide); ++ } else if (world.isClientSide) { ++ return InteractionResult.SUCCESS; ++ } else { ++ EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity; ++ playerEnderChestContainer.setActiveChest(enderChestBlockEntity); ++ player.openMenu(new SimpleMenuProvider((syncId, inventory, playerx) -> { ++ return ChestMenu.threeRows(syncId, inventory, playerEnderChestContainer); ++ }, CONTAINER_TITLE)); ++ player.awardStat(Stats.OPEN_ENDERCHEST); ++ PiglinAi.angerNearbyPiglins(player, true); ++ return InteractionResult.CONSUME; ++ } ++ } else { ++ return InteractionResult.sidedSuccess(world.isClientSide); ++ } ++ } ++ ++ @Override ++ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { ++ return new EnderChestBlockEntity(pos, state); ++ } ++ ++ @Nullable ++ @Override ++ public BlockEntityTicker getTicker(Level world, BlockState state, BlockEntityType type) { ++ return world.isClientSide ? createTickerHelper(type, BlockEntityType.ENDER_CHEST, EnderChestBlockEntity::lidAnimateTick) : null; ++ } ++ ++ @Override ++ public void animateTick(BlockState state, Level world, BlockPos pos, RandomSource random) { ++ for(int i = 0; i < 3; ++i) { ++ int j = random.nextInt(2) * 2 - 1; ++ int k = random.nextInt(2) * 2 - 1; ++ double d = (double)pos.getX() + 0.5D + 0.25D * (double)j; ++ double e = (double)((float)pos.getY() + random.nextFloat()); ++ double f = (double)pos.getZ() + 0.5D + 0.25D * (double)k; ++ double g = (double)(random.nextFloat() * (float)j); ++ double h = ((double)random.nextFloat() - 0.5D) * 0.125D; ++ double l = (double)(random.nextFloat() * (float)k); ++ world.addParticle(ParticleTypes.PORTAL, d, e, f, g, h, l); ++ } ++ ++ } ++ ++ @Override ++ public BlockState rotate(BlockState state, Rotation rotation) { ++ return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); ++ } ++ ++ @Override ++ public BlockState mirror(BlockState state, Mirror mirror) { ++ return state.rotate(mirror.getRotation(state.getValue(FACING))); ++ } ++ ++ @Override ++ protected void createBlockStateDefinition(StateDefinition.Builder builder) { ++ builder.add(FACING, WATERLOGGED); ++ } ++ ++ @Override ++ public FluidState getFluidState(BlockState state) { ++ return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state); ++ } ++ ++ @Override ++ public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { ++ if (state.getValue(WATERLOGGED)) { ++ world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); ++ } ++ ++ return super.updateShape(state, direction, neighborState, world, pos, neighborPos); ++ } ++ ++ @Override ++ public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) { ++ return false; ++ } ++ ++ @Override ++ public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) { ++ BlockEntity blockEntity = world.getBlockEntity(pos); ++ if (blockEntity instanceof EnderChestBlockEntity) { ++ ((EnderChestBlockEntity)blockEntity).recheckOpen(); ++ } ++ ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java +new file mode 100644 +index 0000000000000000000000000000000000000000..f945fae50983424091b58f83ed14f2e8f2621619 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java +@@ -0,0 +1,171 @@ ++package net.minecraft.world.level.levelgen.feature; ++ ++import com.google.common.collect.Lists; ++import com.mojang.datafixers.util.Pair; ++import com.mojang.serialization.Codec; ++import java.util.List; ++import java.util.function.Predicate; ++import net.minecraft.Util; ++import net.minecraft.core.BlockPos; ++import net.minecraft.core.Direction; ++import net.minecraft.tags.BlockTags; ++import net.minecraft.util.Mth; ++import net.minecraft.util.RandomSource; ++import net.minecraft.world.level.WorldGenLevel; ++import net.minecraft.world.level.block.Blocks; ++import net.minecraft.world.level.block.BuddingAmethystBlock; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.block.state.properties.BlockStateProperties; ++import net.minecraft.world.level.levelgen.GeodeBlockSettings; ++import net.minecraft.world.level.levelgen.GeodeCrackSettings; ++import net.minecraft.world.level.levelgen.GeodeLayerSettings; ++import net.minecraft.world.level.levelgen.LegacyRandomSource; ++import net.minecraft.world.level.levelgen.WorldgenRandom; ++import net.minecraft.world.level.levelgen.feature.configurations.GeodeConfiguration; ++import net.minecraft.world.level.levelgen.synth.NormalNoise; ++import net.minecraft.world.level.material.FluidState; ++ ++public class GeodeFeature extends Feature { ++ private static final Direction[] DIRECTIONS = Direction.values(); ++ ++ public GeodeFeature(Codec configCodec) { ++ super(configCodec); ++ } ++ ++ @Override ++ public boolean place(FeaturePlaceContext context) { ++ GeodeConfiguration geodeConfiguration = context.config(); ++ RandomSource randomSource = context.random(); ++ BlockPos blockPos = context.origin(); ++ WorldGenLevel worldGenLevel = context.level(); ++ int i = geodeConfiguration.minGenOffset; ++ int j = geodeConfiguration.maxGenOffset; ++ List> list = Lists.newLinkedList(); ++ int k = geodeConfiguration.distributionPoints.sample(randomSource); ++ WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed())); ++ NormalNoise normalNoise = NormalNoise.create(worldgenRandom, -4, 1.0D); ++ List list2 = Lists.newLinkedList(); ++ double d = (double)k / (double)geodeConfiguration.outerWallDistance.getMaxValue(); ++ GeodeLayerSettings geodeLayerSettings = geodeConfiguration.geodeLayerSettings; ++ GeodeBlockSettings geodeBlockSettings = geodeConfiguration.geodeBlockSettings; ++ GeodeCrackSettings geodeCrackSettings = geodeConfiguration.geodeCrackSettings; ++ double e = 1.0D / Math.sqrt(geodeLayerSettings.filling); ++ double f = 1.0D / Math.sqrt(geodeLayerSettings.innerLayer + d); ++ double g = 1.0D / Math.sqrt(geodeLayerSettings.middleLayer + d); ++ double h = 1.0D / Math.sqrt(geodeLayerSettings.outerLayer + d); ++ double l = 1.0D / Math.sqrt(geodeCrackSettings.baseCrackSize + randomSource.nextDouble() / 2.0D + (k > 3 ? d : 0.0D)); ++ boolean bl = (double)randomSource.nextFloat() < geodeCrackSettings.generateCrackChance; ++ int m = 0; ++ ++ for(int n = 0; n < k; ++n) { ++ int o = geodeConfiguration.outerWallDistance.sample(randomSource); ++ int p = geodeConfiguration.outerWallDistance.sample(randomSource); ++ int q = geodeConfiguration.outerWallDistance.sample(randomSource); ++ BlockPos blockPos2 = blockPos.offset(o, p, q); ++ BlockState blockState = worldGenLevel.getBlockState(blockPos2); ++ if (blockState.isAir() || blockState.is(BlockTags.GEODE_INVALID_BLOCKS)) { ++ ++m; ++ if (m > geodeConfiguration.invalidBlocksThreshold) { ++ return false; ++ } ++ } ++ ++ list.add(Pair.of(blockPos2, geodeConfiguration.pointOffset.sample(randomSource))); ++ } ++ ++ if (bl) { ++ int r = randomSource.nextInt(4); ++ int s = k * 2 + 1; ++ if (r == 0) { ++ list2.add(blockPos.offset(s, 7, 0)); ++ list2.add(blockPos.offset(s, 5, 0)); ++ list2.add(blockPos.offset(s, 1, 0)); ++ } else if (r == 1) { ++ list2.add(blockPos.offset(0, 7, s)); ++ list2.add(blockPos.offset(0, 5, s)); ++ list2.add(blockPos.offset(0, 1, s)); ++ } else if (r == 2) { ++ list2.add(blockPos.offset(s, 7, s)); ++ list2.add(blockPos.offset(s, 5, s)); ++ list2.add(blockPos.offset(s, 1, s)); ++ } else { ++ list2.add(blockPos.offset(0, 7, 0)); ++ list2.add(blockPos.offset(0, 5, 0)); ++ list2.add(blockPos.offset(0, 1, 0)); ++ } ++ } ++ ++ List list3 = Lists.newArrayList(); ++ Predicate predicate = isReplaceable(geodeConfiguration.geodeBlockSettings.cannotReplace); ++ ++ for(BlockPos blockPos3 : BlockPos.betweenClosed(blockPos.offset(i, i, i), blockPos.offset(j, j, j))) { ++ double t = normalNoise.getValue((double)blockPos3.getX(), (double)blockPos3.getY(), (double)blockPos3.getZ()) * geodeConfiguration.noiseMultiplier; ++ double u = 0.0D; ++ double v = 0.0D; ++ ++ for(Pair pair : list) { ++ u += Mth.invSqrt(blockPos3.distSqr(pair.getFirst()) + (double)pair.getSecond().intValue()) + t; ++ } ++ ++ for(BlockPos blockPos4 : list2) { ++ v += Mth.invSqrt(blockPos3.distSqr(blockPos4) + (double)geodeCrackSettings.crackPointOffset) + t; ++ } ++ ++ if (!(u < h)) { ++ if (bl && v >= l && u < e) { ++ this.safeSetBlock(worldGenLevel, blockPos3, Blocks.AIR.defaultBlockState(), predicate); ++ ++ for(Direction direction : DIRECTIONS) { ++ BlockPos blockPos5 = blockPos3.relative(direction); ++ FluidState fluidState = worldGenLevel.getFluidState(blockPos5); ++ if (!fluidState.isEmpty()) { ++ worldGenLevel.scheduleTick(blockPos5, fluidState.getType(), 0); ++ } ++ } ++ } else if (u >= e) { ++ this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.fillingProvider.getState(randomSource, blockPos3), predicate); ++ } else if (u >= f) { ++ boolean bl2 = (double)randomSource.nextFloat() < geodeConfiguration.useAlternateLayer0Chance; ++ if (bl2) { ++ this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.alternateInnerLayerProvider.getState(randomSource, blockPos3), predicate); ++ } else { ++ this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.innerLayerProvider.getState(randomSource, blockPos3), predicate); ++ } ++ ++ if ((!geodeConfiguration.placementsRequireLayer0Alternate || bl2) && (double)randomSource.nextFloat() < geodeConfiguration.usePotentialPlacementsChance) { ++ list3.add(blockPos3.immutable()); ++ } ++ } else if (u >= g) { ++ this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.middleLayerProvider.getState(randomSource, blockPos3), predicate); ++ } else if (u >= h) { ++ this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.outerLayerProvider.getState(randomSource, blockPos3), predicate); ++ } ++ } ++ } ++ ++ List list4 = geodeBlockSettings.innerPlacements; ++ ++ for(BlockPos blockPos6 : list3) { ++ BlockState blockState2 = Util.getRandom(list4, randomSource); ++ ++ for(Direction direction2 : DIRECTIONS) { ++ if (blockState2.hasProperty(BlockStateProperties.FACING)) { ++ blockState2 = blockState2.setValue(BlockStateProperties.FACING, direction2); ++ } ++ ++ BlockPos blockPos7 = blockPos6.relative(direction2); ++ BlockState blockState3 = worldGenLevel.getBlockState(blockPos7); ++ if (blockState2.hasProperty(BlockStateProperties.WATERLOGGED)) { ++ blockState2 = blockState2.setValue(BlockStateProperties.WATERLOGGED, Boolean.valueOf(blockState3.getFluidState().isSource())); ++ } ++ ++ if (BuddingAmethystBlock.canClusterGrowAtState(blockState3)) { ++ this.safeSetBlock(worldGenLevel, blockPos7, blockState2, predicate); ++ break; ++ } ++ } ++ } ++ ++ return true; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java +new file mode 100644 +index 0000000000000000000000000000000000000000..7c252dd2bd314f06703ac9356410c52b21198d12 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java +@@ -0,0 +1,134 @@ ++package net.minecraft.world.level.levelgen.feature; ++ ++import com.mojang.logging.LogUtils; ++import com.mojang.serialization.Codec; ++import java.util.function.Predicate; ++import net.minecraft.Util; ++import net.minecraft.core.BlockPos; ++import net.minecraft.core.Direction; ++import net.minecraft.tags.BlockTags; ++import net.minecraft.util.RandomSource; ++import net.minecraft.world.RandomizableContainer; ++import net.minecraft.world.entity.EntityType; ++import net.minecraft.world.level.WorldGenLevel; ++import net.minecraft.world.level.block.Blocks; ++import net.minecraft.world.level.block.entity.BlockEntity; ++import net.minecraft.world.level.block.entity.SpawnerBlockEntity; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; ++import net.minecraft.world.level.levelgen.structure.StructurePiece; ++import net.minecraft.world.level.storage.loot.BuiltInLootTables; ++import org.slf4j.Logger; ++ ++public class MonsterRoomFeature extends Feature { ++ private static final Logger LOGGER = LogUtils.getLogger(); ++ private static final EntityType[] MOBS = new EntityType[]{EntityType.SKELETON, EntityType.ZOMBIE, EntityType.ZOMBIE, EntityType.SPIDER}; ++ private static final BlockState AIR = Blocks.CAVE_AIR.defaultBlockState(); ++ ++ public MonsterRoomFeature(Codec configCodec) { ++ super(configCodec); ++ } ++ ++ @Override ++ public boolean place(FeaturePlaceContext context) { ++ Predicate predicate = Feature.isReplaceable(BlockTags.FEATURES_CANNOT_REPLACE); ++ BlockPos blockPos = context.origin(); ++ RandomSource randomSource = context.random(); ++ WorldGenLevel worldGenLevel = context.level(); ++ int i = 3; ++ int j = randomSource.nextInt(2) + 2; ++ int k = -j - 1; ++ int l = j + 1; ++ int m = -1; ++ int n = 4; ++ int o = randomSource.nextInt(2) + 2; ++ int p = -o - 1; ++ int q = o + 1; ++ int r = 0; ++ ++ for(int s = k; s <= l; ++s) { ++ for(int t = -1; t <= 4; ++t) { ++ for(int u = p; u <= q; ++u) { ++ BlockPos blockPos2 = blockPos.offset(s, t, u); ++ boolean bl = worldGenLevel.getBlockState(blockPos2).isSolid(); ++ if (t == -1 && !bl) { ++ return false; ++ } ++ ++ if (t == 4 && !bl) { ++ return false; ++ } ++ ++ if ((s == k || s == l || u == p || u == q) && t == 0 && worldGenLevel.isEmptyBlock(blockPos2) && worldGenLevel.isEmptyBlock(blockPos2.above())) { ++ ++r; ++ } ++ } ++ } ++ } ++ ++ if (r >= 1 && r <= 5) { ++ for(int v = k; v <= l; ++v) { ++ for(int w = 3; w >= -1; --w) { ++ for(int x = p; x <= q; ++x) { ++ BlockPos blockPos3 = blockPos.offset(v, w, x); ++ BlockState blockState = worldGenLevel.getBlockState(blockPos3); ++ if (v != k && w != -1 && x != p && v != l && w != 4 && x != q) { ++ if (!blockState.is(Blocks.CHEST) && !blockState.is(Blocks.SPAWNER)) { ++ this.safeSetBlock(worldGenLevel, blockPos3, AIR, predicate); ++ } ++ } else if (blockPos3.getY() >= worldGenLevel.getMinBuildHeight() && !worldGenLevel.getBlockState(blockPos3.below()).isSolid()) { ++ worldGenLevel.setBlock(blockPos3, AIR, 2); ++ } else if (blockState.isSolid() && !blockState.is(Blocks.CHEST)) { ++ if (w == -1 && randomSource.nextInt(4) != 0) { ++ this.safeSetBlock(worldGenLevel, blockPos3, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), predicate); ++ } else { ++ this.safeSetBlock(worldGenLevel, blockPos3, Blocks.COBBLESTONE.defaultBlockState(), predicate); ++ } ++ } ++ } ++ } ++ } ++ ++ for(int y = 0; y < 2; ++y) { ++ for(int z = 0; z < 3; ++z) { ++ int aa = blockPos.getX() + randomSource.nextInt(j * 2 + 1) - j; ++ int ab = blockPos.getY(); ++ int ac = blockPos.getZ() + randomSource.nextInt(o * 2 + 1) - o; ++ BlockPos blockPos4 = new BlockPos(aa, ab, ac); ++ if (worldGenLevel.isEmptyBlock(blockPos4)) { ++ int ad = 0; ++ ++ for(Direction direction : Direction.Plane.HORIZONTAL) { ++ if (worldGenLevel.getBlockState(blockPos4.relative(direction)).isSolid()) { ++ ++ad; ++ } ++ } ++ ++ if (ad == 1) { ++ this.safeSetBlock(worldGenLevel, blockPos4, StructurePiece.reorient(worldGenLevel, blockPos4, Blocks.CHEST.defaultBlockState()), predicate); ++ RandomizableContainer.setBlockEntityLootTable(worldGenLevel, randomSource, blockPos4, BuiltInLootTables.SIMPLE_DUNGEON); ++ break; ++ } ++ } ++ } ++ } ++ ++ this.safeSetBlock(worldGenLevel, blockPos, Blocks.SPAWNER.defaultBlockState(), predicate); ++ BlockEntity blockEntity = worldGenLevel.getBlockEntity(blockPos); ++ if (blockEntity instanceof SpawnerBlockEntity) { ++ SpawnerBlockEntity spawnerBlockEntity = (SpawnerBlockEntity)blockEntity; ++ spawnerBlockEntity.setEntityId(this.randomEntityId(randomSource), randomSource); ++ } else { ++ LOGGER.error("Failed to fetch mob spawner entity at ({}, {}, {})", blockPos.getX(), blockPos.getY(), blockPos.getZ()); ++ } ++ ++ return true; ++ } else { ++ return false; ++ } ++ } ++ ++ private EntityType randomEntityId(RandomSource random) { ++ return Util.getRandom(MOBS, random); ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java +new file mode 100644 +index 0000000000000000000000000000000000000000..f5aea54f81dcd3072e36ddf3c4c6ded848c2c540 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java +@@ -0,0 +1,75 @@ ++package net.minecraft.world.level.levelgen.feature; ++ ++import com.mojang.serialization.Codec; ++import net.minecraft.core.BlockPos; ++import net.minecraft.core.Direction; ++import net.minecraft.util.RandomSource; ++import net.minecraft.world.level.LevelAccessor; ++import net.minecraft.world.level.WorldGenLevel; ++import net.minecraft.world.level.block.Blocks; ++import net.minecraft.world.level.block.SculkBehaviour; ++import net.minecraft.world.level.block.SculkShriekerBlock; ++import net.minecraft.world.level.block.SculkSpreader; ++import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.levelgen.feature.configurations.SculkPatchConfiguration; ++ ++public class SculkPatchFeature extends Feature { ++ public SculkPatchFeature(Codec configCodec) { ++ super(configCodec); ++ } ++ ++ @Override ++ public boolean place(FeaturePlaceContext context) { ++ WorldGenLevel worldGenLevel = context.level(); ++ BlockPos blockPos = context.origin(); ++ if (!this.canSpreadFrom(worldGenLevel, blockPos)) { ++ return false; ++ } else { ++ SculkPatchConfiguration sculkPatchConfiguration = context.config(); ++ RandomSource randomSource = context.random(); ++ SculkSpreader sculkSpreader = SculkSpreader.createWorldGenSpreader(); ++ int i = sculkPatchConfiguration.spreadRounds() + sculkPatchConfiguration.growthRounds(); ++ ++ for(int j = 0; j < i; ++j) { ++ for(int k = 0; k < sculkPatchConfiguration.chargeCount(); ++k) { ++ sculkSpreader.addCursors(blockPos, sculkPatchConfiguration.amountPerCharge()); ++ } ++ ++ boolean bl = j < sculkPatchConfiguration.spreadRounds(); ++ ++ for(int l = 0; l < sculkPatchConfiguration.spreadAttempts(); ++l) { ++ sculkSpreader.updateCursors(worldGenLevel, blockPos, randomSource, bl); ++ } ++ ++ sculkSpreader.clear(); ++ } ++ ++ BlockPos blockPos2 = blockPos.below(); ++ if (randomSource.nextFloat() <= sculkPatchConfiguration.catalystChance() && worldGenLevel.getBlockState(blockPos2).isCollisionShapeFullBlock(worldGenLevel, blockPos2)) { ++ worldGenLevel.setBlock(blockPos, Blocks.SCULK_CATALYST.defaultBlockState(), 3); ++ } ++ ++ int m = sculkPatchConfiguration.extraRareGrowths().sample(randomSource); ++ ++ for(int n = 0; n < m; ++n) { ++ BlockPos blockPos3 = blockPos.offset(randomSource.nextInt(5) - 2, 0, randomSource.nextInt(5) - 2); ++ if (worldGenLevel.getBlockState(blockPos3).isAir() && worldGenLevel.getBlockState(blockPos3.below()).isFaceSturdy(worldGenLevel, blockPos3.below(), Direction.UP)) { ++ worldGenLevel.setBlock(blockPos3, Blocks.SCULK_SHRIEKER.defaultBlockState().setValue(SculkShriekerBlock.CAN_SUMMON, Boolean.valueOf(true)), 3); ++ } ++ } ++ ++ return true; ++ } ++ } ++ ++ private boolean canSpreadFrom(LevelAccessor world, BlockPos pos) { ++ BlockState blockState = world.getBlockState(pos); ++ if (blockState.getBlock() instanceof SculkBehaviour) { ++ return true; ++ } else { ++ return !blockState.isAir() && (!blockState.is(Blocks.WATER) || !blockState.getFluidState().isSource()) ? false : Direction.stream().map(pos::relative).anyMatch((pos2) -> { ++ return world.getBlockState(pos2).isCollisionShapeFullBlock(world, pos2); ++ }); ++ } ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java +new file mode 100644 +index 0000000000000000000000000000000000000000..d051e8c1db6b5c42b8df0be54d9d48ba0e7b0077 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java +@@ -0,0 +1,129 @@ ++package net.minecraft.world.level.storage; ++ ++import com.google.common.collect.Maps; ++import com.mojang.datafixers.DataFixer; ++import com.mojang.logging.LogUtils; ++import java.io.DataInputStream; ++import java.io.File; ++import java.io.FileInputStream; ++import java.io.IOException; ++import java.io.PushbackInputStream; ++import java.util.Map; ++import java.util.function.Function; ++import javax.annotation.Nullable; ++import net.minecraft.SharedConstants; ++import net.minecraft.nbt.CompoundTag; ++import net.minecraft.nbt.NbtAccounter; ++import net.minecraft.nbt.NbtIo; ++import net.minecraft.nbt.NbtUtils; ++import net.minecraft.util.datafix.DataFixTypes; ++import net.minecraft.world.level.saveddata.SavedData; ++import org.slf4j.Logger; ++ ++public class DimensionDataStorage { ++ private static final Logger LOGGER = LogUtils.getLogger(); ++ public final Map cache = Maps.newHashMap(); ++ private final DataFixer fixerUpper; ++ private final File dataFolder; ++ ++ public DimensionDataStorage(File directory, DataFixer dataFixer) { ++ this.fixerUpper = dataFixer; ++ this.dataFolder = directory; ++ } ++ ++ private File getDataFile(String id) { ++ return new File(this.dataFolder, id + ".dat"); ++ } ++ ++ public T computeIfAbsent(SavedData.Factory type, String id) { ++ T savedData = this.get(type, id); ++ if (savedData != null) { ++ return savedData; ++ } else { ++ T savedData2 = type.constructor().get(); ++ this.set(id, savedData2); ++ return savedData2; ++ } ++ } ++ ++ @Nullable ++ public T get(SavedData.Factory type, String id) { ++ SavedData savedData = this.cache.get(id); ++ if (savedData == null && !this.cache.containsKey(id)) { ++ savedData = this.readSavedData(type.deserializer(), type.type(), id); ++ this.cache.put(id, savedData); ++ } ++ ++ return (T)savedData; ++ } ++ ++ @Nullable ++ public T readSavedData(Function readFunction, DataFixTypes dataFixTypes, String id) { ++ try { ++ File file = this.getDataFile(id); ++ if (file.exists()) { ++ CompoundTag compoundTag = this.readTagFromDisk(id, dataFixTypes, SharedConstants.getCurrentVersion().getDataVersion().getVersion()); ++ return readFunction.apply(compoundTag.getCompound("data")); ++ } ++ } catch (Exception var6) { ++ LOGGER.error("Error loading saved data: {}", id, var6); ++ } ++ ++ return (T)null; ++ } ++ ++ public void set(String id, SavedData state) { ++ this.cache.put(id, state); ++ } ++ ++ public CompoundTag readTagFromDisk(String id, DataFixTypes dataFixTypes, int currentSaveVersion) throws IOException { ++ File file = this.getDataFile(id); ++ ++ CompoundTag var9; ++ try ( ++ FileInputStream fileInputStream = new FileInputStream(file); ++ PushbackInputStream pushbackInputStream = new PushbackInputStream(fileInputStream, 2); ++ ) { ++ CompoundTag compoundTag; ++ if (this.isGzip(pushbackInputStream)) { ++ compoundTag = NbtIo.readCompressed(pushbackInputStream, NbtAccounter.unlimitedHeap()); ++ } else { ++ try (DataInputStream dataInputStream = new DataInputStream(pushbackInputStream)) { ++ compoundTag = NbtIo.read(dataInputStream); ++ } ++ } ++ ++ int i = NbtUtils.getDataVersion(compoundTag, 1343); ++ var9 = dataFixTypes.update(this.fixerUpper, compoundTag, i, currentSaveVersion); ++ } ++ ++ return var9; ++ } ++ ++ private boolean isGzip(PushbackInputStream stream) throws IOException { ++ byte[] bs = new byte[2]; ++ boolean bl = false; ++ int i = stream.read(bs, 0, 2); ++ if (i == 2) { ++ int j = (bs[1] & 255) << 8 | bs[0] & 255; ++ if (j == 35615) { ++ bl = true; ++ } ++ } ++ ++ if (i != 0) { ++ stream.unread(bs, 0, i); ++ } ++ ++ return bl; ++ } ++ ++ public void save() { ++ this.cache.forEach((id, state) -> { ++ if (state != null) { ++ state.save(this.getDataFile(id)); ++ } ++ ++ }); ++ } ++} +diff --git a/src/main/java/net/minecraft/world/scores/PlayerTeam.java b/src/main/java/net/minecraft/world/scores/PlayerTeam.java +new file mode 100644 +index 0000000000000000000000000000000000000000..9464054912e19fc78dd965b71fce20a18564b351 +--- /dev/null ++++ b/src/main/java/net/minecraft/world/scores/PlayerTeam.java +@@ -0,0 +1,186 @@ ++package net.minecraft.world.scores; ++ ++import com.google.common.collect.Sets; ++import java.util.Collection; ++import java.util.Set; ++import javax.annotation.Nullable; ++import net.minecraft.ChatFormatting; ++import net.minecraft.network.chat.CommonComponents; ++import net.minecraft.network.chat.Component; ++import net.minecraft.network.chat.ComponentUtils; ++import net.minecraft.network.chat.HoverEvent; ++import net.minecraft.network.chat.MutableComponent; ++import net.minecraft.network.chat.Style; ++ ++public class PlayerTeam extends Team { ++ private static final int BIT_FRIENDLY_FIRE = 0; ++ private static final int BIT_SEE_INVISIBLES = 1; ++ private final Scoreboard scoreboard; ++ private final String name; ++ private final Set players = Sets.newHashSet(); ++ private Component displayName; ++ private Component playerPrefix = CommonComponents.EMPTY; ++ private Component playerSuffix = CommonComponents.EMPTY; ++ private boolean allowFriendlyFire = true; ++ private boolean seeFriendlyInvisibles = true; ++ private Team.Visibility nameTagVisibility = Team.Visibility.ALWAYS; ++ private Team.Visibility deathMessageVisibility = Team.Visibility.ALWAYS; ++ private ChatFormatting color = ChatFormatting.RESET; ++ private Team.CollisionRule collisionRule = Team.CollisionRule.ALWAYS; ++ private final Style displayNameStyle; ++ ++ public PlayerTeam(Scoreboard scoreboard, String name) { ++ this.scoreboard = scoreboard; ++ this.name = name; ++ this.displayName = Component.literal(name); ++ this.displayNameStyle = Style.EMPTY.withInsertion(name).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.literal(name))); ++ } ++ ++ public Scoreboard getScoreboard() { ++ return this.scoreboard; ++ } ++ ++ @Override ++ public String getName() { ++ return this.name; ++ } ++ ++ public Component getDisplayName() { ++ return this.displayName; ++ } ++ ++ public MutableComponent getFormattedDisplayName() { ++ MutableComponent mutableComponent = ComponentUtils.wrapInSquareBrackets(this.displayName.copy().withStyle(this.displayNameStyle)); ++ ChatFormatting chatFormatting = this.getColor(); ++ if (chatFormatting != ChatFormatting.RESET) { ++ mutableComponent.withStyle(chatFormatting); ++ } ++ ++ return mutableComponent; ++ } ++ ++ public void setDisplayName(Component displayName) { ++ if (displayName == null) { ++ throw new IllegalArgumentException("Name cannot be null"); ++ } else { ++ this.displayName = displayName; ++ this.scoreboard.onTeamChanged(this); ++ } ++ } ++ ++ public void setPlayerPrefix(@Nullable Component prefix) { ++ this.playerPrefix = prefix == null ? CommonComponents.EMPTY : prefix; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ public Component getPlayerPrefix() { ++ return this.playerPrefix; ++ } ++ ++ public void setPlayerSuffix(@Nullable Component suffix) { ++ this.playerSuffix = suffix == null ? CommonComponents.EMPTY : suffix; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ public Component getPlayerSuffix() { ++ return this.playerSuffix; ++ } ++ ++ @Override ++ public Collection getPlayers() { ++ return this.players; ++ } ++ ++ @Override ++ public MutableComponent getFormattedName(Component name) { ++ MutableComponent mutableComponent = Component.empty().append(this.playerPrefix).append(name).append(this.playerSuffix); ++ ChatFormatting chatFormatting = this.getColor(); ++ if (chatFormatting != ChatFormatting.RESET) { ++ mutableComponent.withStyle(chatFormatting); ++ } ++ ++ return mutableComponent; ++ } ++ ++ public static MutableComponent formatNameForTeam(@Nullable Team team, Component name) { ++ return team == null ? name.copy() : team.getFormattedName(name); ++ } ++ ++ @Override ++ public boolean isAllowFriendlyFire() { ++ return this.allowFriendlyFire; ++ } ++ ++ public void setAllowFriendlyFire(boolean friendlyFire) { ++ this.allowFriendlyFire = friendlyFire; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ @Override ++ public boolean canSeeFriendlyInvisibles() { ++ return this.seeFriendlyInvisibles; ++ } ++ ++ public void setSeeFriendlyInvisibles(boolean showFriendlyInvisible) { ++ this.seeFriendlyInvisibles = showFriendlyInvisible; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ @Override ++ public Team.Visibility getNameTagVisibility() { ++ return this.nameTagVisibility; ++ } ++ ++ @Override ++ public Team.Visibility getDeathMessageVisibility() { ++ return this.deathMessageVisibility; ++ } ++ ++ public void setNameTagVisibility(Team.Visibility nameTagVisibilityRule) { ++ this.nameTagVisibility = nameTagVisibilityRule; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ public void setDeathMessageVisibility(Team.Visibility deathMessageVisibilityRule) { ++ this.deathMessageVisibility = deathMessageVisibilityRule; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ @Override ++ public Team.CollisionRule getCollisionRule() { ++ return this.collisionRule; ++ } ++ ++ public void setCollisionRule(Team.CollisionRule collisionRule) { ++ this.collisionRule = collisionRule; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ public int packOptions() { ++ int i = 0; ++ if (this.isAllowFriendlyFire()) { ++ i |= 1; ++ } ++ ++ if (this.canSeeFriendlyInvisibles()) { ++ i |= 2; ++ } ++ ++ return i; ++ } ++ ++ public void unpackOptions(int flags) { ++ this.setAllowFriendlyFire((flags & 1) > 0); ++ this.setSeeFriendlyInvisibles((flags & 2) > 0); ++ } ++ ++ public void setColor(ChatFormatting color) { ++ this.color = color; ++ this.scoreboard.onTeamChanged(this); ++ } ++ ++ @Override ++ public ChatFormatting getColor() { ++ return this.color; ++ } ++} diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0002-Build-Changes.patch similarity index 88% rename from patches/server/0001-Build-Changes.patch rename to patches/server/0002-Build-Changes.patch index 674fe11f3..5904759c8 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0002-Build-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build Changes diff --git a/build.gradle.kts b/build.gradle.kts -index 79beac737c17412913983614bd478d33e3c6ed58..b049d50ba82d07f89a608333d4c9e84cfe631c09 100644 +index 58da26ad2f128ba0b66f86820f60853f4be352f0..f9df4ced9b313333102d5f76dff20841a789e53f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -16,7 +16,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..b049d50ba82d07f89a608333d4c9e84c - implementation(project(":paper-mojangapi")) + // Slice start + implementation(project(":slice-api")) -+ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.20.4-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } + // Slice end @@ -42,10 +42,10 @@ index 79beac737c17412913983614bd478d33e3c6ed58..b049d50ba82d07f89a608333d4c9e84c standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..d91ad3622592ece58877f975cdcbf984e61219d7 100644 +index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..04c6357d24a095bcff40e267cd40920e3b3c3c5d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop(); // CraftBukkit end + BlockState iblockdata1 = block.playerWillDestroy(this.level, pos, iblockdata, this.player); + level.pendingPlayerBlockEvents.put(pos, new Level.PendingBlockEvent(pos, this.player)); // Paper - block.playerWillDestroy(this.level, pos, iblockdata, this.player); boolean flag = this.level.removeBlock(pos, false); -@@ -447,6 +448,7 @@ public class ServerPlayerGameMode { + if (flag) { +@@ -446,6 +447,7 @@ public class ServerPlayerGameMode { // CraftBukkit start java.util.List itemsToDrop = this.level.captureDrops; // Paper - store current list this.level.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff -+ this.level.pendingPlayerBlockEvents.remove(pos); // Paper ++ level.pendingPlayerBlockEvents.remove(pos); // Paper if (event.isDropItems()) { org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 4697df75fdee2023c41260bed211e3e3d90d2b9b..e30aaa502f5e98b5658a0dd78853e865cbf91f96 100644 +index de277d61b718fe07a87d75a2547bb1c7f8553aa1..625a852db818d95365ad7ae56e6b1de541bbdada 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -357,6 +357,7 @@ public final class ItemStack { +@@ -378,6 +378,7 @@ public final class ItemStack { CompoundTag oldData = this.getTagClone(); int oldCount = this.getCount(); ServerLevel world = (ServerLevel) context.getLevel(); @@ -37,10 +37,10 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..e30aaa502f5e98b5658a0dd78853e865 if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - capture block states for snow buckets world.captureBlockStates = true; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 763165618a47d9841bb8fc70651a4e80a2bbd67f..7c332c004f469fb47598121c3b828a484634b526 100644 +index fe62e872f0c989f612dcbfc58894bd1787345d25..465bbaeff36f4d03db40fcaf9b6ab98550316afb 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -184,6 +184,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -187,6 +187,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here @@ -68,7 +68,7 @@ index 763165618a47d9841bb8fc70651a4e80a2bbd67f..7c332c004f469fb47598121c3b828a48 // Paper start - fix and optimise world upgrading // copied from below public static ResourceKey getDimensionKey(DimensionType manager) { -@@ -1053,6 +1074,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1056,6 +1077,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { if (!this.preventPoiUpdated) { this.onBlockStateChange(blockposition, iblockdata1, iblockdata2); } @@ -76,7 +76,7 @@ index 763165618a47d9841bb8fc70651a4e80a2bbd67f..7c332c004f469fb47598121c3b828a48 // CraftBukkit end } } -@@ -1074,6 +1096,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1077,6 +1099,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { if (iblockdata.isAir()) { return false; } else { @@ -95,10 +95,10 @@ index 763165618a47d9841bb8fc70651a4e80a2bbd67f..7c332c004f469fb47598121c3b828a48 // Paper start - while the above setAir method is named same and looks very similar // they are NOT used with same intent and the above should not fire this event. The above method is more of a BlockSetToAirEvent, diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java -index 030b38d5d5d2578d6ef482a239ef58787efa3b08..329053cf5c342747985f9079e87edc6f883bfa1e 100644 +index 81d2140351775ad55546af52eb635ccdc8509d89..0ed9f6ae968c06e63e1431ed1ce153dd1e90e908 100644 --- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java +++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java -@@ -105,6 +105,15 @@ public class DoublePlantBlock extends BushBlock { +@@ -112,6 +112,15 @@ public class DoublePlantBlock extends BushBlock { BlockPos blockposition1 = pos.below(); BlockState iblockdata1 = world.getBlockState(blockposition1); @@ -115,10 +115,10 @@ index 030b38d5d5d2578d6ef482a239ef58787efa3b08..329053cf5c342747985f9079e87edc6f BlockState iblockdata2 = iblockdata1.getFluidState().is((Fluid) Fluids.WATER) ? Blocks.WATER.defaultBlockState() : Blocks.AIR.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index e6a4a5898ffdcb2aa2bc01371a6d7dbc06d610ce..204f0cd86a318efb3545a24c0e25a2f9cb7b9f58 100644 +index 3ab8b99837b1d1faea722c598b0228b2780be8b1..45bd7b9e684f71d9186a33277e5772dc7e04e9da 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -@@ -1175,11 +1175,22 @@ public abstract class BlockBehaviour implements FeatureElement { +@@ -1242,11 +1242,22 @@ public abstract class BlockBehaviour implements FeatureElement { BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); Direction[] aenumdirection = BlockBehaviour.UPDATE_SHAPE_ORDER; int k = aenumdirection.length; diff --git a/patches/server/0004-Add-provided-Material-to-getDrops.patch b/patches/server/0005-Add-provided-Material-to-getDrops.patch similarity index 85% rename from patches/server/0004-Add-provided-Material-to-getDrops.patch rename to patches/server/0005-Add-provided-Material-to-getDrops.patch index 11f6b9fe5..835a2cc7f 100644 --- a/patches/server/0004-Add-provided-Material-to-getDrops.patch +++ b/patches/server/0005-Add-provided-Material-to-getDrops.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add provided Material to getDrops diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index cb2826852ea38850eb0c553ab3b626253fd8e7a2..a65f1362bcdb064f3213830e9c9c7f9966ce4623 100644 +index 5b0a5c6ba424eeeb071f362f4ffc856b50dd7b2f..6b764644493accf8b17773120b39cc0c0b7f39d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -590,7 +590,18 @@ public class CraftBlock implements Block { +@@ -591,7 +591,18 @@ public class CraftBlock implements Block { @Override public Collection getDrops(ItemStack item, Entity entity) { @@ -28,7 +28,7 @@ index cb2826852ea38850eb0c553ab3b626253fd8e7a2..a65f1362bcdb064f3213830e9c9c7f99 net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item); // Modelled off EntityHuman#hasBlock -@@ -601,6 +612,7 @@ public class CraftBlock implements Block { +@@ -602,6 +613,7 @@ public class CraftBlock implements Block { return Collections.emptyList(); } } diff --git a/patches/server/0005-Add-Player-to-SpongeAbsorbEvent.patch b/patches/server/0006-Add-Player-to-SpongeAbsorbEvent.patch similarity index 88% rename from patches/server/0005-Add-Player-to-SpongeAbsorbEvent.patch rename to patches/server/0006-Add-Player-to-SpongeAbsorbEvent.patch index 48813dc2b..44966eb96 100644 --- a/patches/server/0005-Add-Player-to-SpongeAbsorbEvent.patch +++ b/patches/server/0006-Add-Player-to-SpongeAbsorbEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player to SpongeAbsorbEvent diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java -index d810f6bf9a8a354e5b8994e51ec3672428277dde..b5eb4718a96ab9abf700a156a23ec3e19757c9aa 100644 +index c4667bea0708d12e228ec2a4c84fcee7e48ca08c..ad2a9c6d91ebeda5bd9cffdf5471e19353348f65 100644 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java -@@ -107,7 +107,8 @@ public class SpongeBlock extends Block { +@@ -114,7 +114,8 @@ public class SpongeBlock extends Block { if (!blocks.isEmpty()) { final org.bukkit.block.Block bblock = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()); diff --git a/patches/server/0006-Add-World-Instance-flag.patch b/patches/server/0007-Add-World-Instance-flag.patch similarity index 84% rename from patches/server/0006-Add-World-Instance-flag.patch rename to patches/server/0007-Add-World-Instance-flag.patch index 65fe8833f..581be28c9 100644 --- a/patches/server/0006-Add-World-Instance-flag.patch +++ b/patches/server/0007-Add-World-Instance-flag.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add World Instance flag diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 584a768f2ce1c98a1de7749060c47f21721f9055..aad0d7662d530eaa9256de635401bbcde3263286 100644 +index 6041f1f5151f26d389f946d70f16e1de76db496b..a530dd1b15093803ffb87848f4c28dcf5da6476c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -224,6 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel { public final UUID uuid; public boolean hasPhysicsEvent = true; // Paper public boolean hasEntityMoveEvent = false; // Paper @@ -17,10 +17,10 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..aad0d7662d530eaa9256de635401bbcd public static Throwable getAddToWorldStackTrace(Entity entity) { final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 746f88db6b78b3c8ec372bfaacb26ec98f3b1163..b2b729c520f6b5dadc4d7bb72135c6da40d94b38 100644 +index 38d842bc0fb7d9c39a3673983a643248e9563fe2..7727a4322155c9b208f097bec751368c01671a07 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1288,6 +1288,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1301,6 +1301,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { this.world.noSave = !value; } diff --git a/patches/server/0007-Add-PlayerData-Events.patch b/patches/server/0008-Add-PlayerData-Events.patch similarity index 89% rename from patches/server/0007-Add-PlayerData-Events.patch rename to patches/server/0008-Add-PlayerData-Events.patch index 93d7532f9..5f939417c 100644 --- a/patches/server/0007-Add-PlayerData-Events.patch +++ b/patches/server/0008-Add-PlayerData-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerData Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 1d32eb837517f2b949613498b1a68c8b1edf0b9a..a31ea11234da240e56bbfd14725dd76295c8f338 100644 +index 4f00c2e8d6ff3a03a334542f699c5e35bfd03ce8..f31fc572413c2e1350adca3691316ac6b0d66fef 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -602,6 +602,8 @@ public class ServerPlayerGameMode { +@@ -603,6 +603,8 @@ public class ServerPlayerGameMode { enuminteractionresult1 = stack.useOn(itemactioncontext); } @@ -45,18 +45,18 @@ index 9bb8d4d7be6a937980aa653db82be084d066a563..9838435fbc31cfbba487d1e62ec5d2e7 private static ResourceLocation getKey(Stat stat) { diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java -index 36af81f0957d17e170d229059c66f4eb4539dfeb..e8d324a32838b69255ce48b1c03e47cd9e201da6 100644 +index b3a90d6ef0e17c236e0b3c46e2d0012671afdaa7..bb22635a8dc7d4e2030f50da62983119520a0b91 100644 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java -@@ -33,6 +33,7 @@ public class PlayerDataStorage { +@@ -36,6 +36,7 @@ public class PlayerDataStorage { public void save(Player player) { if (org.spigotmc.SpigotConfig.disablePlayerDataSaving) return; // Spigot + if (!new com.destroystokyo.paper.event.player.PlayerSaveDataEvent((org.bukkit.entity.Player) player.getBukkitEntity()).callEvent()) return; // Slice try { CompoundTag nbttagcompound = player.saveWithoutId(new CompoundTag()); - File file = File.createTempFile(player.getStringUUID() + "-", ".dat", this.playerDir); -@@ -52,32 +53,40 @@ public class PlayerDataStorage { + Path path = this.playerDir.toPath(); +@@ -56,33 +57,41 @@ public class PlayerDataStorage { public CompoundTag load(Player player) { CompoundTag nbttagcompound = null; @@ -95,14 +95,14 @@ index 36af81f0957d17e170d229059c66f4eb4539dfeb..e8d324a32838b69255ce48b1c03e47cd + // Spigot End - if (file.exists() && file.isFile()) { -- nbttagcompound = NbtIo.readCompressed(file); +- nbttagcompound = NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap()); - } - // Spigot Start - if ( usingWrongFile ) - { - file.renameTo( new File( file.getPath() + ".offline-read" ) ); + if (file.exists() && file.isFile()) { -+ nbttagcompound = NbtIo.readCompressed(file); ++ nbttagcompound = NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap()); + } + // Spigot Start + if (usingWrongFile) { @@ -115,7 +115,9 @@ index 36af81f0957d17e170d229059c66f4eb4539dfeb..e8d324a32838b69255ce48b1c03e47cd - // Spigot End - } catch (Exception exception) { - PlayerDataStorage.LOGGER.warn("Failed to load player data for {}", player.getName().getString()); -+ // Slice end - } +- } ++ } // Slice end ++ if (nbttagcompound != null) { + // CraftBukkit start diff --git a/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch b/patches/server/0009-Add-PlayerGetRespawnLocationEvent.patch similarity index 97% rename from patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch rename to patches/server/0009-Add-PlayerGetRespawnLocationEvent.patch index bd06ff2b5..42f88f7f8 100644 --- a/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch +++ b/patches/server/0009-Add-PlayerGetRespawnLocationEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerGetRespawnLocationEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 33abcf12b4426572b74ca4c813e4392c823494bc..3caf0774537a02d8ceeb9a5cf113bee290f1aef6 100644 +index e98a455b6bca9d094d0da323bddd7b3f2c07bb23..6977fb1024db3e709e5c83215bf886e7c04d5326 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -869,49 +869,57 @@ public abstract class PlayerList { +@@ -867,49 +867,57 @@ public abstract class PlayerList { // CraftBukkit start - fire PlayerRespawnEvent if (location == null) { diff --git a/patches/server/0009-Set-multiple-team-settings-at-once.patch b/patches/server/0010-Set-multiple-team-settings-at-once.patch similarity index 98% rename from patches/server/0009-Set-multiple-team-settings-at-once.patch rename to patches/server/0010-Set-multiple-team-settings-at-once.patch index 26591b623..3aa58fcfe 100644 --- a/patches/server/0009-Set-multiple-team-settings-at-once.patch +++ b/patches/server/0010-Set-multiple-team-settings-at-once.patch @@ -106,7 +106,7 @@ index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca50 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java -index 9c3520524cfb903da6a5401760394ec1b49a1825..a6809c3104d4a8fce89eb5056b445ae0517bf9a0 100644 +index fd86c1d43cccd036f60cb270b56fd33f95707720..9d81ae52f55db1c330ebe2daa2d4008ee9b845c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -341,6 +341,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { diff --git a/patches/server/0010-Smooth-Teleports.patch b/patches/server/0011-Smooth-Teleports.patch similarity index 86% rename from patches/server/0010-Smooth-Teleports.patch rename to patches/server/0011-Smooth-Teleports.patch index 5076438db..6655eea06 100644 --- a/patches/server/0010-Smooth-Teleports.patch +++ b/patches/server/0011-Smooth-Teleports.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Smooth Teleports diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f71a4a8307fb092d33545e12d253e0b80c884168..7f09801b4afd426d75c16dee88c31e1a16108fc1 100644 +index 0eb3384df396508c3d26d1e155cd0e6d64251346..1c3e41c9c849c6ba9fa4a8cd6950f99c28ceff92 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -274,6 +274,7 @@ public class ServerPlayer extends Player { - public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper +@@ -281,6 +281,7 @@ public class ServerPlayer extends Player { + public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper public @Nullable String clientBrandName = null; // Paper - Brand name public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event + public boolean smoothWorldTeleport; // Slice @@ -17,10 +17,10 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..7f09801b4afd426d75c16dee88c31e1a // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3caf0774537a02d8ceeb9a5cf113bee290f1aef6..98290d00c4f472afa5d6db4d6bfd99c30086ceb0 100644 +index 6977fb1024db3e709e5c83215bf886e7c04d5326..2d6a0e30e47e4df22fd9aba1aca0f1f0d03740d2 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -955,10 +955,10 @@ public abstract class PlayerList { +@@ -953,10 +953,10 @@ public abstract class PlayerList { ServerLevel worldserver2 = entityplayer1.serverLevel(); LevelData worlddata = worldserver2.getLevelData(); @@ -34,10 +34,10 @@ index 3caf0774537a02d8ceeb9a5cf113bee290f1aef6..98290d00c4f472afa5d6db4d6bfd99c3 entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked())); entityplayer1.connection.send(new ClientboundSetExperiencePacket(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel)); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 00bae5df87bcc1c75d4e2f430241579d3be82c11..eaaf8b52b72ad688f8df772b574a84c9ee8f8be8 100644 +index 2ec8b8f65661001716d1cb34dcc21cda7286e5d7..16734cf6cb5203a9d40be56672a698b761f8ce8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1246,6 +1246,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1267,6 +1267,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Paper end } diff --git a/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch b/patches/server/0012-Ignore-durability-changes-for-equipment-updates.patch similarity index 83% rename from patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch rename to patches/server/0012-Ignore-durability-changes-for-equipment-updates.patch index 384787122..8c111ba93 100644 --- a/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch +++ b/patches/server/0012-Ignore-durability-changes-for-equipment-updates.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Ignore durability changes for equipment updates diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a76eb3d051db0229ed088b71c92ff3f131449007..d5fe77692292055f71766546d2f283440cccd7d6 100644 +index bc908b75cb99536df658281ae7f8b4eeedbbedc9..edfd68dd73deb703efc6e7164a2af0cb8744a0bd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3161,7 +3161,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3166,7 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) { diff --git a/patches/server/0012-Disable-Azalea-generation.patch b/patches/server/0013-Disable-Azalea-generation.patch similarity index 92% rename from patches/server/0012-Disable-Azalea-generation.patch rename to patches/server/0013-Disable-Azalea-generation.patch index f6a15f331..6d4ad7d94 100644 --- a/patches/server/0012-Disable-Azalea-generation.patch +++ b/patches/server/0013-Disable-Azalea-generation.patch @@ -18,15 +18,15 @@ index b9b7d2e668d9f7f36ac3cf1e1716460c4ad5ed3a..9fdd765b65777a1a82b54326bc7ad152 builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CLASSIC_VINES); } diff --git a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java -index 3d899e4dbb96f64279485bbd5b708df88ddbfe8f..89f33b92dc8cfa22d1e1edbda1a31179743979e8 100644 +index c1f4a722b57bdc1ee516951c9341b146eb0fb34e..9d81f1e3e64edfcd5e8a2885dda3187386941cb8 100644 --- a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java +++ b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java @@ -110,7 +110,7 @@ public class CaveFeatures { RandomizedIntStateProvider randomizedIntStateProvider = new RandomizedIntStateProvider(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.CAVE_VINES.defaultBlockState(), 4).add(Blocks.CAVE_VINES.defaultBlockState().setValue(CaveVines.BERRIES, Boolean.valueOf(true)), 1)), CaveVinesBlock.AGE, UniformInt.of(23, 25)); FeatureUtils.register(featureRegisterable, CAVE_VINE, Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 19), 2).add(UniformInt.of(0, 2), 3).add(UniformInt.of(0, 6), 10).build()), weightedStateProvider), BlockColumnConfiguration.layer(ConstantInt.of(1), randomizedIntStateProvider)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true)); FeatureUtils.register(featureRegisterable, CAVE_VINE_IN_MOSS, Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 3), 5).add(UniformInt.of(1, 7), 1).build()), weightedStateProvider), BlockColumnConfiguration.layer(ConstantInt.of(1), randomizedIntStateProvider)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true)); -- FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.FLOWERING_AZALEA.defaultBlockState(), 4).add(Blocks.AZALEA.defaultBlockState(), 7).add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); -+ FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); +- FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.FLOWERING_AZALEA.defaultBlockState(), 4).add(Blocks.AZALEA.defaultBlockState(), 7).add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.SHORT_GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); ++ FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.SHORT_GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); FeatureUtils.register(featureRegisterable, MOSS_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.8F, UniformInt.of(4, 7), 0.3F)); FeatureUtils.register(featureRegisterable, MOSS_PATCH_BONEMEAL, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F)); FeatureUtils.register(featureRegisterable, DRIPLEAF, Feature.SIMPLE_RANDOM_SELECTOR, new SimpleRandomFeatureConfiguration(HolderSet.direct(makeSmallDripleaf(), makeDripleaf(Direction.EAST), makeDripleaf(Direction.WEST), makeDripleaf(Direction.SOUTH), makeDripleaf(Direction.NORTH)))); diff --git a/patches/server/0013-AntiXray-Bypass.patch b/patches/server/0014-AntiXray-Bypass.patch similarity index 76% rename from patches/server/0013-AntiXray-Bypass.patch rename to patches/server/0014-AntiXray-Bypass.patch index 2c89da1f8..1d3e43590 100644 --- a/patches/server/0013-AntiXray-Bypass.patch +++ b/patches/server/0014-AntiXray-Bypass.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AntiXray Bypass diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java -index 42fdce97d99618a53f2e9c51804ff2205b574f69..7e8d58e3481be2d7ebbe5fe388d61932479e7721 100644 +index e7fe98ea30ae6d0baea3ec1f9f98a89502a49a12..7e2651aa63cc9ddbe28fb9ecbc5188358d52e607 100644 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java -@@ -165,6 +165,7 @@ public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockCo +@@ -169,6 +169,7 @@ public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockCo @Override public boolean shouldModify(ServerPlayer player, LevelChunk chunk) { @@ -17,18 +17,18 @@ index 42fdce97d99618a53f2e9c51804ff2205b574f69..7e8d58e3481be2d7ebbe5fe388d61932 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eaaf8b52b72ad688f8df772b574a84c9ee8f8be8..4e4b77587aaa19d69fad9d15e97330b55ea97a8e 100644 +index 16734cf6cb5203a9d40be56672a698b761f8ce8a..7af85d92f87a645b35ffcb1ebf934b7fcfe0ec7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -198,6 +198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -193,6 +193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus; // Paper - more resource pack API private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit - private long lastSaveTime; - // Paper end + private long lastSaveTime; // Paper - getLastPlayed replacement API + private boolean antiXrayBypass; // Slice public CraftPlayer(CraftServer server, ServerPlayer entity) { super(server, entity); -@@ -2835,6 +2836,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2924,6 +2925,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } // Paper end diff --git a/patches/server/0014-Add-PlayerPreChunkLoadEvent.patch b/patches/server/0015-Add-PlayerPreChunkLoadEvent.patch similarity index 91% rename from patches/server/0014-Add-PlayerPreChunkLoadEvent.patch rename to patches/server/0015-Add-PlayerPreChunkLoadEvent.patch index 15877624f..049132cd1 100644 --- a/patches/server/0014-Add-PlayerPreChunkLoadEvent.patch +++ b/patches/server/0015-Add-PlayerPreChunkLoadEvent.patch @@ -18,10 +18,10 @@ index 1b090f1e79b996e52097afc49c1cec85936653e6..5185bcbf5363fa2c7e2b0226706cc66d private static final byte CHUNK_TICKET_STAGE_NONE = 0; private static final byte CHUNK_TICKET_STAGE_LOADING = 1; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b2b729c520f6b5dadc4d7bb72135c6da40d94b38..11f516e89a6d219033464b774e32dc59632fd5b2 100644 +index 7727a4322155c9b208f097bec751368c01671a07..88507e50e1fd0e9e8bfb124d0162db15e0d046a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -530,6 +530,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -538,6 +538,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { return true; } diff --git a/patches/server/0015-Allow-opening-covered-chests.patch b/patches/server/0016-Allow-opening-covered-chests.patch similarity index 87% rename from patches/server/0015-Allow-opening-covered-chests.patch rename to patches/server/0016-Allow-opening-covered-chests.patch index c74886c42..b0e974d13 100644 --- a/patches/server/0015-Allow-opening-covered-chests.patch +++ b/patches/server/0016-Allow-opening-covered-chests.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow opening covered chests diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -index 5e22d175b1048a58802cdf64ac70a8b56329e915..0f15e574b5c0cc8648bc1c0a12f1c72aa8653724 100644 +index 9804ee2020e5cef23d3f5174d153fc149e611503..8baeb4cb4a6e24e8099a0a98779dc50073d5d0b4 100644 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -@@ -355,9 +355,10 @@ public class ChestBlock extends AbstractChestBlock implements +@@ -358,9 +358,10 @@ public class ChestBlock extends AbstractChestBlock implements } private static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) { @@ -23,10 +23,10 @@ index 5e22d175b1048a58802cdf64ac70a8b56329e915..0f15e574b5c0cc8648bc1c0a12f1c72a private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) { diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java -index 7385e91f32f070e86a4e0fd3d214f55d832c7979..4911b099f865b9202286f51087e5c00ffeaa95a5 100644 +index ddca14f1224327a738415fb8b37398d8df0aa9c8..cfd9bfd30d4b1787dacc95215e823603537131fd 100644 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java -@@ -76,10 +76,10 @@ public class EnderChestBlock extends AbstractChestBlock i +@@ -83,10 +83,10 @@ public class EnderChestBlock extends AbstractChestBlock i PlayerEnderChestContainer playerEnderChestContainer = player.getEnderChestInventory(); BlockEntity blockEntity = world.getBlockEntity(pos); if (playerEnderChestContainer != null && blockEntity instanceof EnderChestBlockEntity) { diff --git a/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch b/patches/server/0017-Don-t-send-fire-packets-if-player-has-FR.patch similarity index 83% rename from patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch rename to patches/server/0017-Don-t-send-fire-packets-if-player-has-FR.patch index edc4c9cf1..b9a8bcd30 100644 --- a/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch +++ b/patches/server/0017-Don-t-send-fire-packets-if-player-has-FR.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't send fire packets if player has FR diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1e05fca2a2ba6e2c0b641b6e27585520889cd8a6..067bfc5414ad69916624aa635e475b6cac8517df 100644 +index 0c46a4aeafd03fbbfd590b0362d41bf2b1d5ca74..91fc0da2cc01c24f9d69ef008a8f6a79c6eaaa5e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -868,7 +868,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -872,7 +872,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S this.checkBelowWorld(); if (!this.level().isClientSide) { diff --git a/patches/server/0017-Allow-access-to-LightEngine.patch b/patches/server/0018-Allow-access-to-LightEngine.patch similarity index 81% rename from patches/server/0017-Allow-access-to-LightEngine.patch rename to patches/server/0018-Allow-access-to-LightEngine.patch index 68ada773a..fcf1adc64 100644 --- a/patches/server/0017-Allow-access-to-LightEngine.patch +++ b/patches/server/0018-Allow-access-to-LightEngine.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow access to LightEngine diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index caa73632aee15583c6b6ed12a668c8f49b794708..f4b82c5506308aacba10a421afc284913a04099b 100644 +index d9cd497bc1b654030ff1a597f038b6a881df9f6b..4407f04904af9b17987ce595cc8b6e9e129ccec7 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -436,7 +436,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -435,7 +435,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Paper end - rewrite player chunk loader } diff --git a/patches/server/0018-Disable-geode-and-monsterspawners-generation.patch b/patches/server/0019-Disable-geode-and-monsterspawners-generation.patch similarity index 100% rename from patches/server/0018-Disable-geode-and-monsterspawners-generation.patch rename to patches/server/0019-Disable-geode-and-monsterspawners-generation.patch diff --git a/patches/server/0019-Set-Mutton-nutrition-equal-to-beef.patch b/patches/server/0020-Set-Mutton-nutrition-equal-to-beef.patch similarity index 100% rename from patches/server/0019-Set-Mutton-nutrition-equal-to-beef.patch rename to patches/server/0020-Set-Mutton-nutrition-equal-to-beef.patch diff --git a/patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch b/patches/server/0022-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch similarity index 57% rename from patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch rename to patches/server/0022-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch index 913c8c9f2..42185c37c 100644 --- a/patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch +++ b/patches/server/0022-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Force Crit to PlayerPreAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index d58b4c0dbe651b5068212e5f14dce3164ee520f5..32d6615ea73c1c149049d16dfd1b395621ad634b 100644 +index 3e597833b57377b855505b8a0f2744801c791f90..04a68a4f0c642984bd2b95bfb0d7d2bd887d18f0 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1283,10 +1283,11 @@ public abstract class Player extends LivingEntity { +@@ -1278,10 +1278,11 @@ public abstract class Player extends LivingEntity { flag1 = true; } @@ -23,31 +23,3 @@ index d58b4c0dbe651b5068212e5f14dce3164ee520f5..32d6615ea73c1c149049d16dfd1b3956 if (flag2) { f *= 1.5F; } -@@ -2413,27 +2414,6 @@ public abstract class Player extends LivingEntity { - this.lastDeathLocation = lastDeathPos; - } - -- @Override -- public float getHurtDir() { -- return this.hurtDir; -- } -- -- @Override -- public void animateHurt(float yaw) { -- super.animateHurt(yaw); -- this.hurtDir = yaw; -- } -- -- @Override -- public boolean canSprint() { -- return true; -- } -- -- @Override -- protected float getFlyingSpeed() { -- return this.abilities.flying && !this.isPassenger() ? (this.isSprinting() ? this.abilities.getFlyingSpeed() * 2.0F : this.abilities.getFlyingSpeed()) : (this.isSprinting() ? 0.025999999F : 0.02F); -- } -- - public static enum BedSleepingProblem { - - NOT_POSSIBLE_HERE, NOT_POSSIBLE_NOW(Component.translatable("block.minecraft.bed.no_sleep")), TOO_FAR_AWAY(Component.translatable("block.minecraft.bed.too_far_away")), OBSTRUCTED(Component.translatable("block.minecraft.bed.obstructed")), OTHER_PROBLEM, NOT_SAFE(Component.translatable("block.minecraft.bed.not_safe")); diff --git a/patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch b/patches/server/0023-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch similarity index 88% rename from patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch rename to patches/server/0023-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch index 9ef459d39..0c361efa3 100644 --- a/patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch +++ b/patches/server/0023-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Preventing KB Bonus to PlayerPreAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 32d6615ea73c1c149049d16dfd1b395621ad634b..0325086157b846da7da0ca291fd33c55fc91f229 100644 +index 04a68a4f0c642984bd2b95bfb0d7d2bd887d18f0..c12b9b70d093217c9c796663341edcfa7fd29932 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1275,7 +1275,11 @@ public abstract class Player extends LivingEntity { +@@ -1270,7 +1270,11 @@ public abstract class Player extends LivingEntity { boolean flag = f2 > 0.9F; boolean flag1 = false; byte b0 = 0; diff --git a/patches/server/0023-noEntityCollisions-for-Entity.patch b/patches/server/0024-noEntityCollisions-for-Entity.patch similarity index 71% rename from patches/server/0023-noEntityCollisions-for-Entity.patch rename to patches/server/0024-noEntityCollisions-for-Entity.patch index 1a0da9142..fa9953e6c 100644 --- a/patches/server/0023-noEntityCollisions-for-Entity.patch +++ b/patches/server/0024-noEntityCollisions-for-Entity.patch @@ -5,22 +5,23 @@ Subject: [PATCH] noEntityCollisions for Entity diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java -index bfb1de19f53d5d7c7b65e25a606fabfa416706b3..63262cc017b15b076f27143309b3e38c48289261 100644 +index ee0331a6bc40cdde08d926fd8eb1dc642630c2e5..d1094f6a61976a81f400ab5b2b604f9608209b28 100644 --- a/src/main/java/io/papermc/paper/util/CollisionUtil.java +++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java -@@ -1777,6 +1777,7 @@ public final class CollisionUtil { - +@@ -1753,7 +1753,7 @@ public final class CollisionUtil { public static boolean getEntityHardCollisions(final CollisionGetter getter, final Entity entity, AABB aabb, final List into, final int collisionFlags, final Predicate predicate) { -+ if (entity != null && entity.noEntityCollisions) return false; // Slice final boolean checkOnly = (collisionFlags & COLLISION_FLAG_CHECK_ONLY) != 0; - if (!(getter instanceof EntityGetter entityGetter)) { +- if (!(getter instanceof EntityGetter entityGetter)) { ++ if ((entity != null && entity.noEntityCollisions) || !(getter instanceof EntityGetter entityGetter)) { return false; + } + diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 067bfc5414ad69916624aa635e475b6cac8517df..c2e0a83819a0ea553f1206d364a111c7c127bc18 100644 +index 91fc0da2cc01c24f9d69ef008a8f6a79c6eaaa5e..25c28dd37e729627739c91e929c208f6aa2539c0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -453,6 +453,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -457,6 +457,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S * Overriding this field will cause memory leaks. */ private final boolean hardCollides; diff --git a/patches/server/0024-Do-not-freeze-MappedRegistry.patch b/patches/server/0025-Do-not-freeze-MappedRegistry.patch similarity index 87% rename from patches/server/0024-Do-not-freeze-MappedRegistry.patch rename to patches/server/0025-Do-not-freeze-MappedRegistry.patch index a10b5a8f0..52fdebd91 100644 --- a/patches/server/0024-Do-not-freeze-MappedRegistry.patch +++ b/patches/server/0025-Do-not-freeze-MappedRegistry.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not freeze MappedRegistry diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java -index 26b92e27de1f079ab8440538c65377ed80e8b6ef..2a52ba73849b3f1f86ab4a5c41fcaf65ad452e41 100644 +index 742af4feb3986ca7d8f5ed136b556a41cbe0722f..d8fd0627b781e4b66ad0882304ec417fbb5c9b20 100644 --- a/src/main/java/net/minecraft/core/MappedRegistry.java +++ b/src/main/java/net/minecraft/core/MappedRegistry.java -@@ -337,7 +337,7 @@ public class MappedRegistry implements WritableRegistry { +@@ -334,7 +334,7 @@ public class MappedRegistry implements WritableRegistry { if (this.frozen) { return this; } else { @@ -17,7 +17,7 @@ index 26b92e27de1f079ab8440538c65377ed80e8b6ef..2a52ba73849b3f1f86ab4a5c41fcaf65 this.byValue.forEach((value, entry) -> { entry.bindValue(value); }); -@@ -364,14 +364,16 @@ public class MappedRegistry implements WritableRegistry { +@@ -361,14 +361,16 @@ public class MappedRegistry implements WritableRegistry { @Override public Holder.Reference createIntrusiveHolder(T value) { diff --git a/patches/server/0025-Add-jackson.patch b/patches/server/0026-Add-jackson.patch similarity index 89% rename from patches/server/0025-Add-jackson.patch rename to patches/server/0026-Add-jackson.patch index 042d7084a..81755dd6c 100644 --- a/patches/server/0025-Add-jackson.patch +++ b/patches/server/0026-Add-jackson.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add jackson diff --git a/build.gradle.kts b/build.gradle.kts -index 2e1cea360bb6ff85eb8da54237bc407653eb91f6..475cbb6120655419fc7dc51292e6beedfe778656 100644 +index f9df4ced9b313333102d5f76dff20841a789e53f..1d78ff5def3357c4b4fed3e6b66f092c237c1a0b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,6 +19,13 @@ dependencies { diff --git a/patches/server/0026-Maybe-can-t-tostring.patch b/patches/server/0027-Maybe-can-t-tostring.patch similarity index 86% rename from patches/server/0026-Maybe-can-t-tostring.patch rename to patches/server/0027-Maybe-can-t-tostring.patch index edac1b435..ee735380a 100644 --- a/patches/server/0026-Maybe-can-t-tostring.patch +++ b/patches/server/0027-Maybe-can-t-tostring.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Maybe can't tostring? diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java -index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..f088d316aac7626204cff330f90468d89ac3581b 100644 +index e464ada187fd1f15efef29a0e5033aeb0c688059..b2e800c653ba423e40de734218a8e4a020069076 100644 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java -@@ -503,6 +503,9 @@ public class CompoundTag implements Tag { +@@ -507,6 +507,9 @@ public class CompoundTag implements Tag { @Override public CompoundTag copy() { // Paper start - reduce memory footprint of NBTTagCompound @@ -19,10 +19,10 @@ index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..f088d316aac7626204cff330f90468d8 java.util.Iterator> iterator = (this.tags instanceof it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) ? ((it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap)this.tags).object2ObjectEntrySet().fastIterator() : this.tags.entrySet().iterator(); while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index e30aaa502f5e98b5658a0dd78853e865cbf91f96..c9cd6d3a3678ec38fbfb9ca3975d2ddbe2ce2881 100644 +index 625a852db818d95365ad7ae56e6b1de541bbdada..f721dd923711d65338820642dfca89ab8022e9a5 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -742,7 +742,11 @@ public final class ItemStack { +@@ -765,7 +765,11 @@ public final class ItemStack { itemstack.setPopTime(this.getPopTime()); if (this.tag != null) { diff --git a/patches/server/0027-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0028-Allow-inventory-clicks-in-Spectator.patch similarity index 88% rename from patches/server/0027-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0028-Allow-inventory-clicks-in-Spectator.patch index 73043b9a4..61456b2b8 100644 --- a/patches/server/0027-Allow-inventory-clicks-in-Spectator.patch +++ b/patches/server/0028-Allow-inventory-clicks-in-Spectator.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow inventory clicks in Spectator diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8bd243a8d5a4be54f907af2b02e96ea833cee62f..e93738332eaef720abb303b382f902c95aa87d72 100644 +index 30ccbab1586a656e0ae41d7406525fb02d9e025b..31f6914f1b254aa568801e94a0d523f2aa2ad65c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2873,7 +2873,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2876,7 +2876,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl if (this.player.isImmobile()) return; // CraftBukkit this.player.resetLastActionTime(); if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit diff --git a/patches/server/0028-Packet-obfuscation-and-reduction.patch b/patches/server/0029-Packet-obfuscation-and-reduction.patch similarity index 92% rename from patches/server/0028-Packet-obfuscation-and-reduction.patch rename to patches/server/0029-Packet-obfuscation-and-reduction.patch index e70b385a5..45aa1706f 100644 --- a/patches/server/0028-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0029-Packet-obfuscation-and-reduction.patch @@ -144,10 +144,10 @@ index 35674f92a67f93382103c2766df4b678ba5c862f..97dbcb6f527bd5c567e77200d7f6cbc1 if (this.entity instanceof LivingEntity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c2e0a83819a0ea553f1206d364a111c7c127bc18..6f60cadb034de8bbe52351a100916879ca98d977 100644 +index 25c28dd37e729627739c91e929c208f6aa2539c0..34f3ddb22febc0aea7d3059b2cbbd84554fd03b4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3334,7 +3334,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3384,7 +3384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID); return; } @@ -157,10 +157,10 @@ index c2e0a83819a0ea553f1206d364a111c7c127bc18..6f60cadb034de8bbe52351a100916879 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d5fe77692292055f71766546d2f283440cccd7d6..1625dea60a5880b04b34d36732370e65ab86e528 100644 +index edfd68dd73deb703efc6e7164a2af0cb8744a0bd..3c453de303422f96abf3aa67fa23523dd71327cb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3161,7 +3161,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3166,7 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) { @@ -170,10 +170,10 @@ index d5fe77692292055f71766546d2f283440cccd7d6..1625dea60a5880b04b34d36732370e65 private void handleHandSwap(Map equipmentChanges) { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index a969ced38fb6cdc4e27f5a4430a4ec98279d9525..69968dff14c08a37a723ecd39c75f6981353df09 100644 +index c12b9b70d093217c9c796663341edcfa7fd29932..88873231244f3d6e36a3e0aae957cb3af2048b8d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -649,7 +649,7 @@ public abstract class Player extends LivingEntity { +@@ -644,7 +644,7 @@ public abstract class Player extends LivingEntity { public void increaseScore(int score) { int j = this.getScore(); @@ -183,10 +183,10 @@ index a969ced38fb6cdc4e27f5a4430a4ec98279d9525..69968dff14c08a37a723ecd39c75f698 public void startAutoSpinAttack(int riptideTicks) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4e4b77587aaa19d69fad9d15e97330b55ea97a8e..3634519803bb755fa0fde91500223c365a1b8ca1 100644 +index 7af85d92f87a645b35ffcb1ebf934b7fcfe0ec7b..c46cb9bbc1b7e8f6febb2ea93082d7d90ed78867 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2599,7 +2599,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2727,7 +2727,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.sendHealthUpdate(); } } diff --git a/patches/server/0029-Long-distance-tracking.patch b/patches/server/0030-Long-distance-tracking.patch similarity index 90% rename from patches/server/0029-Long-distance-tracking.patch rename to patches/server/0030-Long-distance-tracking.patch index 5120c7107..be7f33c8f 100644 --- a/patches/server/0029-Long-distance-tracking.patch +++ b/patches/server/0030-Long-distance-tracking.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Long distance tracking diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f4b82c5506308aacba10a421afc284913a04099b..3ad804d7f5b018757a218547e25b9bf53ecfa78d 100644 +index 4407f04904af9b17987ce595cc8b6e9e129ccec7..2d97c4445bd172a901c8dcf144b03081e0679468 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1422,6 +1422,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1421,6 +1421,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider Vec3 vec3d = player.position().subtract(this.entity.position()); int i = ChunkMap.this.getPlayerViewDistance(player); double d0 = (double) Math.min(this.getEffectiveRange(), i * 16); @@ -17,10 +17,10 @@ index f4b82c5506308aacba10a421afc284913a04099b..3ad804d7f5b018757a218547e25b9bf5 double d2 = d0 * d0; boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7f09801b4afd426d75c16dee88c31e1a16108fc1..702ca0b220e5f81702c3cc8e7b4797be22de9235 100644 +index 1c3e41c9c849c6ba9fa4a8cd6950f99c28ceff92..7a9805d6c4335092bbabb68b3678a8e78b7d406f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -275,6 +275,7 @@ public class ServerPlayer extends Player { +@@ -282,6 +282,7 @@ public class ServerPlayer extends Player { public @Nullable String clientBrandName = null; // Paper - Brand name public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event public boolean smoothWorldTeleport; // Slice @@ -28,7 +28,7 @@ index 7f09801b4afd426d75c16dee88c31e1a16108fc1..702ca0b220e5f81702c3cc8e7b4797be // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); -@@ -2657,4 +2658,18 @@ public class ServerPlayer extends Player { +@@ -2757,4 +2758,18 @@ public class ServerPlayer extends Player { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end @@ -48,7 +48,7 @@ index 7f09801b4afd426d75c16dee88c31e1a16108fc1..702ca0b220e5f81702c3cc8e7b4797be + // Slice end } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index f9b8e2bc039f1a37e47f84909c8785f3ef530284..bfa02a3698a347c55f0fff351ac24e831403cb56 100644 +index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..6dab8b76bef3c97936fc337e813bcb60c7f2026d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -271,6 +271,7 @@ public class SpigotWorldConfig diff --git a/patches/server/0038-Non-saveable-entities.patch b/patches/server/0038-Non-saveable-entities.patch new file mode 100644 index 000000000..87d6d5f8a --- /dev/null +++ b/patches/server/0038-Non-saveable-entities.patch @@ -0,0 +1,61 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Sat, 21 Oct 2023 11:27:52 -0500 +Subject: [PATCH] Non-saveable entities + + +diff --git a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java +index 7e8dc9e8f381abfdcce2746edc93122d623622d1..303e5ed4d5cf2a64b998656bfd189f19f8c8fcde 100644 +--- a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java ++++ b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java +@@ -118,7 +118,7 @@ public final class ChunkEntitySlices { + // removed by us below + continue; + } +- if (entity.shouldBeSaved()) { ++ if (entity.shouldBeSaved() || !entity.saveable) { // Slice + entity.setRemoved(Entity.RemovalReason.UNLOADED_TO_CHUNK); + if (entity.isVehicle()) { + // we cannot assume that these entities are contained within this chunk, because entities can +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index 34f3ddb22febc0aea7d3059b2cbbd84554fd03b4..a6db17c51d6b8e58936e52e7f6cbe07dcebd5418 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S + private UUID originWorld; + public boolean freezeLocked = false; // Paper - Freeze Tick Lock API + public boolean fixedPose = false; // Paper ++ public boolean saveable = true; // Slice + + public void setOrigin(@javax.annotation.Nonnull Location location) { + this.origin = location.toVector(); +@@ -4819,7 +4820,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S + + @Override + public boolean shouldBeSaved() { +- return this.removalReason != null && !this.removalReason.shouldSave() ? false : (this.isPassenger() ? false : !this.isVehicle() || !this.hasAnyPlayerPassengers()); // Paper - rewrite chunk system - it should check if the entity has ANY player passengers ++ return this.saveable && this.removalReason != null && !this.removalReason.shouldSave() ? false : (this.isPassenger() ? false : !this.isVehicle() || !this.hasAnyPlayerPassengers()); // Paper - rewrite chunk system - it should check if the entity has ANY player passengers // Slice - add saveable check + } + + @Override +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +index 1c3e1153d08b59d29b3613fc3b50a4780aa7a3ac..19c56ef79cacfb6d65dea5741d9ce71998c1eacc 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +@@ -1227,4 +1227,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + return this.getHandle().getScoreboardName(); + } + // Paper end - entity scoreboard name ++ ++ // Slice start ++ @Override ++ public boolean isSaveable() { ++ return this.entity.saveable; ++ } ++ ++ @Override ++ public void setSaveable(boolean saveable) { ++ this.entity.saveable = saveable; ++ } ++ // Slice end + } diff --git a/patches/server/0040-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0040-Disable-sending-Entity-Movement-Packets.patch new file mode 100644 index 000000000..384be094e --- /dev/null +++ b/patches/server/0040-Disable-sending-Entity-Movement-Packets.patch @@ -0,0 +1,49 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Wed, 25 Oct 2023 17:05:29 -0500 +Subject: [PATCH] Disable sending Entity Movement Packets + + +diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java +index 97dbcb6f527bd5c567e77200d7f6cbc1abb15792..fa4e0bcf752693c34aff8b53aea3eeaa65834fc1 100644 +--- a/src/main/java/net/minecraft/server/level/ServerEntity.java ++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java +@@ -151,7 +151,7 @@ public class ServerEntity { + boolean flag = Math.abs(i - this.yRotp) >= 1 || Math.abs(j - this.xRotp) >= 1; + + if (flag) { +- this.broadcast.accept(new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround())); ++ if (entity.sendMovementPackets) this.broadcast.accept(new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround())); // Slice + this.yRotp = i; + this.xRotp = j; + } +@@ -180,14 +180,14 @@ public class ServerEntity { + if (!flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.onGround()&& !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync + if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) { + if (flag2) { +- packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround()); ++ if (entity.sendMovementPackets) packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround()); // Slice + flag4 = true; + } else if (flag3) { +- packet1 = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround()); ++ if (entity.sendMovementPackets) packet1 = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround()); // Slice + flag5 = true; + } + } else { +- packet1 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), (byte) i, (byte) j, this.entity.onGround()); ++ if (entity.sendMovementPackets) packet1 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), (byte) i, (byte) j, this.entity.onGround()); // Slice + flag4 = true; + flag5 = true; + } +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index a6db17c51d6b8e58936e52e7f6cbe07dcebd5418..1c75f943055b27d435ba36275fa7cd704e7a7b1a 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -423,6 +423,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S + public boolean freezeLocked = false; // Paper - Freeze Tick Lock API + public boolean fixedPose = false; // Paper + public boolean saveable = true; // Slice ++ public boolean sendMovementPackets = true; // Slice + + public void setOrigin(@javax.annotation.Nonnull Location location) { + this.origin = location.toVector(); diff --git a/patches/server/0041-Player-spawnsOwnMobs.patch b/patches/server/0041-Player-spawnsOwnMobs.patch new file mode 100644 index 000000000..b9e6ac1d0 --- /dev/null +++ b/patches/server/0041-Player-spawnsOwnMobs.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Thu, 7 Dec 2023 08:48:41 -0600 +Subject: [PATCH] Player spawnsOwnMobs + + +diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +index 44ada45d9bf2d9b48e5de1c3cb1a855902f3884b..9c5be1f0fd4d6cb62e7bc7faa8fa4c4e5879ab4e 100644 +--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java ++++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +@@ -557,7 +557,7 @@ public class ServerChunkCache extends ChunkSource { + // Paper start - optimise chunk tick iteration + ChunkMap playerChunkMap = this.chunkMap; + for (ServerPlayer player : this.level.players) { +- if (!player.affectsSpawning || player.isSpectator()) { ++ if (!player.affectsSpawning || player.isSpectator() || player.spawnsOwnMobs) { + playerChunkMap.playerMobSpawnMap.remove(player); + player.playerNaturallySpawnedEvent = null; + player.lastEntitySpawnRadiusSquared = -1.0; +diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java +index 88873231244f3d6e36a3e0aae957cb3af2048b8d..a0b6df7d86345f8a7269ca9cfcec6717b213adfd 100644 +--- a/src/main/java/net/minecraft/world/entity/player/Player.java ++++ b/src/main/java/net/minecraft/world/entity/player/Player.java +@@ -184,6 +184,8 @@ public abstract class Player extends LivingEntity { + public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; + // Paper end + ++ public boolean spawnsOwnMobs = false; // Slice ++ + // CraftBukkit start + public boolean fauxSleeping; + public int oldLevel = -1; diff --git a/patches/server/0042-Set-location-on-a-Custom-Inventory.patch b/patches/server/0042-Set-location-on-a-Custom-Inventory.patch new file mode 100644 index 000000000..0e7d27783 --- /dev/null +++ b/patches/server/0042-Set-location-on-a-Custom-Inventory.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Fri, 8 Dec 2023 08:02:07 -0600 +Subject: [PATCH] Set location on a Custom Inventory + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java +index da1c1fe0faf6819b15a81d6ad53370948e5f984f..84eff85e98484c9701e203bb1fa61435ee88bab4 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java +@@ -69,6 +69,14 @@ public class CraftInventoryCustom extends CraftInventory { + } + // Paper end + ++ // Slice start ++ public void setLocation(Location location) { ++ if (this.inventory instanceof MinecraftInventory minecraftInventory) { ++ minecraftInventory.location = location; ++ } ++ } ++ // Slice end ++ + static class MinecraftInventory implements Container { + private final NonNullList items; + private int maxStack = MAX_STACK; +@@ -77,6 +85,7 @@ public class CraftInventoryCustom extends CraftInventory { + private final net.kyori.adventure.text.Component adventure$title; // Paper + private InventoryType type; + private final InventoryHolder owner; ++ private Location location; // Slice + + // Paper start + public MinecraftInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) { +@@ -239,7 +248,7 @@ public class CraftInventoryCustom extends CraftInventory { + + @Override + public Location getLocation() { +- return null; ++ return location; + } + + // Paper start diff --git a/patches/server/0043-Affinity-Test.patch b/patches/server/0043-Affinity-Test.patch new file mode 100644 index 000000000..52e8853a1 --- /dev/null +++ b/patches/server/0043-Affinity-Test.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Mon, 11 Dec 2023 11:09:16 -0600 +Subject: [PATCH] Affinity Test + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 1d78ff5def3357c4b4fed3e6b66f092c237c1a0b..aff13fbe60cc6970227f86a1d451d88f71f1b346 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -26,6 +26,9 @@ dependencies { + implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.0") + // Slice end + ++ // https://mvnrepository.com/artifact/net.openhft/Java-Thread-Affinity ++ implementation("net.openhft:affinity:3.23.3") ++ + // Paper start + implementation("org.jline:jline-terminal-jansi:3.21.0") + implementation("net.minecrell:terminalconsoleappender:1.3.0")