SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
paper-server/nms-patches/WorldGenTreeProvider.patch
View File

@@ -9,38 +9,54 @@
public abstract class WorldGenTreeProvider {
@@ -16,6 +17,7 @@
if (worldgentreeabstract == null) {
if (worldgenfeatureconfigured == null) {
return false;
} else {
+ setTreeType(worldgentreeabstract); // CraftBukkit
+ setTreeType(worldgenfeatureconfigured); // CraftBukkit
generatoraccess.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 4);
if (worldgentreeabstract.generate(generatoraccess, generatoraccess.getChunkProvider().getChunkGenerator(), random, blockposition, WorldGenFeatureConfiguration.e)) {
return true;
@@ -25,4 +27,30 @@
((WorldGenFeatureSmallTreeConfigurationConfiguration) worldgenfeatureconfigured.c).a();
if (worldgenfeatureconfigured.a(generatoraccess, chunkgenerator, random, blockposition)) {
@@ -26,4 +28,46 @@
}
}
}
+
+ // CraftBukkit start
+ protected void setTreeType(WorldGenTreeAbstract worldgentreeabstract) {
+ if (worldgentreeabstract instanceof WorldGenAcaciaTree) {
+ BlockSapling.treeType = TreeType.ACACIA;
+ } else if (worldgentreeabstract instanceof WorldGenBigTree) {
+ BlockSapling.treeType = TreeType.BIG_TREE;
+ } else if (worldgentreeabstract instanceof WorldGenForest) {
+ BlockSapling.treeType = TreeType.BIRCH;
+ } else if (worldgentreeabstract instanceof WorldGenForestTree) {
+ BlockSapling.treeType = TreeType.DARK_OAK;
+ } else if (worldgentreeabstract instanceof WorldGenJungleTree) {
+ BlockSapling.treeType = TreeType.JUNGLE;
+ } else if (worldgentreeabstract instanceof WorldGenMegaTree) {
+ BlockSapling.treeType = TreeType.MEGA_REDWOOD;
+ } else if (worldgentreeabstract instanceof WorldGenTaiga1) {
+ BlockSapling.treeType = TreeType.REDWOOD;
+ } else if (worldgentreeabstract instanceof WorldGenTaiga2) {
+ BlockSapling.treeType = TreeType.REDWOOD;
+ } else if (worldgentreeabstract instanceof WorldGenTrees) {
+ protected void setTreeType(WorldGenFeatureConfigured<?, ?> worldgentreeabstract) {
+ if (worldgentreeabstract.c == BiomeDecoratorGroups.NORMAL_TREE) {
+ BlockSapling.treeType = TreeType.TREE;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.HUGE_RED_MUSHROOM) {
+ BlockSapling.treeType = TreeType.RED_MUSHROOM;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.HUGE_BROWN_MUSHROOM) {
+ BlockSapling.treeType = TreeType.BROWN_MUSHROOM;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.JUNGLE_TREE) {
+ BlockSapling.treeType = TreeType.COCOA_TREE;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.JUNGLE_TREE_NOVINE) {
+ BlockSapling.treeType = TreeType.SMALL_JUNGLE;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.PINE_TREE) {
+ BlockSapling.treeType = TreeType.TALL_REDWOOD;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.SPRUCE_TREE) {
+ BlockSapling.treeType = TreeType.REDWOOD;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.ACACIA_TREE) {
+ BlockSapling.treeType = TreeType.ACACIA;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.BIRCH_TREE) {
+ BlockSapling.treeType = TreeType.BIRCH;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.TALL_BIRCH_TREE) {
+ BlockSapling.treeType = TreeType.TALL_BIRCH;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.SWAMP_TREE) {
+ BlockSapling.treeType = TreeType.SWAMP;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.FANCY_TREE) {
+ BlockSapling.treeType = TreeType.BIG_TREE;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.JUNGLE_BUSH) {
+ BlockSapling.treeType = TreeType.JUNGLE_BUSH;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.DARK_OAK_TREE) {
+ BlockSapling.treeType = TreeType.DARK_OAK;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.MEGA_SPRUCE_TREE) {
+ BlockSapling.treeType = TreeType.MEGA_REDWOOD;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.MEGA_PINE_TREE) {
+ BlockSapling.treeType = TreeType.MEGA_REDWOOD;
+ } else if (worldgentreeabstract.c == BiomeDecoratorGroups.MEGA_JUNGLE_TREE) {
+ BlockSapling.treeType = TreeType.JUNGLE;
+ } else {
+ throw new IllegalArgumentException("Unknown tree generator " + worldgentreeabstract);
+ }