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

Update to Minecraft 1.18-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/structure/CraftPalette.java
View File

@@ -18,7 +18,7 @@ public class CraftPalette implements Palette {
@Override
public List<BlockState> getBlocks() {
List<BlockState> blocks = new ArrayList<>();
for (DefinedStructure.BlockInfo blockInfo : palette.a()) {
for (DefinedStructure.BlockInfo blockInfo : palette.blocks()) {
blocks.add(CraftBlockStates.getBlockState(blockInfo.pos, blockInfo.state, blockInfo.nbt));
}
return blocks;
@@ -26,6 +26,6 @@ public class CraftPalette implements Palette {
@Override
public int getBlockCount() {
return palette.a().size();
return palette.blocks().size();
}
}

20
paper-server/src/main/java/org/bukkit/craftbukkit/structure/CraftStructure.java
View File

@@ -55,15 +55,15 @@ public class CraftStructure implements Structure {
}
DefinedStructureInfo definedstructureinfo = new DefinedStructureInfo()
.a(EnumBlockMirror.valueOf(mirror.name())) // PAIL rename setMirror
.a(EnumBlockRotation.valueOf(structureRotation.name())) // PAIL rename setRotation
.a(!includeEntities) // PAIL rename setIgnoreEntities
.a(new DefinedStructureProcessorRotation(integrity)) // PAIL rename addStructureProcessor
.a(random); // PAIL rename setRandom
.setMirror(EnumBlockMirror.valueOf(mirror.name()))
.setRotation(EnumBlockRotation.valueOf(structureRotation.name()))
.setIgnoreEntities(!includeEntities)
.addProcessor(new DefinedStructureProcessorRotation(integrity))
.setRandom(random);
definedstructureinfo.palette = palette;
BlockPosition blockPosition = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ());
structure.a(((CraftRegionAccessor) regionAccessor).getHandle(), blockPosition, blockPosition, definedstructureinfo, random, 2); // PAIL rename placeInWorld
structure.placeInWorld(((CraftRegionAccessor) regionAccessor).getHandle(), blockPosition, blockPosition, definedstructureinfo, random, 2);
}
@Override
@@ -88,20 +88,20 @@ public class CraftStructure implements Structure {
throw new IllegalArgumentException("Size must be at least 1x1x1 but was " + size.getBlockX() + "x" + size.getBlockY() + "x" + size.getBlockZ());
}
structure.a(((CraftWorld) world).getHandle(), new BlockPosition(origin.getBlockX(), origin.getBlockY(), origin.getBlockZ()), new BlockPosition(size.getBlockX(), size.getBlockY(), size.getBlockZ()), includeEntities, Blocks.STRUCTURE_VOID); // PAIL rename fillFromWorld
structure.fillFromWorld(((CraftWorld) world).getHandle(), new BlockPosition(origin.getBlockX(), origin.getBlockY(), origin.getBlockZ()), new BlockPosition(size.getBlockX(), size.getBlockY(), size.getBlockZ()), includeEntities, Blocks.STRUCTURE_VOID);
}
@Override
public BlockVector getSize() {
return new BlockVector(structure.a().getX(), structure.a().getY(), structure.a().getZ());
return new BlockVector(structure.getSize().getX(), structure.getSize().getY(), structure.getSize().getZ());
}
@Override
public List<Entity> getEntities() {
List<Entity> entities = new ArrayList<>();
for (DefinedStructure.EntityInfo entity : structure.entityInfoList) {
EntityTypes.a(entity.nbt, ((CraftWorld) Bukkit.getServer().getWorlds().get(0)).getHandle()).ifPresent(dummyEntity -> {
dummyEntity.setPosition(entity.pos.x, entity.pos.y, entity.pos.z);
EntityTypes.create(entity.nbt, ((CraftWorld) Bukkit.getServer().getWorlds().get(0)).getHandle()).ifPresent(dummyEntity -> {
dummyEntity.setPos(entity.pos.x, entity.pos.y, entity.pos.z);
entities.add(dummyEntity.getBukkitEntity());
});
}

20
paper-server/src/main/java/org/bukkit/craftbukkit/structure/CraftStructureManager.java
View File

@@ -59,8 +59,8 @@ public class CraftStructureManager implements StructureManager {
Optional<DefinedStructure> structure = structureManager.structureRepository.get(minecraftKey);
structure = structure == null ? Optional.empty() : structure;
structure = structure.isPresent() ? structure : structureManager.f(minecraftKey);
structure = structure.isPresent() ? structure : structureManager.e(minecraftKey);
structure = structure.isPresent() ? structure : structureManager.loadFromGenerated(minecraftKey);
structure = structure.isPresent() ? structure : structureManager.loadFromResource(minecraftKey);
if (register) {
structureManager.structureRepository.put(minecraftKey, structure);
@@ -78,7 +78,7 @@ public class CraftStructureManager implements StructureManager {
public void saveStructure(NamespacedKey structureKey) {
MinecraftKey minecraftKey = createAndValidateMinecraftStructureKey(structureKey);
structureManager.c(minecraftKey); // PAIL rename save
structureManager.save(minecraftKey);
}
@Override
@@ -120,14 +120,14 @@ public class CraftStructureManager implements StructureManager {
if (unregister) {
structureManager.structureRepository.remove(key);
}
Path path = structureManager.b(key, ".nbt");
Path path = structureManager.createAndValidatePathToStructure(key, ".nbt");
Files.deleteIfExists(path);
}
@Override
public File getStructureFile(NamespacedKey structureKey) {
MinecraftKey minecraftKey = createAndValidateMinecraftStructureKey(structureKey);
return structureManager.b(minecraftKey, ".nbt").toFile();
return structureManager.createAndValidatePathToStructure(minecraftKey, ".nbt").toFile();
}
@Override
@@ -142,7 +142,7 @@ public class CraftStructureManager implements StructureManager {
public Structure loadStructure(InputStream inputStream) throws IOException {
Validate.notNull(inputStream, "inputStream cannot be null");
return new CraftStructure(structureManager.a(inputStream));
return new CraftStructure(structureManager.readStructure(inputStream));
}
@Override
@@ -159,8 +159,8 @@ public class CraftStructureManager implements StructureManager {
Validate.notNull(outputStream, "outputStream cannot be null");
Validate.notNull(structure, "structure cannot be null");
NBTTagCompound nbttagcompound = ((CraftStructure) structure).getHandle().a(new NBTTagCompound());
NBTCompressedStreamTools.a(nbttagcompound, outputStream);
NBTTagCompound nbttagcompound = ((CraftStructure) structure).getHandle().save(new NBTTagCompound());
NBTCompressedStreamTools.writeCompressed(nbttagcompound, outputStream);
}
@Override
@@ -172,7 +172,7 @@ public class CraftStructureManager implements StructureManager {
Validate.notNull(structureKey, "structureKey cannot be null");
MinecraftKey minecraftkey = CraftNamespacedKey.toMinecraft(structureKey);
if (minecraftkey.getKey().contains("//")) {
if (minecraftkey.getPath().contains("//")) {
throw new IllegalArgumentException("Resource key for Structures can not contain \"//\"");
}
return minecraftkey;
@@ -180,6 +180,6 @@ public class CraftStructureManager implements StructureManager {
@Override
public Structure copy(Structure structure) {
return new CraftStructure(structureManager.a(((CraftStructure) structure).getHandle().a(new NBTTagCompound())));
return new CraftStructure(structureManager.readStructure(((CraftStructure) structure).getHandle().save(new NBTTagCompound())));
}
}