Permalink
Browse files

package move

  • Loading branch information...
kashike committed Jul 5, 2018
1 parent de3c470 commit 61c6740556e81cab96e9fd4856d8fbefba57edb1
Showing with 232 additions and 262 deletions.
  1. +2 −2 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
  2. +2 −2 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java
  3. +2 −2 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
  4. +1 −1 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java
  5. +1 −1 worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
  6. +2 −2 worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/LazyBlock.java
  7. +1 −1 worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
  8. +1 −1 worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java
  9. +1 −1 worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java
  10. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/CuboidClipboard.java
  11. +18 −19 worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
  12. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java
  13. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
  14. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java
  15. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
  16. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItem.java
  17. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItemStack.java
  18. +3 −1 worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockID.java
  19. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java
  20. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/blocks/Blocks.java
  21. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
  22. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java
  23. +2 −3 worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
  24. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java
  25. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
  26. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
  27. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
  28. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
  29. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
  30. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
  31. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/InvalidToolBindException.java
  32. +2 −3 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java
  33. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
  34. +3 −4 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
  35. +2 −3 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
  36. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/CylinderBrush.java
  37. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java
  38. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/HollowCylinderBrush.java
  39. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/HollowSphereBrush.java
  40. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/SphereBrush.java
  41. +1 −3 worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java
  42. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java
  43. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
  44. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/RandomPatternParser.java
  45. +7 −7 worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java
  46. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java
  47. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/extent/ChangeSetExtent.java
  48. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/InputExtent.java
  49. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java
  50. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/extent/NullExtent.java
  51. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java
  52. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/extent/buffer/ForgetfulExtentBuffer.java
  53. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java
  54. +1 −1 .../src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java
  55. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java
  56. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
  57. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/OutOfSpaceException.java
  58. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
  59. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
  60. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/validation/BlockChangeLimiter.java
  61. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/validation/DataValidatorExtent.java
  62. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/BlockQuirkExtent.java
  63. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/ChunkLoadingExtent.java
  64. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java
  65. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/SurvivalModeExtent.java
  66. +0 −1 worldedit-core/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java
  67. +2 −3 worldedit-core/src/main/java/com/sk89q/worldedit/function/block/Naturalizer.java
  68. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java
  69. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java
  70. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
  71. +1 −3 worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java
  72. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java
  73. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/FuzzyBlockMask.java
  74. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java
  75. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/BlockMapEntryPlacer.java
  76. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java
  77. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ClipboardPattern.java
  78. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/Pattern.java
  79. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
  80. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java
  81. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/history/change/BlockChange.java
  82. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/BlockOptimizedHistory.java
  83. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/WorldEditBinding.java
  84. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/math/convolution/HeightMap.java
  85. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/ArbitraryShape.java
  86. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/RegionShape.java
  87. +1 −2 worldedit-core/src/main/java/com/sk89q/worldedit/scripting/CraftScriptContext.java
  88. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
  89. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java
  90. +4 −4 worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java
  91. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
  92. +2 −3 worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
  93. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/block}/BlockCategories.java
  94. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/block}/BlockCategory.java
  95. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/block}/BlockState.java
  96. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/block}/BlockStateHolder.java
  97. +3 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/block}/BlockType.java
  98. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/block}/BlockTypes.java
  99. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java
  100. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/fluid}/FluidCategories.java
  101. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/fluid}/FluidCategory.java
  102. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/fluid}/FluidType.java
  103. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/fluid}/FluidTypes.java
  104. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/item}/ItemCategories.java
  105. +1 −3 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/item}/ItemCategory.java
  106. +3 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/item}/ItemType.java
  107. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/{blocks/type → world/item}/ItemTypes.java
  108. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockCategoryRegistry.java
  109. +2 −2 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
  110. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
  111. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
  112. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/ItemCategoryRegistry.java
  113. +3 −3 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java
  114. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBlockCategoryRegistry.java
  115. +1 −1 worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullItemCategoryRegistry.java
  116. +0 −8 worldedit-core/src/test/java/com/sk89q/worldedit/CuboidClipboardTest.java
  117. +2 −2 worldedit-core/src/test/java/com/sk89q/worldedit/extent/transform/BlockTransformExtentTest.java
  118. +1 −1 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeItemRegistry.java
  119. +1 −1 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java
  120. +3 −3 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java
  121. +3 −1 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
  122. +1 −1 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
  123. +3 −4 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
  124. +3 −2 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java
