mirror of
https://github.com/BentoBoxWorld/BSkyBlock.git
synced 2024-09-27 04:03:42 +02:00
Merge branch 'develop' of https://github.com/BentoBoxWorld/BSkyBlock.git
into develop Conflicts: pom.xml
This commit is contained in:
commit
f41cf8b3a1
2
pom.xml
2
pom.xml
@ -65,7 +65,7 @@
|
|||||||
<!-- Do not change unless you want different name for local builds. -->
|
<!-- Do not change unless you want different name for local builds. -->
|
||||||
<build.number>-LOCAL</build.number>
|
<build.number>-LOCAL</build.number>
|
||||||
<!-- This allows to change between versions. -->
|
<!-- This allows to change between versions. -->
|
||||||
<build.version>1.14.1</build.version>
|
<build.version>1.14.3</build.version>
|
||||||
<!-- Sonar Cloud -->
|
<!-- Sonar Cloud -->
|
||||||
<sonar.projectKey>BentoBoxWorld_BSkyBlock</sonar.projectKey>
|
<sonar.projectKey>BentoBoxWorld_BSkyBlock</sonar.projectKey>
|
||||||
<sonar.organization>bentobox-world</sonar.organization>
|
<sonar.organization>bentobox-world</sonar.organization>
|
||||||
|
@ -130,13 +130,25 @@ public class BSkyBlock extends GameModeAddon implements Listener {
|
|||||||
World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld();
|
World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld();
|
||||||
// Set spawn rates
|
// Set spawn rates
|
||||||
if (w != null) {
|
if (w != null) {
|
||||||
|
if (getSettings().getSpawnLimitMonsters() > 0) {
|
||||||
w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters());
|
w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters());
|
||||||
|
}
|
||||||
|
if (getSettings().getSpawnLimitAmbient() > 0) {
|
||||||
w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient());
|
w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient());
|
||||||
|
}
|
||||||
|
if (getSettings().getSpawnLimitAnimals() > 0) {
|
||||||
w.setAnimalSpawnLimit(getSettings().getSpawnLimitAnimals());
|
w.setAnimalSpawnLimit(getSettings().getSpawnLimitAnimals());
|
||||||
|
}
|
||||||
|
if (getSettings().getSpawnLimitWaterAnimals() > 0) {
|
||||||
w.setWaterAnimalSpawnLimit(getSettings().getSpawnLimitWaterAnimals());
|
w.setWaterAnimalSpawnLimit(getSettings().getSpawnLimitWaterAnimals());
|
||||||
|
}
|
||||||
|
if (getSettings().getTicksPerAnimalSpawns() > 0) {
|
||||||
w.setTicksPerAnimalSpawns(getSettings().getTicksPerAnimalSpawns());
|
w.setTicksPerAnimalSpawns(getSettings().getTicksPerAnimalSpawns());
|
||||||
|
}
|
||||||
|
if (getSettings().getTicksPerMonsterSpawns() > 0) {
|
||||||
w.setTicksPerMonsterSpawns(getSettings().getTicksPerMonsterSpawns());
|
w.setTicksPerMonsterSpawns(getSettings().getTicksPerMonsterSpawns());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return w;
|
return w;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -188,9 +188,12 @@ public class Settings implements WorldSettings {
|
|||||||
private int netherSpawnRadius = 32;
|
private int netherSpawnRadius = 32;
|
||||||
|
|
||||||
// End
|
// End
|
||||||
|
@ConfigComment("End Nether - if this is false, the end world will not be made and access to")
|
||||||
|
@ConfigComment("the end will not occur. Other plugins may still enable portal usage.")
|
||||||
@ConfigEntry(path = "world.end.generate")
|
@ConfigEntry(path = "world.end.generate")
|
||||||
private boolean endGenerate = true;
|
private boolean endGenerate = true;
|
||||||
|
|
||||||
|
@ConfigComment("Islands in The End. Change to false for standard vanilla end.")
|
||||||
@ConfigEntry(path = "world.end.islands", needsReset = true)
|
@ConfigEntry(path = "world.end.islands", needsReset = true)
|
||||||
private boolean endIslands = true;
|
private boolean endIslands = true;
|
||||||
|
|
||||||
|
@ -55,7 +55,6 @@ world:
|
|||||||
# Default protection range radius in blocks. Cannot be larger than distance.
|
# Default protection range radius in blocks. Cannot be larger than distance.
|
||||||
# Admins can change protection sizes for players individually using /bsbadmin range set <player> <new range>
|
# Admins can change protection sizes for players individually using /bsbadmin range set <player> <new range>
|
||||||
# or set this permission: bskyblock.island.range.<number>
|
# or set this permission: bskyblock.island.range.<number>
|
||||||
# /!\ 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.
|
|
||||||
protection-range: 50
|
protection-range: 50
|
||||||
# Start islands at these coordinates. This is where new islands will start in the
|
# Start islands at these coordinates. This is where new islands will start in the
|
||||||
# world. These must be a factor of your island distance, but the plugin will auto
|
# world. These must be a factor of your island distance, but the plugin will auto
|
||||||
@ -90,6 +89,8 @@ world:
|
|||||||
default-game-mode: SURVIVAL
|
default-game-mode: SURVIVAL
|
||||||
# The default biome for the overworld
|
# The default biome for the overworld
|
||||||
default-biome: PLAINS
|
default-biome: PLAINS
|
||||||
|
# The default biome for the nether world (this may affect what mobs can spawn)
|
||||||
|
default-nether-biome: NETHER_WASTES
|
||||||
# The default biome for the end world (this may affect what mobs can spawn)
|
# The default biome for the end world (this may affect what mobs can spawn)
|
||||||
default-end-biome: THE_END
|
default-end-biome: THE_END
|
||||||
# The maximum number of players a player can ban at any one time in this game mode.
|
# The maximum number of players a player can ban at any one time in this game mode.
|
||||||
@ -116,7 +117,10 @@ world:
|
|||||||
# Only applies to vanilla nether
|
# Only applies to vanilla nether
|
||||||
spawn-radius: 25
|
spawn-radius: 25
|
||||||
end:
|
end:
|
||||||
|
# End Nether - if this is false, the end world will not be made and access to
|
||||||
|
# the end will not occur. Other plugins may still enable portal usage.
|
||||||
generate: true
|
generate: true
|
||||||
|
# Islands in The End. Change to false for standard vanilla end.
|
||||||
# /!\ 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.
|
# /!\ 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
|
islands: true
|
||||||
# /!\ This feature is experimental and might not work as expected or might not work at all.
|
# /!\ This feature is experimental and might not work as expected or might not work at all.
|
||||||
@ -124,8 +128,8 @@ world:
|
|||||||
# Mob white list - these mobs will NOT be removed when logging in or doing /island
|
# Mob white list - these mobs will NOT be removed when logging in or doing /island
|
||||||
remove-mobs-whitelist:
|
remove-mobs-whitelist:
|
||||||
- ZOMBIE_VILLAGER
|
- ZOMBIE_VILLAGER
|
||||||
- ENDERMAN
|
|
||||||
- WITHER
|
- WITHER
|
||||||
|
- ENDERMAN
|
||||||
# World flags. These are boolean settings for various flags for this world
|
# World flags. These are boolean settings for various flags for this world
|
||||||
flags:
|
flags:
|
||||||
CREEPER_DAMAGE: true
|
CREEPER_DAMAGE: true
|
||||||
@ -168,12 +172,12 @@ world:
|
|||||||
END_PORTAL: 500
|
END_PORTAL: 500
|
||||||
BREEDING: 500
|
BREEDING: 500
|
||||||
HURT_VILLAGERS: 500
|
HURT_VILLAGERS: 500
|
||||||
TURTLE_EGGS: 500
|
|
||||||
FROST_WALKER: 500
|
FROST_WALKER: 500
|
||||||
|
TURTLE_EGGS: 500
|
||||||
COLLECT_LAVA: 500
|
COLLECT_LAVA: 500
|
||||||
LEVER: 500
|
LEVER: 500
|
||||||
RIDING: 500
|
|
||||||
HURT_MONSTERS: 0
|
HURT_MONSTERS: 0
|
||||||
|
RIDING: 500
|
||||||
ARMOR_STAND: 500
|
ARMOR_STAND: 500
|
||||||
NAME_TAG: 500
|
NAME_TAG: 500
|
||||||
TRADING: 0
|
TRADING: 0
|
||||||
@ -181,8 +185,8 @@ world:
|
|||||||
ITEM_DROP: 0
|
ITEM_DROP: 0
|
||||||
NOTE_BLOCK: 0
|
NOTE_BLOCK: 0
|
||||||
NETHER_PORTAL: 500
|
NETHER_PORTAL: 500
|
||||||
CROP_TRAMPLE: 500
|
|
||||||
ITEM_PICKUP: 0
|
ITEM_PICKUP: 0
|
||||||
|
CROP_TRAMPLE: 500
|
||||||
BREWING: 500
|
BREWING: 500
|
||||||
DROPPER: 500
|
DROPPER: 500
|
||||||
COLLECT_WATER: 500
|
COLLECT_WATER: 500
|
||||||
@ -191,11 +195,11 @@ world:
|
|||||||
BEACON: 500
|
BEACON: 500
|
||||||
TRAPDOOR: 500
|
TRAPDOOR: 500
|
||||||
PRESSURE_PLATE: 0
|
PRESSURE_PLATE: 0
|
||||||
ITEM_FRAME: 500
|
|
||||||
PLACE_BLOCKS: 500
|
PLACE_BLOCKS: 500
|
||||||
|
ITEM_FRAME: 500
|
||||||
CRAFTING: 0
|
CRAFTING: 0
|
||||||
SHEARING: 500
|
|
||||||
ENCHANTING: 0
|
ENCHANTING: 0
|
||||||
|
SHEARING: 500
|
||||||
SPAWN_EGGS: 500
|
SPAWN_EGGS: 500
|
||||||
BED: 500
|
BED: 500
|
||||||
MILKING: 0
|
MILKING: 0
|
||||||
@ -204,8 +208,8 @@ world:
|
|||||||
EXPERIENCE_PICKUP: 500
|
EXPERIENCE_PICKUP: 500
|
||||||
HOPPER: 500
|
HOPPER: 500
|
||||||
LEASH: 500
|
LEASH: 500
|
||||||
MOUNT_INVENTORY: 500
|
|
||||||
BREAK_BLOCKS: 500
|
BREAK_BLOCKS: 500
|
||||||
|
MOUNT_INVENTORY: 500
|
||||||
CHORUS_FRUIT: 500
|
CHORUS_FRUIT: 500
|
||||||
CONTAINER: 500
|
CONTAINER: 500
|
||||||
POTION_THROWING: 500
|
POTION_THROWING: 500
|
||||||
@ -214,8 +218,6 @@ world:
|
|||||||
default-island-settings:
|
default-island-settings:
|
||||||
PVP_END: false
|
PVP_END: false
|
||||||
PVP_NETHER: false
|
PVP_NETHER: false
|
||||||
ANIMAL_SPAWN: true
|
|
||||||
MONSTER_SPAWN: true
|
|
||||||
FIRE_SPREAD: true
|
FIRE_SPREAD: true
|
||||||
PVP_OVERWORLD: false
|
PVP_OVERWORLD: false
|
||||||
# These settings/flags are hidden from users
|
# These settings/flags are hidden from users
|
||||||
@ -379,11 +381,11 @@ island:
|
|||||||
on-leave: []
|
on-leave: []
|
||||||
sethome:
|
sethome:
|
||||||
nether:
|
nether:
|
||||||
# Allow setting home in the nether. Only available on nether islands, not vanilla nether
|
# Allow setting home in the nether. Only available on nether islands, not vanilla nether.
|
||||||
allow: true
|
allow: true
|
||||||
require-confirmation: true
|
require-confirmation: true
|
||||||
the-end:
|
the-end:
|
||||||
# Allow setting home in the end. Only available on end islands, not vanilla end
|
# Allow setting home in the end. Only available on end islands, not vanilla end.
|
||||||
allow: true
|
allow: true
|
||||||
require-confirmation: true
|
require-confirmation: true
|
||||||
deaths:
|
deaths:
|
||||||
|
7
src/main/resources/locales/hu.yml
Normal file
7
src/main/resources/locales/hu.yml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
bskyblock:
|
||||||
|
sign:
|
||||||
|
line0: "&cBSkyBlock"
|
||||||
|
line1: Üdvözöljük!
|
||||||
|
line2: "[name]"
|
||||||
|
line3: Ne ess le! &c<3
|
Loading…
Reference in New Issue
Block a user