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

Update CaveBlock to latest API changes.

This commit is contained in:
BONNe1704 2019-07-12 12:14:25 +03:00
parent 898d0fc637
commit fdd4bc795b
3 changed files with 119 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -46,11 +46,11 @@
<java.version>1.8</java.version>
<!-- More visible way how to change dependency versions -->
<spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.5.0</bentobox.version>
<bentobox.version>1.6.0-SNAPSHOT</bentobox.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- This allows to change between versions and snapshots. -->
<build.version>1.5.0</build.version>
<build.version>1.6.0</build.version>
<build.number>-LOCAL</build.number>
</properties>

59
src/main/java/world/bentobox/caveblock/Settings.java
View File

@ -234,17 +234,6 @@ public class Settings implements WorldSettings
}
/**
* This method returns the netherTrees object.
* @return the netherTrees object.
*/
@Override
public boolean isNetherTrees()
{
return netherTrees;
}
/**
* This method returns the netherRoof object.
* @return the netherRoof object.
@ -541,6 +530,17 @@ public class Settings implements WorldSettings
}
/**
* @return true if deaths in the world are reset when the player has a new island
* @since 1.6.0
*/
@Override
public boolean isDeathsResetOnNewIsland()
{
return this.deathsResetOnNewIsland;
}
/**
* This method returns the deathsMax object.
* @return the deathsMax object.
@ -958,17 +958,6 @@ public class Settings implements WorldSettings
}
/**
* This method sets the netherTrees object value.
* @param netherTrees the netherTrees object new value.
*
*/
public void setNetherTrees(boolean netherTrees)
{
this.netherTrees = netherTrees;
}
/**
* This method sets the netherRoof object value.
* @param netherRoof the netherRoof object new value.
@ -1266,6 +1255,17 @@ public class Settings implements WorldSettings
}
/**
* This method sets the deathsResetOnNewIsland value.
* @param deathsResetOnNewIsland the deathsResetOnNewIsland new value.
*
*/
public void setDeathsResetOnNewIsland(boolean deathsResetOnNewIsland)
{
this.deathsResetOnNewIsland = deathsResetOnNewIsland;
}
/**
* This method sets the deathsMax object value.
* @param deathsMax the deathsMax object new value.
@ -1510,12 +1510,12 @@ public class Settings implements WorldSettings
/* Commands */
@ConfigComment("Cave Command. What command users will run to access their cave.")
@ConfigComment("To define alias, just separate commands with white space.")
@ConfigEntry(path = "cave.command.island")
@ConfigEntry(path = "caveblock.command.island")
private String islandCommand = "cave cb";
@ConfigComment("The Cave admin command.")
@ConfigComment("To define alias, just separate commands with white space.")
@ConfigEntry(path = "cave.command.admin")
@ConfigEntry(path = "caveblock.command.admin")
private String adminCommand = "cbadmin cba";
/* WORLD */
@ -1587,7 +1587,7 @@ public class Settings implements WorldSettings
private Biome defaultBiome = Biome.MOUNTAINS;
@ConfigComment("The maximum number of players a player can ban at any one time in this game mode.")
@ConfigComment("The permission acidisland.ban.maxlimit.X where X is a number can also be used per player")
@ConfigComment("The permission caveblock.ban.maxlimit.X where X is a number can also be used per player")
@ConfigComment("-1 = unlimited")
@ConfigEntry(path = "world.ban-limit")
private int banLimit = -1;
@ -1640,11 +1640,6 @@ public class Settings implements WorldSettings
@ConfigEntry(path = "world.nether.islands", needsReset = true)
private boolean netherIslands = true;
@ConfigComment("Nether trees are made if a player grows a tree in the nether (gravel and glowstone)")
@ConfigComment("Applies to both vanilla and islands Nether")
@ConfigEntry(path = "world.nether.trees")
private boolean netherTrees = true;
@ConfigComment("Nether spawn protection radius - this is the distance around the nether spawn")
@ConfigComment("that will be protected from player interaction (breaking blocks, pouring lava etc.)")
@ConfigComment("Minimum is 0 (not recommended), maximum is 100. Default is 25.")
@ -1830,6 +1825,10 @@ public class Settings implements WorldSettings
@ConfigEntry(path = "island.deaths.max")
private int deathsMax = 10;
@ConfigComment("Reset player death count when they start a new cave or reset a cave")
@ConfigEntry(path = "island.deaths.reset-on-new")
private boolean deathsResetOnNewIsland = true;
@ConfigComment("When a player joins a team, reset their death count")
@ConfigEntry(path = "island.deaths.team-join-reset")
private boolean teamJoinDeathReset = true;

161
src/main/resources/config.yml
View File

