mirror of
https://github.com/BentoBoxWorld/BSkyBlock.git
synced 2024-09-27 04:03:42 +02:00
Removed nether trees from BSkyBlock - new 1.6.0 API
This commit is contained in:
parent
a90663e933
commit
afdfad84ab
@ -1,6 +1,5 @@
|
|||||||
package world.bentobox.bskyblock;
|
package world.bentobox.bskyblock;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.World.Environment;
|
import org.bukkit.World.Environment;
|
||||||
import org.bukkit.WorldCreator;
|
import org.bukkit.WorldCreator;
|
||||||
@ -86,15 +85,6 @@ public class BSkyBlock extends GameModeAddon {
|
|||||||
|
|
||||||
// Create the world if it does not exist
|
// Create the world if it does not exist
|
||||||
islandWorld = getWorld(worldName, World.Environment.NORMAL, chunkGenerator);
|
islandWorld = getWorld(worldName, World.Environment.NORMAL, chunkGenerator);
|
||||||
Bukkit.getLogger().info("World spawn limits ambient " + islandWorld.getAmbientSpawnLimit());
|
|
||||||
//islandWorld.setAnimalSpawnLimit(100);
|
|
||||||
//islandWorld.setAmbientSpawnLimit(100);
|
|
||||||
Bukkit.getLogger().info("World spawn limits animal " + islandWorld.getAnimalSpawnLimit());
|
|
||||||
Bukkit.getLogger().info("World spawn limits monster " + islandWorld.getMonsterSpawnLimit());
|
|
||||||
Bukkit.getLogger().info("World spawn limits water " + islandWorld.getWaterAnimalSpawnLimit());
|
|
||||||
//islandWorld.setTicksPerAnimalSpawns(1);
|
|
||||||
Bukkit.getLogger().info("World spawn limits ticks per animal " + islandWorld.getTicksPerAnimalSpawns());
|
|
||||||
Bukkit.getLogger().info("World spawn limits ticks per monster " + islandWorld.getTicksPerMonsterSpawns());
|
|
||||||
|
|
||||||
// Make the nether if it does not exist
|
// Make the nether if it does not exist
|
||||||
if (settings.isNetherGenerate()) {
|
if (settings.isNetherGenerate()) {
|
||||||
|
@ -135,11 +135,6 @@ public class Settings implements WorldSettings {
|
|||||||
@ConfigEntry(path = "world.nether.islands", needsReset = true)
|
@ConfigEntry(path = "world.nether.islands", needsReset = true)
|
||||||
private boolean netherIslands = 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("Make the nether roof, if false, there is nothing up there")
|
@ConfigComment("Make the nether roof, if false, there is nothing up there")
|
||||||
@ConfigComment("Change to false if lag is a problem from the generation")
|
@ConfigComment("Change to false if lag is a problem from the generation")
|
||||||
@ConfigComment("Only applies to islands Nether")
|
@ConfigComment("Only applies to islands Nether")
|
||||||
@ -286,8 +281,8 @@ public class Settings implements WorldSettings {
|
|||||||
private boolean teamJoinDeathReset = true;
|
private boolean teamJoinDeathReset = true;
|
||||||
|
|
||||||
@ConfigComment("Reset player death count when they start a new island or reset and island")
|
@ConfigComment("Reset player death count when they start a new island or reset and island")
|
||||||
@ConfigEntry(path = "island.deaths.reset-on-new")
|
@ConfigEntry(path = "island.deaths.reset-on-new-island")
|
||||||
private boolean deathsResetOnNew = true;
|
private boolean deathsResetOnNewIsland = true;
|
||||||
|
|
||||||
// ---------------------------------------------
|
// ---------------------------------------------
|
||||||
/* PROTECTION */
|
/* PROTECTION */
|
||||||
@ -436,14 +431,6 @@ public class Settings implements WorldSettings {
|
|||||||
return netherIslands;
|
return netherIslands;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the netherTrees
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public boolean isNetherTrees() {
|
|
||||||
return netherTrees;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the netherRoof
|
* @return the netherRoof
|
||||||
*/
|
*/
|
||||||
@ -812,13 +799,6 @@ public class Settings implements WorldSettings {
|
|||||||
this.netherIslands = netherIslands;
|
this.netherIslands = netherIslands;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param netherTrees the netherTrees to set
|
|
||||||
*/
|
|
||||||
public void setNetherTrees(boolean netherTrees) {
|
|
||||||
this.netherTrees = netherTrees;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param netherRoof the netherRoof to set
|
* @param netherRoof the netherRoof to set
|
||||||
*/
|
*/
|
||||||
@ -1129,14 +1109,14 @@ public class Settings implements WorldSettings {
|
|||||||
* @return the deathsResetOnNew
|
* @return the deathsResetOnNew
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean isDeathsResetOnNew() {
|
public boolean isDeathsResetOnNewIsland() {
|
||||||
return deathsResetOnNew;
|
return deathsResetOnNewIsland;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param deathsResetOnNew the deathsResetOnNew to set
|
* @param deathsResetOnNew the deathsResetOnNew to set
|
||||||
*/
|
*/
|
||||||
public void setDeathsResetOnNew(boolean deathsResetOnNew) {
|
public void setDeathsResetOnNewIsland(boolean deathsResetOnNew) {
|
||||||
this.deathsResetOnNew = deathsResetOnNew;
|
this.deathsResetOnNewIsland = deathsResetOnNew;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -67,9 +67,6 @@ world:
|
|||||||
generate: true
|
generate: true
|
||||||
# Islands in Nether. Change to false for standard vanilla nether.
|
# Islands in Nether. Change to false for standard vanilla nether.
|
||||||
islands: true
|
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
|
|
||||||
# Make the nether roof, if false, there is nothing up there
|
# Make the nether roof, if false, there is nothing up there
|
||||||
# Change to false if lag is a problem from the generation
|
# Change to false if lag is a problem from the generation
|
||||||
# Only applies to islands Nether
|
# Only applies to islands Nether
|
||||||
|
@ -24,7 +24,6 @@ import java.util.logging.Logger;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.eclipse.jdt.annotation.Nullable;
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -179,15 +179,6 @@ public class SettingsTest {
|
|||||||
assertTrue(s.isNetherIslands());
|
assertTrue(s.isNetherIslands());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Test method for {@link world.bentobox.bskyblock.Settings#setNetherTrees(boolean)}.
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
public void testSetNetherTrees() {
|
|
||||||
s.setNetherTrees(true);
|
|
||||||
assertTrue(s.isNetherTrees());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test method for {@link world.bentobox.bskyblock.Settings#setNetherRoof(boolean)}.
|
* Test method for {@link world.bentobox.bskyblock.Settings#setNetherRoof(boolean)}.
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user