mirror of
https://github.com/BentoBoxWorld/BSkyBlock.git
synced 2025-01-28 22:11:37 +01:00
Updated BSkyBlock to the latest available BentoBox version
This commit is contained in:
parent
76d3556868
commit
5912e94561
2
pom.xml
2
pom.xml
@ -75,7 +75,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>world.bentobox</groupId>
|
<groupId>world.bentobox</groupId>
|
||||||
<artifactId>bentobox</artifactId>
|
<artifactId>bentobox</artifactId>
|
||||||
<version>0.10.0-SNAPSHOT</version>
|
<version>0.10.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -256,7 +256,24 @@ public class Settings implements DataObject, WorldSettings {
|
|||||||
@ConfigEntry(path = "island.respawn-on-island")
|
@ConfigEntry(path = "island.respawn-on-island")
|
||||||
private boolean respawnOnIsland = true;
|
private boolean respawnOnIsland = true;
|
||||||
|
|
||||||
|
// Sethome
|
||||||
|
@ConfigEntry(path = "island.sethome.nether.allow")
|
||||||
|
private boolean allowSetHomeInNether = true;
|
||||||
|
|
||||||
|
@ConfigEntry(path = "island.sethome.nether.require-confirmation")
|
||||||
|
private boolean requireConfirmationToSetHomeInNether = true;
|
||||||
|
|
||||||
|
@ConfigEntry(path = "island.sethome.the-end.allow")
|
||||||
|
private boolean allowSetHomeInTheEnd = true;
|
||||||
|
|
||||||
|
@ConfigEntry(path = "island.sethome.the-end.require-confirmation")
|
||||||
|
private boolean requireConfirmationToSetHomeInTheEnd = true;
|
||||||
|
|
||||||
// Deaths
|
// Deaths
|
||||||
|
@ConfigComment("Whether deaths are counted or not.")
|
||||||
|
@ConfigEntry(path = "island.deaths.counted")
|
||||||
|
private boolean deathsCounted = true;
|
||||||
|
|
||||||
@ConfigComment("Maximum number of deaths to count. The death count can be used by add-ons.")
|
@ConfigComment("Maximum number of deaths to count. The death count can be used by add-ons.")
|
||||||
@ConfigEntry(path = "island.deaths.max")
|
@ConfigEntry(path = "island.deaths.max")
|
||||||
private int deathsMax = 10;
|
private int deathsMax = 10;
|
||||||
@ -618,6 +635,46 @@ public class Settings implements DataObject, WorldSettings {
|
|||||||
return respawnOnIsland;
|
return respawnOnIsland;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the isDeathsCounted
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isDeathsCounted() {
|
||||||
|
return deathsCounted;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the allowSetHomeInNether
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isAllowSetHomeInNether() {
|
||||||
|
return allowSetHomeInNether;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the allowSetHomeInTheEnd
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isAllowSetHomeInTheEnd() {
|
||||||
|
return allowSetHomeInTheEnd;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the requireConfirmationToSetHomeInNether
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isRequireConfirmationToSetHomeInNether() {
|
||||||
|
return requireConfirmationToSetHomeInNether;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the requireConfirmationToSetHomeInTheEnd
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isRequireConfirmationToSetHomeInTheEnd() {
|
||||||
|
return requireConfirmationToSetHomeInTheEnd;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the deathsMax
|
* @return the deathsMax
|
||||||
*/
|
*/
|
||||||
@ -975,6 +1032,13 @@ public class Settings implements DataObject, WorldSettings {
|
|||||||
this.respawnOnIsland = respawnOnIsland;
|
this.respawnOnIsland = respawnOnIsland;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param deathsCounted the deathsCounted to set
|
||||||
|
*/
|
||||||
|
public void setDeathsCounted(boolean deathsCounted) {
|
||||||
|
this.deathsCounted = deathsCounted;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param deathsMax the deathsMax to set
|
* @param deathsMax the deathsMax to set
|
||||||
*/
|
*/
|
||||||
@ -1024,6 +1088,34 @@ public class Settings implements DataObject, WorldSettings {
|
|||||||
this.closePanelOnClickOutside = closePanelOnClickOutside;
|
this.closePanelOnClickOutside = closePanelOnClickOutside;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param allowSetHomeInNether the allowSetHomeInNether to set
|
||||||
|
*/
|
||||||
|
public void setAllowSetHomeInNether(boolean allowSetHomeInNether) {
|
||||||
|
this.allowSetHomeInNether = allowSetHomeInNether;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param allowSetHomeInTheEnd the allowSetHomeInTheEnd to set
|
||||||
|
*/
|
||||||
|
public void setAllowSetHomeInTheEnd(boolean allowSetHomeInTheEnd) {
|
||||||
|
this.allowSetHomeInTheEnd = allowSetHomeInTheEnd;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param requireConfirmationToSetHomeInNether the requireConfirmationToSetHomeInNether to set
|
||||||
|
*/
|
||||||
|
public void setRequireConfirmationToSetHomeInNether(boolean requireConfirmationToSetHomeInNether) {
|
||||||
|
this.requireConfirmationToSetHomeInNether = requireConfirmationToSetHomeInNether;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param requireConfirmationToSetHomeInTheEnd the requireConfirmationToSetHomeInTheEnd to set
|
||||||
|
*/
|
||||||
|
public void setRequireConfirmationToSetHomeInTheEnd(boolean requireConfirmationToSetHomeInTheEnd) {
|
||||||
|
this.requireConfirmationToSetHomeInTheEnd = requireConfirmationToSetHomeInTheEnd;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param resetEpoch the resetEpoch to set
|
* @param resetEpoch the resetEpoch to set
|
||||||
*/
|
*/
|
||||||
|
@ -2,6 +2,7 @@ package world.bentobox.bskyblock.commands;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
|
||||||
import world.bentobox.bskyblock.BSkyBlock;
|
import world.bentobox.bskyblock.BSkyBlock;
|
||||||
import world.bentobox.bentobox.api.commands.CompositeCommand;
|
import world.bentobox.bentobox.api.commands.CompositeCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.AdminClearResetsAllCommand;
|
import world.bentobox.bentobox.api.commands.admin.AdminClearResetsAllCommand;
|
||||||
@ -61,6 +62,8 @@ public class AdminCommand extends CompositeCommand {
|
|||||||
new AdminClearResetsAllCommand(this);
|
new AdminClearResetsAllCommand(this);
|
||||||
// Delete
|
// Delete
|
||||||
new AdminDeleteCommand(this);
|
new AdminDeleteCommand(this);
|
||||||
|
// Why
|
||||||
|
new AdminWhyCommand(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user