From 9edfbf294bc40b7c54c3204e85742690ff891583 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 29 Nov 2021 22:20:26 -0500 Subject: [PATCH 1/2] GameTuning allowVoxelMapCaveMode --- .../simpleadminhacks/configs/GameFeaturesConfig.java | 4 ++-- .../simpleadminhacks/configs/GameTuningConfig.java | 9 +++++++++ .../minecraft/simpleadminhacks/hacks/GameTuning.java | 8 ++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameFeaturesConfig.java b/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameFeaturesConfig.java index e9e30df5..97a805f1 100644 --- a/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameFeaturesConfig.java +++ b/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameFeaturesConfig.java @@ -97,7 +97,7 @@ protected void wireup(ConfigurationSection config) { if (this.disableNetheriteCrafting) plugin().log(" Disable Netherite Crafting enabled."); this.goldBlockTeleport = config.getBoolean("goldBlockTeleport", false); - if (this.personalDeathMessages) plugin().log(" Gold block teleporter enabled."); + if (this.goldBlockTeleport) plugin().log(" Gold block teleporter enabled."); /* Add additional feature config grabs here. */ } @@ -178,7 +178,7 @@ public boolean isDisableNetheriteCrafting() { } public boolean isGoldblockTeleport() { - return goldBlockTeleport; + return this.goldBlockTeleport; } } diff --git a/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameTuningConfig.java b/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameTuningConfig.java index 346e779f..6ee82b9e 100644 --- a/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameTuningConfig.java +++ b/src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameTuningConfig.java @@ -56,6 +56,8 @@ public class GameTuningConfig extends SimpleHackConfig { private boolean rainReduction; private double rainOccurrenceChance; + private boolean allowVoxelMapCaveMode; + private Set noPlace; public GameTuningConfig(SimpleAdminHacks plugin, ConfigurationSection base) { @@ -117,6 +119,9 @@ protected void wireup(ConfigurationSection config) { this.badOmen = config.getBoolean("badOmen", false); if (!badOmen) plugin().log("Bad Omen effect is disabled."); + this.allowVoxelMapCaveMode = config.getBoolean("allowVoxelMapCaveMode", false); + if (!allowVoxelMapCaveMode) plugin().log("VoxelMap Cavemode disallowed."); + noPlace = new HashSet<>(); if(config.isList("noplace")) { for(String entry : config.getStringList("noplace")) { @@ -331,6 +336,10 @@ public double getRainOccurrenceChance() { return rainOccurrenceChance; } + public boolean allowVoxelMapCaveMode() { + return allowVoxelMapCaveMode; + } + public boolean canPlace(Material mat) { return !noPlace.contains(mat); } diff --git a/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/GameTuning.java b/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/GameTuning.java index 12aa977f..d9133e28 100644 --- a/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/GameTuning.java +++ b/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/GameTuning.java @@ -42,6 +42,7 @@ import org.bukkit.event.player.PlayerBedEnterEvent.BedEnterResult; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerPortalEvent; import org.bukkit.event.player.PlayerTeleportEvent; @@ -483,5 +484,12 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command return true; } + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) + public void onPlayerJoin(PlayerJoinEvent event) { + if (!config.isEnabled() || config.allowVoxelMapCaveMode()) { + return; + } + event.getPlayer().sendMessage("§3 §6 §3 §6 §3 §6 §d "); + } } From 328e861166d673f382d7d5dde4ecaa56a7d159e3 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 30 Nov 2021 09:48:35 -0500 Subject: [PATCH 2/2] add default config option for allowVoxelMapCaveMode --- src/main/resources/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 8336a464..e64d25c2 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -366,6 +366,7 @@ hacks: rainReduction: enabled: false rainOccurrenceChance: .5 + allowVoxelMapCaveMode: false HorseStats: enabled: false wand: COMPASS