From f6de97a5125629fc0afac7bb227c03c3780d309f Mon Sep 17 00:00:00 2001 From: sauilitired Date: Fri, 3 Jul 2015 11:45:00 +0200 Subject: [PATCH] Fixing all broken references --- .../plot/PlotSquared.java | 107 ++---------------- .../plot/api/PlotAPI.java | 8 +- .../plot/commands/Cluster.java | 6 +- .../plot/commands/Condense.java | 4 +- .../plot/commands/DebugExec.java | 2 +- .../plot/commands/DebugUUID.java | 14 +-- .../plot/commands/Merge.java | 2 +- .../plot/commands/Reload.java | 4 +- .../plot/commands/TP.java | 2 +- .../plot/commands/Template.java | 16 +-- .../plot/commands/Trim.java | 2 +- .../plot/database/SQLManager.java | 8 +- .../database/plotme/LikePlotMeConverter.java | 56 ++++----- .../plot/generator/BukkitHybridUtils.java | 2 +- .../plot/generator/HybridUtils.java | 2 +- .../plot/listeners/PlayerEvents.java | 8 +- .../plot/listeners/WorldEvents.java | 2 +- .../plot/listeners/worldedit/WEListener.java | 2 +- .../plot/util/ExpireManager.java | 2 +- .../util/bukkit/BukkitPlayerFunctions.java | 8 +- .../plot/util/bukkit/BukkitSetupUtils.java | 12 +- 21 files changed, 80 insertions(+), 189 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java index 8656225f0..193ee9086 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java @@ -41,14 +41,15 @@ public class PlotSquared implements PlotSquaredMain { private final HashMap plotworlds = new HashMap<>(); private final HashMap plotmanagers = new HashMap<>(); public WorldEditPlugin worldEdit = null; + public File configFile; + public YamlConfiguration config; + public YamlConfiguration storage; + public IPlotMain IMP = null; // Specific implementation of PlotSquared + public TaskManager TASK; private File styleFile; private YamlConfiguration style; - private File configFile; - private YamlConfiguration config; private File storageFile; - private YamlConfiguration storage; private File FILE = null; // This file - private IPlotMain IMP = null; // Specific implementation of PlotSquared private String VERSION = null; private boolean LOADING_WORLD = false; private LinkedHashMap> plots; @@ -77,7 +78,7 @@ public class PlotSquared implements PlotSquaredMain { if (getJavaVersion() < 1.8) { log(C.PREFIX.s() + "&cIt's really recommended to run Java 1.8, as it increases performance"); } - TaskManager TASK = IMP.getTaskManager(); + this.TASK = IMP.getTaskManager(); if (C.ENABLED.s().length() > 0) { log(C.ENABLED.s()); } @@ -405,7 +406,7 @@ public class PlotSquared implements PlotSquaredMain { final PlotGenerator plotGenerator; final PlotManager plotManager; final String path = "worlds." + world; - if (!LOADING_WORLD && (generator != null) && (generator instanceof PlotGenerator)) { + if (!LOADING_WORLD && (generator != null)) { plotGenerator = generator; plotWorld = plotGenerator.getNewPlotWorld(world); plotManager = plotGenerator.getPlotManager(); @@ -582,99 +583,6 @@ public class PlotSquared implements PlotSquaredMain { return true; } - @Override - public boolean setupPlotWorld(final String world, final String id) { - if ((id != null) && (id.length() > 0)) { - // save configuration - final String[] split = id.split(","); - final HybridPlotWorld plotworld = new HybridPlotWorld(world); - final int width = SquarePlotWorld.PLOT_WIDTH_DEFAULT; - final int gap = SquarePlotWorld.ROAD_WIDTH_DEFAULT; - final int height = ClassicPlotWorld.PLOT_HEIGHT_DEFAULT; - final PlotBlock[] floor = ClassicPlotWorld.TOP_BLOCK_DEFAULT; - final PlotBlock[] main = ClassicPlotWorld.MAIN_BLOCK_DEFAULT; - final PlotBlock wall = ClassicPlotWorld.WALL_FILLING_DEFAULT; - final PlotBlock border = ClassicPlotWorld.WALL_BLOCK_DEFAULT; - for (final String element : split) { - final String[] pair = element.split("="); - if (pair.length != 2) { - log("&cNo value provided for: &7" + element); - return false; - } - final String key = pair[0].toLowerCase(); - final String value = pair[1]; - try { - switch (key) { - case "s": - case "size": { - SquarePlotWorld.PLOT_WIDTH_DEFAULT = Configuration.INTEGER.parseString(value).shortValue(); - break; - } - case "g": - case "gap": { - SquarePlotWorld.ROAD_WIDTH_DEFAULT = Configuration.INTEGER.parseString(value).shortValue(); - break; - } - case "h": - case "height": { - ClassicPlotWorld.PLOT_HEIGHT_DEFAULT = Configuration.INTEGER.parseString(value); - ClassicPlotWorld.ROAD_HEIGHT_DEFAULT = Configuration.INTEGER.parseString(value); - ClassicPlotWorld.WALL_HEIGHT_DEFAULT = Configuration.INTEGER.parseString(value); - break; - } - case "f": - case "floor": { - ClassicPlotWorld.TOP_BLOCK_DEFAULT = Configuration.BLOCKLIST.parseString(value); - break; - } - case "m": - case "main": { - ClassicPlotWorld.MAIN_BLOCK_DEFAULT = Configuration.BLOCKLIST.parseString(value); - break; - } - case "w": - case "wall": { - ClassicPlotWorld.WALL_FILLING_DEFAULT = Configuration.BLOCK.parseString(value); - break; - } - case "b": - case "border": { - ClassicPlotWorld.WALL_BLOCK_DEFAULT = Configuration.BLOCK.parseString(value); - break; - } - default: { - log("&cKey not found: &7" + element); - return false; - } - } - } catch (final Exception e) { - e.printStackTrace(); - log("&cInvalid value: &7" + value + " in arg " + element); - return false; - } - } - try { - final String root = "worlds." + world; - if (!config.contains(root)) { - config.createSection(root); - } - plotworld.saveConfiguration(config.getConfigurationSection(root)); - ClassicPlotWorld.PLOT_HEIGHT_DEFAULT = height; - ClassicPlotWorld.ROAD_HEIGHT_DEFAULT = height; - ClassicPlotWorld.WALL_HEIGHT_DEFAULT = height; - ClassicPlotWorld.TOP_BLOCK_DEFAULT = floor; - ClassicPlotWorld.MAIN_BLOCK_DEFAULT = main; - ClassicPlotWorld.WALL_BLOCK_DEFAULT = border; - ClassicPlotWorld.WALL_FILLING_DEFAULT = wall; - SquarePlotWorld.PLOT_WIDTH_DEFAULT = width; - SquarePlotWorld.ROAD_WIDTH_DEFAULT = gap; - } catch (final Exception e) { - e.printStackTrace(); - } - } - return true; - } - @Override public Connection getConnection() { return connection; @@ -782,7 +690,6 @@ public class PlotSquared implements PlotSquaredMain { } else { log(C.PREFIX + "&cNo storage type is set!"); IMP.disable(); - return; } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java index 284ff289d..81f8df96b 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java @@ -117,7 +117,7 @@ import java.util.Set; * @see com.intellectualcrafters.plot.PlotSquared#config */ public YamlConfiguration getConfig() { - return PlotSquared.config; + return PlotSquared.getInstance().config; } /** @@ -126,7 +126,7 @@ import java.util.Set; * @see com.intellectualcrafters.plot.PlotSquared#storage */ public YamlConfiguration getStorage() { - return PlotSquared.storage; + return PlotSquared.getInstance().storage; } /** @@ -138,7 +138,7 @@ import java.util.Set; * @see com.intellectualcrafters.plot.PlotSquared */ public PlotSquared getMain() { - return PlotSquared.THIS; + return PlotSquared.getInstance(); } /** @@ -612,7 +612,7 @@ import java.util.Set; * @see com.intellectualcrafters.plot.PlotSquared */ public PlotSquared getPlotSquared() { - return PlotSquared.THIS; + return PlotSquared.getInstance(); } /** diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java index f88809168..68d282e47 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java @@ -130,16 +130,16 @@ public class Cluster extends SubCommand { } PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); if (plotworld == null) { - PlotSquared.config.createSection("worlds." + world); + PlotSquared.getInstance().config.createSection("worlds." + world); PlotSquared.getInstance().loadWorld(world, null); } else { - final String gen_string = PlotSquared.config.getString("worlds." + world + "." + "generator.plugin"); + final String gen_string = PlotSquared.getInstance().config.getString("worlds." + world + "." + "generator.plugin"); PlotGenerator generator; if (gen_string == null) { generator = new HybridGen(world); } else { - generator = (PlotGenerator) PlotSquared.IMP.getGenerator(world, gen_string); + generator = (PlotGenerator) PlotSquared.getInstance().IMP.getGenerator(world, gen_string); } new AugmentedPopulator(world, generator, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2); } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java index c86d0194c..28b715b15 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java @@ -77,7 +77,7 @@ public class Condense extends SubCommand { return false; } final int radius = Integer.parseInt(args[2]); - final Collection plots = PlotSquared.getPlots(worldname).values(); + final Collection plots = PlotSquared.getInstance().getPlots(worldname).values(); final int size = plots.size(); final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1); if (radius < minimum_radius) { @@ -166,7 +166,7 @@ public class Condense extends SubCommand { return false; } final int radius = Integer.parseInt(args[2]); - final Collection plots = PlotSquared.getPlots(worldname).values(); + final Collection plots = PlotSquared.getInstance().getPlots(worldname).values(); final int size = plots.size(); final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1); if (radius < minimum_radius) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java index 3af3007b0..d21a3e9d6 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java @@ -208,7 +208,7 @@ public class DebugExec extends SubCommand { Trim.sendMessage(" - MCA #: " + empty.size()); Trim.sendMessage(" - CHUNKS: " + (empty.size() * 1024) + " (max)"); Trim.sendMessage("Exporting log for manual approval..."); - final File file = new File(PlotSquared.IMP.getDirectory() + File.separator + "trim.txt"); + final File file = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "trim.txt"); PrintWriter writer; try { writer = new PrintWriter(file); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java index 702672cca..aea05eb04 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java @@ -256,19 +256,19 @@ public class DebugUUID extends SubCommand { } if (newWrapper instanceof OfflineUUIDWrapper) { - PlotSquared.config.set("UUID.force-lowercase", false); - PlotSquared.config.set("UUID.offline", true); + PlotSquared.getInstance().config.set("UUID.force-lowercase", false); + PlotSquared.getInstance().config.set("UUID.offline", true); } else if (newWrapper instanceof LowerOfflineUUIDWrapper) { - PlotSquared.config.set("UUID.force-lowercase", true); - PlotSquared.config.set("UUID.offline", true); + PlotSquared.getInstance().config.set("UUID.force-lowercase", true); + PlotSquared.getInstance().config.set("UUID.offline", true); } else if (newWrapper instanceof DefaultUUIDWrapper) { - PlotSquared.config.set("UUID.force-lowercase", false); - PlotSquared.config.set("UUID.offline", false); + PlotSquared.getInstance().config.set("UUID.force-lowercase", false); + PlotSquared.getInstance().config.set("UUID.offline", false); } try { - PlotSquared.config.save(PlotSquared.configFile); + PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); } catch (Exception e) { MainUtil.sendConsoleMessage("Could not save configuration. It will need to be manuall set!"); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java index 75b50510c..195856867 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java @@ -131,7 +131,7 @@ public class Merge extends SubCommand { HashSet multiPlots = new HashSet<>(); final UUID u1 = plot.owner; for (final PlotId myid : plots) { - final Plot myplot = PlotSquared.getPlots(world).get(myid); + final Plot myplot = PlotSquared.getInstance().getPlots(world).get(myid); if (myplot == null || myplot.owner == null) { MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString())); return false; diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java index ef37e30c0..a573cda1c 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java @@ -36,12 +36,12 @@ public class Reload extends SubCommand { try { // The following won't affect world generation, as that has to be // loaded during startup unfortunately. - PlotSquared.config.load(PlotSquared.configFile); + PlotSquared.getInstance().config.load(PlotSquared.getInstance().configFile); PlotSquared.getInstance().setupConfig(); C.setupTranslations(); for (final String pw : PlotSquared.getInstance().getPlotWorlds()) { final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(pw); - plotworld.loadDefaultConfiguration(PlotSquared.config.getConfigurationSection("worlds." + pw)); + plotworld.loadDefaultConfiguration(PlotSquared.getInstance().config.getConfigurationSection("worlds." + pw)); } MainUtil.sendMessage(plr, C.RELOADED_CONFIGS); } catch (final Exception e) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java index 4cbd47b85..0f691fbd5 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java @@ -92,7 +92,7 @@ public class TP extends SubCommand { } return null; } - for (final Plot p : PlotSquared.getPlots(world).values()) { + for (final Plot p : PlotSquared.getInstance().getPlots(world).values()) { if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) { return p; } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java index 234883688..ad283ec2e 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java @@ -48,12 +48,12 @@ public class Template extends SubCommand { public static boolean extractAllFiles(String world, String template) { byte[] buffer = new byte[2048]; try { - File folder = new File(PlotSquared.IMP.getDirectory() + File.separator + "templates"); + File folder = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "templates"); if (!folder.exists()) { return false; } File input = new File(folder + File.separator + template + ".template"); - File output = PlotSquared.IMP.getDirectory(); + File output = PlotSquared.getInstance().IMP.getDirectory(); if (!output.exists()) { output.mkdirs(); } @@ -81,7 +81,7 @@ public class Template extends SubCommand { } public static byte[] getBytes(PlotWorld plotworld) { - ConfigurationSection section = PlotSquared.config.getConfigurationSection("worlds." + plotworld.worldname); + ConfigurationSection section = PlotSquared.getInstance().config.getConfigurationSection("worlds." + plotworld.worldname); YamlConfiguration config = new YamlConfiguration(); String generator = SetupUtils.manager.getGenerator(plotworld); if (generator != null) { @@ -94,7 +94,7 @@ public class Template extends SubCommand { } public static void zipAll(final String world, Set files) throws IOException { - File output = new File(PlotSquared.IMP.getDirectory() + File.separator + "templates"); + File output = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "templates"); output.mkdirs(); FileOutputStream fos = new FileOutputStream(output + File.separator + world + ".template"); ZipOutputStream zos = new ZipOutputStream(fos); @@ -140,12 +140,12 @@ public class Template extends SubCommand { MainUtil.sendMessage(plr, "&cInvalid template file: " + args[2] +".template"); return false; } - File worldFile = new File(PlotSquared.IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml"); + File worldFile = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml"); YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile); - PlotSquared.config.set("worlds." + world, worldConfig.get("")); + PlotSquared.getInstance().config.set("worlds." + world, worldConfig.get("")); try { - PlotSquared.config.save(PlotSquared.configFile); - PlotSquared.config.load(PlotSquared.configFile); + PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); + PlotSquared.getInstance().config.load(PlotSquared.getInstance().configFile); } catch (Exception e) { e.printStackTrace(); } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java index d60957fdb..3f99467a5 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java @@ -120,7 +120,7 @@ public class Trim extends SubCommand { empty.addAll(chunks); Trim.TASK = false; TaskManager.runTaskAsync(whenDone); - PlotSquared.TASK.cancelTask(Trim.TASK_ID); + PlotSquared.getInstance().TASK.cancelTask(Trim.TASK_ID); return; } final Plot plot = plots.get(0); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java index 31c779203..b36c73c0d 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java @@ -814,8 +814,8 @@ public class SQLManager implements AbstractDB { Statement stmt = null; try { Set worlds = new HashSet<>(); - if (PlotSquared.config.contains("worlds")) { - worlds = PlotSquared.config.getConfigurationSection("worlds").getKeys(false); + if (PlotSquared.getInstance().config.contains("worlds")) { + worlds = PlotSquared.getInstance().config.getConfigurationSection("worlds").getKeys(false); } final HashMap uuids = new HashMap(); final HashMap noExist = new HashMap(); @@ -1686,8 +1686,8 @@ public class SQLManager implements AbstractDB { Statement stmt = null; try { Set worlds = new HashSet<>(); - if (PlotSquared.config.contains("worlds")) { - worlds = PlotSquared.config.getConfigurationSection("worlds").getKeys(false); + if (PlotSquared.getInstance().config.contains("worlds")) { + worlds = PlotSquared.getInstance().config.getConfigurationSection("worlds").getKeys(false); } final HashMap uuids = new HashMap(); final HashMap noExist = new HashMap(); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java index 53cb7a82b..ed1e4cde7 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java @@ -114,22 +114,6 @@ public class LikePlotMeConverter { } } - public void updateWorldYml(String plugin, String location) { - try { - Path path = Paths.get(location); - File file = new File(location); - if (!file.exists()) { - return; - } - Charset charset = StandardCharsets.UTF_8; - String content = new String(Files.readAllBytes(path), charset); - content = content.replaceAll("PlotMe-DefaultGenerator", "PlotSquared"); - content = content.replaceAll(plugin, "PlotSquared"); - Files.write(path, content.getBytes(charset)); - } catch (Exception e) { - } - } - public boolean run(final APlotMeConnector connector) { try { String dataFolder = getPlotMePath(); @@ -166,23 +150,23 @@ public class LikePlotMeConverter { try { String actualWorldName = getWorld(world); final Integer pathwidth = plotConfig.getInt("worlds." + world + ".PathWidth"); // - PlotSquared.config.set("worlds." + actualWorldName + ".road.width", pathwidth); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.width", pathwidth); final Integer plotsize = plotConfig.getInt("worlds." + world + ".PlotSize"); // - PlotSquared.config.set("worlds." + actualWorldName + ".plot.size", plotsize); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.size", plotsize); final String wallblock = plotConfig.getString("worlds." + world + ".WallBlockId"); // - PlotSquared.config.set("worlds." + actualWorldName + ".wall.block", wallblock); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".wall.block", wallblock); final String floor = plotConfig.getString("worlds." + world + ".PlotFloorBlockId"); // - PlotSquared.config.set("worlds." + actualWorldName + ".plot.floor", Arrays.asList(floor)); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.floor", Arrays.asList(floor)); final String filling = plotConfig.getString("worlds." + world + ".PlotFillingBlockId"); // - PlotSquared.config.set("worlds." + actualWorldName + ".plot.filling", Arrays.asList(filling)); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.filling", Arrays.asList(filling)); final String road = plotConfig.getString("worlds." + world + ".RoadMainBlockId"); - PlotSquared.config.set("worlds." + actualWorldName + ".road.block", road); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.block", road); Integer height = plotConfig.getInt("worlds." + world + ".RoadHeight"); // if (height == null) { height = 64; } - PlotSquared.config.set("worlds." + actualWorldName + ".road.height", height); - PlotSquared.config.save(PlotSquared.configFile); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.height", height); + PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); } catch (final Exception e) { sendMessage("&c-- &lFailed to save configuration for world '" + world + "'\nThis will need to be done using the setup command, or manually"); } @@ -210,32 +194,32 @@ public class LikePlotMeConverter { if (pathwidth == null) { pathwidth = 7; } - PlotSquared.config.set("worlds." + world + ".road.width", pathwidth); + PlotSquared.getInstance().config.set("worlds." + world + ".road.width", pathwidth); Integer plotsize = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PlotSize"); // if (plotsize == null) { plotsize = 32; } - PlotSquared.config.set("worlds." + world + ".plot.size", plotsize); + PlotSquared.getInstance().config.set("worlds." + world + ".plot.size", plotsize); String wallblock = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".WallBlock"); // if (wallblock == null) { wallblock = "44"; } - PlotSquared.config.set("worlds." + world + ".wall.block", wallblock); + PlotSquared.getInstance().config.set("worlds." + world + ".wall.block", wallblock); String floor = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".PlotFloorBlock"); // if (floor == null) { floor = "2"; } - PlotSquared.config.set("worlds." + world + ".plot.floor", Arrays.asList(floor)); + PlotSquared.getInstance().config.set("worlds." + world + ".plot.floor", Arrays.asList(floor)); String filling = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".FillBlock"); // if (filling == null) { filling = "3"; } - PlotSquared.config.set("worlds." + world + ".plot.filling", Arrays.asList(filling)); + PlotSquared.getInstance().config.set("worlds." + world + ".plot.filling", Arrays.asList(filling)); String road = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".RoadMainBlock"); if (road == null) { road = "5"; } - PlotSquared.config.set("worlds." + world + ".road.block", road); + PlotSquared.getInstance().config.set("worlds." + world + ".road.block", road); Integer height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); // if ((height == null) || (height == 0)) { height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".GroundHeight"); // @@ -243,10 +227,10 @@ public class LikePlotMeConverter { height = 64; } } - PlotSquared.config.set("worlds." + actualWorldName + ".road.height", height); - PlotSquared.config.set("worlds." + actualWorldName + ".plot.height", height); - PlotSquared.config.set("worlds." + actualWorldName + ".wall.height", height); - PlotSquared.config.save(PlotSquared.configFile); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.height", height); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.height", height); + PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".wall.height", height); + PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); } } catch (final Exception e) { } @@ -254,7 +238,7 @@ public class LikePlotMeConverter { for (final String world : plots.keySet()) { int duplicate = 0; for (final Plot plot : plots.get(world).values()) { - if (!PlotSquared.getPlots(world).containsKey(plot.id)) { + if (!PlotSquared.getInstance().getPlots(world).containsKey(plot.id)) { createdPlots.add(plot); } else { duplicate++; @@ -279,7 +263,7 @@ public class LikePlotMeConverter { }); sendMessage("Saving configuration..."); try { - PlotSquared.config.save(PlotSquared.configFile); + PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); } catch (final IOException e) { sendMessage(" - &cFailed to save configuration."); } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java index 1011f24ba..632b82462 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java @@ -233,7 +233,7 @@ public class BukkitHybridUtils extends HybridUtils { public void run() { int index = chunks.size() - 1; if (index == -1) { - PlotSquared.TASK.cancelTask(TaskManager.tasks.get(currentIndex)); + PlotSquared.getInstance().TASK.cancelTask(TaskManager.tasks.get(currentIndex)); TaskManager.runTaskAsync(run); return; } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java index a8dcb6d3c..7ff156689 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java @@ -44,7 +44,7 @@ public abstract class HybridUtils { final Location pos4 = new Location(world, tx, ty, tz); final CompoundTag sideroad = SchematicHandler.manager.getCompoundTag(world, pos1, pos2); final CompoundTag intersection = SchematicHandler.manager.getCompoundTag(world, pos3, pos4); - final String dir = PlotSquared.IMP.getDirectory() + File.separator + "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.world + File.separator; + final String dir = PlotSquared.getInstance().IMP.getDirectory() + File.separator + "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.world + File.separator; SchematicHandler.manager.save(sideroad, dir + "sideroad.schematic"); SchematicHandler.manager.save(intersection, dir + "intersection.schematic"); plotworld.ROAD_SCHEMATIC_ENABLED = true; diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java index 4ef8fc365..717cfea86 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java @@ -264,7 +264,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi final UUID uuid = pp.getUUID(); UUIDHandler.add(name, uuid); ExpireManager.dates.put(uuid, System.currentTimeMillis()); - if (PlotSquared.worldEdit != null) { + if (PlotSquared.getInstance().worldEdit != null) { if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) { WEManager.bypass.add(pp.getName()); } @@ -463,7 +463,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onWorldChanged(final PlayerChangedWorldEvent event) { final PlotPlayer player = BukkitUtil.getPlayer(event.getPlayer()); - if (PlotSquared.worldEdit != null) { + if (PlotSquared.getInstance().worldEdit != null) { if (!Permissions.hasPermission(player, "plots.worldedit.bypass")) { WEManager.bypass.remove(player.getName()); } @@ -1126,11 +1126,11 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer()); ExpireManager.dates.put(pp.getUUID(), System.currentTimeMillis()); EventUtil.unregisterPlayer(pp); - if (PlotSquared.worldEdit != null) { + if (PlotSquared.getInstance().worldEdit != null) { WEManager.bypass.remove(pp.getName()); } if (Settings.DELETE_PLOTS_ON_BAN && event.getPlayer().isBanned()) { - final Collection plots = PlotSquared.getPlots(pp.getName()).values(); + final Collection plots = PlotSquared.getInstance().getPlots(pp.getName()).values(); for (final Plot plot : plots) { final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotManager manager = PlotSquared.getInstance().getPlotManager(plot.world); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java index f0924a354..5030affb9 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java @@ -33,7 +33,7 @@ public class WorldEvents implements Listener { // PlotSquared.getInstance().loadWorld(name, (PlotGenerator) gen); } else { - if (PlotSquared.config.contains("worlds." + name)) { + if (PlotSquared.getInstance().config.contains("worlds." + name)) { PlotSquared.getInstance().loadWorld(name, null); } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java index 94308541d..8604745d6 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java @@ -93,7 +93,7 @@ public class WEListener implements Listener { } public boolean checkSelection(Player p, PlotPlayer pp, int modifier, long max, Cancellable e) { - final Selection selection = PlotSquared.worldEdit.getSelection(p); + final Selection selection = PlotSquared.getInstance().worldEdit.getSelection(p); if (selection == null) { return true; } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java index 4dd561a38..3c22d59b4 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java @@ -238,7 +238,7 @@ public class ExpireManager { final String worldname = Bukkit.getWorlds().get(0).getName(); String foldername; String filename = null; - if (PlotSquared.IMP.checkVersion(1, 7, 5)) { + if (PlotSquared.getInstance().IMP.checkVersion(1, 7, 5)) { foldername = "playerdata"; try { final OfflinePlotPlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java index 9da7318b4..791f69047 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java @@ -85,8 +85,8 @@ public class BukkitPlayerFunctions { } public static ArrayList getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) { - final Plot plot1 = PlotSquared.getPlots(world).get(pos1); - final Plot plot2 = PlotSquared.getPlots(world).get(pos2); + final Plot plot1 = PlotSquared.getInstance().getPlots(world).get(pos1); + final Plot plot2 = PlotSquared.getInstance().getPlots(world).get(pos2); if (plot1 != null) { pos1 = MainUtil.getBottomPlot(plot1).id; } @@ -118,8 +118,8 @@ public class BukkitPlayerFunctions { if (id == null) { return null; } - if (PlotSquared.getPlots(world).containsKey(id)) { - return PlotSquared.getPlots(world).get(id); + if (PlotSquared.getInstance().getPlots(world).containsKey(id)) { + return PlotSquared.getInstance().getPlots(world).get(id); } return new Plot(id, null, new ArrayList(), new ArrayList(), world); } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java index 905f3b19e..45a237de4 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java @@ -46,14 +46,14 @@ public class BukkitSetupUtils extends SetupUtils { final ConfigurationNode[] steps = object.step; final String world = object.world; for (final ConfigurationNode step : steps) { - PlotSquared.config.set("worlds." + world + "." + step.getConstant(), step.getValue()); + PlotSquared.getInstance().config.set("worlds." + world + "." + step.getConstant(), step.getValue()); } if (object.type != 0) { - PlotSquared.config.set("worlds." + world + "." + "generator.type", object.type); - PlotSquared.config.set("worlds." + world + "." + "generator.terrain", object.terrain); - PlotSquared.config.set("worlds." + world + "." + "generator.plugin", object.plotManager); + PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.type", object.type); + PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.terrain", object.terrain); + PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.plugin", object.plotManager); if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) { - PlotSquared.config.set("worlds." + world + "." + "generator.init", object.setupGenerator); + PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.init", object.setupGenerator); } ChunkGenerator gen = generators.get(object.setupGenerator); if (gen instanceof PlotGenerator) { @@ -61,7 +61,7 @@ public class BukkitSetupUtils extends SetupUtils { } } try { - PlotSquared.config.save(PlotSquared.configFile); + PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); } catch (final IOException e) { e.printStackTrace(); }