@@ -19,8 +19,8 @@
package com.sk89q.worldedit.bukkit;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.extent.inventory.BlockBag;
import com.sk89q.worldedit.extent.inventory.BlockBagException;
import com.sk89q.worldedit.extent.inventory.OutOfBlocksException;
@@ -24,8 +24,8 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.blocks.type.ItemType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.registry.LegacyMapper;
@@ -30,7 +30,7 @@
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.LazyBlock;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.history.change.BlockChange;
@@ -357,7 +357,7 @@ public void simulateBlockMine(Vector pt) {
}
@Override
public com.sk89q.worldedit.blocks.type.BlockState getBlock(Vector position) {
public com.sk89q.worldedit.world.block.BlockState getBlock(Vector position) {
Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
return LegacyMapper.getInstance().getBlockFromLegacy(bukkitBlock.getTypeId(), bukkitBlock.getData());
}
@@ -19,7 +19,7 @@
package com.sk89q.worldedit.bukkit;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import org.bukkit.BlockChangeDelegate;
import com.sk89q.worldedit.EditSession;
@@ -20,7 +20,7 @@
package com.sk89q.worldedit.bukkit.adapter;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.entity.BaseEntity;
import org.bukkit.Location;
import org.bukkit.block.Biome;
@@ -23,8 +23,8 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.blocks.type.BlockType;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.extent.Extent;
/**
@@ -25,7 +25,7 @@
import com.sk89q.jnbt.ShortTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.storage.InvalidFormatException;
import java.util.HashMap;
@@ -22,7 +22,7 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.util.gson.GsonUtil;
import java.util.HashMap;
@@ -22,7 +22,7 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.world.block.BlockState;
import java.util.HashMap;
import java.util.Map;
@@ -22,8 +22,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.command.ClipboardCommands;
import com.sk89q.worldedit.command.SchematicCommands;
import com.sk89q.worldedit.entity.Entity;
@@ -26,12 +26,12 @@
import static com.sk89q.worldedit.regions.Regions.minimumBlockY;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.blocks.LazyBlock;
import com.sk89q.worldedit.blocks.type.BlockCategories;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockCategories;
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;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.event.extent.EditSessionEvent;
@@ -108,7 +108,6 @@
import com.sk89q.worldedit.world.NullWorld;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import java.util.ArrayList;
import java.util.Collections;
@@ -375,7 +374,7 @@ public void setBlockBag(BlockBag blockBag) {
*
* @return a map of missing blocks
*/
public Map<com.sk89q.worldedit.blocks.type.BlockType, Integer> popMissingBlocks() {
public Map<BlockType, Integer> popMissingBlocks() {
return blockBagExtent.popMissing();
}
@@ -727,7 +726,7 @@ public int removeBelow(Vector position, int apothem, int height) throws MaxChang
* @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed
*/
public int removeNear(Vector position, com.sk89q.worldedit.blocks.type.BlockType blockType, int apothem) throws MaxChangedBlocksException {
public int removeNear(Vector position, BlockType blockType, int apothem) throws MaxChangedBlocksException {
checkNotNull(position);
checkArgument(apothem >= 1, "apothem >= 1");
@@ -1143,7 +1142,7 @@ public int drainArea(Vector origin, double radius) throws MaxChangedBlocksExcept
* @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed
*/
public int fixLiquid(Vector origin, double radius, com.sk89q.worldedit.blocks.type.BlockType moving, com.sk89q.worldedit.blocks.type.BlockType stationary) throws MaxChangedBlocksException {
public int fixLiquid(Vector origin, double radius, BlockType moving, BlockType stationary) throws MaxChangedBlocksException {
checkNotNull(origin);
checkArgument(radius >= 0, "radius >= 0 required");
@@ -1449,7 +1448,7 @@ public int thaw(Vector position, double radius)
for (int y = world.getMaxY(); y >= 1; --y) {
Vector pt = new Vector(x, y, z);
com.sk89q.worldedit.blocks.type.BlockType id = getBlock(pt).getBlockType();
BlockType id = getBlock(pt).getBlockType();
if (id == BlockTypes.ICE) {
if (setBlock(pt, water)) {
@@ -1499,7 +1498,7 @@ public int simulateSnow(Vector position, double radius) throws MaxChangedBlocksE
for (int y = world.getMaxY(); y >= 1; --y) {
Vector pt = new Vector(x, y, z);
com.sk89q.worldedit.blocks.type.BlockType id = getBlock(pt).getBlockType();
BlockType id = getBlock(pt).getBlockType();
if (id == BlockTypes.AIR) {
continue;
@@ -1642,7 +1641,7 @@ public int makeForest(Vector basePosition, int size, double density, TreeGenerat
for (int y = basePosition.getBlockY(); y >= basePosition.getBlockY() - 10; --y) {
// Check if we hit the ground
com.sk89q.worldedit.blocks.type.BlockType t = getBlock(new Vector(x, y, z)).getBlockType();
BlockType t = getBlock(new Vector(x, y, z)).getBlockType();
if (t == BlockTypes.GRASS_BLOCK || t == BlockTypes.DIRT) {
treeType.generate(this, new Vector(x, y + 1, z));
++affected;
@@ -1665,9 +1664,9 @@ public int makeForest(Vector basePosition, int size, double density, TreeGenerat
* @param region a region
* @return the results
*/
public List<Countable<com.sk89q.worldedit.blocks.type.BlockType>> getBlockDistribution(Region region) {
List<Countable<com.sk89q.worldedit.blocks.type.BlockType>> distribution = new ArrayList<>();
Map<com.sk89q.worldedit.blocks.type.BlockType, Countable<com.sk89q.worldedit.blocks.type.BlockType>> map = new HashMap<>();
public List<Countable<BlockType>> getBlockDistribution(Region region) {
List<Countable<BlockType>> distribution = new ArrayList<>();
Map<BlockType, Countable<BlockType>> map = new HashMap<>();
if (region instanceof CuboidRegion) {
// Doing this for speed
@@ -1686,12 +1685,12 @@ public int makeForest(Vector basePosition, int size, double density, TreeGenerat
for (int z = minZ; z <= maxZ; ++z) {
Vector pt = new Vector(x, y, z);
com.sk89q.worldedit.blocks.type.BlockType type = getLazyBlock(pt).getBlockType();
BlockType type = getLazyBlock(pt).getBlockType();
if (map.containsKey(type)) {
map.get(type).increment();
} else {
Countable<com.sk89q.worldedit.blocks.type.BlockType> c = new Countable<>(type, 1);
Countable<BlockType> c = new Countable<>(type, 1);
map.put(type, c);
distribution.add(c);
}
@@ -1700,12 +1699,12 @@ public int makeForest(Vector basePosition, int size, double density, TreeGenerat
}
} else {
for (Vector pt : region) {
com.sk89q.worldedit.blocks.type.BlockType type = getLazyBlock(pt).getBlockType();
BlockType type = getLazyBlock(pt).getBlockType();
if (map.containsKey(type)) {
map.get(type).increment();
} else {
Countable<com.sk89q.worldedit.blocks.type.BlockType> c = new Countable<>(type, 1);
Countable<BlockType> c = new Countable<>(type, 1);
map.put(type, c);
}
}
@@ -19,8 +19,8 @@
package com.sk89q.worldedit;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.blocks.type.ItemTypes;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.util.logging.LogFormat;
import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
@@ -25,8 +25,8 @@
import com.sk89q.jchronic.Options;
import com.sk89q.jchronic.utils.Span;
import com.sk89q.jchronic.utils.Time;
import com.sk89q.worldedit.blocks.type.ItemType;
import com.sk89q.worldedit.blocks.type.ItemTypes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.command.tool.BlockTool;
import com.sk89q.worldedit.command.tool.BrushTool;
import com.sk89q.worldedit.command.tool.InvalidToolBindException;
@@ -25,7 +25,7 @@
import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.type.BlockType;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.event.platform.BlockInteractEvent;
import com.sk89q.worldedit.event.platform.InputType;
@@ -22,10 +22,10 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockType;
import com.sk89q.worldedit.blocks.type.BlockTypes;
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;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import com.sk89q.worldedit.world.registry.state.State;
@@ -20,8 +20,8 @@
package com.sk89q.worldedit.blocks;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.blocks.type.ItemType;
import com.sk89q.worldedit.blocks.type.ItemTypes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.world.NbtValued;
import com.sk89q.worldedit.world.registry.LegacyMapper;
@@ -20,7 +20,7 @@
package com.sk89q.worldedit.blocks;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.blocks.type.ItemType;
import com.sk89q.worldedit.world.item.ItemType;
/**
* Represents a stack of BaseItems.
@@ -19,10 +19,12 @@
package com.sk89q.worldedit.blocks;
import com.sk89q.worldedit.world.block.BlockTypes;
/**
* List of block IDs.
*
* {@deprecated Please use {@link com.sk89q.worldedit.blocks.type.BlockTypes}}
* {@deprecated Please use {@link BlockTypes }}
*/
@Deprecated
public final class BlockID {
@@ -22,15 +22,15 @@
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.PlayerDirection;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import java.util.HashMap;
import java.util.Map;
/**
* Block types.
*
* {@deprecated Please use {@link com.sk89q.worldedit.blocks.type.BlockType}}
* {@deprecated Please use {@link com.sk89q.worldedit.world.block.BlockType }}
*/
@Deprecated
public enum BlockType {
@@ -19,10 +19,10 @@
package com.sk89q.worldedit.blocks;
import com.sk89q.worldedit.blocks.type.BlockCategories;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockType;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockCategories;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.Collection;
import java.util.HashSet;
@@ -30,7 +30,7 @@
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.command.tool.BrushTool;
import com.sk89q.worldedit.command.tool.brush.ButcherBrush;
import com.sk89q.worldedit.command.tool.brush.ClipboardBrush;
@@ -24,8 +24,8 @@
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.type.ItemType;
import com.sk89q.worldedit.blocks.type.ItemTypes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.function.mask.Mask;
@@ -33,10 +33,9 @@
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.ItemTypes;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.platform.permission.ActorSelectorLimits;
@@ -23,9 +23,8 @@
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.command.tool.*;
@@ -33,8 +33,8 @@
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockTypes;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.command.util.CreatureButcher;
import com.sk89q.worldedit.command.util.EntityRemover;
import com.sk89q.worldedit.entity.Entity;
Oops, something went wrong.

0 comments on commit 61c6740

Please sign in to comment.