Skip to content

Commit

Permalink
Release Version 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Sn0wStorm committed Dec 13, 2019
1 parent 9afeae7 commit e7a77bf
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 18 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.dre</groupId>
<artifactId>Brewery</artifactId>
<version>2.0-beta1</version>
<version>2.0</version>
<name>Brewery</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
12 changes: 3 additions & 9 deletions src/com/dre/brewery/listeners/InventoryListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}*/
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/com/dre/brewery/listeners/PlayerListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions src/com/dre/brewery/recipe/BCauldronRecipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ public float getIngredientMatch(List<Ingredient> 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;
}
Expand Down
3 changes: 0 additions & 3 deletions src/com/dre/brewery/utility/LegacyUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit e7a77bf

Please sign in to comment.