Upstream
/
addon-level
mirror of https://github.com/BentoBoxWorld/Level.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes bugs introduced by code smell fixes.

This commit is contained in:
tastybento 2020-06-25 19:17:39 -07:00
parent 73fad8a808
commit a6be22bfe5
6 changed files with 136 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -58,14 +58,14 @@
<!-- Non-minecraft related dependencies -->
<powermock.version>2.0.2</powermock.version>
<!-- More visible way how to change dependency versions -->
<spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
<spigot.version>1.16.1-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.14.0-SNAPSHOT</bentobox.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.2.0</build.version>
<build.version>2.3.0</build.version>
</properties>
<!-- Profiles will allow to automatically change build version. -->

7
src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
View File

@ -25,6 +25,7 @@ import org.bukkit.block.data.type.Slab;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import com.bgsoftware.wildstacker.api.WildStackerAPI;
import com.bgsoftware.wildstacker.api.objects.StackedBarrel;
@ -429,12 +430,13 @@ public class IslandLevelCalculator {
* @param chunk - the chunk to scan
* @return future that completes when the scan is done and supplies a boolean that will be true if the scan was successful, false if not
*/
private CompletableFuture<Boolean> scanChunk(@NonNull Chunk chunk) {
private CompletableFuture<Boolean> scanChunk(@Nullable Chunk chunk) {
// If the chunk hasn't been generated, return
if (chunk == null) return CompletableFuture.completedFuture(false);
// Scan chests
if (addon.getSettings().isIncludeChests()) {
scanChests(chunk);
}
// Count blocks in chunk
CompletableFuture<Boolean> result = new CompletableFuture<>();
Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> scanAsync(result, chunk));
@ -447,6 +449,7 @@ public class IslandLevelCalculator {
*/
public CompletableFuture<Boolean> scanNextChunk() {
if (chunksToCheck.isEmpty()) {
addon.logError("Unexpected: no chunks to scan!");
// This should not be needed, but just in case
return CompletableFuture.completedFuture(false);
}

2
src/main/java/world/bentobox/level/calculators/Pipeliner.java
View File

@ -37,6 +37,7 @@ public class Pipeliner {
}
// One island at a time
if (inProcess || processQueue.isEmpty()) return;
IslandLevelCalculator iD = processQueue.poll();
// Ignore deleted or unonwed islands
if (iD.getIsland().isDeleted() || iD.getIsland().isUnowned()) return;
@ -63,6 +64,7 @@ public class Pipeliner {
private void scanChunk(IslandLevelCalculator iD) {
if (iD.getIsland().isDeleted() || iD.getIsland().isUnowned()) {
// Island is deleted, so finish early with nothing
addon.log("Canceling island level calculation - island has been deleted, or has become unowned.");
inProcess = false;
iD.getR().complete(null);
return;

2
src/main/java/world/bentobox/level/commands/AdminLevelStatusCommand.java
View File

@ -25,7 +25,7 @@ public class AdminLevelStatusCommand extends CompositeCommand {
@Override
public boolean execute(User user, String label, List<String> args) {
user.sendMessage("islands-in-queue", TextVariables.NUMBER, String.valueOf(addon.getPipeliner().getIslandsInQueue()));
user.sendMessage("admin.levelstatus.islands-in-queue", TextVariables.NUMBER, String.valueOf(addon.getPipeliner().getIslandsInQueue()));
return true;
}
}

4
src/main/java/world/bentobox/level/commands/IslandLevelCommand.java
View File

@ -50,6 +50,10 @@ public class IslandLevelCommand extends CompositeCommand {
return true;
}
}
if (!user.isPlayer()) {
user.sendMessage("general.errors.use-in-game");
return false;
}
// Self request
// Check player cooldown
int coolDown = this.addon.getSettings().getLevelWait();

162
src/main/resources/blockconfig.yml
View File

@ -27,7 +27,9 @@ blocks:
ACACIA_WALL_SIGN: 6
ACACIA_WOOD: 1
ACTIVATOR_RAIL: 1
AIR: 0
ALLIUM: 1
ANCIENT_DEBRIS: 10
ANDESITE: 1
ANDESITE_SLAB: 1
ANDESITE_STAIRS: 1
@ -40,8 +42,11 @@ blocks:
BAMBOO_SAPLING: 1
BARREL: 2
BARRIER: 0
BEACON: 500
BEDROCK: 0
BASALT: 1
BLACKSTONE: 500
BLACKSTONE_SLAB: 0
BLACKSTONE_STAIRS: 1
BLACKSTONE_WALL: 1
BEETROOTS: 1
BELL: 100
BIRCH_BUTTON: 1
@ -71,6 +76,10 @@ blocks:
BLACK_TERRACOTTA: 2
BLACK_WALL_BANNER: 2
BLACK_WOOL: 2
BLACKSTONE: 1
BLACKSTONE_SLAB: 1
BLACKSTONE_STAIRS: 2
BLACKSTONE_WALL: 1
BLAST_FURNACE: 150
BLUE_BANNER: 2
BLUE_BED: 6
@ -93,10 +102,10 @@ blocks:
BRAIN_CORAL_FAN: 1
BRAIN_CORAL_WALL_FAN: 1
BREWING_STAND: 20
BRICKS: 5
BRICK_SLAB: 3
BRICK_STAIRS: 5
BRICK_WALL: 5
BRICKS: 5
BROWN_BANNER: 2
BROWN_BED: 6
BROWN_CARPET: 1
@ -124,9 +133,12 @@ blocks:
CARVED_PUMPKIN: 2
CAULDRON: 10
CAVE_AIR: 0
CHAIN: 2
CHAIN_COMMAND_BLOCK: 0
CHEST: 8
CHIPPED_ANVIL: 9
CHISELED_NETHER_BRICKS: 2
CHISELED_POLISHED_BLACKSTONE: 2
CHISELED_QUARTZ_BLOCK: 2
CHISELED_RED_SANDSTONE: 2
CHISELED_SANDSTONE: 2
@ -148,10 +160,29 @@ blocks:
COMPOSTER: 9
CONDUIT: 1
CORNFLOWER: 1
CRACKED_NETHER_BRICKS: 1
CRACKED_POLISHED_BLACKSTONE_BRICKS: 1
CRACKED_STONE_BRICKS: 2
CRAFTING_TABLE: 1
CREEPER_HEAD: 1
CREEPER_WALL_HEAD: 1
CRIMSON_BUTTON: 1
CRIMSON_DOOR: 2
CRIMSON_FENCE: 2
CRIMSON_FENCE_GATE: 4
CRIMSON_FUNGUS: 1
CRIMSON_HYPHAE: 1
CRIMSON_NYLIUM: 1
CRIMSON_PLANKS: 1
CRIMSON_PRESSURE_PLATE: 2
CRIMSON_ROOTS: 1
CRIMSON_SIGN: 6
CRIMSON_SLAB: 1
CRIMSON_STAIRS: 2
CRIMSON_STEM: 1
CRIMSON_TRAPDOOR: 3
CRIMSON_WALL_SIGN: 6
CRYING_OBSIDIAN: 15
CUT_RED_SANDSTONE: 1
CUT_RED_SANDSTONE_SLAB: 1
CUT_SANDSTONE: 1
@ -183,25 +214,30 @@ blocks:
DARK_OAK_SLAB: 1
DARK_OAK_STAIRS: 2
DARK_OAK_TRAPDOOR: 3
DARK_OAK_WOOD: 1
DARK_OAK_WALL_SIGN: 6
DARK_OAK_WOOD: 1
DARK_PRISMARINE: 1
DARK_PRISMARINE_SLAB: 1
DARK_PRISMARINE_STAIRS: 2
DAYLIGHT_DETECTOR: 10
DEAD_BRAIN_CORAL: 1
DEAD_BRAIN_CORAL_BLOCK: 1
DEAD_BRAIN_CORAL_FAN: 1
DEAD_BRAIN_CORAL_WALL_FAN: 1
DEAD_BUBBLE_CORAL: 1
DEAD_BUBBLE_CORAL_BLOCK: 1
DEAD_BUBBLE_CORAL_FAN: 1
DEAD_BUBBLE_CORAL_WALL_FAN: 1
DEAD_BUSH: 1
DEAD_FIRE_CORAL: 1
DEAD_FIRE_CORAL_BLOCK: 1
DEAD_FIRE_CORAL_FAN: 1
DEAD_FIRE_CORAL_WALL_FAN: 1
DEAD_HORN_CORAL: 1
DEAD_HORN_CORAL_BLOCK: 1
DEAD_HORN_CORAL_FAN: 1
DEAD_HORN_CORAL_WALL_FAN: 1
DEAD_TUBE_CORAL: 1
DEAD_TUBE_CORAL_BLOCK: 1
DEAD_TUBE_CORAL_FAN: 1
DEAD_TUBE_CORAL_WALL_FAN: 1
@ -222,16 +258,16 @@ blocks:
EMERALD_BLOCK: 150
EMERALD_ORE: 1
ENCHANTING_TABLE: 150
ENDER_CHEST: 150
END_GATEWAY: 0
END_PORTAL: 0
END_PORTAL_FRAME: 0
END_ROD: 1
END_STONE: 1
END_STONE_BRICKS: 2
END_STONE_BRICK_SLAB: 2
END_STONE_BRICK_STAIRS: 2
END_STONE_BRICK_WALL: 2
END_STONE_BRICKS: 2
ENDER_CHEST: 150
FARMLAND: 1
FERN: 1
FIRE: 0
@ -243,6 +279,7 @@ blocks:
FLOWER_POT: 1
FROSTED_ICE: 1
FURNACE: 8
GILDED_BLACKSTONE: 1
GLASS: 2
GLASS_PANE: 1
GLOWSTONE: 1
@ -282,9 +319,11 @@ blocks:
GREEN_WOOL: 2
GRINDSTONE: 8
HAY_BLOCK: 2
HEART_OF_THE_SEA: 3
HEAVY_WEIGHTED_PRESSURE_PLATE: 2
HONEY_BLOCK: 1
HONEYCOMB_BLOCK: 1
HOPPER: -10
HORN_CORAL: 1
HORN_CORAL_BLOCK: 1
HORN_CORAL_FAN: 1
HORN_CORAL_WALL_FAN: 1
@ -301,6 +340,7 @@ blocks:
IRON_ORE: 1
IRON_TRAPDOOR: 4
JACK_O_LANTERN: 2
JIGSAW: 1
JUKEBOX: 10
JUNGLE_BUTTON: 1
JUNGLE_DOOR: 2
@ -367,6 +407,7 @@ blocks:
LIME_TERRACOTTA: 2
LIME_WALL_BANNER: 2
LIME_WOOL: 2
LODESTONE: 10
LOOM: 5
MAGENTA_BANNER: 2
MAGENTA_BED: 6
@ -387,20 +428,26 @@ blocks:
MOSSY_COBBLESTONE_SLAB: 1
MOSSY_COBBLESTONE_STAIRS: 1
MOSSY_COBBLESTONE_WALL: 1
MOSSY_STONE_BRICKS: 2
MOSSY_STONE_BRICK_SLAB: 2
MOSSY_STONE_BRICK_STAIRS: 2
MOSSY_STONE_BRICK_WALL: 2
MOSSY_STONE_BRICKS: 2
MOVING_PISTON: 1
MUSHROOM_STEM: 1
MYCELIUM: 5
NETHERRACK: 1
NETHER_BRICKS: 2
NETHER_BRICK_FENCE: 2
NETHER_BRICK_SLAB: 1
NETHER_BRICK_STAIRS: 2
NETHER_BRICK_WALL: 2
NETHER_BRICKS: 2
NETHER_GOLD_ORE: 1
NETHER_PORTAL: 1
NETHER_QUARTZ_ORE: 1
NETHER_SPROUTS: 1
NETHER_WART: 1
NETHER_WART_BLOCK: 2
NETHERITE_BLOCK: 1
NETHERRACK: 1
NOTE_BLOCK: 10
OAK_BUTTON: 1
OAK_DOOR: 2
@ -450,12 +497,24 @@ blocks:
PINK_WALL_BANNER: 2
PINK_WOOL: 2
PISTON: 2
PISTON_HEAD: 1
PLAYER_HEAD: 1
PLAYER_WALL_HEAD: 1
PODZOL: 2
POLISHED_ANDESITE: 1
POLISHED_ANDESITE_SLAB: 1
POLISHED_ANDESITE_STAIRS: 1
POLISHED_BASALT: 1
POLISHED_BLACKSTONE: 1
POLISHED_BLACKSTONE_BRICK_SLAB: 2
POLISHED_BLACKSTONE_BRICK_STAIRS: 2
POLISHED_BLACKSTONE_BRICK_WALL: 2
POLISHED_BLACKSTONE_BRICKS: 2
POLISHED_BLACKSTONE_BUTTON: 1
POLISHED_BLACKSTONE_PRESSURE_PLATE: 2
POLISHED_BLACKSTONE_SLAB: 1
POLISHED_BLACKSTONE_STAIRS: 2
POLISHED_BLACKSTONE_WALL: 1
POLISHED_DIORITE: 1
POLISHED_DIORITE_SLAB: 1
POLISHED_DIORITE_STAIRS: 1
@ -473,6 +532,8 @@ blocks:
POTTED_BROWN_MUSHROOM: 1
POTTED_CACTUS: 1
POTTED_CORNFLOWER: 1
POTTED_CRIMSON_FUNGUS: 1
POTTED_CRIMSON_ROOTS: 1
POTTED_DANDELION: 1
POTTED_DARK_OAK_SAPLING: 1
POTTED_DEAD_BUSH: 1
@ -487,13 +548,15 @@ blocks:
POTTED_RED_MUSHROOM: 1
POTTED_RED_TULIP: 1
POTTED_SPRUCE_SAPLING: 1
POTTED_WARPED_FUNGUS: 1
POTTED_WARPED_ROOTS: 1
POTTED_WHITE_TULIP: 1
POTTED_WITHER_ROSE: 1
POWERED_RAIL: 2
PRISMARINE: 1
PRISMARINE_BRICKS: 2
PRISMARINE_BRICK_SLAB: 1
PRISMARINE_BRICK_STAIRS: 2
PRISMARINE_BRICKS: 2
PRISMARINE_SLAB: 1
PRISMARINE_STAIRS: 2
PRISMARINE_WALL: 2
@ -516,16 +579,11 @@ blocks:
PURPUR_SLAB: 1
PURPUR_STAIRS: 2
QUARTZ_BLOCK: 1
QUARTZ_BRICKS: 2
QUARTZ_PILLAR: 1
QUARTZ_SLAB: 1
QUARTZ_STAIRS: 2
RAIL: 1
REDSTONE_BLOCK: 10
REDSTONE_LAMP: 10
REDSTONE_ORE: 1
REDSTONE_TORCH: 5
REDSTONE_WALL_TORCH: 5
REDSTONE_WIRE: 1
RED_BANNER: 2
RED_BED: 6
RED_CARPET: 1
@ -534,10 +592,10 @@ blocks:
RED_GLAZED_TERRACOTTA: 5
RED_MUSHROOM: 1
RED_MUSHROOM_BLOCK: 1
RED_NETHER_BRICKS: 2
RED_NETHER_BRICK_SLAB: 2
RED_NETHER_BRICK_STAIRS: 2
RED_NETHER_BRICK_WALL: 2
RED_NETHER_BRICKS: 2
RED_SAND: 1
RED_SANDSTONE: 1
RED_SANDSTONE_SLAB: 1
@ -550,8 +608,15 @@ blocks:
RED_TULIP: 1
RED_WALL_BANNER: 2
RED_WOOL: 2
REDSTONE_BLOCK: 10
REDSTONE_LAMP: 10
REDSTONE_ORE: 1
REDSTONE_TORCH: 5
REDSTONE_WALL_TORCH: 5
REDSTONE_WIRE: 1
REPEATER: 6
REPEATING_COMMAND_BLOCK: 0
RESPAWN_ANCHOR: 100
ROSE_BUSH: 1
SAND: 1
SANDSTONE: 1
@ -559,9 +624,10 @@ blocks:
SANDSTONE_STAIRS: 2
SANDSTONE_WALL: 2
SCAFFOLDING: 1
SEAGRASS: 1
SEA_LANTERN: 9
SEA_PICKLE: 1
SEAGRASS: 1
SHROOMLIGHT: 1
SHULKER_BOX: 10
SKELETON_SKULL: 10
SKELETON_WALL_SKULL: 100
@ -581,7 +647,13 @@ blocks:
SMOOTH_STONE_SLAB: 1
SNOW: 1
SNOW_BLOCK: 1
SOUL_CAMPFIRE: 1
SOUL_FIRE: 1
SOUL_LANTERN: 1
SOUL_SAND: 2
SOUL_SOIL: 1
SOUL_TORCH: 1
SOUL_WALL_TORCH: 1
SPAWNER: 1
SPONGE: 10
SPRUCE_BUTTON: 1
@ -601,19 +673,21 @@ blocks:
SPRUCE_WOOD: 1
STICKY_PISTON: 1
STONE: 1
STONECUTTER: 4
STONE_BRICKS: 2
STONE_BRICK_SLAB: 1
STONE_BRICK_STAIRS: 2
STONE_BRICK_WALL: 2
STONE_BRICKS: 2
STONE_BUTTON: 1
STONE_PRESSURE_PLATE: 2
STONE_SLAB: 1
STONE_STAIRS: 1
STONECUTTER: 4
STRIPPED_ACACIA_LOG: 0
STRIPPED_ACACIA_WOOD: 1
STRIPPED_BIRCH_LOG: 0
STRIPPED_BIRCH_WOOD: 1
STRIPPED_CRIMSON_HYPHAE: 1
STRIPPED_CRIMSON_STEM: 1
STRIPPED_DARK_OAK_LOG: 0
STRIPPED_DARK_OAK_WOOD: 1
STRIPPED_JUNGLE_LOG: 0
@ -622,25 +696,52 @@ blocks:
STRIPPED_OAK_WOOD: 1
STRIPPED_SPRUCE_LOG: 0
STRIPPED_SPRUCE_WOOD: 1
STRIPPED_WARPED_HYPHAE: 1
STRIPPED_WARPED_STEM: 1
STRUCTURE_BLOCK: 0
STRUCTURE_VOID: 0
SUGAR_CANE: 1
SUNFLOWER: 1
SWEET_BERRY_BUSH: 1
TALL_GRASS: 1
TALL_SEAGRASS: 1
TARGET: 5
TERRACOTTA: 2
TNT: 5
TORCH: 1
TRAPPED_CHEST: 10
TRIPWIRE: 2
TRIPWIRE_HOOK: 2
TUBE_CORAL: 1
TUBE_CORAL_BLOCK: 1
TUBE_CORAL_FAN: 1
TUBE_CORAL_WALL_FAN: 1
TURTLE_EGG: 1
TWISTING_VINES: 1
TWISTING_VINES_PLANT: 1
VINE: 1
VOID_AIR: 0
WALL_TORCH: 1
WARPED_BUTTON: 1
WARPED_DOOR: 3
WARPED_FENCE: 2
WARPED_FENCE_GATE: 4
WARPED_FUNGUS: 1
WARPED_HYPHAE: 1
WARPED_NYLIUM: 1
WARPED_PLANKS: 1
WARPED_PRESSURE_PLATE: 2
WARPED_ROOTS: 1
WARPED_SIGN: 6
WARPED_SLAB: 1
WARPED_STAIRS: 2
WARPED_STEM: 1
WARPED_TRAPDOOR: 3
WARPED_WALL_SIGN: 6
WARPED_WART_BLOCK: 1
WATER: 0
WEEPING_VINES: 1
WEEPING_VINES_PLANT: 1
WET_SPONGE: 10
WHEAT: 1
WHITE_BANNER: 2
@ -673,25 +774,6 @@ blocks:
YELLOW_WOOL: 2
ZOMBIE_HEAD: 1
ZOMBIE_WALL_HEAD: 1
AIR: 0
BEEHIVE: 1
BEE_NEST: 1
DEAD_BRAIN_CORAL: 1
DEAD_BUBBLE_CORAL: 1
DEAD_FIRE_CORAL: 1
DEAD_HORN_CORAL: 1
DEAD_TUBE_CORAL: 1
HONEYCOMB_BLOCK: 1
HONEY_BLOCK: 1
HORN_CORAL: 1
JIGSAW: 1
MOVING_PISTON: 1
MUSHROOM_STEM: 1
NETHER_WART: 1
PISTON_HEAD: 1
STRUCTURE_BLOCK: 1
STRUCTURE_VOID: 1
TUBE_CORAL: 1
worlds:
acidisland_world:
SAND: 0