If a matching world cannot be found, a {@link RuntimeException} - * will be thrown.
- * - * @param world the world - * @return a wrapped Bukkit world - */ public static BukkitWorld asBukkitWorld(World world) { - if (world instanceof BukkitWorld) { - return (BukkitWorld) world; - } else { - BukkitWorld bukkitWorld = WorldEditPlugin.getInstance().getInternalPlatform().matchWorld(world); - if (bukkitWorld == null) { - throw new RuntimeException("World '" + world.getName() + "' has no matching version in Bukkit"); - } - return bukkitWorld; - } + return getAdapter().asBukkitWorld(world); } - /** - * Create a WorldEdit world from a Bukkit world. - * - * @param world the Bukkit world - * @return a WorldEdit world - */ public static World adapt(org.bukkit.World world) { - checkNotNull(world); - return new BukkitWorld(world); + return getAdapter().adapt(world); } - /** - * Create a Bukkit world from a WorldEdit world. - * - * @param world the WorldEdit world - * @return a Bukkit world - */ public static org.bukkit.World adapt(World world) { - checkNotNull(world); - if (world instanceof BukkitWorld) { - return ((BukkitWorld) world).getWorld(); - } else { - org.bukkit.World match = Bukkit.getServer().getWorld(world.getName()); - if (match != null) { - return match; - } else { - throw new IllegalArgumentException("Can't find a Bukkit world for " + world); - } - } + return getAdapter().adapt(world); } - /** - * Create a WorldEdit location from a Bukkit location. - * - * @param location the Bukkit location - * @return a WorldEdit location - */ public static Location adapt(org.bukkit.Location location) { - checkNotNull(location); - Vector position = asVector(location); - return new com.sk89q.worldedit.util.Location( - adapt(location.getWorld()), - position, - location.getYaw(), - location.getPitch()); + return getAdapter().adapt(location); } - /** - * Create a Bukkit location from a WorldEdit location. - * - * @param location the WorldEdit location - * @return a Bukkit location - */ public static org.bukkit.Location adapt(Location location) { - checkNotNull(location); - Vector position = location.toVector(); - return new org.bukkit.Location( - adapt((World) location.getExtent()), - position.getX(), position.getY(), position.getZ(), - location.getYaw(), - location.getPitch()); + return getAdapter().adapt(location); } - /** - * Create a Bukkit location from a WorldEdit position with a Bukkit world. - * - * @param world the Bukkit world - * @param position the WorldEdit position - * @return a Bukkit location - */ public static org.bukkit.Location adapt(org.bukkit.World world, Vector position) { - checkNotNull(world); - checkNotNull(position); - return new org.bukkit.Location( - world, - position.getX(), position.getY(), position.getZ()); + return getAdapter().adapt(world, position); } - /** - * Create a Bukkit location from a WorldEdit location with a Bukkit world. - * - * @param world the Bukkit world - * @param location the WorldEdit location - * @return a Bukkit location - */ public static org.bukkit.Location adapt(org.bukkit.World world, Location location) { - checkNotNull(world); - checkNotNull(location); - return new org.bukkit.Location( - world, - location.getX(), location.getY(), location.getZ(), - location.getYaw(), - location.getPitch()); + return getAdapter().adapt(world, location); } - /** - * Create a WorldEdit Vector from a Bukkit location. - * - * @param location The Bukkit location - * @return a WorldEdit vector - */ public static Vector asVector(org.bukkit.Location location) { - checkNotNull(location); - return new Vector(location.getX(), location.getY(), location.getZ()); + return getAdapter().asVector(location); } - /** - * Create a WorldEdit entity from a Bukkit entity. - * - * @param entity the Bukkit entity - * @return a WorldEdit entity - */ public static Entity adapt(org.bukkit.entity.Entity entity) { - checkNotNull(entity); - return new BukkitEntity(entity); + return getAdapter().adapt(entity); } - /** - * Create a Bukkit Material form a WorldEdit ItemType - * - * @param itemType The WorldEdit ItemType - * @return The Bukkit Material - */ public static Material adapt(ItemType itemType) { - checkNotNull(itemType); - if (!itemType.getId().startsWith("minecraft:")) { - throw new IllegalArgumentException("Bukkit only supports Minecraft items"); - } - return Material.getMaterial(itemType.getId().substring(10).toUpperCase()); + return getAdapter().adapt(itemType); } - /** - * Create a Bukkit Material form a WorldEdit BlockType - * - * @param blockType The WorldEdit BlockType - * @return The Bukkit Material - */ public static Material adapt(BlockType blockType) { - checkNotNull(blockType); - if (!blockType.getId().startsWith("minecraft:")) { - throw new IllegalArgumentException("Bukkit only supports Minecraft blocks"); - } - String id = blockType.getId().substring(10).toUpperCase(); - return Material.getMaterial(id); + return getAdapter().adapt(blockType); } - /** - * Create a WorldEdit GameMode from a Bukkit one. - * - * @param gameMode Bukkit GameMode - * @return WorldEdit GameMode - */ public static GameMode adapt(org.bukkit.GameMode gameMode) { - checkNotNull(gameMode); - return GameModes.get(gameMode.name().toLowerCase()); + return getAdapter().adapt(gameMode); } - /** - * Create a WorldEdit EntityType from a Bukkit one. - * - * @param entityType Bukkit EntityType - * @return WorldEdit EntityType - */ public static EntityType adapt(org.bukkit.entity.EntityType entityType) { - return EntityTypes.get(entityType.getName().toLowerCase()); + return getAdapter().adapt(entityType); } public static org.bukkit.entity.EntityType adapt(EntityType entityType) { - if (!entityType.getId().startsWith("minecraft:")) { - throw new IllegalArgumentException("Bukkit only supports vanilla entities"); - } - return org.bukkit.entity.EntityType.fromName(entityType.getId().substring(10).toLowerCase()); + return getAdapter().adapt(entityType); } - /** - * Converts a Material to a BlockType - * - * @param material The material - * @return The blocktype - */ public static BlockType asBlockType(Material material) { - checkNotNull(material); - if (!material.isBlock()) { - throw new IllegalArgumentException(material.getKey().toString() + " is not a block!") { - @Override - public synchronized Throwable fillInStackTrace() { - return this; - } - }; - } - return BlockTypes.get(material.getKey().toString()); + return getAdapter().asBlockType(material); } - - - /** - * Converts a Material to a ItemType - * - * @param material The material - * @return The itemtype - */ public static ItemType asItemType(Material material) { - return CachedBukkitAdapter.asItemType(material); + return getAdapter().asItemType(material); } - /** - * Create a WorldEdit BlockStateHolder from a Bukkit BlockData - * - * @param blockData The Bukkit BlockData - * @return The WorldEdit BlockState - */ public static BlockState adapt(BlockData blockData) { - return CachedBukkitAdapter.adapt(blockData); - } - - public static BlockData getBlockData(int combinedId) { - return CachedBukkitAdapter.getBlockData(combinedId); + return getAdapter().adapt(blockData); } public static BlockTypes adapt(Material material) { - return CachedBukkitAdapter.adapt(material); + return getAdapter().adapt(material); } - /** - * Create a Bukkit BlockData from a WorldEdit BlockStateHolder - * - * @param block The WorldEdit BlockStateHolder - * @return The Bukkit BlockData - */ public static BlockData adapt(BlockStateHolder block) { - return CachedBukkitAdapter.adapt(block); + return getAdapter().adapt(block); + } + + public static BlockData getBlockData(int combinedId) { + return getAdapter().getBlockData(combinedId); } - /** - * Create a WorldEdit BlockStateHolder from a Bukkit ItemStack - * - * @param itemStack The Bukkit ItemStack - * @return The WorldEdit BlockState - */ public static BlockState asBlockState(ItemStack itemStack) { - checkNotNull(itemStack); - if (itemStack.getType().isBlock()) { - return adapt(itemStack.getType().createBlockData()); - } else { - throw new NotABlockException(); - } + return getAdapter().asBlockState(itemStack); } - /** - * Create a WorldEdit BaseItemStack from a Bukkit ItemStack - * - * @param itemStack The Bukkit ItemStack - * @return The WorldEdit BaseItemStack - */ public static BaseItemStack adapt(ItemStack itemStack) { - checkNotNull(itemStack); - return new BukkitItemStack(itemStack); + return getAdapter().adapt(itemStack); } - /** - * Create a Bukkit ItemStack from a WorldEdit BaseItemStack - * - * @param item The WorldEdit BaseItemStack - * @return The Bukkit ItemStack - */ public static ItemStack adapt(BaseItemStack item) { - checkNotNull(item); - if (item instanceof BukkitItemStack) return ((BukkitItemStack) item).getBukkitItemStack(); - return new ItemStack(adapt(item.getType()), item.getAmount()); + return getAdapter().adapt(item); } - /** - * Create a WorldEdit Player from a Bukkit Player. - * - * @param player The Bukkit player - * @return The WorldEdit player - */ public static BukkitPlayer adapt(Player player) { - return WorldEditPlugin.getInstance().wrapPlayer(player); + return getAdapter().adapt(player); } - /** - * Create a Bukkit Player from a WorldEdit Player. - * - * @param player The WorldEdit player - * @return The Bukkit player - */ + public static Player adapt(com.sk89q.worldedit.entity.Player player) { - return ((BukkitPlayer) player).getPlayer(); + return getAdapter().adapt(player); } } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java index c6cfc83ce..7795a0022 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java @@ -21,8 +21,10 @@ package com.sk89q.worldedit.bukkit; import com.bekvon.bukkit.residence.commands.material; import com.sk89q.worldedit.blocks.BlockMaterial; +import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter; import com.sk89q.worldedit.command.tool.BlockDataCyler; import com.sk89q.worldedit.registry.state.Property; +import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -42,24 +44,49 @@ import javax.annotation.Nullable; public class BukkitBlockRegistry extends BundledBlockRegistry { - private MapIf a matching world cannot be found, a {@link RuntimeException} + * will be thrown.
+ * + * @param world the world + * @return a wrapped Bukkit world + */ + default BukkitWorld asBukkitWorld(World world) { + if (world instanceof BukkitWorld) { + return (BukkitWorld) world; + } else { + BukkitWorld bukkitWorld = WorldEditPlugin.getInstance().getInternalPlatform().matchWorld(world); + if (bukkitWorld == null) { + throw new RuntimeException("World '" + world.getName() + "' has no matching version in Bukkit"); + } + return bukkitWorld; + } + } + + /** + * Create a WorldEdit world from a Bukkit world. + * + * @param world the Bukkit world + * @return a WorldEdit world + */ + default World adapt(org.bukkit.World world) { + checkNotNull(world); + return new BukkitWorld(world); + } + + /** + * Create a Bukkit world from a WorldEdit world. + * + * @param world the WorldEdit world + * @return a Bukkit world + */ + default org.bukkit.World adapt(World world) { + checkNotNull(world); + if (world instanceof BukkitWorld) { + return ((BukkitWorld) world).getWorld(); + } else { + org.bukkit.World match = Bukkit.getServer().getWorld(world.getName()); + if (match != null) { + return match; + } else { + throw new IllegalArgumentException("Can't find a Bukkit world for " + world); + } + } + } + + /** + * Create a WorldEdit location from a Bukkit location. + * + * @param location the Bukkit location + * @return a WorldEdit location + */ + default Location adapt(org.bukkit.Location location) { + checkNotNull(location); + Vector position = asVector(location); + return new com.sk89q.worldedit.util.Location( + adapt(location.getWorld()), + position, + location.getYaw(), + location.getPitch()); + } + + /** + * Create a Bukkit location from a WorldEdit location. + * + * @param location the WorldEdit location + * @return a Bukkit location + */ + default org.bukkit.Location adapt(Location location) { + checkNotNull(location); + Vector position = location.toVector(); + return new org.bukkit.Location( + adapt((World) location.getExtent()), + position.getX(), position.getY(), position.getZ(), + location.getYaw(), + location.getPitch()); + } + + /** + * Create a Bukkit location from a WorldEdit position with a Bukkit world. + * + * @param world the Bukkit world + * @param position the WorldEdit position + * @return a Bukkit location + */ + default org.bukkit.Location adapt(org.bukkit.World world, Vector position) { + checkNotNull(world); + checkNotNull(position); + return new org.bukkit.Location( + world, + position.getX(), position.getY(), position.getZ()); + } + + /** + * Create a Bukkit location from a WorldEdit location with a Bukkit world. + * + * @param world the Bukkit world + * @param location the WorldEdit location + * @return a Bukkit location + */ + default org.bukkit.Location adapt(org.bukkit.World world, Location location) { + checkNotNull(world); + checkNotNull(location); + return new org.bukkit.Location( + world, + location.getX(), location.getY(), location.getZ(), + location.getYaw(), + location.getPitch()); + } + + /** + * Create a WorldEdit Vector from a Bukkit location. + * + * @param location The Bukkit location + * @return a WorldEdit vector + */ + default Vector asVector(org.bukkit.Location location) { + checkNotNull(location); + return new Vector(location.getX(), location.getY(), location.getZ()); + } + + /** + * Create a WorldEdit entity from a Bukkit entity. + * + * @param entity the Bukkit entity + * @return a WorldEdit entity + */ + default Entity adapt(org.bukkit.entity.Entity entity) { + checkNotNull(entity); + return new BukkitEntity(entity); + } + + /** + * Create a Bukkit Material form a WorldEdit ItemType + * + * @param itemType The WorldEdit ItemType + * @return The Bukkit Material + */ + default Material adapt(ItemType itemType) { + checkNotNull(itemType); + if (!itemType.getId().startsWith("minecraft:")) { + throw new IllegalArgumentException("Bukkit only supports Minecraft items"); + } + return Material.getMaterial(itemType.getId().substring(10).toUpperCase()); + } + + /** + * Create a Bukkit Material form a WorldEdit BlockType + * + * @param blockType The WorldEdit BlockType + * @return The Bukkit Material + */ + default Material adapt(BlockType blockType) { + checkNotNull(blockType); + if (!blockType.getId().startsWith("minecraft:")) { + throw new IllegalArgumentException("Bukkit only supports Minecraft blocks"); + } + String id = blockType.getId().substring(10).toUpperCase(); + return Material.getMaterial(id); + } + + /** + * Create a WorldEdit GameMode from a Bukkit one. + * + * @param gameMode Bukkit GameMode + * @return WorldEdit GameMode + */ + default GameMode adapt(org.bukkit.GameMode gameMode) { + checkNotNull(gameMode); + return GameModes.get(gameMode.name().toLowerCase()); + } + + /** + * Create a WorldEdit EntityType from a Bukkit one. + * + * @param entityType Bukkit EntityType + * @return WorldEdit EntityType + */ + default EntityType adapt(org.bukkit.entity.EntityType entityType) { + return EntityTypes.get(entityType.getName().toLowerCase()); + } + + default org.bukkit.entity.EntityType adapt(EntityType entityType) { + if (!entityType.getId().startsWith("minecraft:")) { + throw new IllegalArgumentException("Bukkit only supports vanilla entities"); + } + return org.bukkit.entity.EntityType.fromName(entityType.getId().substring(10).toLowerCase()); + } + + /** + * Converts a Material to a BlockType + * + * @param material The material + * @return The blocktype + */ + default BlockType asBlockType(Material material) { + checkNotNull(material); + if (!material.isBlock()) { + throw new IllegalArgumentException(material.getKey().toString() + " is not a block!") { + @Override + public synchronized Throwable fillInStackTrace() { + return this; + } + }; + } + return BlockTypes.get(material.getKey().toString()); + } + + + + /** + * Converts a Material to a ItemType + * + * @param material The material + * @return The itemtype + */ + ItemType asItemType(Material material); + + /** + * Create a WorldEdit BlockStateHolder from a Bukkit BlockData + * + * @param blockData The Bukkit BlockData + * @return The WorldEdit BlockState + */ + BlockState adapt(BlockData blockData); + + BlockTypes adapt(Material material); + + /** + * Create a Bukkit BlockData from a WorldEdit BlockStateHolder + * + * @param block The WorldEdit BlockStateHolder + * @return The Bukkit BlockData + */ + BlockData adapt(BlockStateHolder block); + + default BlockData getBlockData(int combinedId) { + return adapt(BlockState.getFromInternalId(combinedId)); + } + + /** + * Create a WorldEdit BlockStateHolder from a Bukkit ItemStack + * + * @param itemStack The Bukkit ItemStack + * @return The WorldEdit BlockState + */ + default BlockState asBlockState(ItemStack itemStack) { + checkNotNull(itemStack); + if (itemStack.getType().isBlock()) { + return adapt(itemStack.getType().createBlockData()); + } else { + throw new NotABlockException(); + } + } + + /** + * Create a WorldEdit BaseItemStack from a Bukkit ItemStack + * + * @param itemStack The Bukkit ItemStack + * @return The WorldEdit BaseItemStack + */ + default BaseItemStack adapt(ItemStack itemStack) { + checkNotNull(itemStack); + return new BukkitItemStack(itemStack); + } + + /** + * Create a Bukkit ItemStack from a WorldEdit BaseItemStack + * + * @param item The WorldEdit BaseItemStack + * @return The Bukkit ItemStack + */ + default ItemStack adapt(BaseItemStack item) { + checkNotNull(item); + if (item instanceof BukkitItemStack) return ((BukkitItemStack) item).getBukkitItemStack(); + return new ItemStack(adapt(item.getType()), item.getAmount()); + } + + /** + * Create a WorldEdit Player from a Bukkit Player. + * + * @param player The Bukkit player + * @return The WorldEdit player + */ + default BukkitPlayer adapt(Player player) { + return WorldEditPlugin.getInstance().wrapPlayer(player); + } + /** + * Create a Bukkit Player from a WorldEdit Player. + * + * @param player The WorldEdit player + * @return The Bukkit player + */ + default Player adapt(com.sk89q.worldedit.entity.Player player) { + return ((BukkitPlayer) player).getPlayer(); + } +} diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/SimpleBukkitAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/SimpleBukkitAdapter.java new file mode 100644 index 000000000..19891fa7d --- /dev/null +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/SimpleBukkitAdapter.java @@ -0,0 +1,48 @@ +package com.sk89q.worldedit.bukkit.adapter; + +import com.sk89q.worldedit.world.block.BlockStateHolder; +import com.sk89q.worldedit.world.block.BlockTypes; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.block.data.BlockData; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class SimpleBukkitAdapter extends CachedBukkitAdapter { + private BlockData[][] blockDataCache; + + public boolean init() { + if (blockDataCache != null) return false; + this.blockDataCache = new BlockData[BlockTypes.size()][]; + blockDataCache[0] = new BlockData[] {Material.AIR.createBlockData()}; + return true; + } + + /** + * Create a Bukkit BlockData from a WorldEdit BlockStateHolder + * + * @param block The WorldEdit BlockStateHolder + * @return The Bukkit BlockData + */ + @Override + public BlockData adapt(BlockStateHolder block) { + try { + checkNotNull(block); + int typeId = block.getInternalBlockTypeId(); + BlockData[] dataCache = blockDataCache[typeId]; + if (dataCache == null) { + BlockTypes type = BlockTypes.get(typeId); + blockDataCache[typeId] = dataCache = new BlockData[type.getMaxStateId() + 1]; + } + int propId = block.getInternalPropertiesId(); + BlockData blockData = dataCache[propId]; + if (blockData == null) { + dataCache[propId] = blockData = Bukkit.createBlockData(block.getAsString()); + } + return blockData; + } catch (NullPointerException e) { + if (init()) return adapt(block); + throw e; + } + } +} diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java b/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java index 4a83ef60d..82254d7a8 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java @@ -86,7 +86,7 @@ public class Rollback extends FaweCommand { int id = entry.getKey(); BlockStateHolder state = null; try { - state = BlockState.get(id); + state = BlockState.getFromInternalId(id); } catch (Throwable ignore) {}; String itemName = state == null ? "#" + id : state.getAsString(); percentString.append(prefix).append(entry.getValue()).append("% ").append(itemName); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java b/worldedit-core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java index e96b80ae7..e9359d2c8 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java @@ -2,7 +2,6 @@ package com.boydti.fawe.example; import com.boydti.fawe.Fawe; import com.boydti.fawe.FaweAPI; -import com.boydti.fawe.FaweCache; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.FaweChunk; import com.boydti.fawe.object.FaweQueue; @@ -17,11 +16,10 @@ import com.boydti.fawe.util.SetQueue; import com.boydti.fawe.util.TaskManager; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.EditSession; -import com.sk89q.worldedit.blocks.BlockMaterial; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.biome.BaseBiome; import com.sk89q.worldedit.world.block.BlockTypes; -import com.sk89q.worldedit.world.registry.BundledBlockData; + import java.util.ArrayDeque; import java.util.Collection; import java.util.HashSet; diff --git a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java index 59d91ff4f..c8118e4d1 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java @@ -17,7 +17,6 @@ import com.boydti.fawe.util.image.ImageViewer; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.*; import com.sk89q.worldedit.Vector; -import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.extent.clipboard.Clipboard; @@ -32,7 +31,6 @@ import com.sk89q.worldedit.session.ClipboardHolder; import com.sk89q.worldedit.util.TreeGenerator; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.biome.BaseBiome; -import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -74,7 +72,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr protected boolean randomVariation = true; protected int biomePriority = 0; protected int waterId = BlockTypes.WATER.getInternalId(); - protected byte bedrockId = 7; + protected int bedrockId = 7; protected boolean modifiedMain = false; @Override @@ -338,7 +336,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr } public void setBedrockId(int bedrockId) { - this.primtives.bedrockId = (byte) bedrockId; + this.primtives.bedrockId = bedrockId; } public void setFloorThickness(int floorThickness) { @@ -354,7 +352,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr } public void setWaterId(int waterId) { - this.primtives.waterId = (byte) waterId; + this.primtives.waterId = waterId; } public void setTextureRandomVariation(boolean randomVariation) { @@ -1024,7 +1022,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr public BlockState getFloor(int x, int z) { int index = z * getWidth() + x; - return BlockState.get(floor.getInt(index)); + return BlockState.getFromInternalId(floor.getInt(index)); } public int getHeight(int x, int z) { @@ -1048,7 +1046,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr @Override public BlockState getLazyBlock(int x, int y, int z) { - return BlockState.get(getCombinedId4Data(x, y, z)); + return BlockState.getFromInternalId(getCombinedId4Data(x, y, z)); } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java b/worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java index dea975357..ed2e2e8d7 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java @@ -1,6 +1,5 @@ package com.boydti.fawe.object; -import com.boydti.fawe.FaweCache; import com.boydti.fawe.object.visitor.FaweChunkVisitor; import com.boydti.fawe.util.MainUtil; import com.sk89q.jnbt.CompoundTag; @@ -126,7 +125,7 @@ public abstract class FaweChunk