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

Update to Minecraft 1.17.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-07-07 00:00:00 +10:00
parent 0392f45e9c
commit e8c9836ec9
59 changed files with 428 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/nms-patches/net/minecraft/world/level/block/BlockComposter.patch
View File

@@ -86,7 +86,7 @@
return iblockdata;
} else {
int j = i + 1;
@@ -322,10 +349,11 @@
@@ -322,7 +349,8 @@
public IWorldInventory a(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
int i = (Integer) iblockdata.get(BlockComposter.LEVEL);
@@ -95,11 +95,7 @@
+ return (IWorldInventory) (i == 8 ? new BlockComposter.ContainerOutput(iblockdata, generatoraccess, blockposition, new ItemStack(Items.BONE_MEAL)) : (i < 7 ? new BlockComposter.ContainerInput(iblockdata, generatoraccess, blockposition) : new BlockComposter.ContainerEmpty(generatoraccess, blockposition)));
}
- private static class ContainerOutput extends InventorySubcontainer implements IWorldInventory {
+ public static class ContainerOutput extends InventorySubcontainer implements IWorldInventory {
private final IBlockData state;
private final GeneratorAccess level;
public static class ContainerOutput extends InventorySubcontainer implements IWorldInventory {
@@ -337,6 +365,7 @@
this.state = iblockdata;
this.level = generatoraccess;
@@ -108,7 +104,7 @@
}
@Override
@@ -361,12 +390,19 @@
@@ -361,8 +390,15 @@
@Override
public void update() {
@@ -126,11 +122,6 @@
}
}
- private static class ContainerInput extends InventorySubcontainer implements IWorldInventory {
+ public static class ContainerInput extends InventorySubcontainer implements IWorldInventory {
private final IBlockData state;
private final GeneratorAccess level;
@@ -375,6 +411,7 @@
public ContainerInput(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
@@ -139,12 +130,9 @@
this.state = iblockdata;
this.level = generatoraccess;
this.pos = blockposition;
@@ -415,10 +452,11 @@
}
}
@@ -417,8 +454,9 @@
- private static class ContainerEmpty extends InventorySubcontainer implements IWorldInventory {
+ public static class ContainerEmpty extends InventorySubcontainer implements IWorldInventory {
public static class ContainerEmpty extends InventorySubcontainer implements IWorldInventory {
- public ContainerEmpty() {
+ public ContainerEmpty(GeneratorAccess generatoraccess, BlockPosition blockposition) { // CraftBukkit

2
paper-server/nms-patches/net/minecraft/world/level/block/BlockTallPlant.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/BlockTallPlant.java
+++ b/net/minecraft/world/level/block/BlockTallPlant.java
@@ -84,6 +84,11 @@
@@ -92,6 +92,11 @@
}
protected static void b(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman) {

2
paper-server/nms-patches/net/minecraft/world/level/block/LayeredCauldronBlock.patch
View File

@@ -64,7 +64,7 @@
+
@Override
public void a(IBlockData iblockdata, World world, BlockPosition blockposition, BiomeBase.Precipitation biomebase_precipitation) {
if (BlockCauldron.a(world) && (Integer) iblockdata.get(LayeredCauldronBlock.LEVEL) != 3 && this.fillPredicate.test(biomebase_precipitation)) {
if (BlockCauldron.a(world, biomebase_precipitation) && (Integer) iblockdata.get(LayeredCauldronBlock.LEVEL) != 3 && this.fillPredicate.test(biomebase_precipitation)) {
- world.setTypeUpdate(blockposition, (IBlockData) iblockdata.a((IBlockState) LayeredCauldronBlock.LEVEL));
+ changeLevel(iblockdata, world, blockposition, (IBlockData) iblockdata.a((IBlockState) LayeredCauldronBlock.LEVEL), null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL); // CraftBukkit
}

7
paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySkull.patch
View File

@@ -1,7 +0,0 @@
--- a/net/minecraft/world/level/block/entity/TileEntitySkull.java
+++ b/net/minecraft/world/level/block/entity/TileEntitySkull.java
@@ -1,3 +1,4 @@
+// mc-dev import
package net.minecraft.world.level.block.entity;
import com.google.common.collect.Iterables;

10
paper-server/nms-patches/net/minecraft/world/level/storage/Convertable.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/storage/Convertable.java
+++ b/net/minecraft/world/level/storage/Convertable.java
@@ -60,6 +60,10 @@
@@ -61,6 +61,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -11,7 +11,7 @@
public class Convertable {
static final Logger LOGGER = LogManager.getLogger();
@@ -105,26 +109,26 @@
@@ -106,26 +110,26 @@
Logger logger = Convertable.LOGGER;
Objects.requireNonNull(logger);
@@ -42,7 +42,7 @@
return new IllegalStateException("Failed to get noise settings registry");
});
@@ -294,9 +298,23 @@
@@ -302,9 +306,23 @@
return this.backupDir;
}
@@ -68,7 +68,7 @@
public class ConversionSession implements AutoCloseable {
@@ -304,8 +322,12 @@
@@ -312,8 +330,12 @@
public final Path levelPath;
private final String levelId;
private final Map<SavedFile, Path> resources = Maps.newHashMap();
@@ -82,7 +82,7 @@
this.levelId = s;
this.levelPath = Convertable.this.baseDir.resolve(s);
this.lock = SessionLock.a(this.levelPath);
@@ -322,7 +344,7 @@
@@ -330,7 +352,7 @@
}
public File a(ResourceKey<World> resourcekey) {