From 5fd194d01f7d4a699ba3fa74825eff3e28ea4394 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 13 Oct 2019 13:33:20 -0700 Subject: [PATCH] Update to latest BentoBox API --- .../world/bentobox/caveblock/Settings.java | 125 ++++++++++++++++++ src/main/resources/config.yml | 14 +- 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/caveblock/Settings.java b/src/main/java/world/bentobox/caveblock/Settings.java index 0d4d553..745add6 100644 --- a/src/main/java/world/bentobox/caveblock/Settings.java +++ b/src/main/java/world/bentobox/caveblock/Settings.java @@ -1534,6 +1534,107 @@ public class Settings implements WorldSettings this.onLeaveCommands = onLeaveCommands; } + /** + * @return the onJoinResetHealth + */ + @Override + public boolean isOnJoinResetHealth() { + return onJoinResetHealth; + } + + + /** + * @param onJoinResetHealth the onJoinResetHealth to set + */ + public void setOnJoinResetHealth(boolean onJoinResetHealth) { + this.onJoinResetHealth = onJoinResetHealth; + } + + + /** + * @return the onJoinResetHunger + */ + @Override + public boolean isOnJoinResetHunger() { + return onJoinResetHunger; + } + + + /** + * @param onJoinResetHunger the onJoinResetHunger to set + */ + public void setOnJoinResetHunger(boolean onJoinResetHunger) { + this.onJoinResetHunger = onJoinResetHunger; + } + + + /** + * @return the onJoinResetXP + */ + @Override + public boolean isOnJoinResetXP() { + return onJoinResetXP; + } + + + /** + * @param onJoinResetXP the onJoinResetXP to set + */ + public void setOnJoinResetXP(boolean onJoinResetXP) { + this.onJoinResetXP = onJoinResetXP; + } + + + /** + * @return the onLeaveResetHealth + */ + @Override + public boolean isOnLeaveResetHealth() { + return onLeaveResetHealth; + } + + + /** + * @param onLeaveResetHealth the onLeaveResetHealth to set + */ + public void setOnLeaveResetHealth(boolean onLeaveResetHealth) { + this.onLeaveResetHealth = onLeaveResetHealth; + } + + + /** + * @return the onLeaveResetHunger + */ + @Override + public boolean isOnLeaveResetHunger() { + return onLeaveResetHunger; + } + + + /** + * @param onLeaveResetHunger the onLeaveResetHunger to set + */ + public void setOnLeaveResetHunger(boolean onLeaveResetHunger) { + this.onLeaveResetHunger = onLeaveResetHunger; + } + + + /** + * @return the onLeaveResetXP + */ + @Override + public boolean isOnLeaveResetXP() { + return onLeaveResetXP; + } + + + /** + * @param onLeaveResetXP the onLeaveResetXP to set + */ + public void setOnLeaveResetXP(boolean onLeaveResetXP) { + this.onLeaveResetXP = onLeaveResetXP; + } + // --------------------------------------------------------------------- // Section: Variables // --------------------------------------------------------------------- @@ -1813,6 +1914,18 @@ public class Settings implements WorldSettings @ConfigEntry(path = "island.reset.on-join.inventory") private boolean onJoinResetInventory = false; + @ConfigComment("Reset health - if true, the player's health will be reset.") + @ConfigEntry(path = "island.reset.on-join.health") + private boolean onJoinResetHealth = true; + + @ConfigComment("Reset hunger - if true, the player's hunger will be reset.") + @ConfigEntry(path = "island.reset.on-join.hunger") + private boolean onJoinResetHunger = true; + + @ConfigComment("Reset experience points - if true, the player's experience will be reset.") + @ConfigEntry(path = "island.reset.on-join.exp") + private boolean onJoinResetXP = false; + @ConfigComment("Reset Ender Chest - if true, the player's Ender Chest will be cleared.") @ConfigEntry(path = "island.reset.on-join.ender-chest") private boolean onJoinResetEnderChest = false; @@ -1830,6 +1943,18 @@ public class Settings implements WorldSettings @ConfigEntry(path = "island.reset.on-leave.inventory") private boolean onLeaveResetInventory = false; + @ConfigComment("Reset health - if true, the player's health will be reset.") + @ConfigEntry(path = "island.reset.on-leave.health") + private boolean onLeaveResetHealth = false; + + @ConfigComment("Reset hunger - if true, the player's hunger will be reset.") + @ConfigEntry(path = "island.reset.on-leave.hunger") + private boolean onLeaveResetHunger = false; + + @ConfigComment("Reset experience - if true, the player's experience will be reset.") + @ConfigEntry(path = "island.reset.on-leave.exp") + private boolean onLeaveResetXP = false; + @ConfigComment("Reset Ender Chest - if true, the player's Ender Chest will be cleared.") @ConfigEntry(path = "island.reset.on-leave.ender-chest") private boolean onLeaveResetEnderChest = false; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 3455261..9e0635b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -292,7 +292,7 @@ island: # Overrides the on-leave inventory reset for kicked players. kicked-keep-inventory: false on-join: - # What the plugin should reset when the player joins or creates an island + # What the addon should reset when the player joins or creates an island # Reset Money - if this is true, will reset the player's money to the starting money # Recommendation is that this is set to true, but if you run multi-worlds # make sure your economy handles multi-worlds too. @@ -301,6 +301,12 @@ island: # Note: if you have MultiInv running or a similar inventory control plugin, that # plugin may still reset the inventory when the world changes. inventory: false + # Reset health - if true, the player's health will be reset. + health: true + # Reset hunger - if true, the player's hunger will be reset. + hunger: true + # Reset experience points - if true, the player's experience will be reset. + exp: false # Reset Ender Chest - if true, the player's Ender Chest will be cleared. ender-chest: false on-leave: @@ -313,6 +319,12 @@ island: # Note: if you have MultiInv running or a similar inventory control plugin, that # plugin may still reset the inventory when the world changes. inventory: false + # Reset health - if true, the player's health will be reset. + health: false + # Reset hunger - if true, the player's hunger will be reset. + hunger: false + # Reset experience - if true, the player's experience will be reset. + exp: false # Reset Ender Chest - if true, the player's Ender Chest will be cleared. ender-chest: false commands: