diff --git a/pom.xml b/pom.xml index 4a1340dc..bf4ac797 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.dre Brewery - 2.0-beta1 + 2.0 Brewery diff --git a/resources/plugin.yml b/resources/plugin.yml index 312b86c7..f82c6daf 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,5 +1,5 @@ name: Brewery -version: 1.8.3 +version: 2.0 main: com.dre.brewery.P softdepend: [LWC, LogBlock, WorldGuard, GriefPrevention, Vault, Citadel] authors: [Milan Albrecht, Frank Baumann, ProgrammerDan, Daniel Saukel] diff --git a/src/com/dre/brewery/listeners/InventoryListener.java b/src/com/dre/brewery/listeners/InventoryListener.java index a27283fb..6484c227 100644 --- a/src/com/dre/brewery/listeners/InventoryListener.java +++ b/src/com/dre/brewery/listeners/InventoryListener.java @@ -126,16 +126,10 @@ public void onInventoryClickLow(InventoryClickEvent event) { } } } - //long t1 = System.nanoTime(); - Brew brew = Brew.get(item); - //long t2 = System.nanoTime(); + /*Brew brew = Brew.get(item); if (brew != null) { - P.p.log(brew.toString()); - - //P.p.log("Brew.get(): " + (t2 - t1) / 1000000.0 + "ms"); - - //brew.touch(); - } + brew.touch(); + }*/ } } } diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java index ab1d99c3..ad0cdec7 100644 --- a/src/com/dre/brewery/listeners/PlayerListener.java +++ b/src/com/dre/brewery/listeners/PlayerListener.java @@ -65,8 +65,6 @@ public void onPlayerInteract(PlayerInteractEvent event) { if (barrel != null) { event.setCancelled(true); - P.p.debugLog("Barrel has area of: " + barrel.getBody().getBounds().area()); - if (!barrel.hasPermsOpen(player, event)) { return; } diff --git a/src/com/dre/brewery/recipe/BCauldronRecipe.java b/src/com/dre/brewery/recipe/BCauldronRecipe.java index 2c2363d5..077a7dcc 100644 --- a/src/com/dre/brewery/recipe/BCauldronRecipe.java +++ b/src/com/dre/brewery/recipe/BCauldronRecipe.java @@ -172,8 +172,6 @@ public float getIngredientMatch(List items) { //double mod = 0.1 + (0.9 * Math.exp(-0.03 * difference)); // logarithmic curve from 1 to 0.1 double mod = 1 + (0.9 * -Math.exp(-0.03 * factor)); // logarithmic curve from 0.1 to 1, small for a low factor - P.p.debugLog("Mod for " + recipeIng + ": " + mod); - match *= mod; continue search; } diff --git a/src/com/dre/brewery/utility/LegacyUtil.java b/src/com/dre/brewery/utility/LegacyUtil.java index 33a09f19..93100668 100644 --- a/src/com/dre/brewery/utility/LegacyUtil.java +++ b/src/com/dre/brewery/utility/LegacyUtil.java @@ -261,17 +261,14 @@ public static boolean initNbt() { try { Class.forName("org.bukkit.persistence.PersistentDataContainer"); NewNbtVer = true; - P.p.log("Using the NEW nbt api"); return true; } catch (ClassNotFoundException e) { try { Class.forName("org.bukkit.inventory.meta.tags.CustomItemTagContainer"); NewNbtVer = false; - P.p.log("Using the OLD nbt api"); return true; } catch (ClassNotFoundException ex) { NewNbtVer = false; - P.p.log("No nbt api found, using Lore Save System"); return false; } }