Update to Minecraft 1.20

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-06-08 01:30:00 +10:00
parent bac55e67d6
commit 9d740b84b0
269 changed files with 2605 additions and 2568 deletions

View File

@@ -13,7 +13,7 @@
public class BlockComposter extends Block implements IInventoryHolder {
public static final int READY = 8;
@@ -246,7 +252,14 @@
@@ -248,7 +254,14 @@
int i = (Integer) iblockdata.getValue(BlockComposter.LEVEL);
if (i < 7 && BlockComposter.COMPOSTABLES.containsKey(itemstack.getItem())) {
@@ -29,7 +29,7 @@
itemstack.shrink(1);
return iblockdata1;
@@ -256,6 +269,14 @@
@@ -258,6 +271,14 @@
}
public static IBlockData extractProduce(Entity entity, IBlockData iblockdata, World world, BlockPosition blockposition) {
@@ -44,7 +44,7 @@
if (!world.isClientSide) {
Vec3D vec3d = Vec3D.atLowerCornerWithOffset(blockposition, 0.5D, 1.01D, 0.5D).offsetRandom(world.random, 0.7F);
EntityItem entityitem = new EntityItem(world, vec3d.x(), vec3d.y(), vec3d.z(), new ItemStack(Items.BONE_MEAL));
@@ -279,10 +300,16 @@
@@ -281,10 +302,16 @@
}
static IBlockData addItem(@Nullable Entity entity, IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition, ItemStack itemstack) {
@@ -62,7 +62,7 @@
return iblockdata;
} else {
int j = i + 1;
@@ -331,7 +358,8 @@
@@ -333,7 +360,8 @@
public IWorldInventory getContainer(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
int i = (Integer) iblockdata.getValue(BlockComposter.LEVEL);
@@ -72,7 +72,7 @@
}
public static class ContainerOutput extends InventorySubcontainer implements IWorldInventory {
@@ -346,6 +374,7 @@
@@ -348,6 +376,7 @@
this.state = iblockdata;
this.level = generatoraccess;
this.pos = blockposition;
@@ -80,7 +80,7 @@
}
@Override
@@ -370,8 +399,15 @@
@@ -372,8 +401,15 @@
@Override
public void setChanged() {
@@ -98,7 +98,7 @@
}
}
@@ -384,6 +420,7 @@
@@ -386,6 +422,7 @@
public ContainerInput(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
super(1);
@@ -106,7 +106,7 @@
this.state = iblockdata;
this.level = generatoraccess;
this.pos = blockposition;
@@ -426,8 +463,9 @@
@@ -428,8 +465,9 @@
public static class ContainerEmpty extends InventorySubcontainer implements IWorldInventory {