diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java index 21786f5..0179508 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java @@ -113,7 +113,7 @@ public class RTPTeleport { private void loadingTeleport(Player p, CommandSender sendi) { eTitles.showTitle(RTPTitles.RTP_TITLE_TYPE.LOADING, p, p.getLocation(), 0, 0); - if (eTitles.sendMsg(RTPTitles.RTP_TITLE_TYPE.LOADING) || sendi != p) //Show msg if enabled or if not same player + if ((eTitles.sendMsg(RTPTitles.RTP_TITLE_TYPE.LOADING) && sendStatusMessage()) || sendi != p) //Show msg if enabled or if not same player getPl().getText().getSuccessLoading(sendi); } @@ -155,6 +155,10 @@ public class RTPTeleport { getPl().getText().getOtherSuccess(sendi, player, x, y, z, world, attempts); } + private boolean sendStatusMessage() { + return getPl().getSettings().statusMessages; + } + private BetterRTP getPl() { return BetterRTP.getInstance(); } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java index 607d44b..39db1af 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java @@ -7,9 +7,10 @@ public class Settings { public boolean debug; public boolean delayEnabled; - public boolean rtpOnFirstJoin_Enabled; - public String rtpOnFirstJoin_World; - public boolean rtpOnFirstJoin_SetAsRespawn; + public boolean rtpOnFirstJoin_Enabled; + public String rtpOnFirstJoin_World; + public boolean rtpOnFirstJoin_SetAsRespawn; + public boolean statusMessages; //Send more information about rtp public int preloadRadius; //Amount of chunks to load around a safe rtp location (clamped (0 - 16)) //Dependencies private final SoftDepends depends = new SoftDepends(); @@ -22,6 +23,7 @@ public class Settings { rtpOnFirstJoin_World = config.getString("Settings.RtpOnFirstJoin.World"); rtpOnFirstJoin_SetAsRespawn = config.getBoolean("Settings.RtpOnFirstJoin.SetAsRespawn"); preloadRadius = config.getInt("Settings.PreloadRadius"); + statusMessages = config.getBoolean("Settings.StatusMessages"); depends.load(); } diff --git a/src/main/resources/config-test.yml b/src/main/resources/config-test.yml new file mode 100644 index 0000000..6a1f110 --- /dev/null +++ b/src/main/resources/config-test.yml @@ -0,0 +1,134 @@ +# BetterRTP plugin by SuperRonanCraft! (Join my Public Server mc.RonanCraft.net) # +# Need help? go to https://ronancraft.net/discord! # + +Language-File: 'en.yml' + +Settings: + Respect: + ## Respect WorldGuard areas (https://dev.bukkit.org/projects/worldguard) + WorldGuard: false + ## Respect GriefPrevention areas (https://www.spigotmc.org/resources/griefprevention.1884/) + GriefPrevention: false + ## Respect Towny areas (https://www.spigotmc.org/resources/towny.72694/) + Towny: false + ## Respect RedProtect areas (https://www.spigotmc.org/resources/redprotect.15841/) + RedProtect: false + ## Respect FactionsUUID areas (https://www.spigotmc.org/resources/factionsuuid.1035/) + FactionsUUID: false + ## Respect Lands areas (https://www.spigotmc.org/resources/lands.53313/) + Lands: false + ## Respect Residence areas (https://www.spigotmc.org/resources/residence.11480/) + Residence: false + ## Respect KingdomsX areas (https://www.spigotmc.org/resources/kingdomsx.77670/) + KingdomsX: false + ## Output to console some debugging info + Debugger: false + ## Amount of chunks to preload around a safe location + PreloadRadius: 5 + ## Maximum amount of tries before BetterRTP gives up and sends a NotSafeMessage # + MaxAttempts: 32 + RtpOnFirstJoin: # Will execute as console to override delays + Enabled: false # Make the player rtp when joining the server for the first time + World: 'world' # World to first rtp in + SetAsRespawn: false # Save this first rtp as players new spawn point + Cooldown: + Enabled: true # Enabled or disabled cooldown timer + LockAfter: 0 # Lock the player in an infinite cooldown after # rtp's (0 to disable) + Time: 600 # in SECONDS + ## Time between command and actually rtp'ing, time is in SECONDS. Set to "0" to disable delay timer # + Delay: + Enabled: true + Time: 5 + CancelOnMove: true + StatusMessages: true # Send extra information about current status of RTP + DisableUpdater: false + +Default: + UseWorldBorder: false + ## "Biomes: []" means all biomes are allowed! # + ## Biomes are optional, more biomes at https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/Biome.html # + Biomes: [] + MaxRadius: 1000 + MinRadius: 10 + ## If "UseWorldBorder" is set to true above, Center X and Z will be ignored! # + CenterX: 0 + CenterZ: 0 + Shape: 'square' + +## Blocks BetterRTP will NOT teleport onto. More Blocks at: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Material.html # +BlacklistedBlocks: + - stationary_water + - stationary_lava + - water + - flowing_water + - lava + - flowing_lava + - cactus + - leaves + - leaves_2 + - air + - void_air + - bedrock + - oak_leaves + - jungle_leaves + +## Worlds to NOT allow /rtp in, unless there is an override to another enabled world # +DisabledWorlds: + - prison + - creative + +## Worlds you want to have a custom min/max and spawn center in # +## [MaxRadius] and [MinRadius] MUST be positive! These cannot be equal to each other! +CustomWorlds: + - custom_world_1: + UseWorldBorder: false + ## If UseWorldBorder is true, everything will be ignored EXCEPT "MinRadius"! + MaxRadius: 1000 + MinRadius: 100 + CenterX: 0 + CenterZ: 0 + Price: 50 + Shape: 'square' + - other_custom_world: + MaxRadius: 10000 + MinRadius: 150 + CenterX: 123 + CenterZ: -123 + Price: 0 + ## Biomes are optional, but useful! More biomes: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/Biome.html + Biomes: + - 'desert' + - 'forest' + Shape: 'circle' + +## Override a world and rtp a player executing the command in one world, to another +Overrides: + #FORMAT - : + - master_world: 'world' + - creative_world: 'world' + +WorldType: # Available types are NORMAL, NETHER + - world: NORMAL + - world_nether: NETHER + - world_the_end: NORMAL + +PermissionGroup: #Player requires "betterrtp.group." to trigger these configs + Enabled: false + Groups: + - vip: # permission: betterrtp.config.vip + - Build_World: #World named "Build_World" + MaxRadius: 10000 + MinRadius: 1000 + Price: 100 + - Survival_World: + UseWorldBorder: false + MaxRadius: 5000 + MinRadius: 1000 + CenterX: 10 + CenterZ: 10 + Price: 10 + - vip2: # permission: betterrtp.config.vip2 + - Build_World: + MaxRadius: 25000 + MinRadius: 10000 + Price: 15 \ No newline at end of file