Refractor Utility

src/com/dre/brewery/BCauldron.java

@@ -1,6 +1,8 @@
 package com.dre.brewery;
 
 import com.dre.brewery.api.events.IngedientAddEvent;
+import com.dre.brewery.utility.BUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import org.bukkit.Effect;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/com/dre/brewery/BEffect.java

@@ -1,5 +1,6 @@
 package com.dre.brewery;
 
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffect;

src/com/dre/brewery/BIngredients.java

@@ -2,6 +2,7 @@ package com.dre.brewery;
 
 import com.dre.brewery.api.events.brew.BrewModifyEvent;
 import com.dre.brewery.lore.BrewLore;
+import com.dre.brewery.utility.PotionColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

src/com/dre/brewery/BPlayer.java

@@ -6,6 +6,7 @@ import com.dre.brewery.api.events.PlayerPukeEvent;
 import com.dre.brewery.api.events.PlayerPushEvent;
 import com.dre.brewery.api.events.brew.BrewDrinkEvent;
 import com.dre.brewery.filedata.BConfig;
+import com.dre.brewery.utility.BUtil;
 import org.apache.commons.lang.mutable.MutableInt;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/com/dre/brewery/BRecipe.java

@@ -1,6 +1,7 @@
 package com.dre.brewery;
 
 import com.dre.brewery.filedata.BConfig;
+import com.dre.brewery.utility.PotionColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

src/com/dre/brewery/Barrel.java

@@ -7,6 +7,8 @@ import com.dre.brewery.api.events.barrel.BarrelRemoveEvent;
 import com.dre.brewery.filedata.BConfig;
 import com.dre.brewery.integration.LogBlockBarrel;
 import com.dre.brewery.lore.BrewLore;
+import com.dre.brewery.utility.BUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;

src/com/dre/brewery/BarrelBody.java

@@ -1,5 +1,7 @@
 package com.dre.brewery;
 
+import com.dre.brewery.utility.BUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/com/dre/brewery/Brew.java

@@ -3,6 +3,7 @@ package com.dre.brewery;
 import com.dre.brewery.api.events.brew.BrewModifyEvent;
 import com.dre.brewery.filedata.BConfig;
 import com.dre.brewery.lore.*;
+import com.dre.brewery.utility.PotionColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.BrewerInventory;

src/com/dre/brewery/P.java

@@ -8,6 +8,7 @@ import com.dre.brewery.filedata.UpdateChecker;
 import com.dre.brewery.integration.IntegrationListener;
 import com.dre.brewery.integration.LogBlockBarrel;
 import com.dre.brewery.listeners.*;
+import com.dre.brewery.utility.BUtil;
 import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

src/com/dre/brewery/Wakeup.java

@@ -1,5 +1,6 @@
 package com.dre.brewery;
 
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;

src/com/dre/brewery/api/events/IngedientAddEvent.java

@@ -1,9 +1,8 @@
 package com.dre.brewery.api.events;
 
 import com.dre.brewery.BCauldron;
-import com.dre.brewery.LegacyUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Levelled;
 import org.bukkit.entity.Player;