@ -20,6 +20,7 @@ world:
# Will be rounded up to the nearest 16 blocks.
# It is the same for every dimension : Overworld, Nether and End.
# This value cannot be changed mid-game and the plugin will not start if it is different.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
distance-between-caves: 64
# Default protection range radius in blocks. Cannot be larger than distance.
# Admins can change protection sizes for players individually using /cbadmin range set <player> <new range>
@ -30,7 +31,9 @@ world:
# calculate the closest location on the grid. Islands develop around this location
# both positively and negatively in a square grid.
# If none of this makes sense, leave it at 0,0.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
start-x: 0
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
start-z: 0
offset-x: 0
offset-z: 0
@ -56,16 +59,21 @@ world:
#
# This is cave... no height... only depth. Max 256.
# Should not be less then island height.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
world-depth: 256
# This indicate how many times block should be tried to generate.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
generation-tries: 2
normal:
#
# Make over world roof of bedrock, if false, it will be made from stone
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
roof: true
# Make over world floor of bedrock, if false, it will be made from stone
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
floor: true
# Main block of which world will be generated.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
main-block: STONE
# Blocks that will occasionally replace main block by random chance.
# Blocks will replace only main-block and will try to create packs that
@ -76,21 +84,22 @@ world:
# Example:
# MATERIAL:DIAMOND_ORE:100:5 - means there is 100% chace of spawing diamonds
# where max amount in pack are 5 per each subchunk!
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
blocks:
- MATERIAL:DIAMOND_ORE:1:5
- MATERIAL:GOLD_ORE:1:4
- MATERIAL:IRON_ORE:5:4
- MATERIAL:COAL_ORE:10:6
- MATERIAL:EMERALD_ORE:1:1
- MATERIAL:CLAY:10:6
- MATERIAL:DIRT:10:10
- MATERIAL:GRAVEL:20:6
- MATERIAL:GRANITE:20:10
- MATERIAL:ANDESITE:20:10
- MATERIAL:DIORITE:30:8
- ENTITY:ZOMBIE:1:1
- ENTITY:DOLPHIN:0.1:1
- ENTITY:CAVE_SPIDER:1:1
- MATERIAL:DIAMOND_ORE:1:5
- MATERIAL:GOLD_ORE:1:4
- MATERIAL:IRON_ORE:5:4
- MATERIAL:COAL_ORE:10:6
- MATERIAL:EMERALD_ORE:1:1
- MATERIAL:CLAY:10:6
- MATERIAL:DIRT:10:10
- MATERIAL:GRAVEL:20:6
- MATERIAL:GRANITE:20:10
- MATERIAL:ANDESITE:20:10
- MATERIAL:DIORITE:30:8
- ENTITY:ZOMBIE:1:1
- ENTITY:DOLPHIN:0.1:1
- ENTITY:CAVE_SPIDER:1:1
nether:
# Generate Nether - if this is false, the nether world will not be made and access to
# the nether will not occur. Other plugins may still enable portal usage.
@ -99,20 +108,21 @@ world:
# portal will return them back to their islands.
generate: true
# Islands in Nether. Change to false for standard vanilla nether.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
islands: true
# Nether trees are made if a player grows a tree in the nether (gravel and glowstone)
# Applies to both vanilla and islands Nether
trees: true
# Nether spawn protection radius - this is the distance around the nether spawn
# that will be protected from player interaction (breaking blocks, pouring lava etc.)
# Minimum is 0 (not recommended), maximum is 100. Default is 25.
# Only applies to vanilla nether
spawn-radius: 25
# Make over world roof of bedrock, if false, it will be made from stone
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
roof: true
# Make over world floor of bedrock, if false, it will be made from stone
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
floor: true
# Main block of which world will be generated.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
main-block: NETHERRACK
# Blocks that will occasionally replace main block by random chance.
# Blocks will replace only main-block and will try to create packs that
@ -123,27 +133,32 @@ world:
# Example:
# MATERIAL:DIAMOND_ORE:100:5 - means there is 100% chace of spawing diamonds
# where max amount in pack are 5 per each subchunk!
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
blocks:
- MATERIAL:NETHER_QUARTZ_ORE:30:5
- MATERIAL:SOUL_SAND:40:10
- MATERIAL:MAGMA_BLOCK:10:3
- MATERIAL:GLOWSTONE:20:8
- MATERIAL:NETHER_BRICKS:10:5
- MATERIAL:LAVA:10:1
- ENTITY:MAGMA_CUBE:0.5:1
- ENTITY:GHAST:0.1:1
- ENTITY:WITHER_SKELETON:0.1:1
- MATERIAL:FIRE:10:1
- MATERIAL:NETHER_QUARTZ_ORE:30:5
- MATERIAL:SOUL_SAND:40:10
- MATERIAL:MAGMA_BLOCK:10:3
- MATERIAL:GLOWSTONE:20:8
- MATERIAL:NETHER_BRICKS:10:5
- MATERIAL:LAVA:10:1
- ENTITY:MAGMA_CUBE:0.5:1
- ENTITY:GHAST:0.1:1
- ENTITY:WITHER_SKELETON:0.1:1
- MATERIAL:FIRE:10:1
end:
generate: true
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
islands: true
# /!\ This feature is experimental and might not work as expected or might not work at all.
dragon-spawn: false
# Make over world roof of bedrock, if false, it will be made from stone
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
roof: true
# Make over world floor of bedrock, if false, it will be made from stone
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
floor: true
# Main block of which world will be generated.
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
main-block: END_STONE
# Blocks that will occasionally replace main block by random chance.
# Blocks will replace only main-block and will try to create packs that
@ -154,16 +169,17 @@ world:
# Example:
# MATERIAL:DIAMOND_ORE:100:5 - means there is 100% chace of spawing diamonds
# where max amount in pack are 5 per each subchunk!
# /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
blocks:
- ENTITY:SHULKER:0.2:1
- MATERIAL:OBSIDIAN:1:1
- MATERIAL:CHORUS_PLANT:1:3
- ENTITY:SHULKER:0.2:1
- MATERIAL:OBSIDIAN:1:1
- MATERIAL:CHORUS_PLANT:1:3
# Mob white list - these mobs will NOT be removed when logging in or doing /cave
remove-mobs-whitelist:
- WITHER
- ZOMBIE_VILLAGER
- PIG_ZOMBIE
- ENDERMAN
- ZOMBIE_VILLAGER
- WITHER
- ENDERMAN
- PIG_ZOMBIE
# World flags. These are boolean settings for various flags for this world
flags:
CREEPER_DAMAGE: true
@ -194,13 +210,11 @@ world:
FURNACE: 500
ANVIL: 500
FISH_SCOOPING: 500
FIRE: 500
END_PORTAL: 500
BREEDING: 500
HURT_VILLAGERS: 500
TNT: 500
TURTLE_EGGS: 500
FROST_WALKER: 500
TURTLE_EGGS: 500
COLLECT_LAVA: 500
LEVER: 500
RIDING: 500
@ -212,10 +226,10 @@ world:
ITEM_DROP: 0
NOTE_BLOCK: 0
NETHER_PORTAL: 500
CROP_TRAMPLE: 500
ITEM_PICKUP: 0
BREWING: 500
CROP_TRAMPLE: 500
DROPPER: 500
BREWING: 500
COLLECT_WATER: 500
BUTTON: 500
FIRE_EXTINGUISH: 500
@ -227,20 +241,20 @@ world:
CRAFTING: 0
ENCHANTING: 0
SHEARING: 500
BED: 500
SPAWN_EGGS: 500
BED: 500
MILKING: 0
DISPENSER: 500
GATE: 0
EXPERIENCE_PICKUP: 500
HOPPER: 500
LEASH: 500
BREAK_BLOCKS: 500
MOUNT_INVENTORY: 500
BREAK_BLOCKS: 500
CHORUS_FRUIT: 500
CONTAINER: 500
POTION_THROWING: 500
JUKEBOX: 500
POTION_THROWING: 500
# These are the default settings for new islands
default-island-settings:
PVP_END: false
@ -254,11 +268,11 @@ world:
hidden-flags: []
# Visitor banned commands - Visitors to islands cannot use these commands in this world
visitor-banned-commands:
- spawner
- spawnmob
- spawner
- spawnmob
island:
# Default max team size
# Permission size cannot be less than the default below.
# Permission size cannot be less than the default below.
max-team-size: 4
# Default maximum number of homes a player can have. Min = 1
# Accessed via /cave sethome <number> or /cave go <number>
@ -313,44 +327,45 @@ island:
counted: true
# Maximum number of deaths to count. The death count can be used by add-ons.
max: 10
# Reset player death count when they start a new cave or reset a cave
reset-on-new: true
# When a player joins a team, reset their death count
team-join-reset: true
protection:
# Geo restrict mobs.
# Mobs that exit the island space where they were spawned will be removed.
geo-limit-settings:
- GHAST
- BAT
- BLAZE
- GHAST
- BAT
- BLAZE
# Invincible visitors. List of damages that will not affect visitors.
# Make list blank if visitors should receive all damages
invincible-visitors:
- BLOCK_EXPLOSION
- CONTACT
- CUSTOM
- DROWNING
- ENTITY_ATTACK
- ENTITY_EXPLOSION
- FALL
- FALLING_BLOCK
- FIRE
- FIRE_TICK
- LAVA
- LIGHTNING
- MAGIC
- POISON
- PROJECTILE
- STARVATION
- SUFFOCATION
- THORNS
- WITHER
- DRAGON_BREATH
- FLY_INTO_WALL
- HOT_FLOOR
- CRAMMING
- VOID
- BLOCK_EXPLOSION
- CONTACT
- CUSTOM
- DROWNING
- ENTITY_ATTACK
- ENTITY_EXPLOSION
- FALL
- FALLING_BLOCK
- FIRE
- FIRE_TICK
- LAVA
- LIGHTNING
- MAGIC
- POISON
- PROJECTILE
- STARVATION
- SUFFOCATION
- THORNS
- WITHER
- DRAGON_BREATH
- FLY_INTO_WALL
- HOT_FLOOR
- CRAMMING
- VOID
do-not-edit-these-settings:
# These settings should not be edited
reset-epoch: 0
debug: false
uniqueId: config