Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 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
@@ -25,6 +25,12 @@
@@ -24,6 +24,12 @@
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.feature.WorldGenFeatureConfigured;
@@ -13,7 +13,7 @@
public final class WorldGenTreeProvider {
private static final Map<String, WorldGenTreeProvider> GROWERS = new Object2ObjectArrayMap();
@@ -75,21 +81,22 @@
@@ -74,21 +80,22 @@
}
}
@@ -39,7 +39,7 @@
for (int i = 0; i >= -1; --i) {
for (int j = 0; j >= -1; --j) {
if (isTwoByTwoSapling(iblockdata, worldserver, blockposition, i, j)) {
@@ -120,11 +127,12 @@
@@ -119,11 +126,12 @@
if (resourcekey1 == null) {
return false;
} else {
@@ -53,7 +53,7 @@
WorldGenFeatureConfigured<?, ?> worldgenfeatureconfigured1 = (WorldGenFeatureConfigured) holder1.value();
IBlockData iblockdata2 = worldserver.getFluidState(blockposition).createLegacyBlock();
@@ -165,11 +173,62 @@
@@ -164,11 +172,62 @@
return true;
}
@@ -117,4 +117,4 @@
+ Map<String, WorldGenTreeProvider> map = WorldGenTreeProvider.GROWERS; // CraftBukkit - decompile error
Objects.requireNonNull(map);
CODEC = ExtraCodecs.stringResolverCodec(function, map::get);
CODEC = Codec.stringResolver(function, map::get);