From ef7293883fb100a6a75f8a0a21b14fbb74509085 Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Mon, 9 Sep 2013 16:28:35 +0200 Subject: [PATCH] Disable Debug Messages --- src/com/dre/brewery/BIngredients.java | 11 +++--- src/com/dre/brewery/BPlayer.java | 1 - src/com/dre/brewery/Barrel.java | 5 +-- src/com/dre/brewery/Brew.java | 2 - src/com/dre/brewery/P.java | 54 ++++++--------------------- 5 files changed, 18 insertions(+), 55 deletions(-) diff --git a/src/com/dre/brewery/BIngredients.java b/src/com/dre/brewery/BIngredients.java index fb9b153..81b0fdf 100644 --- a/src/com/dre/brewery/BIngredients.java +++ b/src/com/dre/brewery/BIngredients.java @@ -64,7 +64,7 @@ public class BIngredients { if (cookRecipe != null) { // Potion is best with cooking only int quality = (int) Math.round((getIngredientQuality(cookRecipe) + getCookingQuality(cookRecipe, false)) / 2.0); - P.p.log("cooked potion has Quality: " + quality); + P.p.debugLog("cooked potion has Quality: " + quality); Brew brew = new Brew(uid, quality, cookRecipe, this); Brew.addOrReplaceEffects(potionMeta, brew.getEffects()); @@ -135,8 +135,8 @@ public class BIngredients { // needs riping in barrel ageQuality = getAgeQuality(recipe, time); woodQuality = getWoodQuality(recipe, wood); - P.p.log("Ingredient Quality: " + ingredientQuality + " Cooking Quality: " + cookingQuality + " Wood Quality: " + woodQuality + - " age Quality: " + ageQuality + " for " + recipe.getName(5)); + P.p.debugLog("Ingredient Quality: " + ingredientQuality + " Cooking Quality: " + cookingQuality + + " Wood Quality: " + woodQuality + " age Quality: " + ageQuality + " for " + recipe.getName(5)); // is this recipe better than the previous best? if ((((float) ingredientQuality + cookingQuality + woodQuality + ageQuality) / 4) > quality) { @@ -144,7 +144,7 @@ public class BIngredients { bestRecipe = recipe; } } else { - P.p.log("Ingredient Quality: " + ingredientQuality + " Cooking Quality: " + cookingQuality + " for " + recipe.getName(5)); + P.p.debugLog("Ingredient Quality: " + ingredientQuality + " Cooking Quality: " + cookingQuality + " for " + recipe.getName(5)); // calculate quality without age and barrel if ((((float) ingredientQuality + cookingQuality) / 2) > quality) { quality = ((float) ingredientQuality + cookingQuality) / 2; @@ -154,7 +154,7 @@ public class BIngredients { } } if (bestRecipe != null) { - P.p.log("best recipe: " + bestRecipe.getName(5) + " has Quality= " + quality); + P.p.debugLog("best recipe: " + bestRecipe.getName(5) + " has Quality= " + quality); } return bestRecipe; } @@ -269,7 +269,6 @@ public class BIngredients { return 10; } int quality = 10 - Math.round(recipe.getWoodDiff(wood) * recipe.getDifficulty()); - P.p.log("wood: " + wood + " needed: " + recipe.getWood() + " diff: " + recipe.getWoodDiff(wood)); if (quality > 0) { return quality; diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java index ac4ed81..b988b1e 100644 --- a/src/com/dre/brewery/BPlayer.java +++ b/src/com/dre/brewery/BPlayer.java @@ -109,7 +109,6 @@ public class BPlayer { } else { bPlayer.drinkCap(player); } - P.p.msg(player, "Du bist nun " + bPlayer.drunkeness + "% betrunken, mit einer Qualität von " + bPlayer.getQuality()); return true; } return false; diff --git a/src/com/dre/brewery/Barrel.java b/src/com/dre/brewery/Barrel.java index 24ef1c8..4258c7a 100644 --- a/src/com/dre/brewery/Barrel.java +++ b/src/com/dre/brewery/Barrel.java @@ -93,7 +93,7 @@ public class Barrel { } loadTime = System.nanoTime() - loadTime; float ftime = (float) (loadTime / 1000000.0); - P.p.log("opening Barrel with potions (" + ftime + "ms)"); + P.p.debugLog("opening Barrel with potions (" + ftime + "ms)"); } } } @@ -375,7 +375,6 @@ public class Barrel { int x = startX; int y = 0; int z = startZ; - // P.p.log("startX="+startX+" startZ="+startZ+" endX="+endX+" endZ="+endZ+" direction="+direction); while (y <= 1) { while (x <= endX) { while (z <= endZ) { @@ -441,12 +440,10 @@ public class Barrel { int x = startX; int y = 0; int z = startZ; - // P.p.log("startX="+startX+" startZ="+startZ+" endX="+endX+" endZ="+endZ+" direction="+direction); while (y <= 2) { while (x <= endX) { while (z <= endZ) { typeId = spigot.getRelative(x, y, z).getTypeId(); - // spigot.getRelative(x,y,z).setTypeId(1); if (direction == 1 || direction == 2) { if (y == 1 && z == 0) { if (x == -2 || x == -3 || x == 2 || x == 3) { diff --git a/src/com/dre/brewery/Brew.java b/src/com/dre/brewery/Brew.java index 2953c21..428d7b8 100644 --- a/src/com/dre/brewery/Brew.java +++ b/src/com/dre/brewery/Brew.java @@ -285,7 +285,6 @@ public class Brew { // distillRuns will have an effect on the amount of alcohol, not the quality currentRecipe = recipe; quality = calcQuality(); - P.p.log("destilled " + recipe.getName(5) + " has Quality: " + quality + ", alc: " + calcAlcohol()); addOrReplaceEffects(potionMeta, getEffects()); potionMeta.setDisplayName(P.p.color("&f" + recipe.getName(quality))); @@ -330,7 +329,6 @@ public class Brew { if (recipe != null) { currentRecipe = recipe; quality = calcQuality(); - P.p.log("Final " + recipe.getName(5) + " has Quality: " + quality + ", alc: " + calcAlcohol()); addOrReplaceEffects(potionMeta, getEffects()); potionMeta.setDisplayName(P.p.color("&f" + recipe.getName(quality))); diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index e96d99c..f139bad 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -29,6 +29,7 @@ import com.dre.brewery.listeners.*; public class P extends JavaPlugin { public static P p; + public static boolean debug; public static int lastBackup = 0; public static int lastSave = 1; public static int autosave = 3; @@ -125,6 +126,12 @@ public class P extends JavaPlugin { this.msg(Bukkit.getConsoleSender(), msg); } + public void debugLog(String msg) { + if (debug) { + this.msg(Bukkit.getConsoleSender(), "&2[Debug] &f" + msg); + } + } + public void errorLog(String msg) { Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[Brewery] " + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg); } @@ -146,6 +153,7 @@ public class P extends JavaPlugin { // various Settings autosave = config.getInt("autosave", 3); + debug = config.getBoolean("debug", false); BPlayer.pukeItemId = Material.matchMaterial(config.getString("pukeItem", "SOUL_SAND")).getId(); BPlayer.hangoverTime = config.getInt("hangoverDays", 0) * 24 * 60; BPlayer.overdrinkKick = config.getBoolean("enableKickOnOverdrink", false); @@ -411,56 +419,26 @@ public class P extends JavaPlugin { FileConfiguration configFile = new YamlConfiguration(); - time = System.nanoTime() - time; - float ftime = (float) (time / 1000000.0); - p.log("Creating a savefile (" + ftime + "ms)"); - time = System.nanoTime(); - if (!Brew.potions.isEmpty()) { Brew.save(configFile.createSection("Brew")); } - time = System.nanoTime() - time; - ftime = (float) (time / 1000000.0); - p.log("Saving Brew (" + ftime + "ms)"); - time = System.nanoTime(); - if (!BCauldron.bcauldrons.isEmpty() || oldData.contains("BCauldron")) { BCauldron.save(configFile.createSection("BCauldron"), oldData.getConfigurationSection("BCauldron")); } - time = System.nanoTime() - time; - ftime = (float) (time / 1000000.0); - p.log("Saving BCauldrons (" + ftime + "ms)"); - time = System.nanoTime(); - if (!Barrel.barrels.isEmpty() || oldData.contains("Barrel")) { Barrel.save(configFile.createSection("Barrel"), oldData.getConfigurationSection("Barrel")); } - time = System.nanoTime() - time; - ftime = (float) (time / 1000000.0); - p.log("Saving Barrels (" + ftime + "ms)"); - time = System.nanoTime(); - if (!BPlayer.players.isEmpty()) { BPlayer.save(configFile.createSection("Player")); } - time = System.nanoTime() - time; - ftime = (float) (time / 1000000.0); - p.log("Saving players (" + ftime + "ms)"); - time = System.nanoTime(); - if (!Wakeup.wakeups.isEmpty() || oldData.contains("Wakeup")) { Wakeup.save(configFile.createSection("Wakeup"), oldData.getConfigurationSection("Wakeup")); } - time = System.nanoTime() - time; - ftime = (float) (time / 1000000.0); - p.log("Saving Wakeups (" + ftime + "ms)"); - time = System.nanoTime(); - saveWorldNames(configFile, oldData.getConfigurationSection("Worlds")); configFile.set("Version", "0.5"); @@ -474,8 +452,8 @@ public class P extends JavaPlugin { lastSave = 1; time = System.nanoTime() - time; - ftime = (float) (time / 1000000.0); - p.log("Writing Data to File (" + ftime + "ms)"); + float ftime = (float) (time / 1000000.0); + p.debugLog("Writing Data to File (" + ftime + "ms)"); } public void saveWorldNames(FileConfiguration root, ConfigurationSection old) { @@ -604,26 +582,18 @@ public class P extends JavaPlugin { @Override public void run() { - long time = System.nanoTime(); - for (BCauldron cauldron : BCauldron.bcauldrons) { cauldron.onUpdate();// runs every min to update cooking time } Barrel.onUpdate();// runs every min to check and update ageing time BPlayer.onUpdate();// updates players drunkeness + debugLog("Update"); + if (lastSave >= autosave) { saveData();// save all data - - time = System.nanoTime() - time; - float ftime = (float) (time / 1000000.0); - p.log("Update and saving (" + ftime + "ms)"); } else { lastSave++; - - time = System.nanoTime() - time; - float ftime = (float) (time / 1000000.0); - p.log("Update (" + ftime + "ms)"); } }