mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-30 16:49:42 +02:00
This PR contains all of Tuinity's patches. Very notable ones are: - Highly optimised collisions - Optimised entity lookups by bounding box (Mojang made regressions in 1.17, this brings it back to 1.16) - Starlight https://github.com/PaperMC/Starlight - Rewritten dataconverter system https://github.com/PaperMC/DataConverter - Random block ticking optimisation (wrongly dropped from Paper 1.17) - Chunk ticking optimisations - Anything else I've forgotten in the 60 or so patches If you are a previous Tuinity user, your config will not migrate. You must do it yourself. The config options have simply been moved into paper.yml, so it will be an easy migration. However, please note that the chunk loading options in tuinity.yml are NOT compatible with the options in paper.yml. * Port tuinity, initial patchset * Update gradle to 7.2 jmp said it fixes rebuildpatches not working for me. it fucking better * Completely clean apply * Remove tuinity config, add per player api patch * Remove paper reobf mappings patch * Properly update gradlew * Force clean rebuild * Mark fixups Comments and ATs still need to be done * grep -r "Tuinity" * Fixup * Ensure gameprofile lastaccess is written only under the state lock * update URL for dataconverter * Only clean rebuild tuinity patches might fix merge conflicts * Use UTF-8 for gradlew * Clean rb patches again * Convert block ids used as item ids Neither the converters of pre 1.13 nor DFU handled these cases, as by the time they were written the game at the time didn't consider these ids valid - they would be air. Because of this, some worlds have logspam since only DataConverter (not DFU or legacy converters) will warn when an invalid id has been seen. While quite a few do need to now be considered as air, quite a lot do not. So it makes sense to add conversion for these items, instead of simply suppressing or ignoring the logs. I've now added id -> string conversion for all block ids that could be used as items that existed in the game before 1.7.10 (I have no interest in tracking down the exact version block ids stopped working) that were on https://minecraft-ids.grahamedgecombe.com/ Items that did not directly convert to new items will be instead converted to air: stems, wheat crops, piston head, tripwire wire block * Fix LightPopulated parsing in V1466 The DFU code was checking if the number existed, not if it didn't exist. I misread the original code. * Always parse protochunk light sources unless it is marked as non-lit Chunks not marked as lit will always go through the light engine, so they should always have their block sources parsed. * Update custom names to JSON for players Missed this fix from CB, as it was inside the DataFixers class. I decided to double check all of the CB changes again: DataFixers.java was the only area I missed, as I had inspected all datafixer diffs and implemented them all into DataConverter. I also checked Bootstrap.java again, and re-evaluated their changes. I had previously done this, but determined that they were all bad. The changes to make standing_sign block map to oak_sign block in V1450 is bad, because that's not the item id V1450 accepts. Only in 1.14 did oak_sign even exist, and as expected there is a converter to rename all existing sign items/blocks. The fix to register the portal block under id 1440 is useless, as the flattenning logic will default to the lowest registered id - which is the exact blockstate that CB registers into 1440. So it just doesn't do anything. The extra item ids in the id -> string converter are already added, but I found this from EMC originally. The change for the spawn egg id 23 -> Arrow is just wrong, that id DOES correspond to TippedArrow, NOT Arrow. As expected, the spawn egg already has a dedicated mapping for Arrow, which is id 10 - which was Arrow's entity id. I also ported a fix for the cooked_fished id update. This doesn't really matter since there is already a dataconverter to fix this, but the game didn't accept cooked_fished at the time. So I see no harm. * Review all converters and walkers - Refactor V99 to have helper methods for defining entity/tile entity types - Automatically namespace all ids that should be namespaced. While vanilla never saved non-namespaced data for things that are namespaced, plugins/users might have. - Synchronised the identity ensure map in HelperBlockFlatteningV1450 - Code style consistency - Add missing log warning in V102 for ITEM_NAME type conversion - Use getBoolean instead of getByte - Use ConverterAbstractEntityRename for V143 TippedArrow -> Arrow rename, as it will affect ENTITY_NAME type - Always set isVillager to false in V502 for Zombie - Register V808's converter under subversion 1 like DFU - Register a breakpoint for V1.17.1. In the future, all final versions of major releases will have a breakpoint so that the work required to determine if a converter needs a breakpoint is minimal - Validate that a dataconverter is only registered for a version that is registered - ConverterFlattenTileEntity is actually ConverterFlattenEntity It even registered the converters under TILE_ENTITY, instead of ENTITY. - Fix id comparison in V1492 STRUCTURE_FEATURE renamer - Use ConverterAbstractStatsRename for V1510 stats renamer At the time I had written that class, the abstract renamer didn't exist. - Ensure OwnerUUID is at least set to empty string in V1904 if the ocelot is converted to a cat (this is likely so that it retains a collar) - Use generic read/write for Records in V1946 Records is actually a list, not a map. So reading map was invalid. * Always set light to zero when propagating decrease This fixes an almost infinite loop where light values would be spam queued on a very small subset on blocks. This also likely fixes the memory issues people were seeing. * re-organize patches * Apply and fix conflicts * Revert some patches getChunkAt retains chunks so that plugins don't spam loads revert mc-4 fix will remain unless issues pop up * Shuffle iterated chunks if per player is not enabled Can help with some mob spawning stacking up at locations * Make per player default, migrate all configs * Adjust comments in fixups * Rework config for player chunk loader Old config is not compatible. Move all configs to be under `settings` in paper.yml The player chunk loader has been modified to less aggressively load chunks, but to send chunks at higher rates compared to tuinity. There are new config entries to tune this behavior. * Add back old constructor to CompressionEncoder/Decoder (fixes Tuinity #358) * Raise chunk loading default limits * Reduce worldgen thread workers for lower core count cpus * Raise limits for chunk loading config Also place it under `chunk-loading` * Disable max chunk send rate by default * Fix conflicts and rebuild patches * Drop default send rate again Appears to be still causing problems for no known reason * Raise chunk send limits to 100 per player While a low limit fixes ping issues for some people, most people do not suffer from this issue and thus should not suffer from an extremely slow load-in rate. * Rebase part 1 Autosquash the fixups * Move not implemented up * Fixup mc-dev fixes Missed this one * Rebase per player viewdistance api into the original api patch * Remove old light engine patch part 1 The prioritisation must be kept from it, so that part has been rebased into the priority patch. Part 2 will deal with rebasing all of the patches _after_ * Rebase remaining patches for old light patch removal * Remove other mid tick patch * Remove Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch Replaced by `Do not copy visible chunks` * Revert AT for Vec3i setX/Y/Z The class is immutable. set should not be exposed * Remove old IntegerUtil class * Replace old CraftChunk#getEntities patch * Remove import for SWMRNibbleArray in ChunkAccess * Finished merge checklist * Remove ensureTickThread impl in urgency patch Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
479 lines
23 KiB
Diff
479 lines
23 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: dfsek <dfsek@protonmail.com>
|
|
Date: Sat, 19 Jun 2021 20:15:59 -0700
|
|
Subject: [PATCH] Add more LimitedRegion API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/world/generation/CraftProtoWorld.java b/src/main/java/io/papermc/paper/world/generation/CraftProtoWorld.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..ccb6b20b5f56c3bacdc6bd384931986cf804f06a
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/world/generation/CraftProtoWorld.java
|
|
@@ -0,0 +1,116 @@
|
|
+package io.papermc.paper.world.generation;
|
|
+
|
|
+import net.minecraft.core.BlockPos;
|
|
+import net.minecraft.nbt.CompoundTag;
|
|
+import net.minecraft.server.level.WorldGenRegion;
|
|
+import net.minecraft.world.entity.Mob;
|
|
+import net.minecraft.world.entity.MobSpawnType;
|
|
+import net.minecraft.world.entity.SpawnGroupData;
|
|
+import net.minecraft.world.level.block.entity.BlockEntity;
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.block.data.BlockData;
|
|
+import org.bukkit.craftbukkit.block.CraftBlockEntityState;
|
|
+import org.bukkit.craftbukkit.block.CraftBlockState;
|
|
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
|
|
+import org.bukkit.craftbukkit.inventory.CraftMetaBlockState;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.util.Vector;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+import java.util.Objects;
|
|
+import java.util.function.Consumer;
|
|
+
|
|
+@Deprecated
|
|
+public class CraftProtoWorld implements ProtoWorld {
|
|
+ private WorldGenRegion region;
|
|
+
|
|
+ public CraftProtoWorld(WorldGenRegion region) {
|
|
+ this.region = region;
|
|
+ }
|
|
+
|
|
+ public void clearReference() {
|
|
+ region = null;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setBlockData(int x, int y, int z, @NotNull BlockData data) {
|
|
+ BlockPos position = new BlockPos(x, y, z);
|
|
+ getDelegate().setBlock(position, ((CraftBlockData) data).getState(), 3);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setBlockState(int x, int y, int z, @NotNull BlockState state) {
|
|
+ BlockPos pos = new BlockPos(x, y, z);
|
|
+ if(!state.getBlockData().matches(getDelegate().getBlockState(pos).createCraftBlockData())) {
|
|
+ throw new IllegalArgumentException("BlockData does not match! Expected " + state.getBlockData().getAsString(false) + ", got " + getDelegate().getBlockState(pos).createCraftBlockData().getAsString(false));
|
|
+ }
|
|
+ getDelegate().getBlockEntity(pos).load(((CraftBlockEntityState<?>) state).getSnapshotNBT());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull BlockState getBlockState(int x, int y, int z) {
|
|
+ BlockEntity entity = getDelegate().getBlockEntity(new BlockPos(x, y, z));
|
|
+ return CraftMetaBlockState.createBlockState(entity.getBlockState().getBukkitMaterial(), entity.save(new CompoundTag()));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void scheduleBlockUpdate(int x, int y, int z) {
|
|
+ BlockPos position = new BlockPos(x, y, z);
|
|
+ getDelegate().getBlockTicks().scheduleTick(position, getDelegate().getBlockIfLoaded(position), 0);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void scheduleFluidUpdate(int x, int y, int z) {
|
|
+ BlockPos position = new BlockPos(x, y, z);
|
|
+ getDelegate().getLiquidTicks().scheduleTick(position, getDelegate().getFluidState(position).getType(), 0);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull World getWorld() {
|
|
+ // reading/writing the returned Minecraft world causes a deadlock.
|
|
+ // By implementing this, and covering it in warnings, we're assuming people won't be stupid, and
|
|
+ // if they are stupid, they'll figure it out pretty fast.
|
|
+ return getDelegate().getMinecraftWorld().getWorld();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull BlockData getBlockData(int x, int y, int z) {
|
|
+ return CraftBlockData.fromData(getDelegate().getBlockState(new BlockPos(x, y, z)));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getCenterChunkX() {
|
|
+ return getDelegate().getCenter().x;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getCenterChunkZ() {
|
|
+ return getDelegate().getCenter().z;
|
|
+ }
|
|
+
|
|
+ @SuppressWarnings({"unchecked", "deprecation"})
|
|
+ @Override
|
|
+ public <T extends Entity> @NotNull T spawn(@NotNull Vector location, @NotNull Class<T> clazz, @Nullable Consumer<T> function, CreatureSpawnEvent.@NotNull SpawnReason reason) throws IllegalArgumentException {
|
|
+ net.minecraft.world.entity.Entity entity = getDelegate().getMinecraftWorld().getWorld().createEntity(location.toLocation(getWorld()), clazz);
|
|
+ Objects.requireNonNull(entity, "Cannot spawn null entity");
|
|
+ if (entity instanceof Mob) {
|
|
+ ((Mob) entity).finalizeSpawn(getDelegate(), getDelegate().getCurrentDifficultyAt(entity.blockPosition()), MobSpawnType.COMMAND, (SpawnGroupData) null, null);
|
|
+ }
|
|
+
|
|
+ if (function != null) {
|
|
+ function.accept((T) entity.getBukkitEntity());
|
|
+ }
|
|
+
|
|
+ getDelegate().addEntity(entity, reason);
|
|
+ return (T) entity.getBukkitEntity();
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ private WorldGenRegion getDelegate() {
|
|
+ return Objects.requireNonNull(region, "Cannot access ProtoWorld after generation!");
|
|
+ }
|
|
+}
|
|
+
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
|
|
index 8f968ed09b960c2e4aca2fa6aba20aae00456ea8..0d23d2be7829b62391dc1313b0f20762002c1d34 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
|
|
@@ -6,6 +6,7 @@ import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
+import net.minecraft.core.BlockPos; // Paper
|
|
import net.minecraft.nbt.CompoundTag;
|
|
import net.minecraft.server.level.WorldGenRegion;
|
|
import net.minecraft.world.entity.EntityType;
|
|
@@ -134,7 +135,10 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
|
|
@Override
|
|
public BlockState getBlockState(int x, int y, int z) {
|
|
Preconditions.checkArgument(this.isInRegion(x, y, z), "Coordinates %s, %s, %s are not in the region", x, y, z);
|
|
- return super.getBlockState(x, y, z);
|
|
+ // Paper start
|
|
+ net.minecraft.world.level.block.entity.BlockEntity entity = getHandle().getBlockEntity(new BlockPos(x, y, z));
|
|
+ return org.bukkit.craftbukkit.inventory.CraftMetaBlockState.createBlockState(entity.getBlockState().getBukkitMaterial(), entity.save(new CompoundTag()));
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|
|
@@ -152,7 +156,7 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
|
|
@Override
|
|
public void setBlockData(int x, int y, int z, BlockData blockData) {
|
|
Preconditions.checkArgument(this.isInRegion(x, y, z), "Coordinates %s, %s, %s are not in the region", x, y, z);
|
|
- super.setBlockData(x, y, z, blockData);
|
|
+ getHandle().setBlock(new BlockPos(x, y, z), ((org.bukkit.craftbukkit.block.data.CraftBlockData) blockData).getState(), 3); // Paper
|
|
}
|
|
|
|
@Override
|
|
@@ -182,4 +186,45 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
|
|
public void addEntityToWorld(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason) {
|
|
this.entities.add(entity);
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void setBlockState(int x, int y, int z, BlockState state) {
|
|
+ BlockPos pos = new BlockPos(x, y, z);
|
|
+ if (!state.getBlockData().matches(getHandle().getBlockState(pos).createCraftBlockData())) {
|
|
+ throw new IllegalArgumentException("BlockData does not match! Expected " + state.getBlockData().getAsString(false) + ", got " + getHandle().getBlockState(pos).createCraftBlockData().getAsString(false));
|
|
+ }
|
|
+ getHandle().getBlockEntity(pos).load(((org.bukkit.craftbukkit.block.CraftBlockEntityState<?>) state).getSnapshotNBT());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void scheduleBlockUpdate(int x, int y, int z) {
|
|
+ BlockPos position = new BlockPos(x, y, z);
|
|
+ getHandle().getBlockTicks().scheduleTick(position, getHandle().getBlockIfLoaded(position), 0);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void scheduleFluidUpdate(int x, int y, int z) {
|
|
+ BlockPos position = new BlockPos(x, y, z);
|
|
+ getHandle().getLiquidTicks().scheduleTick(position, getHandle().getFluidState(position).getType(), 0);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public World getWorld() {
|
|
+ // reading/writing the returned Minecraft world causes a deadlock.
|
|
+ // By implementing this, and covering it in warnings, we're assuming people won't be stupid, and
|
|
+ // if they are stupid, they'll figure it out pretty fast.
|
|
+ return getHandle().getMinecraftWorld().getWorld();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getCenterChunkX() {
|
|
+ return centerChunkX;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getCenterChunkZ() {
|
|
+ return centerChunkZ;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
|
|
index 98461949badc8a708c1e7e2f225a93e8d1ca5822..4fa8cce0818a8e461330fc29021e6ff65cb67125 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
|
|
@@ -187,6 +187,12 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
|
|
for (BlockPos lightPosition : craftData.getLights()) {
|
|
((ProtoChunk) chunk).addLight(new BlockPos((x << 4) + lightPosition.getX(), lightPosition.getY(), (z << 4) + lightPosition.getZ())); // PAIL rename addLightBlock
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ io.papermc.paper.world.generation.CraftProtoWorld protoWorld = new io.papermc.paper.world.generation.CraftProtoWorld(region);
|
|
+ generator.generateDecorations(protoWorld);
|
|
+ protoWorld.clearReference(); // make sure people dont try to use the ProtoWorld after we're done with it.
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
|
|
index bfdeb4f2971e65c38334f2f90c66ef62564e83e6..5ec7a3903838ce2f60926782965107e84b44643c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
|
|
@@ -271,13 +271,18 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
|
|
return this.blockEntityTag != null;
|
|
}
|
|
|
|
+ // Paper start - Delegate to utility method
|
|
@Override
|
|
public BlockState getBlockState() {
|
|
- Material stateMaterial = (this.material != Material.SHIELD) ? this.material : CraftMetaBlockState.shieldToBannerHack(this.blockEntityTag); // Only actually used for jigsaws
|
|
- if (this.blockEntityTag != null) {
|
|
- switch (this.material) {
|
|
+ return createBlockState(this.material, this.blockEntityTag);
|
|
+ }
|
|
+
|
|
+ public static BlockState createBlockState(Material material, CompoundTag blockEntityTag) {
|
|
+ Material stateMaterial = (material != Material.SHIELD) ? material : CraftMetaBlockState.shieldToBannerHack(blockEntityTag); // Only actually used for jigsaws
|
|
+ if (blockEntityTag != null) {
|
|
+ switch (material) {
|
|
case SHIELD:
|
|
- this.blockEntityTag.putString("id", "banner");
|
|
+ blockEntityTag.putString("id", "banner");
|
|
break;
|
|
case SHULKER_BOX:
|
|
case WHITE_SHULKER_BOX:
|
|
@@ -296,19 +301,19 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
|
|
case GREEN_SHULKER_BOX:
|
|
case RED_SHULKER_BOX:
|
|
case BLACK_SHULKER_BOX:
|
|
- this.blockEntityTag.putString("id", "shulker_box");
|
|
+ blockEntityTag.putString("id", "shulker_box");
|
|
break;
|
|
case BEE_NEST:
|
|
case BEEHIVE:
|
|
- this.blockEntityTag.putString("id", "beehive");
|
|
+ blockEntityTag.putString("id", "beehive");
|
|
break;
|
|
}
|
|
}
|
|
BlockPos blockposition = BlockPos.ZERO;
|
|
net.minecraft.world.level.block.state.BlockState iblockdata = CraftMagicNumbers.getBlock(stateMaterial).defaultBlockState();
|
|
- BlockEntity te = (this.blockEntityTag == null) ? null : BlockEntity.loadStatic(blockposition, iblockdata, blockEntityTag);
|
|
+ BlockEntity te = (blockEntityTag == null) ? null : BlockEntity.loadStatic(blockposition, iblockdata, blockEntityTag);
|
|
|
|
- switch (this.material) {
|
|
+ switch (material) {
|
|
case ACACIA_SIGN:
|
|
case ACACIA_WALL_SIGN:
|
|
case BIRCH_SIGN:
|
|
@@ -328,53 +333,53 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
|
|
if (te == null) {
|
|
te = new SignBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftSign(this.material, (SignBlockEntity) te);
|
|
+ return new CraftSign(material, (SignBlockEntity) te);
|
|
case CHEST:
|
|
case TRAPPED_CHEST:
|
|
if (te == null) {
|
|
te = new ChestBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftChest(this.material, (ChestBlockEntity) te);
|
|
+ return new CraftChest(material, (ChestBlockEntity) te);
|
|
case FURNACE:
|
|
if (te == null) {
|
|
te = new FurnaceBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftFurnaceFurnace(this.material, (FurnaceBlockEntity) te);
|
|
+ return new CraftFurnaceFurnace(material, (FurnaceBlockEntity) te);
|
|
case DISPENSER:
|
|
if (te == null) {
|
|
te = new DispenserBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftDispenser(this.material, (DispenserBlockEntity) te);
|
|
+ return new CraftDispenser(material, (DispenserBlockEntity) te);
|
|
case DROPPER:
|
|
if (te == null) {
|
|
te = new DropperBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftDropper(this.material, (DropperBlockEntity) te);
|
|
+ return new CraftDropper(material, (DropperBlockEntity) te);
|
|
case END_GATEWAY:
|
|
if (te == null) {
|
|
te = new TheEndGatewayBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftEndGateway(this.material, (TheEndGatewayBlockEntity) te);
|
|
+ return new CraftEndGateway(material, (TheEndGatewayBlockEntity) te);
|
|
case HOPPER:
|
|
if (te == null) {
|
|
te = new HopperBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftHopper(this.material, (HopperBlockEntity) te);
|
|
+ return new CraftHopper(material, (HopperBlockEntity) te);
|
|
case SPAWNER:
|
|
if (te == null) {
|
|
te = new SpawnerBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftCreatureSpawner(this.material, (SpawnerBlockEntity) te);
|
|
+ return new CraftCreatureSpawner(material, (SpawnerBlockEntity) te);
|
|
case JUKEBOX:
|
|
if (te == null) {
|
|
te = new JukeboxBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftJukebox(this.material, (JukeboxBlockEntity) te);
|
|
+ return new CraftJukebox(material, (JukeboxBlockEntity) te);
|
|
case BREWING_STAND:
|
|
if (te == null) {
|
|
te = new BrewingStandBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBrewingStand(this.material, (BrewingStandBlockEntity) te);
|
|
+ return new CraftBrewingStand(material, (BrewingStandBlockEntity) te);
|
|
case CREEPER_HEAD:
|
|
case CREEPER_WALL_HEAD:
|
|
case DRAGON_HEAD:
|
|
@@ -390,24 +395,24 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
|
|
if (te == null) {
|
|
te = new SkullBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftSkull(this.material, (SkullBlockEntity) te);
|
|
+ return new CraftSkull(material, (SkullBlockEntity) te);
|
|
case COMMAND_BLOCK:
|
|
case REPEATING_COMMAND_BLOCK:
|
|
case CHAIN_COMMAND_BLOCK:
|
|
if (te == null) {
|
|
te = new CommandBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftCommandBlock(this.material, (CommandBlockEntity) te);
|
|
+ return new CraftCommandBlock(material, (CommandBlockEntity) te);
|
|
case BEACON:
|
|
if (te == null) {
|
|
te = new BeaconBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBeacon(this.material, (BeaconBlockEntity) te);
|
|
+ return new CraftBeacon(material, (BeaconBlockEntity) te);
|
|
case SHIELD:
|
|
if (te == null) {
|
|
te = new BannerBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- ((BannerBlockEntity) te).baseColor = (this.blockEntityTag == null) ? DyeColor.WHITE : DyeColor.byId(this.blockEntityTag.getInt(CraftMetaBanner.BASE.NBT));
|
|
+ ((BannerBlockEntity) te).baseColor = (blockEntityTag == null) ? DyeColor.WHITE : DyeColor.byId(blockEntityTag.getInt(CraftMetaBanner.BASE.NBT));
|
|
case BLACK_BANNER:
|
|
case BLACK_WALL_BANNER:
|
|
case BLUE_BANNER:
|
|
@@ -443,12 +448,12 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
|
|
if (te == null) {
|
|
te = new BannerBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBanner(this.material == Material.SHIELD ? CraftMetaBlockState.shieldToBannerHack(this.blockEntityTag) : this.material, (BannerBlockEntity) te);
|
|
+ return new CraftBanner(material == Material.SHIELD ? CraftMetaBlockState.shieldToBannerHack(blockEntityTag) : material, (BannerBlockEntity) te);
|
|
case STRUCTURE_BLOCK:
|
|
if (te == null) {
|
|
te = new StructureBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftStructureBlock(this.material, (StructureBlockEntity) te);
|
|
+ return new CraftStructureBlock(material, (StructureBlockEntity) te);
|
|
case SHULKER_BOX:
|
|
case WHITE_SHULKER_BOX:
|
|
case ORANGE_SHULKER_BOX:
|
|
@@ -469,78 +474,79 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
|
|
if (te == null) {
|
|
te = new ShulkerBoxBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftShulkerBox(this.material, (ShulkerBoxBlockEntity) te);
|
|
+ return new CraftShulkerBox(material, (ShulkerBoxBlockEntity) te);
|
|
case ENCHANTING_TABLE:
|
|
if (te == null) {
|
|
te = new EnchantmentTableBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftEnchantingTable(this.material, (EnchantmentTableBlockEntity) te);
|
|
+ return new CraftEnchantingTable(material, (EnchantmentTableBlockEntity) te);
|
|
case ENDER_CHEST:
|
|
if (te == null) {
|
|
te = new EnderChestBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftEnderChest(this.material, (EnderChestBlockEntity) te);
|
|
+ return new CraftEnderChest(material, (EnderChestBlockEntity) te);
|
|
case DAYLIGHT_DETECTOR:
|
|
if (te == null) {
|
|
te = new DaylightDetectorBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftDaylightDetector(this.material, (DaylightDetectorBlockEntity) te);
|
|
+ return new CraftDaylightDetector(material, (DaylightDetectorBlockEntity) te);
|
|
case COMPARATOR:
|
|
if (te == null) {
|
|
te = new ComparatorBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftComparator(this.material, (ComparatorBlockEntity) te);
|
|
+ return new CraftComparator(material, (ComparatorBlockEntity) te);
|
|
case BARREL:
|
|
if (te == null) {
|
|
te = new BarrelBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBarrel(this.material, (BarrelBlockEntity) te);
|
|
+ return new CraftBarrel(material, (BarrelBlockEntity) te);
|
|
case BELL:
|
|
if (te == null) {
|
|
te = new BellBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBell(this.material, (BellBlockEntity) te);
|
|
+ return new CraftBell(material, (BellBlockEntity) te);
|
|
case BLAST_FURNACE:
|
|
if (te == null) {
|
|
te = new BlastFurnaceBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBlastFurnace(this.material, (BlastFurnaceBlockEntity) te);
|
|
+ return new CraftBlastFurnace(material, (BlastFurnaceBlockEntity) te);
|
|
case CAMPFIRE:
|
|
case SOUL_CAMPFIRE:
|
|
if (te == null) {
|
|
te = new CampfireBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftCampfire(this.material, (CampfireBlockEntity) te);
|
|
+ return new CraftCampfire(material, (CampfireBlockEntity) te);
|
|
case JIGSAW:
|
|
if (te == null) {
|
|
te = new JigsawBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftJigsaw(this.material, (JigsawBlockEntity) te);
|
|
+ return new CraftJigsaw(material, (JigsawBlockEntity) te);
|
|
case LECTERN:
|
|
if (te == null) {
|
|
te = new LecternBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftLectern(this.material, (LecternBlockEntity) te);
|
|
+ return new CraftLectern(material, (LecternBlockEntity) te);
|
|
case SMOKER:
|
|
if (te == null) {
|
|
te = new SmokerBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftSmoker(this.material, (SmokerBlockEntity) te);
|
|
+ return new CraftSmoker(material, (SmokerBlockEntity) te);
|
|
case BEE_NEST:
|
|
case BEEHIVE:
|
|
if (te == null) {
|
|
te = new BeehiveBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftBeehive(this.material, (BeehiveBlockEntity) te);
|
|
+ return new CraftBeehive(material, (BeehiveBlockEntity) te);
|
|
case SCULK_SENSOR:
|
|
if (te == null) {
|
|
te = new SculkSensorBlockEntity(blockposition, iblockdata);
|
|
}
|
|
- return new CraftSculkSensor(this.material, (SculkSensorBlockEntity) te);
|
|
+ return new CraftSculkSensor(material, (SculkSensorBlockEntity) te);
|
|
default:
|
|
- throw new IllegalStateException("Missing blockState for " + this.material);
|
|
+ throw new IllegalStateException("Missing blockState for " + material);
|
|
}
|
|
}
|
|
+ // Paper end
|
|
|
|
@Override
|
|
public void setBlockState(BlockState blockState) {
|