@@ -11,8 +10,6 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Cauldron;
-import org.bukkit.material.MaterialData;
 
 /*
  * Player adding an ingredient to a cauldron

src/com/dre/brewery/filedata/BConfig.java

@@ -3,8 +3,9 @@ package com.dre.brewery.filedata;
 import com.dre.brewery.*;
 import com.dre.brewery.integration.WGBarrel;
 import com.dre.brewery.integration.WGBarrel7;
-import com.dre.brewery.integration.WGBarrelNew;
+import com.dre.brewery.integration.WGBarrel6;
-import com.dre.brewery.integration.WGBarrelOld;
+import com.dre.brewery.integration.WGBarrel5;
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -138,9 +139,9 @@ public class BConfig {
 			if (plugin != null) {
 				String wgv = plugin.getDescription().getVersion();
 				if (wgv.startsWith("6.")) {
-					wg = new WGBarrelNew();
+					wg = new WGBarrel6();
 				} else if (wgv.startsWith("5.")) {
-					wg = new WGBarrelOld();
+					wg = new WGBarrel5();
 				} else {
 					wg = new WGBarrel7();
 				}

src/com/dre/brewery/filedata/BData.java

@@ -1,6 +1,7 @@
 package com.dre.brewery.filedata;
 
 import com.dre.brewery.*;
+import com.dre.brewery.utility.BUtil;
 import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/com/dre/brewery/filedata/ConfigUpdater.java

@@ -1,6 +1,6 @@
 package com.dre.brewery.filedata;
 
-import com.dre.brewery.LegacyUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import com.dre.brewery.P;
 import org.bukkit.Material;
 

src/com/dre/brewery/filedata/DataSave.java

@@ -4,7 +4,7 @@ package com.dre.brewery.filedata;
 import java.io.File;
 
 import com.dre.brewery.MCBarrel;
-import com.dre.brewery.BUtil;
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;

src/com/dre/brewery/filedata/DataUpdater.java

@@ -1,107 +1,106 @@
-package com.dre.brewery.filedata;
+package com.dre.brewery.filedata;
-
+
-import com.dre.brewery.LegacyUtil;
+import com.dre.brewery.utility.LegacyUtil;
-import java.io.File;
+import com.dre.brewery.P;
-import java.io.IOException;
+import org.bukkit.Material;
-import java.util.HashMap;
+import org.bukkit.configuration.ConfigurationSection;
-import java.util.Map;
+import org.bukkit.configuration.file.FileConfiguration;
-
+
-import org.bukkit.Material;
+import java.io.File;
-import org.bukkit.configuration.ConfigurationSection;
+import java.io.IOException;
-import org.bukkit.configuration.file.FileConfiguration;
+import java.util.HashMap;
-
+import java.util.Map;
-import com.dre.brewery.P;
+
-
+public class DataUpdater {
-public class DataUpdater {
+
-
+	private FileConfiguration data;
-	private FileConfiguration data;
+	private File file;
-	private File file;
+
-
+	public DataUpdater(FileConfiguration data, File file) {
-	public DataUpdater(FileConfiguration data, File file) {
+		this.data = data;
-		this.data = data;
+		this.file = file;
-		this.file = file;
+	}
-	}
+
-
+
-
+
-
+	public void update(String fromVersion) {
-	public void update(String fromVersion) {
+		if (fromVersion.equalsIgnoreCase("1.0")) {
-		if (fromVersion.equalsIgnoreCase("1.0")) {
+			update10();
-			update10();
+			//fromVersion = "1.1";
-			//fromVersion = "1.1";
+		}
-		}
+
-
+		try {
-		try {
+			data.save(file);
-			data.save(file);
+		} catch (IOException e) {
-		} catch (IOException e) {
+			e.printStackTrace();
-			e.printStackTrace();
+		}
-		}
+	}
-	}
+
-
+
-
+
-
+
-
+	@SuppressWarnings("deprecation")
-	@SuppressWarnings("deprecation")
+	public void update10() {
-	public void update10() {
+
-
+		data.set("Version", DataSave.dataVersion);
-		data.set("Version", DataSave.dataVersion);
+
-
+		ConfigurationSection section = data.getConfigurationSection("Ingredients");
-		ConfigurationSection section = data.getConfigurationSection("Ingredients");
+		try {
-		try {
+			if (section != null) {
-			if (section != null) {
+				for (String id : section.getKeys(false)) {
-				for (String id : section.getKeys(false)) {
+					ConfigurationSection matSection = section.getConfigurationSection(id + ".mats");
-					ConfigurationSection matSection = section.getConfigurationSection(id + ".mats");
+					if (matSection != null) {
-					if (matSection != null) {
+						// matSection has all the materials + amount as Integers
-						// matSection has all the materials + amount as Integers
+						Map<String, Integer> ingredients = new HashMap<>();
-						Map<String, Integer> ingredients = new HashMap<>();
+						for (String ingredient : matSection.getKeys(false)) {
-						for (String ingredient : matSection.getKeys(false)) {
+							// convert to Material
-							// convert to Material
+							Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient));
-							Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient));
+							if (mat != null) {
-							if (mat != null) {
+								ingredients.put(mat.name(), matSection.getInt(ingredient));
-								ingredients.put(mat.name(), matSection.getInt(ingredient));
+							}
-							}
+						}
-						}
+						section.set(id + ".mats", ingredients);
-						section.set(id + ".mats", ingredients);
+					} else {
-					} else {
+						P.p.errorLog("Ingredient id: '" + id + "' incomplete in data.yml");
-						P.p.errorLog("Ingredient id: '" + id + "' incomplete in data.yml");
+					}
-					}
+				}
-				}
+			}
-			}
+		} catch (Exception e) {
-		} catch (Exception e) {
+			// Getting Material by id may not work in the future
-			// Getting Material by id may not work in the future
+			P.p.errorLog("Error Converting Ingredient Section of the Data File, newer versions of Bukkit may not support the old Save File anymore:");
-			P.p.errorLog("Error Converting Ingredient Section of the Data File, newer versions of Bukkit may not support the old Save File anymore:");
+			e.printStackTrace();
-			e.printStackTrace();
+		}
-		}
+
-
+		section = data.getConfigurationSection("BCauldron");
-		section = data.getConfigurationSection("BCauldron");
+		if (section != null) {
-		if (section != null) {
+			try {
-			try {
+				for (String uuid : section.getKeys(false)) {
-				for (String uuid : section.getKeys(false)) {
+					ConfigurationSection cauldrons = section.getConfigurationSection(uuid);
-					ConfigurationSection cauldrons = section.getConfigurationSection(uuid);
+					if (cauldrons != null) {
-					if (cauldrons != null) {
+						for (String id : cauldrons.getKeys(false)) {
-						for (String id : cauldrons.getKeys(false)) {
+							ConfigurationSection ingredientSection = cauldrons.getConfigurationSection(id + ".ingredients");
-							ConfigurationSection ingredientSection = cauldrons.getConfigurationSection(id + ".ingredients");
+							if (ingredientSection != null) {
-							if (ingredientSection != null) {
+								// has all the materials + amount as Integers
-								// has all the materials + amount as Integers
+								Map<String, Integer> ingredients = new HashMap<>();
-								Map<String, Integer> ingredients = new HashMap<>();
+								for (String ingredient : ingredientSection.getKeys(false)) {
-								for (String ingredient : ingredientSection.getKeys(false)) {
+									// convert to Material
-									// convert to Material
+									Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient));
-									Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient));
+									if (mat != null) {
-									if (mat != null) {
+										ingredients.put(mat.name(), ingredientSection.getInt(ingredient));
-										ingredients.put(mat.name(), ingredientSection.getInt(ingredient));
+									}
-									}
+								}
-								}
+								cauldrons.set(id + ".ingredients", ingredients);
-								cauldrons.set(id + ".ingredients", ingredients);
+							} else {
-							} else {
+								P.p.errorLog("BCauldron " + id + " is missing Ingredient Section");
-								P.p.errorLog("BCauldron " + id + " is missing Ingredient Section");
+							}
-							}
+						}
-						}
+					}
-					}
+				}
-				}
+			} catch (Exception e) {
-			} catch (Exception e) {
+				// Getting Material by id may not work in the future
-				// Getting Material by id may not work in the future
+				P.p.errorLog("Error Converting Ingredient Section of Cauldrons, newer versions of Bukkit may not support the old Save File anymore:");
-				P.p.errorLog("Error Converting Ingredient Section of Cauldrons, newer versions of Bukkit may not support the old Save File anymore:");
+				e.printStackTrace();
-				e.printStackTrace();
+			}
-			}
+		}
-		}
+	}
-	}
+}
-}

src/com/dre/brewery/integration/IntegrationListener.java

@@ -1,7 +1,7 @@
 package com.dre.brewery.integration;
 
 import com.dre.brewery.Barrel;
-import com.dre.brewery.LegacyUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import com.dre.brewery.P;
 import com.dre.brewery.api.events.barrel.BarrelAccessEvent;
 import com.dre.brewery.api.events.barrel.BarrelDestroyEvent;

src/com/dre/brewery/integration/LogBlockBarrel.java

@@ -1,6 +1,6 @@
 package com.dre.brewery.integration;
 
-import com.dre.brewery.LegacyUtil;
+import com.dre.brewery.utility.LegacyUtil;
 import com.dre.brewery.P;
 import de.diddiz.LogBlock.Actor;
 

src/com/dre/brewery/integration/WGBarrel5.java

@@ -17,13 +17,13 @@ import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 
 
-public class WGBarrelOld implements WGBarrel {
+public class WGBarrel5 implements WGBarrel {
 
 	private Method allows;
 	private Method canBuild;
 	private Method getApplicableRegions;
 
-	public WGBarrelOld() {
+	public WGBarrel5() {
 		try {
 			allows = ApplicableRegionSet.class.getMethod("allows", StateFlag.class, LocalPlayer.class);
 			canBuild = ApplicableRegionSet.class.getMethod("canBuild", LocalPlayer.class);

src/com/dre/brewery/integration/WGBarrel6.java

@@ -9,7 +9,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-public class WGBarrelNew implements WGBarrel {
+public class WGBarrel6 implements WGBarrel {
 
 	public boolean checkAccess(Player player, Block spigot, Plugin plugin) {
 		WorldGuardPlugin wg = (WorldGuardPlugin) plugin;

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

@@ -1,7 +1,7 @@
 package com.dre.brewery.listeners;
 
 import com.dre.brewery.BPlayer;
-import com.dre.brewery.BUtil;
+import com.dre.brewery.utility.BUtil;
 import com.dre.brewery.Barrel;
 import com.dre.brewery.P;
 import com.dre.brewery.DistortChat;

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

@@ -3,6 +3,7 @@ package com.dre.brewery.listeners;
 import com.dre.brewery.*;
 import com.dre.brewery.api.events.brew.BrewModifyEvent;
 import com.dre.brewery.filedata.BConfig;
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

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

@@ -3,6 +3,7 @@ package com.dre.brewery.listeners;
 import com.dre.brewery.*;
 import com.dre.brewery.filedata.BConfig;
 import com.dre.brewery.filedata.UpdateChecker;
+import com.dre.brewery.utility.LegacyUtil;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

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

@@ -2,8 +2,7 @@ package com.dre.brewery.listeners;
 
 import com.dre.brewery.BCauldron;
 import com.dre.brewery.Barrel;
-import com.dre.brewery.P;
+import com.dre.brewery.utility.BUtil;
-import com.dre.brewery.BUtil;
 import com.dre.brewery.filedata.BData;
 import com.dre.brewery.filedata.DataSave;
 import org.bukkit.World;

src/com/dre/brewery/lore/BrewLore.java

@@ -1,6 +1,7 @@
 package com.dre.brewery.lore;
 
 import com.dre.brewery.*;
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;

src/com/dre/brewery/utility/BUtil.java

@@ -1,5 +1,8 @@
-package com.dre.brewery;
+package com.dre.brewery.utility;
 
+import com.dre.brewery.BCauldron;
+import com.dre.brewery.Barrel;
+import com.dre.brewery.P;
 import com.dre.brewery.api.events.barrel.BarrelDestroyEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

src/com/dre/brewery/utility/LegacyUtil.java

@@ -1,5 +1,6 @@
-package com.dre.brewery;
+package com.dre.brewery.utility;
 
+import com.dre.brewery.P;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/com/dre/brewery/utility/PotionColor.java

@@ -1,5 +1,6 @@
-package com.dre.brewery;
+package com.dre.brewery.utility;
 
+import com.dre.brewery.P;
 import org.bukkit.Color;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
@@ -39,6 +40,7 @@ public class PotionColor {
 
 	// gets the Damage Value, that sets a color on the potion
 	// offset +32 is not accepted by brewer, so not further destillable
+	// Only for minecraft pre 1.9
 	public short getColorId(boolean destillable) {
 		if (destillable) {
 			return (short) (colorId + 64);