Changes for Distilling and 1.9

src/com/dre/brewery/Brew.java

@@ -15,6 +15,7 @@ import org.bukkit.potion.PotionEffectType;
 public class Brew {
 
 	// represents the liquid in the brewed Potions
+
 	public static Map<Integer, Brew> potions = new HashMap<Integer, Brew>();
 	public static Boolean colorInBarrels; // color the Lore while in Barrels
 	public static Boolean colorInBrewer; // color the Lore while in Brewer
@@ -307,6 +308,7 @@ public class Brew {
 	}
 
 	// Distilling section ---------------
+
 	// distill all custom potions in the brewer
 	public static void distillAll(BrewerInventory inv, Boolean[] contents) {
 		int slot = 0;
@@ -369,6 +371,7 @@ public class Brew {
 	}
 
 	// Ageing Section ------------------
+
 	public void age(ItemStack item, float time, byte woodType) {
 		if (stat) {
 			return;
@@ -452,6 +455,7 @@ public class Brew {
 	}
 
 	// Lore -----------
+	
 	// Converts to/from qualitycolored Lore
 	public void convertLore(PotionMeta meta, Boolean toQuality) {
 		if (currentRecipe == null) {

src/com/dre/brewery/P.java

@@ -35,7 +35,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 public class P extends JavaPlugin {
 	public static P p;
-	public static String configVersion = "1.3.1";
+	public static final String configVersion = "1.3.1";
 	public static boolean debug;
 	public static boolean useUUID;
 	public static boolean use1_9;
@@ -55,7 +55,7 @@ public class P extends JavaPlugin {
 	public EntityListener entityListener;
 	public InventoryListener inventoryListener;
 	public WorldListener worldListener;
-	public Compat1_9 compat1_9;
+	public DrinkListener1_9 drinkListener1_9;
 
 	// Language
 	public String language;
@@ -97,7 +97,7 @@ public class P extends JavaPlugin {
 		entityListener = new EntityListener();
 		inventoryListener = new InventoryListener();
 		worldListener = new WorldListener();
-		compat1_9 = new Compat1_9();
+		drinkListener1_9 = new DrinkListener1_9();
 		getCommand("Brewery").setExecutor(new CommandListener());
 
 		p.getServer().getPluginManager().registerEvents(blockListener, p);
@@ -106,7 +106,7 @@ public class P extends JavaPlugin {
 		p.getServer().getPluginManager().registerEvents(inventoryListener, p);
 		p.getServer().getPluginManager().registerEvents(worldListener, p);
 		if (use1_9) {
-			p.getServer().getPluginManager().registerEvents(compat1_9, p);
+			p.getServer().getPluginManager().registerEvents(drinkListener1_9, p);
 		}
 
 		// Heartbeat

src/com/dre/brewery/listeners/DrinkListener1_9.java

@@ -11,7 +11,7 @@ import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionType;
 
 // Workaround to remove unwanted potion effects
-public class Compat1_9 implements Listener {
+public class DrinkListener1_9 implements Listener {
 
 	@EventHandler
 	public void onPlayerDrink(PlayerItemConsumeEvent event) {

src/com/dre/brewery/listeners/InventoryListener.java

@@ -12,6 +12,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.BrewEvent;
+import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -49,6 +50,7 @@ public class InventoryListener implements Listener {
 	/* === Recreating manually the prior BrewEvent behavior. === */
 	private HashSet<UUID> trackedBrewmen = new HashSet<UUID>();
 	private HashMap<Block, Integer> trackedBrewers = new HashMap<Block, Integer>();
+	private static final int DISTILLTIME = 401;
 
 	/**
 	 * Start tracking distillation for a person when they open the brewer window.
@@ -98,6 +100,7 @@ public class InventoryListener implements Listener {
 		if (!trackedBrewmen.contains(puid)) return;
 
 		if (InventoryType.BREWING != inv.getType()) return;
+		if (event.getAction() == InventoryAction.NOTHING) return; // Ignore clicks that do nothing
 
 		BrewerInventory brewer = (BrewerInventory) inv;
 		final Block brewery = brewer.getHolder().getBlock();
@@ -110,37 +113,39 @@ public class InventoryListener implements Listener {
 
 		// Now check if we should bother to track it.
 		trackedBrewers.put(brewery, new BukkitRunnable() {
-			private int brewTime = 401;
+			private int brewTime = DISTILLTIME;
 			@Override
 			public void run() {
 				BlockState now = brewery.getState();
 				if (now instanceof BrewingStand) {
 					BrewingStand stand = (BrewingStand) now;
-					// check if still custom
-					BrewerInventory brewer = stand.getInventory();
-					if (isCustomAndDistill(brewer) ) {
+					if (brewTime == DISTILLTIME) { // only check at the beginning (and end) for distillables
+						if (!isCustomAndDistill(stand.getInventory())) {
+							this.cancel();
+							trackedBrewers.remove(brewery);
+							P.p.debugLog("nothing to distill");
+							return;
+						}
+					}
 
-						// Still a valid brew distillation
-						brewTime = brewTime - 1; // count down.
+					brewTime--; // count down.
 					stand.setBrewingTime(brewTime); // arbitrary for now
 
 					if (brewTime <= 1) { // Done!
-							BrewEvent doBrew = new BrewEvent(brewery, brewer);
-							Bukkit.getServer().getPluginManager().callEvent(doBrew);
-							if (!doBrew.isCancelled()) { // BrewEvent _wasn't_ cancelled.
+						//BrewEvent doBrew = new BrewEvent(brewery, brewer);
+						//Bukkit.getServer().getPluginManager().callEvent(doBrew);
+
+						BrewerInventory brewer = stand.getInventory();
+						if (!runDistill(brewer)) {
 							this.cancel();
 							trackedBrewers.remove(brewery);
 							stand.setBrewingTime(0);
 							P.p.debugLog("All done distilling");
 						} else {
-								brewTime = 401; // go again.
+							brewTime = DISTILLTIME; // go again.
 							P.p.debugLog("Can distill more! Continuing.");
 						}
 					}
-					} else {
-						this.cancel();
-						trackedBrewers.remove(brewery);
-					}
 				} else {
 					this.cancel();
 					trackedBrewers.remove(brewery);
@@ -174,8 +179,13 @@ public class InventoryListener implements Listener {
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onBrew(BrewEvent event) {
+		if (runDistill(event.getContents())) {
+			event.setCancelled(true);
+		}
+	}
+
+	private boolean runDistill(BrewerInventory inv) {
 		int slot = 0;
-		BrewerInventory inv = event.getContents();
 		ItemStack item;
 		boolean custom = false;
 		Boolean[] contents = new Boolean[3];
@@ -200,10 +210,10 @@ public class InventoryListener implements Listener {
 			slot++;
 		}
 		if (custom) {
-			event.setCancelled(true);
 			Brew.distillAll(inv, contents);
+			return true;
 		}
-
+		return false;
 	}
 
 	// convert to non colored Lore when taking out of Barrel/Brewer

src/com/dre/brewery/listeners/PlayerListener.java

@@ -70,6 +70,14 @@ public class PlayerListener implements Listener {
 								BCauldron.remove(clickedBlock);
 							}
 							return;
+
+							// Its possible to empty a Cauldron with a Bucket in 1.9
+						} else if (P.use1_9 && materialInHand == Material.BUCKET) {
+							if (BCauldron.getFillLevel(clickedBlock) == 2) {
+								// will only remove when existing
+								BCauldron.remove(clickedBlock);
+							}
+							return;
 						}
 
 						// Check if fire alive below cauldron when adding ingredients