From 6e270d5ec380277df7a1fa84e705de688d00ca47 Mon Sep 17 00:00:00 2001 From: Wizjany Date: Sun, 13 Jan 2013 17:21:51 -0500 Subject: [PATCH] Setting summary-on-start to false reduces much more clutter now --- .../worldguard/bukkit/WorldConfiguration.java | 12 +++++++--- .../worldguard/bukkit/WorldGuardPlugin.java | 22 ++++++++++++------- .../protection/GlobalRegionManager.java | 13 ++++++----- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index 56225a8f..72fc4864 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -75,6 +75,7 @@ public class WorldConfiguration { private ChestProtection chestProtection = new SignChestProtection(); /* Configuration data start */ + public boolean summaryOnStart; public boolean opPermissions; public boolean fireSpreadDisableToggle; public boolean itemDurability; @@ -189,7 +190,9 @@ public WorldConfiguration(WorldGuardPlugin plugin, String worldName, YAMLProcess config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED); loadConfiguration(); - plugin.getLogger().info("Loaded configuration for world '" + worldName + "'"); + if (summaryOnStart) { + plugin.getLogger().info("Loaded configuration for world '" + worldName + "'"); + } } private boolean getBoolean(String node, boolean def) { @@ -295,6 +298,7 @@ private void loadConfiguration() { e.printStackTrace(); } + summaryOnStart = getBoolean("summary-on-start", true); opPermissions = getBoolean("op-permissions", true); itemDurability = getBoolean("protection.item-durability", true); @@ -464,7 +468,9 @@ private void loadConfiguration() { this.blacklist = null; } else { this.blacklist = blist; - plugin.getLogger().log(Level.INFO, "Blacklist loaded."); + if (summaryOnStart) { + plugin.getLogger().log(Level.INFO, "Blacklist loaded."); + } BlacklistLogger blacklistLogger = blist.getLogger(); @@ -490,7 +496,7 @@ private void loadConfiguration() { } // Print an overview of settings - if (getBoolean("summary-on-start", true)) { + if (summaryOnStart) { plugin.getLogger().log(Level.INFO, blockTNTExplosions ? "(" + worldName + ") TNT ignition is blocked." : "(" + worldName + ") TNT ignition is PERMITTED."); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index f5b2205a..ae651768 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -34,9 +34,6 @@ import java.util.jar.JarFile; import java.util.zip.ZipEntry; -import com.sk89q.bukkit.util.CommandsManagerRegistration; -import com.sk89q.minecraft.util.commands.*; -import com.sk89q.wepif.PermissionsResolverManager; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; @@ -50,6 +47,15 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; +import com.sk89q.bukkit.util.CommandsManagerRegistration; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissionsException; +import com.sk89q.minecraft.util.commands.CommandUsageException; +import com.sk89q.minecraft.util.commands.CommandsManager; +import com.sk89q.minecraft.util.commands.MissingNestedCommandException; +import com.sk89q.minecraft.util.commands.SimpleInjector; +import com.sk89q.minecraft.util.commands.WrappedCommandException; +import com.sk89q.wepif.PermissionsResolverManager; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.bukkit.commands.GeneralCommands; @@ -138,12 +144,12 @@ public void run() { LegacyWorldGuardMigration.migrateBlacklist(this); try { - // Load the configuration - configuration.load(); - globalRegionManager.preload(); + // Load the configuration + configuration.load(); + globalRegionManager.preload(); } catch (FatalConfigurationLoadingException e) { - e.printStackTrace(); - getServer().shutdown(); + e.printStackTrace(); + getServer().shutdown(); } // Migrate regions after the regions were loaded because diff --git a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java index 94119464..f9a87810 100644 --- a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java @@ -36,12 +36,11 @@ import com.sk89q.worldguard.bukkit.ConfigurationManager; import com.sk89q.worldguard.bukkit.WorldConfiguration; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; -import com.sk89q.worldguard.protection.databases.ProtectionDatabase; -import com.sk89q.worldguard.protection.databases.YAMLDatabase; import com.sk89q.worldguard.protection.databases.MySQLDatabase; +import com.sk89q.worldguard.protection.databases.ProtectionDatabase; +import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; +import com.sk89q.worldguard.protection.databases.YAMLDatabase; import com.sk89q.worldguard.protection.flags.StateFlag; -import com.sk89q.worldguard.protection.managers.FlatRegionManager; import com.sk89q.worldguard.protection.managers.PRTreeRegionManager; import com.sk89q.worldguard.protection.managers.RegionManager; @@ -160,8 +159,10 @@ public RegionManager create(World world) { RegionManager manager = new PRTreeRegionManager(database); manager.load(); - plugin.getLogger().info(manager.getRegions().size() - + " regions loaded for '" + name + "'"); + if (plugin.getGlobalStateManager().get(world).summaryOnStart) { + plugin.getLogger().info(manager.getRegions().size() + + " regions loaded for '" + name + "'"); + } return manager; } catch (ProtectionDatabaseException e) {