diff --git a/src/com/dre/brewery/BCauldron.java b/src/com/dre/brewery/BCauldron.java index 56c7311..b8cd460 100644 --- a/src/com/dre/brewery/BCauldron.java +++ b/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; diff --git a/src/com/dre/brewery/BEffect.java b/src/com/dre/brewery/BEffect.java index fe12836..4d516bd 100644 --- a/src/com/dre/brewery/BEffect.java +++ b/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; diff --git a/src/com/dre/brewery/BIngredients.java b/src/com/dre/brewery/BIngredients.java index 8eca978..fc44e07 100644 --- a/src/com/dre/brewery/BIngredients.java +++ b/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; diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java index bf133e5..857e57c 100644 --- a/src/com/dre/brewery/BPlayer.java +++ b/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; diff --git a/src/com/dre/brewery/BRecipe.java b/src/com/dre/brewery/BRecipe.java index c5644e6..4263f78 100644 --- a/src/com/dre/brewery/BRecipe.java +++ b/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; diff --git a/src/com/dre/brewery/Barrel.java b/src/com/dre/brewery/Barrel.java index 8135511..e5cc718 100644 --- a/src/com/dre/brewery/Barrel.java +++ b/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; diff --git a/src/com/dre/brewery/BarrelBody.java b/src/com/dre/brewery/BarrelBody.java index 1f3ad3f..c1cb350 100644 --- a/src/com/dre/brewery/BarrelBody.java +++ b/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; diff --git a/src/com/dre/brewery/Brew.java b/src/com/dre/brewery/Brew.java index 98b576b..df4ee1e 100644 --- a/src/com/dre/brewery/Brew.java +++ b/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; diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index d7cb911..2203109 100644 --- a/src/com/dre/brewery/P.java +++ b/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; diff --git a/src/com/dre/brewery/Wakeup.java b/src/com/dre/brewery/Wakeup.java index e578957..371d169 100644 --- a/src/com/dre/brewery/Wakeup.java +++ b/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; diff --git a/src/com/dre/brewery/api/events/IngedientAddEvent.java b/src/com/dre/brewery/api/events/IngedientAddEvent.java index 8008595..60bde23 100644 --- a/src/com/dre/brewery/api/events/IngedientAddEvent.java +++ b/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 diff --git a/src/com/dre/brewery/filedata/BConfig.java b/src/com/dre/brewery/filedata/BConfig.java index b06cae3..63a40c2 100644 --- a/src/com/dre/brewery/filedata/BConfig.java +++ b/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.WGBarrelOld; +import com.dre.brewery.integration.WGBarrel6; +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(); } diff --git a/src/com/dre/brewery/filedata/BData.java b/src/com/dre/brewery/filedata/BData.java index afc9355..0d4bed5 100644 --- a/src/com/dre/brewery/filedata/BData.java +++ b/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; diff --git a/src/com/dre/brewery/filedata/ConfigUpdater.java b/src/com/dre/brewery/filedata/ConfigUpdater.java index ed2d0af..60b1f71 100644 --- a/src/com/dre/brewery/filedata/ConfigUpdater.java +++ b/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; diff --git a/src/com/dre/brewery/filedata/DataSave.java b/src/com/dre/brewery/filedata/DataSave.java index 8a63842..0cd86ed 100644 --- a/src/com/dre/brewery/filedata/DataSave.java +++ b/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; diff --git a/src/com/dre/brewery/filedata/DataUpdater.java b/src/com/dre/brewery/filedata/DataUpdater.java index 0bacfe1..fc84159 100644 --- a/src/com/dre/brewery/filedata/DataUpdater.java +++ b/src/com/dre/brewery/filedata/DataUpdater.java @@ -1,107 +1,106 @@ -package com.dre.brewery.filedata; - -import com.dre.brewery.LegacyUtil; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; - -import com.dre.brewery.P; - -public class DataUpdater { - - private FileConfiguration data; - private File file; - - public DataUpdater(FileConfiguration data, File file) { - this.data = data; - this.file = file; - } - - - - public void update(String fromVersion) { - if (fromVersion.equalsIgnoreCase("1.0")) { - update10(); - //fromVersion = "1.1"; - } - - try { - data.save(file); - } catch (IOException e) { - e.printStackTrace(); - } - } - - - - - @SuppressWarnings("deprecation") - public void update10() { - - data.set("Version", DataSave.dataVersion); - - ConfigurationSection section = data.getConfigurationSection("Ingredients"); - try { - if (section != null) { - for (String id : section.getKeys(false)) { - ConfigurationSection matSection = section.getConfigurationSection(id + ".mats"); - if (matSection != null) { - // matSection has all the materials + amount as Integers - Map ingredients = new HashMap<>(); - for (String ingredient : matSection.getKeys(false)) { - // convert to Material - Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient)); - if (mat != null) { - ingredients.put(mat.name(), matSection.getInt(ingredient)); - } - } - section.set(id + ".mats", ingredients); - } else { - P.p.errorLog("Ingredient id: '" + id + "' incomplete in data.yml"); - } - } - } - } catch (Exception e) { - // 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:"); - e.printStackTrace(); - } - - section = data.getConfigurationSection("BCauldron"); - if (section != null) { - try { - for (String uuid : section.getKeys(false)) { - ConfigurationSection cauldrons = section.getConfigurationSection(uuid); - if (cauldrons != null) { - for (String id : cauldrons.getKeys(false)) { - ConfigurationSection ingredientSection = cauldrons.getConfigurationSection(id + ".ingredients"); - if (ingredientSection != null) { - // has all the materials + amount as Integers - Map ingredients = new HashMap<>(); - for (String ingredient : ingredientSection.getKeys(false)) { - // convert to Material - Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient)); - if (mat != null) { - ingredients.put(mat.name(), ingredientSection.getInt(ingredient)); - } - } - cauldrons.set(id + ".ingredients", ingredients); - } else { - P.p.errorLog("BCauldron " + id + " is missing Ingredient Section"); - } - } - } - } - } catch (Exception e) { - // 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:"); - e.printStackTrace(); - } - } - } -} +package com.dre.brewery.filedata; + +import com.dre.brewery.utility.LegacyUtil; +import com.dre.brewery.P; +import org.bukkit.Material; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class DataUpdater { + + private FileConfiguration data; + private File file; + + public DataUpdater(FileConfiguration data, File file) { + this.data = data; + this.file = file; + } + + + + public void update(String fromVersion) { + if (fromVersion.equalsIgnoreCase("1.0")) { + update10(); + //fromVersion = "1.1"; + } + + try { + data.save(file); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + + + @SuppressWarnings("deprecation") + public void update10() { + + data.set("Version", DataSave.dataVersion); + + ConfigurationSection section = data.getConfigurationSection("Ingredients"); + try { + if (section != null) { + for (String id : section.getKeys(false)) { + ConfigurationSection matSection = section.getConfigurationSection(id + ".mats"); + if (matSection != null) { + // matSection has all the materials + amount as Integers + Map ingredients = new HashMap<>(); + for (String ingredient : matSection.getKeys(false)) { + // convert to Material + Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient)); + if (mat != null) { + ingredients.put(mat.name(), matSection.getInt(ingredient)); + } + } + section.set(id + ".mats", ingredients); + } else { + P.p.errorLog("Ingredient id: '" + id + "' incomplete in data.yml"); + } + } + } + } catch (Exception e) { + // 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:"); + e.printStackTrace(); + } + + section = data.getConfigurationSection("BCauldron"); + if (section != null) { + try { + for (String uuid : section.getKeys(false)) { + ConfigurationSection cauldrons = section.getConfigurationSection(uuid); + if (cauldrons != null) { + for (String id : cauldrons.getKeys(false)) { + ConfigurationSection ingredientSection = cauldrons.getConfigurationSection(id + ".ingredients"); + if (ingredientSection != null) { + // has all the materials + amount as Integers + Map ingredients = new HashMap<>(); + for (String ingredient : ingredientSection.getKeys(false)) { + // convert to Material + Material mat = LegacyUtil.getMaterial(P.p.parseInt(ingredient)); + if (mat != null) { + ingredients.put(mat.name(), ingredientSection.getInt(ingredient)); + } + } + cauldrons.set(id + ".ingredients", ingredients); + } else { + P.p.errorLog("BCauldron " + id + " is missing Ingredient Section"); + } + } + } + } + } catch (Exception e) { + // 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:"); + e.printStackTrace(); + } + } + } +} diff --git a/src/com/dre/brewery/integration/IntegrationListener.java b/src/com/dre/brewery/integration/IntegrationListener.java index 8523137..5d69e2d 100644 --- a/src/com/dre/brewery/integration/IntegrationListener.java +++ b/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; diff --git a/src/com/dre/brewery/integration/LogBlockBarrel.java b/src/com/dre/brewery/integration/LogBlockBarrel.java index 4d368a8..371c0bf 100644 --- a/src/com/dre/brewery/integration/LogBlockBarrel.java +++ b/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; diff --git a/src/com/dre/brewery/integration/WGBarrelOld.java b/src/com/dre/brewery/integration/WGBarrel5.java similarity index 96% rename from src/com/dre/brewery/integration/WGBarrelOld.java rename to src/com/dre/brewery/integration/WGBarrel5.java index 5cbcb7f..a71666a 100644 --- a/src/com/dre/brewery/integration/WGBarrelOld.java +++ b/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); diff --git a/src/com/dre/brewery/integration/WGBarrelNew.java b/src/com/dre/brewery/integration/WGBarrel6.java similarity index 95% rename from src/com/dre/brewery/integration/WGBarrelNew.java rename to src/com/dre/brewery/integration/WGBarrel6.java index e5d876a..f89fa53 100644 --- a/src/com/dre/brewery/integration/WGBarrelNew.java +++ b/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; diff --git a/src/com/dre/brewery/listeners/BlockListener.java b/src/com/dre/brewery/listeners/BlockListener.java index 96bcd58..8f1a6df 100644 --- a/src/com/dre/brewery/listeners/BlockListener.java +++ b/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; diff --git a/src/com/dre/brewery/listeners/CommandListener.java b/src/com/dre/brewery/listeners/CommandListener.java index 02f97a7..12dbf7d 100644 --- a/src/com/dre/brewery/listeners/CommandListener.java +++ b/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; diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java index 7d9800d..f30e0fd 100644 --- a/src/com/dre/brewery/listeners/PlayerListener.java +++ b/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; diff --git a/src/com/dre/brewery/listeners/WorldListener.java b/src/com/dre/brewery/listeners/WorldListener.java index 48cea50..a945622 100644 --- a/src/com/dre/brewery/listeners/WorldListener.java +++ b/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.BUtil; +import com.dre.brewery.utility.BUtil; import com.dre.brewery.filedata.BData; import com.dre.brewery.filedata.DataSave; import org.bukkit.World; diff --git a/src/com/dre/brewery/lore/BrewLore.java b/src/com/dre/brewery/lore/BrewLore.java index 5fe529c..07cd4b5 100644 --- a/src/com/dre/brewery/lore/BrewLore.java +++ b/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; diff --git a/src/com/dre/brewery/BUtil.java b/src/com/dre/brewery/utility/BUtil.java similarity index 98% rename from src/com/dre/brewery/BUtil.java rename to src/com/dre/brewery/utility/BUtil.java index 50c0dca..50edb94 100644 --- a/src/com/dre/brewery/BUtil.java +++ b/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; diff --git a/src/com/dre/brewery/LegacyUtil.java b/src/com/dre/brewery/utility/LegacyUtil.java similarity index 99% rename from src/com/dre/brewery/LegacyUtil.java rename to src/com/dre/brewery/utility/LegacyUtil.java index f0f369a..37e173b 100644 --- a/src/com/dre/brewery/LegacyUtil.java +++ b/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; diff --git a/src/com/dre/brewery/PotionColor.java b/src/com/dre/brewery/utility/PotionColor.java similarity index 97% rename from src/com/dre/brewery/PotionColor.java rename to src/com/dre/brewery/utility/PotionColor.java index 8dd4359..2218061 100644 --- a/src/com/dre/brewery/PotionColor.java +++ b/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);