Update to Minecraft 1.19

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/grower/WorldGenTreeProvider.java
+++ b/net/minecraft/world/level/block/grower/WorldGenTreeProvider.java
@@ -13,6 +13,12 @@
@@ -12,6 +12,12 @@
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.feature.WorldGenFeatureConfigured;
@@ -13,15 +13,15 @@
public abstract class WorldGenTreeProvider {
public WorldGenTreeProvider() {}
@@ -26,6 +32,7 @@
@@ -25,6 +31,7 @@
if (holder == null) {
return false;
} else {
+ setTreeType(holder); // CraftBukkit
WorldGenFeatureConfigured<?, ?> worldgenfeatureconfigured = (WorldGenFeatureConfigured) holder.value();
IBlockData iblockdata1 = worldserver.getFluidState(blockposition).createLegacyBlock();
worldserver.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 4);
@@ -53,4 +60,48 @@
@@ -57,4 +64,52 @@
return true;
}
@@ -64,6 +64,10 @@
+ BlockSapling.treeType = TreeType.JUNGLE;
+ } else if (worldgentreeabstract == TreeFeatures.AZALEA_TREE) {
+ BlockSapling.treeType = TreeType.AZALEA;
+ } else if (worldgentreeabstract == TreeFeatures.MANGROVE) {
+ BlockSapling.treeType = TreeType.MANGROVE;
+ } else if (worldgentreeabstract == TreeFeatures.TALL_MANGROVE) {
+ BlockSapling.treeType = TreeType.TALL_MANGROVE;
+ } else {
+ throw new IllegalArgumentException("Unknown tree generator " + worldgentreeabstract);
+ }