EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Shorten class name (refactor if necessary)

Browse Source
This commit is contained in:
boy0001 2015-07-03 22:15:20 +10:00
parent 4926cae53e
commit 289527b8e5
98 changed files with 748 additions and 754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
View File

@ -68,7 +68,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@Override @Override
public void onEnable() { public void onEnable() {
THIS = this; THIS = this;
PlotSquared.instance = new PlotSquared(this); PS.instance = new PS(this);
if (Settings.METRICS) { if (Settings.METRICS) {
try { try {
final Metrics metrics = new Metrics(this); final Metrics metrics = new Metrics(this);
@ -97,7 +97,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@Override @Override
public void onDisable() { public void onDisable() {
PlotSquared.getInstance().disable(); PS.get().disable();
THIS = null; THIS = null;
} }
@ -235,7 +235,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
this.error = 0l; this.error = 0l;
} }
World world; World world;
for (final String w : PlotSquared.getInstance().getPlotWorlds()) { for (final String w : PS.get().getPlotWorlds()) {
world = Bukkit.getWorld(w); world = Bukkit.getWorld(w);
try { try {
if (world.getLoadedChunks().length < 1) { if (world.getLoadedChunks().length < 1) {
@ -263,7 +263,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@Override @Override
final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) { final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
WorldEvents.lastWorld = world; WorldEvents.lastWorld = world;
if (!PlotSquared.getInstance().setupPlotWorld(world, id)) { if (!PS.get().setupPlotWorld(world, id)) {
return null; return null;
} }
HybridGen result = new HybridGen(world); HybridGen result = new HybridGen(world);
@ -308,8 +308,8 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
@Override @Override
public void registerWorldEditEvents() { public void registerWorldEditEvents() {
if (getServer().getPluginManager().getPlugin("WorldEdit") != null) { if (getServer().getPluginManager().getPlugin("WorldEdit") != null) {
PlotSquared.getInstance().worldEdit = (WorldEditPlugin) getServer().getPluginManager().getPlugin("WorldEdit"); PS.get().worldEdit = (WorldEditPlugin) getServer().getPluginManager().getPlugin("WorldEdit");
final String version = PlotSquared.getInstance().worldEdit.getDescription().getVersion(); final String version = PS.get().worldEdit.getDescription().getVersion();
if ((version != null) && version.startsWith("5.")) { if ((version != null) && version.startsWith("5.")) {
log("&cThis version of WorldEdit does not support PlotSquared."); log("&cThis version of WorldEdit does not support PlotSquared.");
log("&cPlease use WorldEdit 6+ for masking support"); log("&cPlease use WorldEdit 6+ for masking support");

15
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java → PlotSquared/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -37,13 +37,10 @@ import java.util.zip.ZipInputStream;
* @author Sauilitired | Citymonstret * @author Sauilitired | Citymonstret
* @author boy0001 | Empire92 * @author boy0001 | Empire92
*/ */
public class PlotSquared { public class PS {
// public static final:
public static final String MAIN_PERMISSION = "plots.use";
// protected static: // protected static:
protected static PlotSquared instance; protected static PS instance;
// private final: // private final:
private final HashMap<String, PlotWorld> plotworlds = new HashMap<>(); private final HashMap<String, PlotWorld> plotworlds = new HashMap<>();
@ -72,11 +69,11 @@ public class PlotSquared {
* Initialize PlotSquared with the desired Implementation class * Initialize PlotSquared with the desired Implementation class
* @param imp_class * @param imp_class
*/ */
protected PlotSquared(final IPlotMain imp_class) { protected PS(final IPlotMain imp_class) {
SetupUtils.generators = new HashMap<>(); SetupUtils.generators = new HashMap<>();
IMP = imp_class; IMP = imp_class;
try { try {
FILE = new File(PlotSquared.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()); FILE = new File(PS.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
} catch (Exception e) { } catch (Exception e) {
log("Could not determine file path"); log("Could not determine file path");
} }
@ -173,7 +170,7 @@ public class PlotSquared {
* *
* @return the instance created by IPlotMain * @return the instance created by IPlotMain
*/ */
public static PlotSquared getInstance() { public static PS get() {
return instance; return instance;
} }
@ -184,7 +181,7 @@ public class PlotSquared {
* @see IPlotMain#log(String) * @see IPlotMain#log(String)
*/ */
public static void log(final String message) { public static void log(final String message) {
getInstance().IMP.log(message); get().IMP.log(message);
} }
/** /**

68
PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
View File

@ -21,7 +21,7 @@
package com.intellectualcrafters.plot.api; package com.intellectualcrafters.plot.api;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.commands.MainCommand; import com.intellectualcrafters.plot.commands.MainCommand;
import com.intellectualcrafters.plot.commands.SubCommand; import com.intellectualcrafters.plot.commands.SubCommand;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
@ -68,7 +68,7 @@ import java.util.Set;
* *
* @throws com.intellectualcrafters.plot.util.PlotSquaredException if the program fails to fetch the PlotSquared * @throws com.intellectualcrafters.plot.util.PlotSquaredException if the program fails to fetch the PlotSquared
* instance * instance
* @see com.intellectualcrafters.plot.PlotSquared * @see com.intellectualcrafters.plot.PS
*/ */
@Deprecated @Deprecated
public PlotAPI(final JavaPlugin plugin) { public PlotAPI(final JavaPlugin plugin) {
@ -82,10 +82,10 @@ import java.util.Set;
* *
* @return all plots * @return all plots
* *
* @see com.intellectualcrafters.plot.PlotSquared#getPlots() * @see com.intellectualcrafters.plot.PS#getPlots()
*/ */
public Set<Plot> getAllPlots() { public Set<Plot> getAllPlots() {
return PlotSquared.getInstance().getPlots(); return PS.get().getPlots();
} }
/** /**
@ -96,7 +96,7 @@ import java.util.Set;
* @return all plots that a player owns * @return all plots that a player owns
*/ */
public Set<Plot> getPlayerPlots(final Player player) { public Set<Plot> getPlayerPlots(final Player player) {
return PlotSquared.getInstance().getPlots(BukkitUtil.getPlayer(player)); return PS.get().getPlots(BukkitUtil.getPlayer(player));
} }
/** /**
@ -106,29 +106,29 @@ import java.util.Set;
* @param plotWorld Plot World Object * @param plotWorld Plot World Object
* @param manager World Manager * @param manager World Manager
* *
* @see com.intellectualcrafters.plot.PlotSquared#addPlotWorld(String, com.intellectualcrafters.plot.object.PlotWorld, * @see com.intellectualcrafters.plot.PS#addPlotWorld(String, com.intellectualcrafters.plot.object.PlotWorld,
* com.intellectualcrafters.plot.object.PlotManager) * com.intellectualcrafters.plot.object.PlotManager)
*/ */
public void addPlotWorld(final String world, final PlotWorld plotWorld, final PlotManager manager) { public void addPlotWorld(final String world, final PlotWorld plotWorld, final PlotManager manager) {
PlotSquared.getInstance().addPlotWorld(world, plotWorld, manager); PS.get().addPlotWorld(world, plotWorld, manager);
} }
/** /**
* @return main configuration * @return main configuration
* *
* @see com.intellectualcrafters.plot.PlotSquared#config * @see com.intellectualcrafters.plot.PS#config
*/ */
public YamlConfiguration getConfig() { public YamlConfiguration getConfig() {
return PlotSquared.getInstance().config; return PS.get().config;
} }
/** /**
* @return storage configuration * @return storage configuration
* *
* @see com.intellectualcrafters.plot.PlotSquared#storage * @see com.intellectualcrafters.plot.PS#storage
*/ */
public YamlConfiguration getStorage() { public YamlConfiguration getStorage() {
return PlotSquared.getInstance().storage; return PS.get().storage;
} }
/** /**
@ -137,10 +137,10 @@ import java.util.Set;
* *
* @return PlotSquared PlotSquared Main Class * @return PlotSquared PlotSquared Main Class
* *
* @see com.intellectualcrafters.plot.PlotSquared * @see com.intellectualcrafters.plot.PS
*/ */
public PlotSquared getMain() { public PS getMain() {
return PlotSquared.getInstance(); return PS.get();
} }
/** /**
@ -275,10 +275,10 @@ import java.util.Set;
* @return PlotManager * @return PlotManager
* *
* @see com.intellectualcrafters.plot.object.PlotManager * @see com.intellectualcrafters.plot.object.PlotManager
* @see PlotSquared#getPlotManager(String) * @see PS#getPlotManager(String)
*/ */
public PlotManager getPlotManager(final World world) { public PlotManager getPlotManager(final World world) {
return PlotSquared.getInstance().getPlotManager(world.getName()); return PS.get().getPlotManager(world.getName());
} }
/** /**
@ -289,11 +289,11 @@ import java.util.Set;
* *
* @return PlotManager * @return PlotManager
* *
* @see PlotSquared#getPlotManager(String) * @see PS#getPlotManager(String)
* @see com.intellectualcrafters.plot.object.PlotManager * @see com.intellectualcrafters.plot.object.PlotManager
*/ */
public PlotManager getPlotManager(final String world) { public PlotManager getPlotManager(final String world) {
return PlotSquared.getInstance().getPlotManager(world); return PS.get().getPlotManager(world);
} }
/** /**
@ -304,11 +304,11 @@ import java.util.Set;
* *
* @return PlotWorld class for that world ! will return null if not a plot world world * @return PlotWorld class for that world ! will return null if not a plot world world
* *
* @see PlotSquared#getPlotWorld(String) * @see PS#getPlotWorld(String)
* @see com.intellectualcrafters.plot.object.PlotWorld * @see com.intellectualcrafters.plot.object.PlotWorld
*/ */
public PlotWorld getWorldSettings(final World world) { public PlotWorld getWorldSettings(final World world) {
return PlotSquared.getInstance().getPlotWorld(world.getName()); return PS.get().getPlotWorld(world.getName());
} }
/** /**
@ -318,11 +318,11 @@ import java.util.Set;
* *
* @return PlotWorld class for that world ! will return null if not a plot world world * @return PlotWorld class for that world ! will return null if not a plot world world
* *
* @see PlotSquared#getPlotWorld(String) * @see PS#getPlotWorld(String)
* @see com.intellectualcrafters.plot.object.PlotWorld * @see com.intellectualcrafters.plot.object.PlotWorld
*/ */
public PlotWorld getWorldSettings(final String world) { public PlotWorld getWorldSettings(final String world) {
return PlotSquared.getInstance().getPlotWorld(world); return PS.get().getPlotWorld(world);
} }
/** /**
@ -464,7 +464,7 @@ import java.util.Set;
*/ */
public Plot[] getPlots(final World world, final Player plr, final boolean just_owner) { public Plot[] getPlots(final World world, final Player plr, final boolean just_owner) {
final ArrayList<Plot> pPlots = new ArrayList<>(); final ArrayList<Plot> pPlots = new ArrayList<>();
for (final Plot plot : PlotSquared.getInstance().getPlots(world.getName()).values()) { for (final Plot plot : PS.get().getPlots(world.getName()).values()) {
if (just_owner) { if (just_owner) {
if ((plot.owner != null) && (plot.owner.equals(UUIDHandler.getUUID(BukkitUtil.getPlayer(plr))))) { if ((plot.owner != null) && (plot.owner.equals(UUIDHandler.getUUID(BukkitUtil.getPlayer(plr))))) {
pPlots.add(plot); pPlots.add(plot);
@ -485,11 +485,11 @@ import java.util.Set;
* *
* @return Plot[] - array of plot objects in world * @return Plot[] - array of plot objects in world
* *
* @see PlotSquared#getPlots(String) * @see PS#getPlots(String)
* @see com.intellectualcrafters.plot.object.Plot * @see com.intellectualcrafters.plot.object.Plot
*/ */
public Plot[] getPlots(final World world) { public Plot[] getPlots(final World world) {
Collection<Plot> plots = PlotSquared.getInstance().getPlots(world.getName()).values(); Collection<Plot> plots = PS.get().getPlots(world.getName()).values();
return plots.toArray(new Plot[plots.size()]); return plots.toArray(new Plot[plots.size()]);
} }
@ -498,10 +498,10 @@ import java.util.Set;
* *
* @return World[] - array of plot worlds * @return World[] - array of plot worlds
* *
* @see com.intellectualcrafters.plot.PlotSquared#getPlotWorlds() * @see com.intellectualcrafters.plot.PS#getPlotWorlds()
*/ */
public String[] getPlotWorlds() { public String[] getPlotWorlds() {
Set<String> worlds = PlotSquared.getInstance().getPlotWorlds(); Set<String> worlds = PS.get().getPlotWorlds();
return worlds.toArray(new String[worlds.size()]); return worlds.toArray(new String[worlds.size()]);
} }
@ -512,10 +512,10 @@ import java.util.Set;
* *
* @return boolean (if plot world or not) * @return boolean (if plot world or not)
* *
* @see com.intellectualcrafters.plot.PlotSquared#isPlotWorld(String) * @see com.intellectualcrafters.plot.PS#isPlotWorld(String)
*/ */
public boolean isPlotWorld(final World world) { public boolean isPlotWorld(final World world) {
return PlotSquared.getInstance().isPlotWorld(world.getName()); return PS.get().isPlotWorld(world.getName());
} }
/** /**
@ -611,10 +611,10 @@ import java.util.Set;
* *
* @return PlotSquared Class * @return PlotSquared Class
* *
* @see com.intellectualcrafters.plot.PlotSquared * @see com.intellectualcrafters.plot.PS
*/ */
public PlotSquared getPlotSquared() { public PS getPlotSquared() {
return PlotSquared.getInstance(); return PS.get();
} }
/** /**
@ -639,12 +639,12 @@ import java.util.Set;
* *
* @return a set containing the players plots * @return a set containing the players plots
* *
* @see com.intellectualcrafters.plot.PlotSquared#getPlots(String, PlotPlayer) * @see com.intellectualcrafters.plot.PS#getPlots(String, PlotPlayer)
* org.bukkit.entity.Player) * org.bukkit.entity.Player)
* @see com.intellectualcrafters.plot.object.Plot * @see com.intellectualcrafters.plot.object.Plot
*/ */
public Set<Plot> getPlayerPlots(final World world, final Player player) { public Set<Plot> getPlayerPlots(final World world, final Player player) {
return PlotSquared.getInstance().getPlots(world.getName(), BukkitUtil.getPlayer(player)); return PS.get().getPlots(world.getName(), BukkitUtil.getPlayer(player));
} }
/** /**

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Add.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -77,7 +77,7 @@ public class Add extends SubCommand {
DBFunc.removeTrusted(loc.getWorld(), plot, uuid); DBFunc.removeTrusted(loc.getWorld(), plot, uuid);
} }
if (plot.denied.contains(uuid)) { if (plot.denied.contains(uuid)) {
if (plot.members.size() + plot.trusted.size() >= PlotSquared.getInstance().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) { if (plot.members.size() + plot.trusted.size() >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) {
MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS); MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS);
return false; return false;
} }
@ -91,7 +91,7 @@ public class Add extends SubCommand {
MainUtil.sendMessage(plr, C.ALREADY_ADDED); MainUtil.sendMessage(plr, C.ALREADY_ADDED);
return false; return false;
} }
if (plot.members.size() + plot.trusted.size() >= PlotSquared.getInstance().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) { if (plot.members.size() + plot.trusted.size() >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) {
MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS); MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS);
return false; return false;
} }

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
@ -70,11 +70,11 @@ public class Auto extends SubCommand {
int size_x = 1; int size_x = 1;
int size_z = 1; int size_z = 1;
String schematic = ""; String schematic = "";
if (PlotSquared.getInstance().getPlotWorlds().size() == 1) { if (PS.get().getPlotWorlds().size() == 1) {
world = PlotSquared.getInstance().getPlotWorlds().iterator().next(); world = PS.get().getPlotWorlds().iterator().next();
} else { } else {
world = plr.getLocation().getWorld(); world = plr.getLocation().getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD); MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return false; return false;
} }
@ -122,7 +122,7 @@ public class Auto extends SubCommand {
} }
return false; return false;
} }
final PlotWorld pWorld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld pWorld = PS.get().getPlotWorld(world);
if ((EconHandler.manager != null) && pWorld.USE_ECONOMY) { if ((EconHandler.manager != null) && pWorld.USE_ECONOMY) {
double cost = pWorld.PLOT_PRICE; double cost = pWorld.PLOT_PRICE;
cost = (size_x * size_z) * cost; cost = (size_x * size_z) * cost;
@ -148,7 +148,7 @@ public class Auto extends SubCommand {
// } // }
} }
final String worldname = world; final String worldname = world;
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(worldname); final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
if (plotworld.TYPE == 2) { if (plotworld.TYPE == 2) {
final Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(new Location(worldname, loc.getX(), loc.getY(), loc.getZ())); final Plot plot = MainUtil.getPlot(new Location(worldname, loc.getX(), loc.getY(), loc.getZ()));
@ -199,7 +199,7 @@ public class Auto extends SubCommand {
MainUtil.lastPlot.put(worldname, start); MainUtil.lastPlot.put(worldname, start);
if (lastPlot) { if (lastPlot) {
} }
if ((PlotSquared.getInstance().getPlots(worldname).get(start) != null) && (PlotSquared.getInstance().getPlots(worldname).get(start).owner != null)) { if ((PS.get().getPlots(worldname).get(start) != null) && (PS.get().getPlots(worldname).get(start).owner != null)) {
continue; continue;
} else { } else {
lastPlot = false; lastPlot = false;

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Buy.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -46,7 +46,7 @@ public class Buy extends SubCommand {
} }
final Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final String world = loc.getWorld(); final String world = loc.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return sendMessage(plr, C.NOT_IN_PLOT_WORLD); return sendMessage(plr, C.NOT_IN_PLOT_WORLD);
} }
Plot plot; Plot plot;
@ -83,7 +83,7 @@ public class Buy extends SubCommand {
final PlotId id = plot.id; final PlotId id = plot.id;
final PlotId id2 = MainUtil.getTopPlot(plot).id; final PlotId id2 = MainUtil.getTopPlot(plot).id;
final int size = MainUtil.getPlotSelectionIds(id, id2).size(); final int size = MainUtil.getPlotSelectionIds(id, id2).size();
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (plotworld.USE_ECONOMY) { if (plotworld.USE_ECONOMY) {
price += plotworld.PLOT_PRICE * size; price += plotworld.PLOT_PRICE * size;
initPrice += plotworld.SELL_PRICE * size; initPrice += plotworld.SELL_PRICE * size;

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Chat.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PlotWorld;
@ -13,7 +13,7 @@ public class Chat extends SubCommand {
@Override @Override
public boolean execute(PlotPlayer plr, String... args) { public boolean execute(PlotPlayer plr, String... args) {
final String world = plr.getLocation().getWorld(); final String world = plr.getLocation().getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return !sendMessage(plr, C.NOT_IN_PLOT_WORLD); return !sendMessage(plr, C.NOT_IN_PLOT_WORLD);
} }
boolean enable = !(plr.getMeta("chat") != null && (Boolean) plr.getMeta("chat")); boolean enable = !(plr.getMeta("chat") != null && (Boolean) plr.getMeta("chat"));
@ -24,7 +24,7 @@ public class Chat extends SubCommand {
enable = false; enable = false;
} }
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (!enable && plotworld.PLOT_CHAT) { if (!enable && plotworld.PLOT_CHAT) {
return !sendMessage(plr, C.PLOT_CHAT_FORCED); return !sendMessage(plr, C.PLOT_CHAT_FORCED);
} }

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -56,8 +56,8 @@ public class Claim extends SubCommand {
MainUtil.teleportPlayer(player, loc, plot); MainUtil.teleportPlayer(player, loc, plot);
} }
final String world = plot.world; final String world = plot.world;
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final Plot plot2 = PlotSquared.getInstance().getPlots(world).get(plot.id); final Plot plot2 = PS.get().getPlots(world).get(plot.id);
if (plotworld.SCHEMATIC_ON_CLAIM) { if (plotworld.SCHEMATIC_ON_CLAIM) {
Schematic sch; Schematic sch;
if (schematic.equals("")) { if (schematic.equals("")) {
@ -70,7 +70,7 @@ public class Claim extends SubCommand {
} }
SchematicHandler.manager.paste(sch, plot2, 0, 0); SchematicHandler.manager.paste(sch, plot2, 0, 0);
} }
PlotSquared.getInstance().getPlotManager(world).claimPlot(plotworld, plot); PS.get().getPlotManager(world).claimPlot(plotworld, plot);
} }
return result; return result;
} }
@ -93,7 +93,7 @@ public class Claim extends SubCommand {
if (!MainUtil.canClaim(plr, plot)) { if (!MainUtil.canClaim(plr, plot)) {
return sendMessage(plr, C.PLOT_IS_CLAIMED); return sendMessage(plr, C.PLOT_IS_CLAIMED);
} }
final PlotWorld world = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotWorld world = PS.get().getPlotWorld(plot.world);
if ((EconHandler.manager != null) && world.USE_ECONOMY) { if ((EconHandler.manager != null) && world.USE_ECONOMY) {
final double cost = world.PLOT_PRICE; final double cost = world.PLOT_PRICE;
if (cost > 0d) { if (cost > 0d) {

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -45,25 +45,25 @@ public class Clear extends SubCommand {
if (plr == null) { if (plr == null) {
// Is console // Is console
if (args.length < 2) { if (args.length < 2) {
PlotSquared.log("You need to specify two arguments: ID (0;0) & World (world)"); PS.log("You need to specify two arguments: ID (0;0) & World (world)");
} else { } else {
final PlotId id = PlotId.fromString(args[0]); final PlotId id = PlotId.fromString(args[0]);
final String world = args[1]; final String world = args[1];
if (id == null) { if (id == null) {
PlotSquared.log("Invalid Plot ID: " + args[0]); PS.log("Invalid Plot ID: " + args[0]);
} else { } else {
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
PlotSquared.log("Invalid plot world: " + world); PS.log("Invalid plot world: " + world);
} else { } else {
final Plot plot = MainUtil.getPlot(world, id); final Plot plot = MainUtil.getPlot(world, id);
if (plot == null) { if (plot == null) {
PlotSquared.log("Could not find plot " + args[0] + " in world " + world); PS.log("Could not find plot " + args[0] + " in world " + world);
} else { } else {
Runnable runnable = new Runnable() { Runnable runnable = new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.clear(world, plot, plot.owner == null, null); MainUtil.clear(world, plot, plot.owner == null, null);
PlotSquared.log("Plot " + plot.getId().toString() + " cleared."); PS.log("Plot " + plot.getId().toString() + " cleared.");
} }
}; };
if (Settings.CONFIRM_CLEAR && !(Permissions.hasPermission(plr, "plots.confirm.bypass"))) { if (Settings.CONFIRM_CLEAR && !(Permissions.hasPermission(plr, "plots.confirm.bypass"))) {
@ -84,7 +84,7 @@ public class Clear extends SubCommand {
PlotId id = PlotId.fromString(args[0]); PlotId id = PlotId.fromString(args[0]);
if (id == null) { if (id == null) {
if (args[1].equalsIgnoreCase("mine")) { if (args[1].equalsIgnoreCase("mine")) {
Set<Plot> plots = PlotSquared.getInstance().getPlots(plr); Set<Plot> plots = PS.get().getPlots(plr);
if (plots.size() == 0) { if (plots.size() == 0) {
MainUtil.sendMessage(plr, C.NO_PLOTS); MainUtil.sendMessage(plr, C.NO_PLOTS);
return false; return false;

22
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.generator.AugmentedPopulator; import com.intellectualcrafters.plot.generator.AugmentedPopulator;
@ -121,25 +121,25 @@ public class Cluster extends SubCommand {
} }
ClusterManager.clusters.get(world).add(cluster); ClusterManager.clusters.get(world).add(cluster);
// Add any existing plots to the current cluster // Add any existing plots to the current cluster
for (final Plot plot : PlotSquared.getInstance().getPlots(plr.getLocation().getWorld()).values()) { for (final Plot plot : PS.get().getPlots(plr.getLocation().getWorld()).values()) {
final PlotCluster current = ClusterManager.getCluster(plot); final PlotCluster current = ClusterManager.getCluster(plot);
if (cluster.equals(current) && !cluster.isAdded(plot.owner)) { if (cluster.equals(current) && !cluster.isAdded(plot.owner)) {
cluster.invited.add(plot.owner); cluster.invited.add(plot.owner);
DBFunc.setInvited(world, cluster, plot.owner); DBFunc.setInvited(world, cluster, plot.owner);
} }
} }
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); PlotWorld plotworld = PS.get().getPlotWorld(world);
if (plotworld == null) { if (plotworld == null) {
PlotSquared.getInstance().config.createSection("worlds." + world); PS.get().config.createSection("worlds." + world);
PlotSquared.getInstance().loadWorld(world, null); PS.get().loadWorld(world, null);
} }
else { else {
final String gen_string = PlotSquared.getInstance().config.getString("worlds." + world + "." + "generator.plugin"); final String gen_string = PS.get().config.getString("worlds." + world + "." + "generator.plugin");
PlotGenerator generator; PlotGenerator generator;
if (gen_string == null) { if (gen_string == null) {
generator = new HybridGen(world); generator = new HybridGen(world);
} else { } else {
generator = (PlotGenerator) PlotSquared.getInstance().IMP.getGenerator(world, gen_string); generator = (PlotGenerator) PS.get().IMP.getGenerator(world, gen_string);
} }
new AugmentedPopulator(world, generator, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2); new AugmentedPopulator(world, generator, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
} }
@ -177,10 +177,10 @@ public class Cluster extends SubCommand {
return false; return false;
} }
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plr.getLocation().getWorld()); final PlotWorld plotworld = PS.get().getPlotWorld(plr.getLocation().getWorld());
if (plotworld.TYPE == 2) { if (plotworld.TYPE == 2) {
final ArrayList<Plot> toRemove = new ArrayList<>(); final ArrayList<Plot> toRemove = new ArrayList<>();
for (final Plot plot : PlotSquared.getInstance().getPlots(plr.getLocation().getWorld()).values()) { for (final Plot plot : PS.get().getPlots(plr.getLocation().getWorld()).values()) {
final PlotCluster other = ClusterManager.getCluster(plot); final PlotCluster other = ClusterManager.getCluster(plot);
if (cluster.equals(other)) { if (cluster.equals(other)) {
toRemove.add(plot); toRemove.add(plot);
@ -361,7 +361,7 @@ public class Cluster extends SubCommand {
if (player != null) { if (player != null) {
MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName()); MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
} }
for (final Plot plot : PlotSquared.getInstance().getPlots(plr.getLocation().getWorld(), uuid)) { for (final Plot plot : PS.get().getPlots(plr.getLocation().getWorld(), uuid)) {
final PlotCluster current = ClusterManager.getCluster(plot); final PlotCluster current = ClusterManager.getCluster(plot);
if ((current != null) && current.equals(cluster)) { if ((current != null) && current.equals(cluster)) {
final String world = plr.getLocation().getWorld(); final String world = plr.getLocation().getWorld();
@ -411,7 +411,7 @@ public class Cluster extends SubCommand {
cluster.invited.remove(uuid); cluster.invited.remove(uuid);
DBFunc.removeInvited(cluster, uuid); DBFunc.removeInvited(cluster, uuid);
MainUtil.sendMessage(plr, C.CLUSTER_REMOVED, cluster.getName()); MainUtil.sendMessage(plr, C.CLUSTER_REMOVED, cluster.getName());
for (final Plot plot : PlotSquared.getInstance().getPlots(plr.getLocation().getWorld(), uuid)) { for (final Plot plot : PS.get().getPlots(plr.getLocation().getWorld(), uuid)) {
final PlotCluster current = ClusterManager.getCluster(plot); final PlotCluster current = ClusterManager.getCluster(plot);
if ((current != null) && current.equals(cluster)) { if ((current != null) && current.equals(cluster)) {
final String world = plr.getLocation().getWorld(); final String world = plr.getLocation().getWorld();

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
@ -40,7 +40,7 @@ public class Condense extends SubCommand {
} }
public static void sendMessage(final String message) { public static void sendMessage(final String message) {
PlotSquared.log("&3PlotSquared -> Plot condense&8: &7" + message); PS.log("&3PlotSquared -> Plot condense&8: &7" + message);
} }
@Override @Override
@ -54,7 +54,7 @@ public class Condense extends SubCommand {
return false; return false;
} }
final String worldname = args[0]; final String worldname = args[0];
if (!BlockManager.manager.isWorld(worldname) || !PlotSquared.getInstance().isPlotWorld(worldname)) { if (!BlockManager.manager.isWorld(worldname) || !PS.get().isPlotWorld(worldname)) {
MainUtil.sendMessage(plr, "INVALID WORLD"); MainUtil.sendMessage(plr, "INVALID WORLD");
return false; return false;
} }
@ -77,7 +77,7 @@ public class Condense extends SubCommand {
return false; return false;
} }
final int radius = Integer.parseInt(args[2]); final int radius = Integer.parseInt(args[2]);
final Collection<Plot> plots = PlotSquared.getInstance().getPlots(worldname).values(); final Collection<Plot> plots = PS.get().getPlots(worldname).values();
final int size = plots.size(); final int size = plots.size();
final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1); final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
if (radius < minimum_radius) { if (radius < minimum_radius) {
@ -166,7 +166,7 @@ public class Condense extends SubCommand {
return false; return false;
} }
final int radius = Integer.parseInt(args[2]); final int radius = Integer.parseInt(args[2]);
final Collection<Plot> plots = PlotSquared.getInstance().getPlots(worldname).values(); final Collection<Plot> plots = PS.get().getPlots(worldname).values();
final int size = plots.size(); final int size = plots.size();
final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1); final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
if (radius < minimum_radius) { if (radius < minimum_radius) {

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.generator.HybridPlotWorld; import com.intellectualcrafters.plot.generator.HybridPlotWorld;
import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.generator.HybridUtils;
@ -41,7 +41,7 @@ public class CreateRoadSchematic extends SubCommand {
if (plot == null) { if (plot == null) {
return sendMessage(player, C.NOT_IN_PLOT); return sendMessage(player, C.NOT_IN_PLOT);
} }
if (!(PlotSquared.getInstance().getPlotWorld(loc.getWorld()) instanceof HybridPlotWorld)) { if (!(PS.get().getPlotWorld(loc.getWorld()) instanceof HybridPlotWorld)) {
return sendMessage(player, C.NOT_IN_PLOT_WORLD); return sendMessage(player, C.NOT_IN_PLOT_WORLD);
} }
HybridUtils.manager.setupRoadSchematic(plot); HybridUtils.manager.setupRoadSchematic(plot);

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.MySQL; import com.intellectualcrafters.plot.database.MySQL;
import com.intellectualcrafters.plot.database.SQLManager; import com.intellectualcrafters.plot.database.SQLManager;
@ -28,7 +28,7 @@ public class Database extends SubCommand {
private static boolean sendMessageU(final UUID uuid, final String msg) { private static boolean sendMessageU(final UUID uuid, final String msg) {
if (uuid == null) { if (uuid == null) {
PlotSquared.log(msg); PS.log(msg);
} else { } else {
final PlotPlayer p = UUIDHandler.getPlayer(uuid); final PlotPlayer p = UUIDHandler.getPlayer(uuid);
if ((p != null) && p.isOnline()) { if ((p != null) && p.isOnline()) {
@ -41,7 +41,7 @@ public class Database extends SubCommand {
} }
public static void insertPlots(final SQLManager manager, final UUID requester, final Connection c) { public static void insertPlots(final SQLManager manager, final UUID requester, final Connection c) {
final java.util.Set<Plot> plots = PlotSquared.getInstance().getPlots(); final java.util.Set<Plot> plots = PS.get().getPlots();
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -92,7 +92,7 @@ public class Database extends SubCommand {
} }
Connection n; Connection n;
try { try {
n = new MySQL(PlotSquared.getInstance(), host, port, database, username, password).openConnection(); n = new MySQL(PS.get(), host, port, database, username, password).openConnection();
// Connection // Connection
if (n.isClosed()) { if (n.isClosed()) {
return sendMessage(plr, "Failed to open connection"); return sendMessage(plr, "Failed to open connection");
@ -128,7 +128,7 @@ public class Database extends SubCommand {
private boolean sendMessage(final PlotPlayer player, final String msg) { private boolean sendMessage(final PlotPlayer player, final String msg) {
if (player == null) { if (player == null) {
PlotSquared.log(msg); PS.log(msg);
} else { } else {
MainUtil.sendMessage(player, msg); MainUtil.sendMessage(player, msg);
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.Lag; import com.intellectualcrafters.plot.util.Lag;
@ -51,7 +51,7 @@ public class Debug extends SubCommand {
} }
{ {
final StringBuilder worlds = new StringBuilder(""); final StringBuilder worlds = new StringBuilder("");
for (final String world : PlotSquared.getInstance().getPlotWorlds()) { for (final String world : PS.get().getPlotWorlds()) {
worlds.append(world).append(" "); worlds.append(world).append(" ");
} }
information.append(header); information.append(header);
@ -61,7 +61,7 @@ public class Debug extends SubCommand {
information.append(getLine(line, "TPS Percentage", (int) Lag.getFullPercentage() + "%")); information.append(getLine(line, "TPS Percentage", (int) Lag.getFullPercentage() + "%"));
information.append(getSection(section, "PlotWorld")); information.append(getSection(section, "PlotWorld"));
information.append(getLine(line, "Plot Worlds", worlds)); information.append(getLine(line, "Plot Worlds", worlds));
information.append(getLine(line, "Owned Plots", PlotSquared.getInstance().getPlots().size())); information.append(getLine(line, "Owned Plots", PS.get().getPlots().size()));
information.append(getSection(section, "Messages")); information.append(getSection(section, "Messages"));
information.append(getLine(line, "Total Messages", C.values().length)); information.append(getLine(line, "Total Messages", C.values().length));
information.append(getLine(line, "View all captions", "/plot debug msg")); information.append(getLine(line, "View all captions", "/plot debug msg"));

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
View File

@ -21,7 +21,7 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
@ -66,7 +66,7 @@ public class DebugClaimTest extends SubCommand {
return !MainUtil.sendMessage(null, "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}"); return !MainUtil.sendMessage(null, "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}");
} }
final String world = args[0]; final String world = args[0];
if (!BlockManager.manager.isWorld(world) || !PlotSquared.getInstance().isPlotWorld(world)) { if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(world)) {
return !MainUtil.sendMessage(null, "&cInvalid plot world!"); return !MainUtil.sendMessage(null, "&cInvalid plot world!");
} }
PlotId min, max; PlotId min, max;
@ -80,12 +80,12 @@ public class DebugClaimTest extends SubCommand {
} }
MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Beginning sign to plot conversion. This may take a while..."); MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Beginning sign to plot conversion. This may take a while...");
MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)"); MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)");
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final ArrayList<Plot> plots = new ArrayList<>(); final ArrayList<Plot> plots = new ArrayList<>();
for (final PlotId id : MainUtil.getPlotSelectionIds(min, max)) { for (final PlotId id : MainUtil.getPlotSelectionIds(min, max)) {
final Plot plot = MainUtil.getPlot(world, id); final Plot plot = MainUtil.getPlot(world, id);
final boolean contains = PlotSquared.getInstance().getPlots(world).containsKey(plot.id); final boolean contains = PS.get().getPlots(world).containsKey(plot.id);
if (contains) { if (contains) {
MainUtil.sendMessage(null, " - &cDB Already contains: " + plot.id); MainUtil.sendMessage(null, " - &cDB Already contains: " + plot.id);
continue; continue;
@ -134,7 +134,7 @@ public class DebugClaimTest extends SubCommand {
} }
}); });
for (final Plot plot : plots) { for (final Plot plot : plots) {
PlotSquared.getInstance().updatePlot(plot); PS.get().updatePlot(plot);
} }
MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Complete!"); MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Complete!");
} else { } else {

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.generator.SquarePlotWorld; import com.intellectualcrafters.plot.generator.SquarePlotWorld;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -42,19 +42,19 @@ public class DebugClear extends SubCommand {
if (plr == null) { if (plr == null) {
// Is console // Is console
if (args.length < 2) { if (args.length < 2) {
PlotSquared.log("You need to specify two arguments: ID (0;0) & World (world)"); PS.log("You need to specify two arguments: ID (0;0) & World (world)");
} else { } else {
final PlotId id = PlotId.fromString(args[0]); final PlotId id = PlotId.fromString(args[0]);
final String world = args[1]; final String world = args[1];
if (id == null) { if (id == null) {
PlotSquared.log("Invalid Plot ID: " + args[0]); PS.log("Invalid Plot ID: " + args[0]);
} else { } else {
if (!PlotSquared.getInstance().isPlotWorld(world) || !(PlotSquared.getInstance().getPlotWorld(world) instanceof SquarePlotWorld)) { if (!PS.get().isPlotWorld(world) || !(PS.get().getPlotWorld(world) instanceof SquarePlotWorld)) {
PlotSquared.log("Invalid plot world: " + world); PS.log("Invalid plot world: " + world);
} else { } else {
final Plot plot = MainUtil.getPlot(world, id); final Plot plot = MainUtil.getPlot(world, id);
if (plot == null) { if (plot == null) {
PlotSquared.log("Could not find plot " + args[0] + " in world " + world); PS.log("Could not find plot " + args[0] + " in world " + world);
} else { } else {
final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1); final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id); final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
@ -67,8 +67,8 @@ public class DebugClear extends SubCommand {
@Override @Override
public void run() { public void run() {
MainUtil.runners.remove(plot); MainUtil.runners.remove(plot);
PlotSquared.log("Plot " + plot.getId().toString() + " cleared."); PS.log("Plot " + plot.getId().toString() + " cleared.");
PlotSquared.log("&aDone!"); PS.log("&aDone!");
} }
}); });
} }
@ -79,7 +79,7 @@ public class DebugClear extends SubCommand {
} }
final Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if ((plot == null) || !(PlotSquared.getInstance().getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) { if ((plot == null) || !(PS.get().getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }
if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) { if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {

20
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagManager;
@ -86,7 +86,7 @@ public class DebugExec extends SubCommand {
return false; return false;
} }
String flag = args[1]; String flag = args[1];
for (Plot plot : PlotSquared.getInstance().getPlots()) { for (Plot plot : PS.get().getPlots()) {
if (FlagManager.getPlotFlag(plot, flag) != null) { if (FlagManager.getPlotFlag(plot, flag) != null) {
FlagManager.removePlotFlag(plot, flag); FlagManager.removePlotFlag(plot, flag);
} }
@ -95,11 +95,11 @@ public class DebugExec extends SubCommand {
} }
case "start-rgar": { case "start-rgar": {
if (args.length != 2) { if (args.length != 2) {
PlotSquared.log("&cInvalid syntax: /plot debugexec start-rgar <world>"); PS.log("&cInvalid syntax: /plot debugexec start-rgar <world>");
return false; return false;
} }
boolean result; boolean result;
if (!PlotSquared.getInstance().isPlotWorld(args[1])) { if (!PS.get().isPlotWorld(args[1])) {
MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[1]); MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[1]);
return false; return false;
} }
@ -110,26 +110,26 @@ public class DebugExec extends SubCommand {
result = HybridUtils.manager.scheduleRoadUpdate(args[1], 0); result = HybridUtils.manager.scheduleRoadUpdate(args[1], 0);
} }
if (!result) { if (!result) {
PlotSquared.log("&cCannot schedule mass schematic update! (Is one already in progress?)"); PS.log("&cCannot schedule mass schematic update! (Is one already in progress?)");
return false; return false;
} }
return true; return true;
} }
case "stop-rgar": { case "stop-rgar": {
if (((BukkitHybridUtils)(HybridUtils.manager)).task == 0) { if (((BukkitHybridUtils)(HybridUtils.manager)).task == 0) {
PlotSquared.log("&cTASK NOT RUNNING!"); PS.log("&cTASK NOT RUNNING!");
return false; return false;
} }
((BukkitHybridUtils)(HybridUtils.manager)).task = 0; ((BukkitHybridUtils)(HybridUtils.manager)).task = 0;
Bukkit.getScheduler().cancelTask(((BukkitHybridUtils)(HybridUtils.manager)).task); Bukkit.getScheduler().cancelTask(((BukkitHybridUtils)(HybridUtils.manager)).task);
PlotSquared.log("&cCancelling task..."); PS.log("&cCancelling task...");
while (BukkitHybridUtils.chunks.size() > 0) { while (BukkitHybridUtils.chunks.size() > 0) {
ChunkLoc chunk = BukkitHybridUtils.chunks.get(0); ChunkLoc chunk = BukkitHybridUtils.chunks.get(0);
BukkitHybridUtils.chunks.remove(0); BukkitHybridUtils.chunks.remove(0);
HybridUtils.manager.regenerateRoad(BukkitHybridUtils.world, chunk, 0); HybridUtils.manager.regenerateRoad(BukkitHybridUtils.world, chunk, 0);
ChunkManager.manager.unloadChunk(BukkitHybridUtils.world, chunk); ChunkManager.manager.unloadChunk(BukkitHybridUtils.world, chunk);
} }
PlotSquared.log("&cCancelled!"); PS.log("&cCancelled!");
return true; return true;
} }
case "start-expire": { case "start-expire": {
@ -197,7 +197,7 @@ public class DebugExec extends SubCommand {
return MainUtil.sendMessage(player, "&7 - Run after plot expiry has run"); return MainUtil.sendMessage(player, "&7 - Run after plot expiry has run");
} }
final String world = args[1]; final String world = args[1];
if (!BlockManager.manager.isWorld(world) || !PlotSquared.getInstance().isPlotWorld(args[1])) { if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(args[1])) {
return MainUtil.sendMessage(player, "Invalid world: " + args[1]); return MainUtil.sendMessage(player, "Invalid world: " + args[1]);
} }
final ArrayList<ChunkLoc> empty = new ArrayList<>(); final ArrayList<ChunkLoc> empty = new ArrayList<>();
@ -208,7 +208,7 @@ public class DebugExec extends SubCommand {
Trim.sendMessage(" - MCA #: " + empty.size()); Trim.sendMessage(" - MCA #: " + empty.size());
Trim.sendMessage(" - CHUNKS: " + (empty.size() * 1024) + " (max)"); Trim.sendMessage(" - CHUNKS: " + (empty.size() * 1024) + " (max)");
Trim.sendMessage("Exporting log for manual approval..."); Trim.sendMessage("Exporting log for manual approval...");
final File file = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "trim.txt"); final File file = new File(PS.get().IMP.getDirectory() + File.separator + "trim.txt");
PrintWriter writer; PrintWriter writer;
try { try {
writer = new PrintWriter(file); writer = new PrintWriter(file);

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.Flag;
@ -50,12 +50,12 @@ public class DebugFixFlags extends SubCommand {
return false; return false;
} }
final String world = args[0]; final String world = args[0];
if (!BlockManager.manager.isWorld(world) || !PlotSquared.getInstance().isPlotWorld(world)) { if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(world)) {
MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD, args[0]); MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD, args[0]);
return false; return false;
} }
MainUtil.sendMessage(plr, "&8--- &6Starting task &8 ---"); MainUtil.sendMessage(plr, "&8--- &6Starting task &8 ---");
for (final Plot plot : PlotSquared.getInstance().getPlots(world).values()) { for (final Plot plot : PS.get().getPlots(world).values()) {
final HashMap<String, Flag> flags = plot.settings.flags; final HashMap<String, Flag> flags = plot.settings.flags;
Iterator<Entry<String, Flag>> i = flags.entrySet().iterator(); Iterator<Entry<String, Flag>> i = flags.entrySet().iterator();
boolean changed = false; boolean changed = false;

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
View File

@ -22,7 +22,7 @@ package com.intellectualcrafters.plot.commands;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
@ -39,13 +39,13 @@ public class DebugLoadTest extends SubCommand {
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {
try { try {
final Field fPlots = PlotSquared.class.getDeclaredField("plots"); final Field fPlots = PS.class.getDeclaredField("plots");
fPlots.setAccessible(true); fPlots.setAccessible(true);
fPlots.set(null, DBFunc.getPlots()); fPlots.set(null, DBFunc.getPlots());
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&3===FAILED&3==="); PS.log("&3===FAILED&3===");
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&3===END OF STACKTRACE==="); PS.log("&3===END OF STACKTRACE===");
} }
} else { } else {
MainUtil.sendMessage(plr, "&6This command can only be executed by console as it has been deemed unsafe if abused.."); MainUtil.sendMessage(plr, "&6This command can only be executed by console as it has been deemed unsafe if abused..");

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.generator.HybridPlotWorld; import com.intellectualcrafters.plot.generator.HybridPlotWorld;
import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.generator.HybridUtils;
@ -38,7 +38,7 @@ public class DebugRoadRegen extends SubCommand {
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
final Location loc = player.getLocation(); final Location loc = player.getLocation();
final String world = loc.getWorld(); final String world = loc.getWorld();
if (!(PlotSquared.getInstance().getPlotWorld(world) instanceof HybridPlotWorld)) { if (!(PS.get().getPlotWorld(world) instanceof HybridPlotWorld)) {
return sendMessage(player, C.NOT_IN_PLOT_WORLD); return sendMessage(player, C.NOT_IN_PLOT_WORLD);
} }
final ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4); final ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -40,7 +40,7 @@ public class DebugSaveTest extends SubCommand {
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {
final ArrayList<Plot> plots = new ArrayList<Plot>(); final ArrayList<Plot> plots = new ArrayList<Plot>();
plots.addAll(PlotSquared.getInstance().getPlots()); plots.addAll(PS.get().getPlots());
MainUtil.sendMessage(null, "&6Starting `DEBUGSAVETEST`"); MainUtil.sendMessage(null, "&6Starting `DEBUGSAVETEST`");
DBFunc.createPlotsAndData(plots, new Runnable() { DBFunc.createPlotsAndData(plots, new Runnable() {
@Override @Override

28
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.AbstractDB; import com.intellectualcrafters.plot.database.AbstractDB;
@ -139,7 +139,7 @@ public class DebugUUID extends SubCommand {
final UUID uuid = UUID.fromString(s); final UUID uuid = UUID.fromString(s);
uuids.add(uuid); uuids.add(uuid);
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log(C.PREFIX.s() + "Invalid playerdata: " + current); PS.log(C.PREFIX.s() + "Invalid playerdata: " + current);
} }
} }
} }
@ -170,7 +170,7 @@ public class DebugUUID extends SubCommand {
uCReverse.put(uuid2, uuid); uCReverse.put(uuid2, uuid);
} }
} catch (final Throwable e) { } catch (final Throwable e) {
PlotSquared.log(C.PREFIX.s() + "&6Invalid playerdata: " + uuid.toString() + ".dat"); PS.log(C.PREFIX.s() + "&6Invalid playerdata: " + uuid.toString() + ".dat");
} }
} }
for (final String name : names) { for (final String name : names) {
@ -215,7 +215,7 @@ public class DebugUUID extends SubCommand {
MainUtil.sendConsoleMessage("&7 - Updating plot objects"); MainUtil.sendConsoleMessage("&7 - Updating plot objects");
for (Plot plot : PlotSquared.getInstance().getPlotsRaw()) { for (Plot plot : PS.get().getPlotsRaw()) {
UUID value = uCMap.get(plot.owner); UUID value = uCMap.get(plot.owner);
if (value != null) { if (value != null) {
plot.owner = value; plot.owner = value;
@ -235,13 +235,13 @@ public class DebugUUID extends SubCommand {
database.createTables(Settings.DB.USE_MYSQL ? "mysql" : "sqlite"); database.createTables(Settings.DB.USE_MYSQL ? "mysql" : "sqlite");
if (!result) { if (!result) {
MainUtil.sendConsoleMessage("&cConversion failed! Attempting recovery"); MainUtil.sendConsoleMessage("&cConversion failed! Attempting recovery");
for (Plot plot : PlotSquared.getInstance().getPlots()) { for (Plot plot : PS.get().getPlots()) {
UUID value = uCReverse.get(plot.owner); UUID value = uCReverse.get(plot.owner);
if (value != null) { if (value != null) {
plot.owner = value; plot.owner = value;
} }
} }
database.createPlotsAndData(new ArrayList<>(PlotSquared.getInstance().getPlots()), new Runnable() { database.createPlotsAndData(new ArrayList<>(PS.get().getPlots()), new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.sendMessage(null, "&6Recovery was successful!"); MainUtil.sendMessage(null, "&6Recovery was successful!");
@ -256,19 +256,19 @@ public class DebugUUID extends SubCommand {
} }
if (newWrapper instanceof OfflineUUIDWrapper) { if (newWrapper instanceof OfflineUUIDWrapper) {
PlotSquared.getInstance().config.set("UUID.force-lowercase", false); PS.get().config.set("UUID.force-lowercase", false);
PlotSquared.getInstance().config.set("UUID.offline", true); PS.get().config.set("UUID.offline", true);
} }
else if (newWrapper instanceof LowerOfflineUUIDWrapper) { else if (newWrapper instanceof LowerOfflineUUIDWrapper) {
PlotSquared.getInstance().config.set("UUID.force-lowercase", true); PS.get().config.set("UUID.force-lowercase", true);
PlotSquared.getInstance().config.set("UUID.offline", true); PS.get().config.set("UUID.offline", true);
} }
else if (newWrapper instanceof DefaultUUIDWrapper) { else if (newWrapper instanceof DefaultUUIDWrapper) {
PlotSquared.getInstance().config.set("UUID.force-lowercase", false); PS.get().config.set("UUID.force-lowercase", false);
PlotSquared.getInstance().config.set("UUID.offline", false); PS.get().config.set("UUID.offline", false);
} }
try { try {
PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); PS.get().config.save(PS.get().configFile);
} }
catch (Exception e) { catch (Exception e) {
MainUtil.sendConsoleMessage("Could not save configuration. It will need to be manuall set!"); MainUtil.sendConsoleMessage("Could not save configuration. It will need to be manuall set!");
@ -279,7 +279,7 @@ public class DebugUUID extends SubCommand {
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@Override @Override
public void run() { public void run() {
ArrayList<Plot> plots = new ArrayList<>(PlotSquared.getInstance().getPlots()); ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
database.createPlotsAndData(plots, new Runnable() { database.createPlotsAndData(plots, new Runnable() {
@Override @Override
public void run() { public void run() {

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -50,7 +50,7 @@ public class Delete extends SubCommand {
return !sendMessage(plr, C.NO_PLOT_PERMS); return !sendMessage(plr, C.NO_PLOT_PERMS);
} }
assert plot != null; assert plot != null;
final PlotWorld pWorld = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotWorld pWorld = PS.get().getPlotWorld(plot.world);
if (MainUtil.runners.containsKey(plot)) { if (MainUtil.runners.containsKey(plot)) {
MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER); MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
return false; return false;
@ -65,7 +65,7 @@ public class Delete extends SubCommand {
sendMessage(plr, C.ADDED_BALANCE, c + ""); sendMessage(plr, C.ADDED_BALANCE, c + "");
} }
} }
PlotSquared.getInstance().removePlot(loc.getWorld(), plot.id, true); PS.get().removePlot(loc.getWorld(), plot.id, true);
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
final boolean result = MainUtil.clearAsPlayer(plot, true, new Runnable() { final boolean result = MainUtil.clearAsPlayer(plot, true, new Runnable() {
@Override @Override

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Deny.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -89,7 +89,7 @@ public class Deny extends SubCommand {
} }
MainUtil.sendMessage(plr, C.DENIED_ADDED); MainUtil.sendMessage(plr, C.DENIED_ADDED);
if (!uuid.equals(DBFunc.everyone)) { if (!uuid.equals(DBFunc.everyone)) {
PlotSquared.getInstance().IMP.handleKick(uuid, C.YOU_GOT_DENIED); PS.get().IMP.handleKick(uuid, C.YOU_GOT_DENIED);
} }
return true; return true;
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -37,7 +37,7 @@ public class Home extends SubCommand {
} }
private Plot isAlias(final String a) { private Plot isAlias(final String a) {
for (final Plot p : PlotSquared.getInstance().getPlots()) { for (final Plot p : PS.get().getPlots()) {
if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) { if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) {
return p; return p;
} }
@ -47,7 +47,7 @@ public class Home extends SubCommand {
@Override @Override
public boolean execute(final PlotPlayer plr, String... args) { public boolean execute(final PlotPlayer plr, String... args) {
final ArrayList<Plot> plots = PlotSquared.getInstance().sortPlotsByWorld(PlotSquared.getInstance().getPlots(plr)); final ArrayList<Plot> plots = PS.get().sortPlotsByWorld(PS.get().getPlots(plr));
if (plots.size() == 1) { if (plots.size() == 1) {
MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(0)); MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(0));
return true; return true;

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java
View File

@ -28,7 +28,7 @@ import java.util.regex.Matcher;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
@ -111,9 +111,6 @@ public class MainCommand {
} }
public static boolean onCommand(final PlotPlayer player, final String cmd, final String... args) { public static boolean onCommand(final PlotPlayer player, final String cmd, final String... args) {
if (!Permissions.hasPermission(player, PlotSquared.MAIN_PERMISSION)) {
return no_permission(player, PlotSquared.MAIN_PERMISSION);
}
if ((args.length < 1) || ((args.length >= 1) && (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("he")))) { if ((args.length < 1) || ((args.length >= 1) && (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("he")))) {
if (args.length < 2) { if (args.length < 2) {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.*; import com.intellectualcrafters.plot.util.*;
@ -131,7 +131,7 @@ public class Merge extends SubCommand {
HashSet<PlotId> multiPlots = new HashSet<>(); HashSet<PlotId> multiPlots = new HashSet<>();
final UUID u1 = plot.owner; final UUID u1 = plot.owner;
for (final PlotId myid : plots) { for (final PlotId myid : plots) {
final Plot myplot = PlotSquared.getInstance().getPlots(world).get(myid); final Plot myplot = PS.get().getPlots(world).get(myid);
if (myplot == null || myplot.owner == null) { if (myplot == null || myplot.owner == null) {
MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString())); MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
return false; return false;
@ -163,7 +163,7 @@ public class Merge extends SubCommand {
sendMessage(accepter, C.MERGE_NOT_VALID); sendMessage(accepter, C.MERGE_NOT_VALID);
return; return;
} }
final PlotWorld plotWorld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotWorld = PS.get().getPlotWorld(world);
if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY) { if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY) {
double cost = plotWorld.MERGE_PRICE; double cost = plotWorld.MERGE_PRICE;
cost = plots.size() * cost; cost = plots.size() * cost;
@ -192,7 +192,7 @@ public class Merge extends SubCommand {
MainUtil.sendMessage(plr, C.MERGE_REQUESTED); MainUtil.sendMessage(plr, C.MERGE_REQUESTED);
return true; return true;
} }
final PlotWorld plotWorld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotWorld = PS.get().getPlotWorld(world);
if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY) { if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY) {
double cost = plotWorld.MERGE_PRICE; double cost = plotWorld.MERGE_PRICE;
cost = plots.size() * cost; cost = plots.size() * cost;

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Move.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
@ -61,8 +61,8 @@ public class Move extends SubCommand {
} }
String world2; String world2;
if (args.length == 2) { if (args.length == 2) {
PlotWorld other = PlotSquared.getInstance().getPlotWorld(args[1]); PlotWorld other = PS.get().getPlotWorld(args[1]);
PlotWorld current = PlotSquared.getInstance().getPlotWorld(loc.getWorld()); PlotWorld current = PS.get().getPlotWorld(loc.getWorld());
if (other == null || current == null || !other.equals(current)) { if (other == null || current == null || !other.equals(current)) {
MainUtil.sendMessage(plr, C.PLOTWORLD_INCOMPATIBLE); MainUtil.sendMessage(plr, C.PLOTWORLD_INCOMPATIBLE);
return false; return false;

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -91,7 +91,7 @@ public class Purge extends SubCommand {
return false; return false;
} }
final String worldname = args[1]; final String worldname = args[1];
if (!PlotSquared.getInstance().getAllPlotsRaw().containsKey(worldname)) { if (!PS.get().getAllPlotsRaw().containsKey(worldname)) {
MainUtil.sendMessage(plr, "INVALID WORLD"); MainUtil.sendMessage(plr, "INVALID WORLD");
return false; return false;
} }
@ -107,7 +107,7 @@ public class Purge extends SubCommand {
return finishPurge(DBid == Integer.MAX_VALUE ? 1 : 0); return finishPurge(DBid == Integer.MAX_VALUE ? 1 : 0);
} }
if (arg.equals("all")) { if (arg.equals("all")) {
final Set<PlotId> ids = PlotSquared.getInstance().getPlots(worldname).keySet(); final Set<PlotId> ids = PS.get().getPlots(worldname).keySet();
int length = ids.size(); int length = ids.size();
if (length == 0) { if (length == 0) {
return MainUtil.sendMessage(null, "&cNo plots found"); return MainUtil.sendMessage(null, "&cNo plots found");
@ -116,7 +116,7 @@ public class Purge extends SubCommand {
return finishPurge(length); return finishPurge(length);
} }
if (arg.equals("unknown")) { if (arg.equals("unknown")) {
final Collection<Plot> plots = PlotSquared.getInstance().getPlots(worldname).values(); final Collection<Plot> plots = PS.get().getPlots(worldname).values();
final Set<PlotId> ids = new HashSet<>(); final Set<PlotId> ids = new HashSet<>();
for (final Plot plot : plots) { for (final Plot plot : plots) {
if (plot.owner != null) { if (plot.owner != null) {
@ -134,7 +134,7 @@ public class Purge extends SubCommand {
return finishPurge(length); return finishPurge(length);
} }
if (arg.equals("unowned")) { if (arg.equals("unowned")) {
final Collection<Plot> plots = PlotSquared.getInstance().getPlots(worldname).values(); final Collection<Plot> plots = PS.get().getPlots(worldname).values();
final Set<PlotId> ids = new HashSet<>(); final Set<PlotId> ids = new HashSet<>();
for (final Plot plot : plots) { for (final Plot plot : plots) {
if (plot.owner == null) { if (plot.owner == null) {
@ -150,7 +150,7 @@ public class Purge extends SubCommand {
} }
final UUID uuid = UUIDHandler.getUUID(args[0]); final UUID uuid = UUIDHandler.getUUID(args[0]);
if (uuid != null) { if (uuid != null) {
final Set<Plot> plots = PlotSquared.getInstance().getPlots(worldname, uuid); final Set<Plot> plots = PS.get().getPlots(worldname, uuid);
final Set<PlotId> ids = new HashSet<>(); final Set<PlotId> ids = new HashSet<>();
for (final Plot plot : plots) { for (final Plot plot : plots) {
ids.add(plot.id); ids.add(plot.id);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -49,7 +49,7 @@ public class Rate extends SubCommand {
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
if (args.length == 1) { if (args.length == 1) {
if (args[0].equalsIgnoreCase("next")) { if (args[0].equalsIgnoreCase("next")) {
ArrayList<Plot> plots = new ArrayList<>(PlotSquared.getInstance().getPlots()); ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
Collections.sort(plots, new Comparator<Plot>() { Collections.sort(plots, new Comparator<Plot>() {
@Override @Override
public int compare(Plot p1, Plot p2) { public int compare(Plot p1, Plot p2) {

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.generator.HybridPlotManager; import com.intellectualcrafters.plot.generator.HybridPlotManager;
import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.generator.HybridUtils;
@ -58,19 +58,19 @@ public class RegenAllRoads extends SubCommand {
} }
} }
final String name = args[0]; final String name = args[0];
final PlotManager manager = PlotSquared.getInstance().getPlotManager(name); final PlotManager manager = PS.get().getPlotManager(name);
if ((manager == null) || !(manager instanceof HybridPlotManager)) { if ((manager == null) || !(manager instanceof HybridPlotManager)) {
sendMessage(player, C.NOT_VALID_PLOT_WORLD); sendMessage(player, C.NOT_VALID_PLOT_WORLD);
return false; return false;
} }
final List<ChunkLoc> chunks = ChunkManager.manager.getChunkChunks(name); final List<ChunkLoc> chunks = ChunkManager.manager.getChunkChunks(name);
PlotSquared.log("&cIf no schematic is set, the following will not do anything"); PS.log("&cIf no schematic is set, the following will not do anything");
PlotSquared.log("&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic"); PS.log("&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic");
PlotSquared.log("&6Potential chunks to update: &7" + (chunks.size() * 1024)); PS.log("&6Potential chunks to update: &7" + (chunks.size() * 1024));
PlotSquared.log("&6Estimated time: &7" + (chunks.size()) + " seconds"); PS.log("&6Estimated time: &7" + (chunks.size()) + " seconds");
final boolean result = HybridUtils.manager.scheduleRoadUpdate(name, height); final boolean result = HybridUtils.manager.scheduleRoadUpdate(name, height);
if (!result) { if (!result) {
PlotSquared.log("&cCannot schedule mass schematic update! (Is one already in progress?)"); PS.log("&cCannot schedule mass schematic update! (Is one already in progress?)");
return false; return false;
} }
return true; return true;

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PlotWorld;
@ -36,12 +36,12 @@ public class Reload extends SubCommand {
try { try {
// The following won't affect world generation, as that has to be // The following won't affect world generation, as that has to be
// loaded during startup unfortunately. // loaded during startup unfortunately.
PlotSquared.getInstance().config.load(PlotSquared.getInstance().configFile); PS.get().config.load(PS.get().configFile);
PlotSquared.getInstance().setupConfig(); PS.get().setupConfig();
C.setupTranslations(); C.setupTranslations();
for (final String pw : PlotSquared.getInstance().getPlotWorlds()) { for (final String pw : PS.get().getPlotWorlds()) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(pw); final PlotWorld plotworld = PS.get().getPlotWorld(pw);
plotworld.loadDefaultConfiguration(PlotSquared.getInstance().config.getConfigurationSection("worlds." + pw)); plotworld.loadDefaultConfiguration(PS.get().config.getConfigurationSection("worlds." + pw));
} }
MainUtil.sendMessage(plr, C.RELOADED_CONFIGS); MainUtil.sendMessage(plr, C.RELOADED_CONFIGS);
} catch (final Exception e) { } catch (final Exception e) {

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -58,7 +58,7 @@ public class SchematicCmd extends SubCommand {
switch (arg) { switch (arg) {
case "paste": { case "paste": {
if (plr == null) { if (plr == null) {
PlotSquared.log(C.IS_CONSOLE.s()); PS.log(C.IS_CONSOLE.s());
return false; return false;
} }
if (!Permissions.hasPermission(plr, "plots.schematic.paste")) { if (!Permissions.hasPermission(plr, "plots.schematic.paste")) {
@ -134,7 +134,7 @@ public class SchematicCmd extends SubCommand {
SchematicHandler.manager.pasteStates(schematic, plot, 0, 0); SchematicHandler.manager.pasteStates(schematic, plot, 0, 0);
sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS); sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
SchematicCmd.this.running = false; SchematicCmd.this.running = false;
PlotSquared.getInstance().TASK.cancelTask(SchematicCmd.this.task); PS.get().TASK.cancelTask(SchematicCmd.this.task);
return; return;
} }
final int end = Math.min(start + 5000, blen); final int end = Math.min(start + 5000, blen);
@ -155,7 +155,7 @@ public class SchematicCmd extends SubCommand {
} }
case "test": { case "test": {
if (plr == null) { if (plr == null) {
PlotSquared.log(C.IS_CONSOLE.s()); PS.log(C.IS_CONSOLE.s());
return false; return false;
} }
if (!Permissions.hasPermission(plr, "plots.schematic.test")) { if (!Permissions.hasPermission(plr, "plots.schematic.test")) {
@ -198,7 +198,7 @@ public class SchematicCmd extends SubCommand {
MainUtil.sendMessage(null, "&cNeed world arg. Use &7/plots sch exportall <world>"); MainUtil.sendMessage(null, "&cNeed world arg. Use &7/plots sch exportall <world>");
return false; return false;
} }
final HashMap<PlotId, Plot> plotmap = PlotSquared.getInstance().getPlots(args[1]); final HashMap<PlotId, Plot> plotmap = PS.get().getPlots(args[1]);
if ((plotmap == null) || (plotmap.size() == 0)) { if ((plotmap == null) || (plotmap.size() == 0)) {
MainUtil.sendMessage(plr, "&cInvalid world. Use &7/plots sch exportall <world>"); MainUtil.sendMessage(plr, "&cInvalid world. Use &7/plots sch exportall <world>");
return false; return false;
@ -215,8 +215,8 @@ public class SchematicCmd extends SubCommand {
return false; return false;
} }
else { else {
PlotSquared.log("&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while."); PS.log("&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while.");
PlotSquared.log("&3PlotSquared&8->&3Schemaitc&8: &7Found &c" + plotmap.size() + "&7 plots..."); PS.log("&3PlotSquared&8->&3Schemaitc&8: &7Found &c" + plotmap.size() + "&7 plots...");
} }
break; break;
} }
@ -250,11 +250,11 @@ public class SchematicCmd extends SubCommand {
world = args[1]; world = args[1];
final String[] split = args[2].split(";"); final String[] split = args[2].split(";");
final PlotId i = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1])); final PlotId i = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
if ((PlotSquared.getInstance().getPlots(world) == null) || (PlotSquared.getInstance().getPlots(world).get(i) == null)) { if ((PS.get().getPlots(world) == null) || (PS.get().getPlots(world).get(i) == null)) {
MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
return false; return false;
} }
p2 = PlotSquared.getInstance().getPlots(world).get(i); p2 = PS.get().getPlots(world).get(i);
} catch (final Exception e) { } catch (final Exception e) {
MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
return false; return false;

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Configuration; import com.intellectualcrafters.plot.config.Configuration;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -66,10 +66,10 @@ public class Set extends SubCommand {
} }
} }
if (args.length < 1) { if (args.length < 1) {
PlotManager manager = PlotSquared.getInstance().getPlotManager(loc.getWorld()); PlotManager manager = PS.get().getPlotManager(loc.getWorld());
ArrayList<String> newValues = new ArrayList<String>(); ArrayList<String> newValues = new ArrayList<String>();
newValues.addAll(Arrays.asList(values)); newValues.addAll(Arrays.asList(values));
newValues.addAll(Arrays.asList(manager.getPlotComponents(PlotSquared.getInstance().getPlotWorld(loc.getWorld()), plot.id))); newValues.addAll(Arrays.asList(manager.getPlotComponents(PS.get().getPlotWorld(loc.getWorld()), plot.id)));
MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(newValues)); MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(newValues));
return false; return false;
} }
@ -171,7 +171,7 @@ public class Set extends SubCommand {
MainUtil.sendMessage(plr, C.ALIAS_TOO_LONG); MainUtil.sendMessage(plr, C.ALIAS_TOO_LONG);
return false; return false;
} }
for (final Plot p : PlotSquared.getInstance().getPlots(plr.getLocation().getWorld()).values()) { for (final Plot p : PS.get().getPlots(plr.getLocation().getWorld()).values()) {
if (p.settings.getAlias().equalsIgnoreCase(alias)) { if (p.settings.getAlias().equalsIgnoreCase(alias)) {
MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN); MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
return false; return false;
@ -217,8 +217,8 @@ public class Set extends SubCommand {
} }
// Get components // Get components
final String world = plr.getLocation().getWorld(); final String world = plr.getLocation().getWorld();
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final String[] components = manager.getPlotComponents(plotworld, plot.id); final String[] components = manager.getPlotComponents(plotworld, plot.id);
for (final String component : components) { for (final String component : components) {
if (component.equalsIgnoreCase(args[0])) { if (component.equalsIgnoreCase(args[0])) {
@ -308,7 +308,7 @@ public class Set extends SubCommand {
} }
ArrayList<String> newValues = new ArrayList<String>(); ArrayList<String> newValues = new ArrayList<String>();
newValues.addAll(Arrays.asList(values)); newValues.addAll(Arrays.asList(values));
newValues.addAll(Arrays.asList(manager.getPlotComponents(PlotSquared.getInstance().getPlotWorld(loc.getWorld()), plot.id))); newValues.addAll(Arrays.asList(manager.getPlotComponents(PS.get().getPlotWorld(loc.getWorld()), plot.id)));
MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(newValues)); MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(newValues));
return false; return false;
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -93,14 +93,14 @@ public class SetOwner extends SubCommand {
final String world = loc.getWorld(); final String world = loc.getWorld();
for (final PlotId id : plots) { for (final PlotId id : plots) {
final Plot current = PlotSquared.getInstance().getPlots(world).get(id); final Plot current = PS.get().getPlots(world).get(id);
final UUID uuid = getUUID(args[0]); final UUID uuid = getUUID(args[0]);
if (uuid == null) { if (uuid == null) {
MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]); MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
return false; return false;
} }
current.owner = uuid; current.owner = uuid;
PlotSquared.getInstance().updatePlot(current); PS.get().updatePlot(current);
DBFunc.setOwner(current, current.owner); DBFunc.setOwner(current, current.owner);
} }
MainUtil.setSign(args[0], plot); MainUtil.setSign(args[0], plot);

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -55,7 +55,7 @@ public class TP extends SubCommand {
world = args[1]; world = args[1];
} }
} }
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD); MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return false; return false;
} }
@ -85,14 +85,14 @@ public class TP extends SubCommand {
} }
final PlotPlayer player = UUIDHandler.getPlayer(a); final PlotPlayer player = UUIDHandler.getPlayer(a);
if (player != null) { if (player != null) {
final java.util.Set<Plot> plotMainPlots = PlotSquared.getInstance().getPlots(world, player); final java.util.Set<Plot> plotMainPlots = PS.get().getPlots(world, player);
final Plot[] plots = plotMainPlots.toArray(new Plot[plotMainPlots.size()]); final Plot[] plots = plotMainPlots.toArray(new Plot[plotMainPlots.size()]);
if (plots.length > index) { if (plots.length > index) {
return plots[index]; return plots[index];
} }
return null; return null;
} }
for (final Plot p : PlotSquared.getInstance().getPlots(world).values()) { for (final Plot p : PS.get().getPlots(world).values()) {
if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) { if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) {
return p; return p;
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Target.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
@ -35,7 +35,7 @@ public class Target extends SubCommand {
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
final Location ploc = plr.getLocation(); final Location ploc = plr.getLocation();
if (!PlotSquared.getInstance().isPlotWorld(ploc.getWorld())) { if (!PS.get().isPlotWorld(ploc.getWorld())) {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD); MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return false; return false;
} }

24
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.ConfigurationNode; import com.intellectualcrafters.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
@ -48,12 +48,12 @@ public class Template extends SubCommand {
public static boolean extractAllFiles(String world, String template) { public static boolean extractAllFiles(String world, String template) {
byte[] buffer = new byte[2048]; byte[] buffer = new byte[2048];
try { try {
File folder = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "templates"); File folder = new File(PS.get().IMP.getDirectory() + File.separator + "templates");
if (!folder.exists()) { if (!folder.exists()) {
return false; return false;
} }
File input = new File(folder + File.separator + template + ".template"); File input = new File(folder + File.separator + template + ".template");
File output = PlotSquared.getInstance().IMP.getDirectory(); File output = PS.get().IMP.getDirectory();
if (!output.exists()) { if (!output.exists()) {
output.mkdirs(); output.mkdirs();
} }
@ -81,7 +81,7 @@ public class Template extends SubCommand {
} }
public static byte[] getBytes(PlotWorld plotworld) { public static byte[] getBytes(PlotWorld plotworld) {
ConfigurationSection section = PlotSquared.getInstance().config.getConfigurationSection("worlds." + plotworld.worldname); ConfigurationSection section = PS.get().config.getConfigurationSection("worlds." + plotworld.worldname);
YamlConfiguration config = new YamlConfiguration(); YamlConfiguration config = new YamlConfiguration();
String generator = SetupUtils.manager.getGenerator(plotworld); String generator = SetupUtils.manager.getGenerator(plotworld);
if (generator != null) { if (generator != null) {
@ -94,7 +94,7 @@ public class Template extends SubCommand {
} }
public static void zipAll(final String world, Set<FileBytes> files) throws IOException { public static void zipAll(final String world, Set<FileBytes> files) throws IOException {
File output = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "templates"); File output = new File(PS.get().IMP.getDirectory() + File.separator + "templates");
output.mkdirs(); output.mkdirs();
FileOutputStream fos = new FileOutputStream(output + File.separator + world + ".template"); FileOutputStream fos = new FileOutputStream(output + File.separator + world + ".template");
ZipOutputStream zos = new ZipOutputStream(fos); ZipOutputStream zos = new ZipOutputStream(fos);
@ -131,7 +131,7 @@ public class Template extends SubCommand {
MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template import <world> <template>"); MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template import <world> <template>");
return false; return false;
} }
if (PlotSquared.getInstance().isPlotWorld(world)) { if (PS.get().isPlotWorld(world)) {
MainUtil.sendMessage(plr, C.SETUP_WORLD_TAKEN, world); MainUtil.sendMessage(plr, C.SETUP_WORLD_TAKEN, world);
return false; return false;
} }
@ -140,12 +140,12 @@ public class Template extends SubCommand {
MainUtil.sendMessage(plr, "&cInvalid template file: " + args[2] +".template"); MainUtil.sendMessage(plr, "&cInvalid template file: " + args[2] +".template");
return false; return false;
} }
File worldFile = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml"); File worldFile = new File(PS.get().IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml");
YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile); YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile);
PlotSquared.getInstance().config.set("worlds." + world, worldConfig.get("")); PS.get().config.set("worlds." + world, worldConfig.get(""));
try { try {
PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); PS.get().config.save(PS.get().configFile);
PlotSquared.getInstance().config.load(PlotSquared.getInstance().configFile); PS.get().config.load(PS.get().configFile);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -180,12 +180,12 @@ public class Template extends SubCommand {
MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template export <world>"); MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template export <world>");
return false; return false;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (!BlockManager.manager.isWorld(world) || (plotworld == null)) { if (!BlockManager.manager.isWorld(world) || (plotworld == null)) {
MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD); MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD);
return false; return false;
} }
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@Override @Override
public void run() { public void run() {

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.BlockManager;
@ -66,7 +66,7 @@ public class Trim extends SubCommand {
final ChunkLoc loc = new ChunkLoc(x, z); final ChunkLoc loc = new ChunkLoc(x, z);
empty.add(loc); empty.add(loc);
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("INVALID MCA: " + name); PS.log("INVALID MCA: " + name);
} }
} else { } else {
final Path path = Paths.get(file.getPath()); final Path path = Paths.get(file.getPath());
@ -83,7 +83,7 @@ public class Trim extends SubCommand {
final ChunkLoc loc = new ChunkLoc(x, z); final ChunkLoc loc = new ChunkLoc(x, z);
empty.add(loc); empty.add(loc);
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("INVALID MCA: " + name); PS.log("INVALID MCA: " + name);
} }
} }
} catch (final Exception e) { } catch (final Exception e) {
@ -106,7 +106,7 @@ public class Trim extends SubCommand {
System.currentTimeMillis(); System.currentTimeMillis();
sendMessage("Collecting region data..."); sendMessage("Collecting region data...");
final ArrayList<Plot> plots = new ArrayList<>(); final ArrayList<Plot> plots = new ArrayList<>();
plots.addAll(PlotSquared.getInstance().getPlots(world).values()); plots.addAll(PS.get().getPlots(world).values());
final HashSet<ChunkLoc> chunks = new HashSet<>(ChunkManager.manager.getChunkChunks(world)); final HashSet<ChunkLoc> chunks = new HashSet<>(ChunkManager.manager.getChunkChunks(world));
sendMessage(" - MCA #: " + chunks.size()); sendMessage(" - MCA #: " + chunks.size());
sendMessage(" - CHUNKS: " + (chunks.size() * 1024) + " (max)"); sendMessage(" - CHUNKS: " + (chunks.size() * 1024) + " (max)");
@ -120,7 +120,7 @@ public class Trim extends SubCommand {
empty.addAll(chunks); empty.addAll(chunks);
Trim.TASK = false; Trim.TASK = false;
TaskManager.runTaskAsync(whenDone); TaskManager.runTaskAsync(whenDone);
PlotSquared.getInstance().TASK.cancelTask(Trim.TASK_ID); PS.get().TASK.cancelTask(Trim.TASK_ID);
return; return;
} }
final Plot plot = plots.get(0); final Plot plot = plots.get(0);
@ -145,7 +145,7 @@ public class Trim extends SubCommand {
} }
public static void sendMessage(final String message) { public static void sendMessage(final String message) {
PlotSquared.log("&3PlotSquared -> World trim&8: &7" + message); PS.log("&3PlotSquared -> World trim&8: &7" + message);
} }
public PlotId getId(final String id) { public PlotId getId(final String id) {
@ -187,7 +187,7 @@ public class Trim extends SubCommand {
return false; return false;
} }
final String world = args[1]; final String world = args[1];
if (!BlockManager.manager.isWorld(world) || (PlotSquared.getInstance().getPlotWorld(world) == null)) { if (!BlockManager.manager.isWorld(world) || (PS.get().getPlotWorld(world) == null)) {
MainUtil.sendMessage(plr, C.NOT_VALID_WORLD); MainUtil.sendMessage(plr, C.NOT_VALID_WORLD);
return false; return false;
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trust.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -77,7 +77,7 @@ public class Trust extends SubCommand {
DBFunc.removeMember(loc.getWorld(), plot, uuid); DBFunc.removeMember(loc.getWorld(), plot, uuid);
} }
if (plot.denied.contains(uuid)) { if (plot.denied.contains(uuid)) {
if (plot.members.size() + plot.trusted.size() >= PlotSquared.getInstance().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) { if (plot.members.size() + plot.trusted.size() >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) {
MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS); MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS);
return false; return false;
} }
@ -91,7 +91,7 @@ public class Trust extends SubCommand {
MainUtil.sendMessage(plr, C.ALREADY_ADDED); MainUtil.sendMessage(plr, C.ALREADY_ADDED);
return false; return false;
} }
if (plot.members.size() + plot.trusted.size() >= PlotSquared.getInstance().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) { if (plot.members.size() + plot.trusted.size() >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) {
MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS); MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS);
return false; return false;
} }

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -50,7 +50,7 @@ public class Unclaim extends SubCommand {
return !sendMessage(plr, C.NO_PLOT_PERMS); return !sendMessage(plr, C.NO_PLOT_PERMS);
} }
assert plot != null; assert plot != null;
final PlotWorld pWorld = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotWorld pWorld = PS.get().getPlotWorld(plot.world);
if ((EconHandler.manager != null) && pWorld.USE_ECONOMY) { if ((EconHandler.manager != null) && pWorld.USE_ECONOMY) {
final double c = pWorld.SELL_PRICE; final double c = pWorld.SELL_PRICE;
if (c > 0d) { if (c > 0d) {
@ -58,10 +58,10 @@ public class Unclaim extends SubCommand {
sendMessage(plr, C.ADDED_BALANCE, c + ""); sendMessage(plr, C.ADDED_BALANCE, c + "");
} }
} }
final boolean result = PlotSquared.getInstance().removePlot(loc.getWorld(), plot.id, true); final boolean result = PS.get().removePlot(loc.getWorld(), plot.id, true);
if (result) { if (result) {
final String worldname = plr.getLocation().getWorld(); final String worldname = plr.getLocation().getWorld();
PlotSquared.getInstance().getPlotManager(worldname).unclaimPlot(pWorld, plot); PS.get().getPlotManager(worldname).unclaimPlot(pWorld, plot);
DBFunc.delete(worldname, plot); DBFunc.delete(worldname, plot);
// TODO set wall block // TODO set wall block
} else { } else {

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -39,7 +39,7 @@ public class Visit extends SubCommand {
public List<Plot> getPlots(final UUID uuid) { public List<Plot> getPlots(final UUID uuid) {
final List<Plot> plots = new ArrayList<>(); final List<Plot> plots = new ArrayList<>();
for (final Plot p : PlotSquared.getInstance().getPlots()) { for (final Plot p : PS.get().getPlots()) {
if (p.hasOwner() && p.isOwner(uuid)) { if (p.hasOwner() && p.isOwner(uuid)) {
plots.add(p); plots.add(p);
} }
@ -56,10 +56,10 @@ public class Visit extends SubCommand {
UUID user = UUIDHandler.getUUID(args[0]); UUID user = UUIDHandler.getUUID(args[0]);
if (user != null ) { if (user != null ) {
// do plots by username // do plots by username
plots.addAll(PlotSquared.getInstance().getPlots(user)); plots.addAll(PS.get().getPlots(user));
} else if (PlotSquared.getInstance().isPlotWorld(args[0])) { } else if (PS.get().isPlotWorld(args[0])) {
// do plots by world // do plots by world
plots.addAll(PlotSquared.getInstance().getPlots(args[0]).values()); plots.addAll(PS.get().getPlots(args[0]).values());
} }
else { else {
Plot plot = MainUtil.getPlotFromString(plr, args[0], true); Plot plot = MainUtil.getPlotFromString(plr, args[0], true);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.listeners.worldedit.WEManager; import com.intellectualcrafters.plot.listeners.worldedit.WEManager;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -34,7 +34,7 @@ public class WE_Anywhere extends SubCommand {
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (PlotSquared.getInstance().worldEdit == null) { if (PS.get().worldEdit == null) {
MainUtil.sendMessage(plr, "&cWorldEdit is not enabled on this server"); MainUtil.sendMessage(plr, "&cWorldEdit is not enabled on this server");
return false; return false;
} }

30
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.Flag;
@ -102,7 +102,7 @@ public class list extends SubCommand {
world = plr.getLocation().getWorld(); world = plr.getLocation().getWorld();
} }
else { else {
Set<String> worlds = PlotSquared.getInstance().getPlotWorlds(); Set<String> worlds = PS.get().getPlotWorlds();
if (worlds.size() == 0) { if (worlds.size() == 0) {
world = "world"; world = "world";
} }
@ -121,7 +121,7 @@ public class list extends SubCommand {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.mine"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.mine");
return false; return false;
} }
plots = new ArrayList<>(PlotSquared.getInstance().getPlots(plr)); plots = new ArrayList<>(PS.get().getPlots(plr));
break; break;
} }
case "shared": { case "shared": {
@ -133,7 +133,7 @@ public class list extends SubCommand {
return false; return false;
} }
plots = new ArrayList<Plot>(); plots = new ArrayList<Plot>();
for (Plot plot : PlotSquared.getInstance().getPlots()) { for (Plot plot : PS.get().getPlots()) {
if (plot.trusted.contains(plr.getUUID()) || plot.members.contains(plr.getUUID())) { if (plot.trusted.contains(plr.getUUID()) || plot.members.contains(plr.getUUID())) {
plots.add(plot); plots.add(plot);
} }
@ -149,7 +149,7 @@ public class list extends SubCommand {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world." + world); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world." + world);
return false; return false;
} }
plots = new ArrayList<>(PlotSquared.getInstance().getPlots(world).values()); plots = new ArrayList<>(PS.get().getPlots(world).values());
break; break;
} }
case "all": { case "all": {
@ -157,7 +157,7 @@ public class list extends SubCommand {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.all"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.all");
return false; return false;
} }
plots = new ArrayList<>(PlotSquared.getInstance().getPlots()); plots = new ArrayList<>(PS.get().getPlots());
break; break;
} }
case "top": { case "top": {
@ -165,7 +165,7 @@ public class list extends SubCommand {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.top"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.top");
return false; return false;
} }
plots = new ArrayList<>(PlotSquared.getInstance().getPlots()); plots = new ArrayList<>(PS.get().getPlots());
Collections.sort(plots, new Comparator<Plot>() { Collections.sort(plots, new Comparator<Plot>() {
@Override @Override
public int compare(Plot p1, Plot p2) { public int compare(Plot p1, Plot p2) {
@ -203,7 +203,7 @@ public class list extends SubCommand {
break; break;
} }
plots = new ArrayList<>(); plots = new ArrayList<>();
for (Plot plot : PlotSquared.getInstance().getPlots()) { for (Plot plot : PS.get().getPlots()) {
final Flag price = FlagManager.getPlotFlag(plot, "price"); final Flag price = FlagManager.getPlotFlag(plot, "price");
if (price != null) { if (price != null) {
plots.add(plot); plots.add(plot);
@ -217,7 +217,7 @@ public class list extends SubCommand {
return false; return false;
} }
plots = new ArrayList<>(); plots = new ArrayList<>();
for (Plot plot : PlotSquared.getInstance().getPlots()) { for (Plot plot : PS.get().getPlots()) {
if (plot.owner == null) { if (plot.owner == null) {
plots.add(plot); plots.add(plot);
} }
@ -230,7 +230,7 @@ public class list extends SubCommand {
return false; return false;
} }
plots = new ArrayList<>(); plots = new ArrayList<>();
for (Plot plot : PlotSquared.getInstance().getPlots()) { for (Plot plot : PS.get().getPlots()) {
if (plot.owner == null) { if (plot.owner == null) {
continue; continue;
} }
@ -241,7 +241,7 @@ public class list extends SubCommand {
break; break;
} }
default: { default: {
if (PlotSquared.getInstance().isPlotWorld(args[0])) { if (PS.get().isPlotWorld(args[0])) {
if (!Permissions.hasPermission(plr, "plots.list.world")) { if (!Permissions.hasPermission(plr, "plots.list.world")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
return false; return false;
@ -250,7 +250,7 @@ public class list extends SubCommand {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world." + args[0]); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world." + args[0]);
return false; return false;
} }
plots = new ArrayList<>(PlotSquared.getInstance().getPlots(args[0]).values()); plots = new ArrayList<>(PS.get().getPlots(args[0]).values());
break; break;
} }
UUID uuid = UUIDHandler.getUUID(args[0]); UUID uuid = UUIDHandler.getUUID(args[0]);
@ -259,7 +259,7 @@ public class list extends SubCommand {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.player"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.player");
return false; return false;
} }
plots = new ArrayList<>(PlotSquared.getInstance().getPlots(uuid)); plots = new ArrayList<>(PS.get().getPlots(uuid));
break; break;
} }
} }
@ -281,10 +281,10 @@ public class list extends SubCommand {
public void displayPlots(PlotPlayer player, List<Plot> plots, int pageSize, int page, String world, String[] args, boolean sort) { public void displayPlots(PlotPlayer player, List<Plot> plots, int pageSize, int page, String world, String[] args, boolean sort) {
if (sort) { if (sort) {
if (world != null) { if (world != null) {
plots = PlotSquared.getInstance().sortPlots(plots, world); plots = PS.get().sortPlots(plots, world);
} }
else { else {
plots = PlotSquared.getInstance().sortPlots(plots); plots = PS.get().sortPlots(plots);
} }
} }
if (page < 0) { if (page < 0) {

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
@ -93,7 +93,7 @@ public class plugin extends SubCommand {
public void run() { public void run() {
final ArrayList<String> strings = new ArrayList<String>() { final ArrayList<String> strings = new ArrayList<String>() {
{ {
add(String.format("&c>> &6PlotSquared (Version: %s)", PlotSquared.getInstance().IMP.getVersion())); add(String.format("&c>> &6PlotSquared (Version: %s)", PS.get().IMP.getVersion()));
add(String.format("&c>> &6Made by Citymonstret and Empire92")); add(String.format("&c>> &6Made by Citymonstret and Empire92"));
add(String.format("&c>> &6Download at &lhttp://www.spigotmc.org/resources/1177")); add(String.format("&c>> &6Download at &lhttp://www.spigotmc.org/resources/1177"));
add(String.format("&c>> &cNewest Version (Spigot): %s", version)); add(String.format("&c>> &cNewest Version (Spigot): %s", version));

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java
View File

@ -24,7 +24,7 @@ import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
/** /**
* Abstract Database class, serves as a base for any connection method (MySQL, SQLite, etc.) * Abstract Database class, serves as a base for any connection method (MySQL, SQLite, etc.)
@ -36,14 +36,14 @@ public abstract class Database {
/** /**
* Plugin instance, use for plugin.getDataFolder() * Plugin instance, use for plugin.getDataFolder()
*/ */
protected final PlotSquared plotsquared; protected final PS plotsquared;
/** /**
* Creates a new Database * Creates a new Database
* *
* @param plotsquared Plugin instance * @param plotsquared Plugin instance
*/ */
protected Database(final PlotSquared plotsquared) { protected Database(final PS plotsquared) {
this.plotsquared = plotsquared; this.plotsquared = plotsquared;
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
View File

@ -26,7 +26,7 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
/** /**
* Connects to and uses a MySQL database * Connects to and uses a MySQL database
@ -51,7 +51,7 @@ public class MySQL extends Database {
* @param username Username * @param username Username
* @param password Password * @param password Password
*/ */
public MySQL(final PlotSquared plotsquared, final String hostname, final String port, final String database, final String username, final String password) { public MySQL(final PS plotsquared, final String hostname, final String port, final String database, final String username, final String password) {
super(plotsquared); super(plotsquared);
this.hostname = hostname; this.hostname = hostname;
this.port = port; this.port = port;

150
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.database; package com.intellectualcrafters.plot.database;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagManager;
@ -76,7 +76,7 @@ public class SQLManager implements AbstractDB {
@Override @Override
public void run() { public void run() {
try { try {
SQLManager.this.connection = PlotSquared.getInstance().getDatabase().forceConnection(); SQLManager.this.connection = PS.get().getDatabase().forceConnection();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -111,7 +111,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Could not set owner for plot " + plot.id); PS.log("&c[ERROR] " + "Could not set owner for plot " + plot.id);
} }
} }
}); });
@ -171,7 +171,7 @@ public class SQLManager implements AbstractDB {
TaskManager.runTaskLater(whenDone, 60); TaskManager.runTaskLater(whenDone, 60);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to set all helpers for plots"); PS.log("&7[WARN] " + "Failed to set all helpers for plots");
} }
} }
}); });
@ -322,7 +322,7 @@ public class SQLManager implements AbstractDB {
last = subList.size(); last = subList.size();
preparedStmt.addBatch(); preparedStmt.addBatch();
} }
PlotSquared.log("&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName()); PS.log("&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
preparedStmt.executeBatch(); preparedStmt.executeBatch();
preparedStmt.clearParameters(); preparedStmt.clearParameters();
preparedStmt.close(); preparedStmt.close();
@ -330,7 +330,7 @@ public class SQLManager implements AbstractDB {
} catch (Exception e) { } catch (Exception e) {
if (Settings.DB.USE_MYSQL) { if (Settings.DB.USE_MYSQL) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&cERROR 1: " + " | " + objList.get(0).getClass().getCanonicalName()); PS.log("&cERROR 1: " + " | " + objList.get(0).getClass().getCanonicalName());
} }
} }
try { try {
@ -363,17 +363,17 @@ public class SQLManager implements AbstractDB {
last = subList.size(); last = subList.size();
preparedStmt.addBatch(); preparedStmt.addBatch();
} }
PlotSquared.log("&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName()); PS.log("&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
preparedStmt.executeBatch(); preparedStmt.executeBatch();
preparedStmt.clearParameters(); preparedStmt.clearParameters();
preparedStmt.close(); preparedStmt.close();
return; return;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&cERROR 2: " + " | " + objList.get(0).getClass().getCanonicalName()); PS.log("&cERROR 2: " + " | " + objList.get(0).getClass().getCanonicalName());
} }
PlotSquared.log("&6[WARN] " + "Could not bulk save!"); PS.log("&6[WARN] " + "Could not bulk save!");
try { try {
PreparedStatement preparedStmt = null; PreparedStatement preparedStmt = null;
String nonBulk = mod.getCreateSQL(); String nonBulk = mod.getCreateSQL();
@ -383,15 +383,15 @@ public class SQLManager implements AbstractDB {
mod.setSQL(preparedStmt, obj); mod.setSQL(preparedStmt, obj);
preparedStmt.addBatch(); preparedStmt.addBatch();
} catch (final Exception e3) { } catch (final Exception e3) {
PlotSquared.log("&c[ERROR] " + "Failed to save " + obj + "!"); PS.log("&c[ERROR] " + "Failed to save " + obj + "!");
} }
} }
PlotSquared.log("&aBatch 3"); PS.log("&aBatch 3");
preparedStmt.executeBatch(); preparedStmt.executeBatch();
preparedStmt.close(); preparedStmt.close();
} catch (Exception e3) { } catch (Exception e3) {
e3.printStackTrace(); e3.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Failed to save all!"); PS.log("&c[ERROR] " + "Failed to save all!");
} }
} }
@ -581,7 +581,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Failed to save plot " + plot.id); PS.log("&c[ERROR] " + "Failed to save plot " + plot.id);
} }
} }
}); });
@ -608,7 +608,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Failed to save plot " + plot.id); PS.log("&c[ERROR] " + "Failed to save plot " + plot.id);
} }
} }
}); });
@ -641,7 +641,7 @@ public class SQLManager implements AbstractDB {
} }
boolean add_constraint; boolean add_constraint;
add_constraint = create == tables.length; add_constraint = create == tables.length;
PlotSquared.log("Creating tables"); PS.log("Creating tables");
final boolean mysql = database.equals("mysql"); final boolean mysql = database.equals("mysql");
final Statement stmt = this.connection.createStatement(); final Statement stmt = this.connection.createStatement();
if (mysql) { if (mysql) {
@ -684,7 +684,7 @@ public class SQLManager implements AbstractDB {
*/ */
@Override @Override
public void delete(final String world, final Plot plot) { public void delete(final String world, final Plot plot) {
PlotSquared.getInstance().removePlot(world, plot.id, false); PS.get().removePlot(world, plot.id, false);
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -717,7 +717,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Failed to delete plot " + plot.id); PS.log("&c[ERROR] " + "Failed to delete plot " + plot.id);
} }
} }
}); });
@ -814,8 +814,8 @@ public class SQLManager implements AbstractDB {
Statement stmt = null; Statement stmt = null;
try { try {
Set<String> worlds = new HashSet<>(); Set<String> worlds = new HashSet<>();
if (PlotSquared.getInstance().config.contains("worlds")) { if (PS.get().config.contains("worlds")) {
worlds = PlotSquared.getInstance().config.getConfigurationSection("worlds").getKeys(false); worlds = PS.get().config.getConfigurationSection("worlds").getKeys(false);
} }
final HashMap<String, UUID> uuids = new HashMap<String, UUID>(); final HashMap<String, UUID> uuids = new HashMap<String, UUID>();
final HashMap<String, Integer> noExist = new HashMap<String, Integer>(); final HashMap<String, Integer> noExist = new HashMap<String, Integer>();
@ -867,7 +867,7 @@ public class SQLManager implements AbstractDB {
} }
plot.settings.ratings.put(user, r.getInt("rating")); plot.settings.ratings.put(user, r.getInt("rating"));
} else { } else {
PlotSquared.log("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry."); PS.log("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
} }
} }
} }
@ -888,7 +888,7 @@ public class SQLManager implements AbstractDB {
if (plot != null) { if (plot != null) {
plot.addTrusted(user); plot.addTrusted(user);
} else { } else {
PlotSquared.log("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry."); PS.log("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
} }
} }
/* /*
@ -907,7 +907,7 @@ public class SQLManager implements AbstractDB {
if (plot != null) { if (plot != null) {
plot.addMember(user); plot.addMember(user);
} else { } else {
PlotSquared.log("&cPLOT " + id + " in plot_trusted does not exist. Please create the plot or remove this entry."); PS.log("&cPLOT " + id + " in plot_trusted does not exist. Please create the plot or remove this entry.");
} }
} }
/* /*
@ -926,7 +926,7 @@ public class SQLManager implements AbstractDB {
if (plot != null) { if (plot != null) {
plot.addDenied(user); plot.addDenied(user);
} else { } else {
PlotSquared.log("&cPLOT " + id + " in plot_denied does not exist. Please create the plot or remove this entry."); PS.log("&cPLOT " + id + " in plot_denied does not exist. Please create the plot or remove this entry.");
} }
} }
r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`"); r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`");
@ -1004,18 +1004,18 @@ public class SQLManager implements AbstractDB {
Flag flag = new Flag(FlagManager.getFlag(element, true), ""); Flag flag = new Flag(FlagManager.getFlag(element, true), "");
flags.put(flag.getKey(), flag); flags.put(flag.getKey(), flag);
} else { } else {
PlotSquared.log("INVALID FLAG: " + element); PS.log("INVALID FLAG: " + element);
} }
} }
} }
if (exception) { if (exception) {
PlotSquared.log("&cPlot " + id + " had an invalid flag. A fix has been attempted."); PS.log("&cPlot " + id + " had an invalid flag. A fix has been attempted.");
PlotSquared.log("&c" + myflags); PS.log("&c" + myflags);
setFlags(id, flags.values()); setFlags(id, flags.values());
} }
plot.settings.flags = flags; plot.settings.flags = flags;
} else { } else {
PlotSquared.log("&cPLOT " + id + " in plot_settings does not exist. Please create the plot or remove this entry."); PS.log("&cPLOT " + id + " in plot_settings does not exist. Please create the plot or remove this entry.");
} }
} }
stmt.close(); stmt.close();
@ -1026,13 +1026,13 @@ public class SQLManager implements AbstractDB {
boolean invalidPlot = false; boolean invalidPlot = false;
for (final String worldname : noExist.keySet()) { for (final String worldname : noExist.keySet()) {
invalidPlot = true; invalidPlot = true;
PlotSquared.log("&c[WARNING] Found " + noExist.get(worldname) + " plots in DB for non existant world; '" + worldname + "'."); PS.log("&c[WARNING] Found " + noExist.get(worldname) + " plots in DB for non existant world; '" + worldname + "'.");
} }
if (invalidPlot) { if (invalidPlot) {
PlotSquared.log("&c[WARNING] - Please create the world/s or remove the plots using the purge command"); PS.log("&c[WARNING] - Please create the world/s or remove the plots using the purge command");
} }
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to load plots."); PS.log("&7[WARN] " + "Failed to load plots.");
e.printStackTrace(); e.printStackTrace();
} }
return newplots; return newplots;
@ -1056,7 +1056,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Could not set merged for plot " + plot.id); PS.log("&7[WARN] " + "Could not set merged for plot " + plot.id);
} }
} }
}); });
@ -1139,7 +1139,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Could not set flag for plot " + plot.id); PS.log("&7[WARN] " + "Could not set flag for plot " + plot.id);
} }
} }
}); });
@ -1158,7 +1158,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Could not set flag for plot " + id); PS.log("&7[WARN] " + "Could not set flag for plot " + id);
} }
} }
}); });
@ -1178,7 +1178,7 @@ public class SQLManager implements AbstractDB {
stmt.executeUpdate(); stmt.executeUpdate();
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set alias for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set alias for plot " + plot.id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1221,11 +1221,11 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!"); PS.log("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!");
return; return;
} }
} }
PlotSquared.log("&6[INFO] " + "SUCCESSFULLY PURGED WORLD '" + world + "'!"); PS.log("&6[INFO] " + "SUCCESSFULLY PURGED WORLD '" + world + "'!");
} }
@Override @Override
@ -1250,11 +1250,11 @@ public class SQLManager implements AbstractDB {
PlotId plotId = iter.next(); PlotId plotId = iter.next();
iter.remove(); iter.remove();
PlotId id = new PlotId(plotId.x, plotId.y); PlotId id = new PlotId(plotId.x, plotId.y);
PlotSquared.getInstance().removePlot(world, new PlotId(id.x, id.y), true); PS.get().removePlot(world, new PlotId(id.x, id.y), true);
} }
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!"); PS.log("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!");
} }
} }
@ -1271,7 +1271,7 @@ public class SQLManager implements AbstractDB {
stmt.executeUpdate(); stmt.executeUpdate();
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set position for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set position for plot " + plot.id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1320,7 +1320,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
r.close(); r.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to load settings for plot: " + id); PS.log("&7[WARN] " + "Failed to load settings for plot: " + id);
e.printStackTrace(); e.printStackTrace();
} }
return h; return h;
@ -1350,7 +1350,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove comment for plot " + plot.id); PS.log("&7[WARN] " + "Failed to remove comment for plot " + plot.id);
} }
} }
}); });
@ -1376,7 +1376,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove comment for plot " + plot.id); PS.log("&7[WARN] " + "Failed to remove comment for plot " + plot.id);
} }
} }
}); });
@ -1421,7 +1421,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
set.close(); set.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to fetch comment"); PS.log("&7[WARN] " + "Failed to fetch comment");
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1445,7 +1445,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to set comment for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set comment for plot " + plot.id);
} }
} }
}); });
@ -1464,7 +1464,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove helper for plot " + plot.id); PS.log("&7[WARN] " + "Failed to remove helper for plot " + plot.id);
} }
} }
}); });
@ -1483,7 +1483,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove trusted user for plot " + plot.id); PS.log("&7[WARN] " + "Failed to remove trusted user for plot " + plot.id);
} }
} }
}); });
@ -1501,7 +1501,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set helper for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set helper for plot " + plot.id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1519,7 +1519,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set helper for id " + id); PS.log("&7[WARN] " + "Failed to set helper for id " + id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1538,7 +1538,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set plot trusted for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set plot trusted for plot " + plot.id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1558,7 +1558,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove denied for plot " + plot.id); PS.log("&7[WARN] " + "Failed to remove denied for plot " + plot.id);
} }
} }
}); });
@ -1576,7 +1576,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set denied for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set denied for plot " + plot.id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1598,7 +1598,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
set.close(); set.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to fetch rating for plot " + plot.getId().toString()); PS.log("&7[WARN] " + "Failed to fetch rating for plot " + plot.getId().toString());
e.printStackTrace(); e.printStackTrace();
} }
return map; return map;
@ -1617,7 +1617,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set denied for plot " + plot.id); PS.log("&7[WARN] " + "Failed to set denied for plot " + plot.id);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1649,7 +1649,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Failed to delete plot cluster: " + cluster.getP1() + ":" + cluster.getP2()); PS.log("&c[ERROR] " + "Failed to delete plot cluster: " + cluster.getP1() + ":" + cluster.getP2());
} }
} }
}); });
@ -1686,8 +1686,8 @@ public class SQLManager implements AbstractDB {
Statement stmt = null; Statement stmt = null;
try { try {
Set<String> worlds = new HashSet<>(); Set<String> worlds = new HashSet<>();
if (PlotSquared.getInstance().config.contains("worlds")) { if (PS.get().config.contains("worlds")) {
worlds = PlotSquared.getInstance().config.getConfigurationSection("worlds").getKeys(false); worlds = PS.get().config.getConfigurationSection("worlds").getKeys(false);
} }
final HashMap<String, UUID> uuids = new HashMap<String, UUID>(); final HashMap<String, UUID> uuids = new HashMap<String, UUID>();
final HashMap<String, Integer> noExist = new HashMap<String, Integer>(); final HashMap<String, Integer> noExist = new HashMap<String, Integer>();
@ -1740,7 +1740,7 @@ public class SQLManager implements AbstractDB {
if (cluster != null) { if (cluster != null) {
cluster.helpers.add(user); cluster.helpers.add(user);
} else { } else {
PlotSquared.log("&cCluster " + id + " in cluster_helpers does not exist. Please create the cluster or remove this entry."); PS.log("&cCluster " + id + " in cluster_helpers does not exist. Please create the cluster or remove this entry.");
} }
} }
/* /*
@ -1759,7 +1759,7 @@ public class SQLManager implements AbstractDB {
if (cluster != null) { if (cluster != null) {
cluster.invited.add(user); cluster.invited.add(user);
} else { } else {
PlotSquared.log("&cCluster " + id + " in cluster_invited does not exist. Please create the cluster or remove this entry."); PS.log("&cCluster " + id + " in cluster_invited does not exist. Please create the cluster or remove this entry.");
} }
} }
r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`"); r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
@ -1834,12 +1834,12 @@ public class SQLManager implements AbstractDB {
} }
} }
if (exception) { if (exception) {
PlotSquared.log("&cCluster " + id + " had an invalid flag. A fix has been attempted."); PS.log("&cCluster " + id + " had an invalid flag. A fix has been attempted.");
PlotSquared.log("&c" + myflags); PS.log("&c" + myflags);
} }
cluster.settings.flags = flags; cluster.settings.flags = flags;
} else { } else {
PlotSquared.log("&cCluster " + id + " in cluster_settings does not exist. Please create the cluster or remove this entry."); PS.log("&cCluster " + id + " in cluster_settings does not exist. Please create the cluster or remove this entry.");
} }
} }
stmt.close(); stmt.close();
@ -1854,13 +1854,13 @@ public class SQLManager implements AbstractDB {
boolean invalidPlot = false; boolean invalidPlot = false;
for (final String w : noExist.keySet()) { for (final String w : noExist.keySet()) {
invalidPlot = true; invalidPlot = true;
PlotSquared.log("&c[WARNING] Found " + noExist.get(w) + " clusters in DB for non existant world; '" + w + "'."); PS.log("&c[WARNING] Found " + noExist.get(w) + " clusters in DB for non existant world; '" + w + "'.");
} }
if (invalidPlot) { if (invalidPlot) {
PlotSquared.log("&c[WARNING] - Please create the world/s or remove the clusters using the purge command"); PS.log("&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
} }
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to load clusters."); PS.log("&7[WARN] " + "Failed to load clusters.");
e.printStackTrace(); e.printStackTrace();
} }
return newClusters; return newClusters;
@ -1888,7 +1888,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Could not set flag for plot " + cluster); PS.log("&7[WARN] " + "Could not set flag for plot " + cluster);
} }
} }
}); });
@ -1908,7 +1908,7 @@ public class SQLManager implements AbstractDB {
stmt.executeUpdate(); stmt.executeUpdate();
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set alias for cluster " + cluster); PS.log("&7[WARN] " + "Failed to set alias for cluster " + cluster);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1928,7 +1928,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove helper for cluster " + cluster); PS.log("&7[WARN] " + "Failed to remove helper for cluster " + cluster);
} }
} }
}); });
@ -1946,7 +1946,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set helper for cluster " + cluster); PS.log("&7[WARN] " + "Failed to set helper for cluster " + cluster);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1977,7 +1977,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&c[ERROR] " + "Failed to save cluster " + cluster); PS.log("&c[ERROR] " + "Failed to save cluster " + cluster);
} }
} }
}); });
@ -2003,7 +2003,7 @@ public class SQLManager implements AbstractDB {
stmt.executeUpdate(); stmt.executeUpdate();
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to rezize cluster " + current); PS.log("&7[WARN] " + "Failed to rezize cluster " + current);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -2023,7 +2023,7 @@ public class SQLManager implements AbstractDB {
stmt.executeUpdate(); stmt.executeUpdate();
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set position for cluster " + cluster); PS.log("&7[WARN] " + "Failed to set position for cluster " + cluster);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -2072,7 +2072,7 @@ public class SQLManager implements AbstractDB {
stmt.close(); stmt.close();
r.close(); r.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to load settings for cluster: " + id); PS.log("&7[WARN] " + "Failed to load settings for cluster: " + id);
e.printStackTrace(); e.printStackTrace();
} }
return h; return h;
@ -2091,7 +2091,7 @@ public class SQLManager implements AbstractDB {
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&7[WARN] " + "Failed to remove invited for cluster " + cluster); PS.log("&7[WARN] " + "Failed to remove invited for cluster " + cluster);
} }
} }
}); });
@ -2109,7 +2109,7 @@ public class SQLManager implements AbstractDB {
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} catch (final SQLException e) { } catch (final SQLException e) {
PlotSquared.log("&7[WARN] " + "Failed to set helper for cluster " + cluster); PS.log("&7[WARN] " + "Failed to set helper for cluster " + cluster);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -2120,7 +2120,7 @@ public class SQLManager implements AbstractDB {
public boolean deleteTables() { public boolean deleteTables() {
try { try {
SQLManager.this.connection.close(); SQLManager.this.connection.close();
SQLManager.this.connection = PlotSquared.getInstance().getDatabase().forceConnection(); SQLManager.this.connection = PS.get().getDatabase().forceConnection();
final Statement stmt = this.connection.createStatement(); final Statement stmt = this.connection.createStatement();
stmt.addBatch("DROP TABLE `" + prefix + "cluster_invited`"); stmt.addBatch("DROP TABLE `" + prefix + "cluster_invited`");
stmt.addBatch("DROP TABLE `" + prefix + "cluster_helpers`"); stmt.addBatch("DROP TABLE `" + prefix + "cluster_helpers`");

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.database; package com.intellectualcrafters.plot.database;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -41,7 +41,7 @@ public class SQLite extends Database {
* *
* @param dbLocation Location of the Database (Must end in .db) * @param dbLocation Location of the Database (Must end in .db)
*/ */
public SQLite(final PlotSquared plotsquared, final String dbLocation) { public SQLite(final PS plotsquared, final String dbLocation) {
super(plotsquared); super(plotsquared);
this.dbLocation = dbLocation; this.dbLocation = dbLocation;
} }
@ -51,15 +51,15 @@ public class SQLite extends Database {
if (checkConnection()) { if (checkConnection()) {
return this.connection; return this.connection;
} }
if (!PlotSquared.getInstance().IMP.getDirectory().exists()) { if (!PS.get().IMP.getDirectory().exists()) {
PlotSquared.getInstance().IMP.getDirectory().mkdirs(); PS.get().IMP.getDirectory().mkdirs();
} }
final File file = new File(this.dbLocation); final File file = new File(this.dbLocation);
if (!(file.exists())) { if (!(file.exists())) {
try { try {
file.createNewFile(); file.createNewFile();
} catch (final IOException e) { } catch (final IOException e) {
PlotSquared.log("&cUnable to create database!"); PS.log("&cUnable to create database!");
} }
} }
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.database.plotme; package com.intellectualcrafters.plot.database.plotme;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.database.SQLite; import com.intellectualcrafters.plot.database.SQLite;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -44,7 +44,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
return DriverManager.getConnection(con, user, password); return DriverManager.getConnection(con, user, password);
// return new MySQL(plotsquared, hostname, port, database, username, password) // return new MySQL(plotsquared, hostname, port, database, username, password)
} else { } else {
return new SQLite(PlotSquared.getInstance(), dataFolder + File.separator + "plots.db").openConnection(); return new SQLite(PS.get(), dataFolder + File.separator + "plots.db").openConnection();
} }
} }
catch (SQLException | ClassNotFoundException e) {} catch (SQLException | ClassNotFoundException e) {}
@ -112,8 +112,8 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
final String name = r.getString("owner"); final String name = r.getString("owner");
final String world = LikePlotMeConverter.getWorld(r.getString("world")); final String world = LikePlotMeConverter.getWorld(r.getString("world"));
if (!plots.containsKey(world)) { if (!plots.containsKey(world)) {
int plot = PlotSquared.getInstance().config.getInt("worlds." + world + ".plot.size"); int plot = PS.get().config.getInt("worlds." + world + ".plot.size");
int path = PlotSquared.getInstance().config.getInt("worlds." + world + ".road.width"); int path = PS.get().config.getInt("worlds." + world + ".road.width");
if (plot == 0 && path == 0) { if (plot == 0 && path == 0) {
} }

60
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.database.plotme; package com.intellectualcrafters.plot.database.plotme;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.generator.HybridGen; import com.intellectualcrafters.plot.generator.HybridGen;
@ -75,7 +75,7 @@ public class LikePlotMeConverter {
} }
private void sendMessage(final String message) { private void sendMessage(final String message) {
PlotSquared.log("&3PlotMe&8->&3PlotSquared&8: &7" + message); PS.log("&3PlotMe&8->&3PlotSquared&8: &7" + message);
} }
public String getPlotMePath() { public String getPlotMePath() {
@ -150,23 +150,23 @@ public class LikePlotMeConverter {
try { try {
String actualWorldName = getWorld(world); String actualWorldName = getWorld(world);
final Integer pathwidth = plotConfig.getInt("worlds." + world + ".PathWidth"); // final Integer pathwidth = plotConfig.getInt("worlds." + world + ".PathWidth"); //
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.width", pathwidth); PS.get().config.set("worlds." + actualWorldName + ".road.width", pathwidth);
final Integer plotsize = plotConfig.getInt("worlds." + world + ".PlotSize"); // final Integer plotsize = plotConfig.getInt("worlds." + world + ".PlotSize"); //
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.size", plotsize); PS.get().config.set("worlds." + actualWorldName + ".plot.size", plotsize);
final String wallblock = plotConfig.getString("worlds." + world + ".WallBlockId"); // final String wallblock = plotConfig.getString("worlds." + world + ".WallBlockId"); //
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".wall.block", wallblock); PS.get().config.set("worlds." + actualWorldName + ".wall.block", wallblock);
final String floor = plotConfig.getString("worlds." + world + ".PlotFloorBlockId"); // final String floor = plotConfig.getString("worlds." + world + ".PlotFloorBlockId"); //
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.floor", Arrays.asList(floor)); PS.get().config.set("worlds." + actualWorldName + ".plot.floor", Arrays.asList(floor));
final String filling = plotConfig.getString("worlds." + world + ".PlotFillingBlockId"); // final String filling = plotConfig.getString("worlds." + world + ".PlotFillingBlockId"); //
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.filling", Arrays.asList(filling)); PS.get().config.set("worlds." + actualWorldName + ".plot.filling", Arrays.asList(filling));
final String road = plotConfig.getString("worlds." + world + ".RoadMainBlockId"); final String road = plotConfig.getString("worlds." + world + ".RoadMainBlockId");
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.block", road); PS.get().config.set("worlds." + actualWorldName + ".road.block", road);
Integer height = plotConfig.getInt("worlds." + world + ".RoadHeight"); // Integer height = plotConfig.getInt("worlds." + world + ".RoadHeight"); //
if (height == null) { if (height == null) {
height = 64; height = 64;
} }
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.height", height); PS.get().config.set("worlds." + actualWorldName + ".road.height", height);
PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); PS.get().config.save(PS.get().configFile);
} catch (final Exception e) { } 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"); sendMessage("&c-- &lFailed to save configuration for world '" + world + "'\nThis will need to be done using the setup command, or manually");
} }
@ -194,32 +194,32 @@ public class LikePlotMeConverter {
if (pathwidth == null) { if (pathwidth == null) {
pathwidth = 7; pathwidth = 7;
} }
PlotSquared.getInstance().config.set("worlds." + world + ".road.width", pathwidth); PS.get().config.set("worlds." + world + ".road.width", pathwidth);
Integer plotsize = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PlotSize"); // Integer plotsize = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PlotSize"); //
if (plotsize == null) { if (plotsize == null) {
plotsize = 32; plotsize = 32;
} }
PlotSquared.getInstance().config.set("worlds." + world + ".plot.size", plotsize); PS.get().config.set("worlds." + world + ".plot.size", plotsize);
String wallblock = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".WallBlock"); // String wallblock = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".WallBlock"); //
if (wallblock == null) { if (wallblock == null) {
wallblock = "44"; wallblock = "44";
} }
PlotSquared.getInstance().config.set("worlds." + world + ".wall.block", wallblock); PS.get().config.set("worlds." + world + ".wall.block", wallblock);
String floor = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".PlotFloorBlock"); // String floor = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".PlotFloorBlock"); //
if (floor == null) { if (floor == null) {
floor = "2"; floor = "2";
} }
PlotSquared.getInstance().config.set("worlds." + world + ".plot.floor", Arrays.asList(floor)); PS.get().config.set("worlds." + world + ".plot.floor", Arrays.asList(floor));
String filling = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".FillBlock"); // String filling = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".FillBlock"); //
if (filling == null) { if (filling == null) {
filling = "3"; filling = "3";
} }
PlotSquared.getInstance().config.set("worlds." + world + ".plot.filling", Arrays.asList(filling)); PS.get().config.set("worlds." + world + ".plot.filling", Arrays.asList(filling));
String road = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".RoadMainBlock"); String road = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".RoadMainBlock");
if (road == null) { if (road == null) {
road = "5"; road = "5";
} }
PlotSquared.getInstance().config.set("worlds." + world + ".road.block", road); PS.get().config.set("worlds." + world + ".road.block", road);
Integer height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); // Integer height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
if ((height == null) || (height == 0)) { if ((height == null) || (height == 0)) {
height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".GroundHeight"); // height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".GroundHeight"); //
@ -227,10 +227,10 @@ public class LikePlotMeConverter {
height = 64; height = 64;
} }
} }
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".road.height", height); PS.get().config.set("worlds." + actualWorldName + ".road.height", height);
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".plot.height", height); PS.get().config.set("worlds." + actualWorldName + ".plot.height", height);
PlotSquared.getInstance().config.set("worlds." + actualWorldName + ".wall.height", height); PS.get().config.set("worlds." + actualWorldName + ".wall.height", height);
PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); PS.get().config.save(PS.get().configFile);
} }
} catch (final Exception e) { } catch (final Exception e) {
} }
@ -238,14 +238,14 @@ public class LikePlotMeConverter {
for (final String world : plots.keySet()) { for (final String world : plots.keySet()) {
int duplicate = 0; int duplicate = 0;
for (final Plot plot : plots.get(world).values()) { for (final Plot plot : plots.get(world).values()) {
if (!PlotSquared.getInstance().getPlots(world).containsKey(plot.id)) { if (!PS.get().getPlots(world).containsKey(plot.id)) {
createdPlots.add(plot); createdPlots.add(plot);
} else { } else {
duplicate++; duplicate++;
} }
} }
if (duplicate > 0) { if (duplicate > 0) {
PlotSquared.log("&c[WARNING] Found " + duplicate + " duplicate plots already in DB for world: '" + world + "'. Have you run the converter already?"); PS.log("&c[WARNING] Found " + duplicate + " duplicate plots already in DB for world: '" + world + "'. Have you run the converter already?");
} }
} }
sendMessage("Creating plot DB"); sendMessage("Creating plot DB");
@ -254,16 +254,16 @@ public class LikePlotMeConverter {
@Override @Override
public void run() { public void run() {
sendMessage("&aDatabase conversion is now complete!"); sendMessage("&aDatabase conversion is now complete!");
PlotSquared.log("&c - Stop the server"); PS.log("&c - Stop the server");
PlotSquared.log("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml"); PS.log("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
PlotSquared.log("&c - Correct any generator settings that haven't copied to 'settings.yml' properly"); PS.log("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
PlotSquared.log("&c - Start the server"); PS.log("&c - Start the server");
PlotSquared.getInstance().setAllPlotsRaw(DBFunc.getPlots()); PS.get().setAllPlotsRaw(DBFunc.getPlots());
} }
}); });
sendMessage("Saving configuration..."); sendMessage("Saving configuration...");
try { try {
PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); PS.get().config.save(PS.get().configFile);
} catch (final IOException e) { } catch (final IOException e) {
sendMessage(" - &cFailed to save configuration."); sendMessage(" - &cFailed to save configuration.");
} }
@ -285,7 +285,7 @@ public class LikePlotMeConverter {
} }
final String actualWorldName = world.getName(); final String actualWorldName = world.getName();
sendMessage("Reloading generator for world: '" + actualWorldName + "'..."); sendMessage("Reloading generator for world: '" + actualWorldName + "'...");
PlotSquared.getInstance().removePlotWorld(actualWorldName); PS.get().removePlotWorld(actualWorldName);
if (MV) { if (MV) {
// unload world with MV // unload world with MV
Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + actualWorldName); Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + actualWorldName);
@ -321,7 +321,7 @@ public class LikePlotMeConverter {
} }
}); });
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&/end/"); PS.log("&/end/");
} }
return true; return true;
} }

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.flag; package com.intellectualcrafters.plot.flag;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
@ -90,15 +90,15 @@ public class FlagManager {
} }
public static boolean addFlag(AbstractFlag af, boolean reserved) { public static boolean addFlag(AbstractFlag af, boolean reserved) {
PlotSquared.log(C.PREFIX.s() + "&8 - Adding flag: &7" + af); PS.log(C.PREFIX.s() + "&8 - Adding flag: &7" + af);
for (PlotWorld plotworld : PlotSquared.getInstance().getPlotWorldObjects()) { for (PlotWorld plotworld : PS.get().getPlotWorldObjects()) {
Flag flag = ((HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone()).get(af.getKey()); Flag flag = ((HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone()).get(af.getKey());
if (flag != null) { if (flag != null) {
flag.setKey(af); flag.setKey(af);
} }
} }
if (PlotSquared.getInstance().getAllPlotsRaw() != null) { if (PS.get().getAllPlotsRaw() != null) {
for (final Plot plot : PlotSquared.getInstance().getPlotsRaw()) { for (final Plot plot : PS.get().getPlotsRaw()) {
Flag flag = plot.settings.flags.get(af.getKey()); Flag flag = plot.settings.flags.get(af.getKey());
if (flag != null) { if (flag != null) {
flag.setKey(af); flag.setKey(af);
@ -115,7 +115,7 @@ public class FlagManager {
public static Flag getSettingFlag(final String world, final PlotSettings settings, final String id) { public static Flag getSettingFlag(final String world, final PlotSettings settings, final String id) {
Flag flag = settings.flags.get(id); Flag flag = settings.flags.get(id);
if (flag == null) { if (flag == null) {
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); PlotWorld plotworld = PS.get().getPlotWorld(world);
if (plotworld == null) { if (plotworld == null) {
return null; return null;
} }
@ -227,7 +227,7 @@ public class FlagManager {
} }
public static Collection<Flag> getSettingFlags(final String world, final PlotSettings settings) { public static Collection<Flag> getSettingFlags(final String world, final PlotSettings settings) {
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); PlotWorld plotworld = PS.get().getPlotWorld(world);
HashMap<String, Flag> map; HashMap<String, Flag> map;
if (plotworld == null) { if (plotworld == null) {
map = new HashMap<>(); map = new HashMap<>();

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
@ -38,7 +38,7 @@ public class AugmentedPopulator extends BlockPopulator {
initCache(); initCache();
this.cluster = cluster; this.cluster = cluster;
this.generator = generator; this.generator = generator;
this.plotworld = PlotSquared.getInstance().getPlotWorld(world); this.plotworld = PS.get().getPlotWorld(world);
this.manager = generator.getPlotManager(); this.manager = generator.getPlotManager();
this.p = p; this.p = p;
this.b = b; this.b = b;

22
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java
View File

@ -1,7 +1,7 @@
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import com.intellectualcrafters.plot.BukkitMain; import com.intellectualcrafters.plot.BukkitMain;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ChunkManager;
@ -233,7 +233,7 @@ public class BukkitHybridUtils extends HybridUtils {
public void run() { public void run() {
int index = chunks.size() - 1; int index = chunks.size() - 1;
if (index == -1) { if (index == -1) {
PlotSquared.getInstance().TASK.cancelTask(TaskManager.tasks.get(currentIndex)); PS.get().TASK.cancelTask(TaskManager.tasks.get(currentIndex));
TaskManager.runTaskAsync(run); TaskManager.runTaskAsync(run);
return; return;
} }
@ -288,7 +288,7 @@ public class BukkitHybridUtils extends HybridUtils {
chunks.add(world.getChunkAt(X,Z)); chunks.add(world.getChunkAt(X,Z));
} }
} }
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plot.world); PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
if (!(plotworld instanceof ClassicPlotWorld)) { if (!(plotworld instanceof ClassicPlotWorld)) {
whenDone.value = -1; whenDone.value = -1;
TaskManager.runTaskLater(whenDone, 1); TaskManager.runTaskLater(whenDone, 1);
@ -426,11 +426,11 @@ public class BukkitHybridUtils extends HybridUtils {
public void run() { public void run() {
count.increment(); count.increment();
if (count.intValue() % 20 == 0) { if (count.intValue() % 20 == 0) {
PlotSquared.log("PROGRESS: " + ((100 * (2048 - chunks.size())) / 2048) + "%"); PS.log("PROGRESS: " + ((100 * (2048 - chunks.size())) / 2048) + "%");
} }
if (regions.size() == 0 && chunks.size() == 0) { if (regions.size() == 0 && chunks.size() == 0) {
BukkitHybridUtils.UPDATE = false; BukkitHybridUtils.UPDATE = false;
PlotSquared.log(C.PREFIX.s() + "Finished road conversion"); PS.log(C.PREFIX.s() + "Finished road conversion");
Bukkit.getScheduler().cancelTask(BukkitHybridUtils.this.task); Bukkit.getScheduler().cancelTask(BukkitHybridUtils.this.task);
return; return;
} else { } else {
@ -438,8 +438,8 @@ public class BukkitHybridUtils extends HybridUtils {
if (chunks.size() < 1024) { if (chunks.size() < 1024) {
if (regions.size() > 0) { if (regions.size() > 0) {
final ChunkLoc loc = regions.get(0); final ChunkLoc loc = regions.get(0);
PlotSquared.log("&3Updating .mcr: " + loc.x + ", " + loc.z + " (aprrox 1024 chunks)"); PS.log("&3Updating .mcr: " + loc.x + ", " + loc.z + " (aprrox 1024 chunks)");
PlotSquared.log(" - Remaining: " + regions.size()); PS.log(" - Remaining: " + regions.size());
chunks.addAll(getChunks(loc)); chunks.addAll(getChunks(loc));
regions.remove(0); regions.remove(0);
System.gc(); System.gc();
@ -449,7 +449,7 @@ public class BukkitHybridUtils extends HybridUtils {
long diff = System.currentTimeMillis() + 25; long diff = System.currentTimeMillis() + 25;
if (System.currentTimeMillis() - last > 1200 && last != 0) { if (System.currentTimeMillis() - last > 1200 && last != 0) {
last = 0; last = 0;
PlotSquared.log(C.PREFIX.s() + "Detected low TPS. Rescheduling in 30s"); PS.log(C.PREFIX.s() + "Detected low TPS. Rescheduling in 30s");
while (chunks.size() > 0) { while (chunks.size() > 0) {
ChunkLoc chunk = chunks.get(0); ChunkLoc chunk = chunks.get(0);
chunks.remove(0); chunks.remove(0);
@ -478,7 +478,7 @@ public class BukkitHybridUtils extends HybridUtils {
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
final ChunkLoc loc = regions.get(0); final ChunkLoc loc = regions.get(0);
PlotSquared.log("&c[ERROR]&7 Could not update '" + world + "/region/r." + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)"); PS.log("&c[ERROR]&7 Could not update '" + world + "/region/r." + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)");
final int sx = loc.x << 5; final int sx = loc.x << 5;
final int sz = loc.z << 5; final int sz = loc.z << 5;
for (int x = sx; x < (sx + 32); x++) { for (int x = sx; x < (sx + 32); x++) {
@ -486,8 +486,8 @@ public class BukkitHybridUtils extends HybridUtils {
ChunkManager.manager.unloadChunk(world, new ChunkLoc(x, z)); ChunkManager.manager.unloadChunk(world, new ChunkLoc(x, z));
} }
} }
PlotSquared.log("&d - Potentially skipping 1024 chunks"); PS.log("&d - Potentially skipping 1024 chunks");
PlotSquared.log("&d - TODO: recommend chunkster if corrupt"); PS.log("&d - TODO: recommend chunkster if corrupt");
} }
} }
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java
View File

@ -3,7 +3,7 @@ package com.intellectualcrafters.plot.generator;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Configuration; import com.intellectualcrafters.plot.config.Configuration;
import com.intellectualcrafters.plot.config.ConfigurationNode; import com.intellectualcrafters.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotBlock;
@ -49,7 +49,7 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
@Override @Override
public void loadConfiguration(final ConfigurationSection config) { public void loadConfiguration(final ConfigurationSection config) {
if (!config.contains("plot.height")) { if (!config.contains("plot.height")) {
PlotSquared.log(" - &cConfiguration is null? (" + config.getCurrentPath() + ")"); PS.log(" - &cConfiguration is null? (" + config.getCurrentPath() + ")");
} }
this.PLOT_BEDROCK = config.getBoolean("plot.bedrock"); this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height")); this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.commands.Template; import com.intellectualcrafters.plot.commands.Template;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
@ -40,7 +40,7 @@ public class HybridPlotManager extends ClassicPlotManager {
@Override @Override
public void exportTemplate(final PlotWorld plotworld) throws IOException { public void exportTemplate(final PlotWorld plotworld) throws IOException {
final HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld)))); final HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld))));
final String psRoot = PlotSquared.getInstance().IMP.getDirectory() + File.separator; final String psRoot = PS.get().IMP.getDirectory() + File.separator;
final String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plotworld.worldname + File.separator; final String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plotworld.worldname + File.separator;
final String newDir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator; final String newDir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator;
try { try {

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
View File

@ -27,7 +27,7 @@ import java.util.Map.Entry;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Configuration; import com.intellectualcrafters.plot.config.Configuration;
import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotBlock;
@ -64,7 +64,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
@Override @Override
public void loadConfiguration(final ConfigurationSection config) { public void loadConfiguration(final ConfigurationSection config) {
if (!config.contains("plot.height")) { if (!config.contains("plot.height")) {
PlotSquared.log(" - &cConfiguration is null? (" + config.getCurrentPath() + ")"); PS.log(" - &cConfiguration is null? (" + config.getCurrentPath() + ")");
} }
this.PLOT_BEDROCK = config.getBoolean("plot.bedrock"); this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height")); this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));
@ -88,7 +88,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
try { try {
setupSchematics(); setupSchematics();
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c - road schematics are disabled for this world."); PS.log("&c - road schematics are disabled for this world.");
} }
} }
@ -152,7 +152,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
} }
} }
if ((schem1 == null) || (schem2 == null) || (this.ROAD_WIDTH == 0)) { if ((schem1 == null) || (schem2 == null) || (this.ROAD_WIDTH == 0)) {
PlotSquared.log(C.PREFIX.s() + "&3 - schematic: &7false"); PS.log(C.PREFIX.s() + "&3 - schematic: &7false");
return; return;
} }
this.ROAD_SCHEMATIC_ENABLED = true; this.ROAD_SCHEMATIC_ENABLED = true;

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.object.schematic.PlotItem; import com.intellectualcrafters.plot.object.schematic.PlotItem;
import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.BlockManager;
@ -106,7 +106,7 @@ public class HybridPop extends PlotPopulator {
@Override @Override
public void populate(World world, RegionWrapper requiredRegion, PseudoRandom random, int cx, int cz) { public void populate(World world, RegionWrapper requiredRegion, PseudoRandom random, int cx, int cz) {
PlotSquared.getInstance().getPlotManager(world.getName()); PS.get().getPlotManager(world.getName());
int sx = (short) ((this.X) % this.size); int sx = (short) ((this.X) % this.size);
int sz = (short) ((this.Z) % this.size); int sz = (short) ((this.Z) % this.size);

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
View File

@ -1,7 +1,7 @@
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import com.intellectualcrafters.jnbt.CompoundTag; import com.intellectualcrafters.jnbt.CompoundTag;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.BlockManager;
import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ChunkManager;
@ -25,7 +25,7 @@ public abstract class HybridUtils {
final String world = plot.world; final String world = plot.world;
final Location bot = MainUtil.getPlotBottomLoc(world, plot.id); final Location bot = MainUtil.getPlotBottomLoc(world, plot.id);
final Location top = MainUtil.getPlotTopLoc(world, plot.id); final Location top = MainUtil.getPlotTopLoc(world, plot.id);
final HybridPlotWorld plotworld = (HybridPlotWorld) PlotSquared.getInstance().getPlotWorld(world); final HybridPlotWorld plotworld = (HybridPlotWorld) PS.get().getPlotWorld(world);
final int sx = (bot.getX() - plotworld.ROAD_WIDTH) + 1; final int sx = (bot.getX() - plotworld.ROAD_WIDTH) + 1;
final int sz = bot.getZ() + 1; final int sz = bot.getZ() + 1;
final int sy = plotworld.ROAD_HEIGHT; final int sy = plotworld.ROAD_HEIGHT;
@ -44,7 +44,7 @@ public abstract class HybridUtils {
final Location pos4 = new Location(world, tx, ty, tz); final Location pos4 = new Location(world, tx, ty, tz);
final CompoundTag sideroad = SchematicHandler.manager.getCompoundTag(world, pos1, pos2); final CompoundTag sideroad = SchematicHandler.manager.getCompoundTag(world, pos1, pos2);
final CompoundTag intersection = SchematicHandler.manager.getCompoundTag(world, pos3, pos4); final CompoundTag intersection = SchematicHandler.manager.getCompoundTag(world, pos3, pos4);
final String dir = PlotSquared.getInstance().IMP.getDirectory() + File.separator + "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.world + File.separator; final String dir = PS.get().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(sideroad, dir + "sideroad.schematic");
SchematicHandler.manager.save(intersection, dir + "intersection.schematic"); SchematicHandler.manager.save(intersection, dir + "intersection.schematic");
plotworld.ROAD_SCHEMATIC_ENABLED = true; plotworld.ROAD_SCHEMATIC_ENABLED = true;
@ -61,7 +61,7 @@ public abstract class HybridUtils {
final int z = chunk.z << 4; final int z = chunk.z << 4;
final int ex = x + 15; final int ex = x + 15;
final int ez = z + 15; final int ez = z + 15;
final HybridPlotWorld plotworld = (HybridPlotWorld) PlotSquared.getInstance().getPlotWorld(world); final HybridPlotWorld plotworld = (HybridPlotWorld) PS.get().getPlotWorld(world);
extend = Math.min(extend, 255 - plotworld.ROAD_HEIGHT - plotworld.SCHEMATIC_HEIGHT); extend = Math.min(extend, 255 - plotworld.ROAD_HEIGHT - plotworld.SCHEMATIC_HEIGHT);
if (!plotworld.ROAD_SCHEMATIC_ENABLED) { if (!plotworld.ROAD_SCHEMATIC_ENABLED) {
return false; return false;
@ -77,7 +77,7 @@ public abstract class HybridUtils {
toCheck = c1 ^ c2; toCheck = c1 ^ c2;
} }
} }
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotId id1 = manager.getPlotId(plotworld, x, 0, z); final PlotId id1 = manager.getPlotId(plotworld, x, 0, z);
final PlotId id2 = manager.getPlotId(plotworld, ex, 0, ez); final PlotId id2 = manager.getPlotId(plotworld, ex, 0, ez);
if ((id1 == null) || (id2 == null) || (id1 != id2)) { if ((id1 == null) || (id2 == null) || (id1 != id2)) {

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
@ -122,7 +122,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
// This means you are in the intersection // This means you are in the intersection
final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_WIDTH, 0, z + dpw.ROAD_WIDTH); final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_WIDTH, 0, z + dpw.ROAD_WIDTH);
final PlotId id = MainUtil.getPlotAbs(loc); final PlotId id = MainUtil.getPlotAbs(loc);
final Plot plot = PlotSquared.getInstance().getPlots(plotworld.worldname).get(id); final Plot plot = PS.get().getPlots(plotworld.worldname).get(id);
if (plot == null) { if (plot == null) {
return null; return null;
} }
@ -135,7 +135,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
// You are on a road running West to East (yeah, I named the var poorly) // You are on a road running West to East (yeah, I named the var poorly)
final Location loc = new Location(plotworld.worldname, x, 0, z + dpw.ROAD_WIDTH); final Location loc = new Location(plotworld.worldname, x, 0, z + dpw.ROAD_WIDTH);
final PlotId id = MainUtil.getPlotAbs(loc); final PlotId id = MainUtil.getPlotAbs(loc);
final Plot plot = PlotSquared.getInstance().getPlots(plotworld.worldname).get(id); final Plot plot = PS.get().getPlots(plotworld.worldname).get(id);
if (plot == null) { if (plot == null) {
return null; return null;
} }
@ -148,7 +148,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
// This is the road separating an Eastern and Western plot // This is the road separating an Eastern and Western plot
final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_WIDTH, 0, z); final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_WIDTH, 0, z);
final PlotId id = MainUtil.getPlotAbs(loc); final PlotId id = MainUtil.getPlotAbs(loc);
final Plot plot = PlotSquared.getInstance().getPlots(plotworld.worldname).get(id); final Plot plot = PS.get().getPlots(plotworld.worldname).get(id);
if (plot == null) { if (plot == null) {
return null; return null;
} }
@ -158,7 +158,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
return null; return null;
} }
final PlotId id = new PlotId(dx, dz); final PlotId id = new PlotId(dx, dz);
final Plot plot = PlotSquared.getInstance().getPlots(plotworld.worldname).get(id); final Plot plot = PS.get().getPlots(plotworld.worldname).get(id);
if (plot == null) { if (plot == null) {
return id; return id;
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java
View File

@ -2,7 +2,7 @@ package com.intellectualcrafters.plot.generator;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
public abstract class SquarePlotWorld extends GridPlotWorld { public abstract class SquarePlotWorld extends GridPlotWorld {
public static int PLOT_WIDTH_DEFAULT = 42; public static int PLOT_WIDTH_DEFAULT = 42;
@ -13,7 +13,7 @@ public abstract class SquarePlotWorld extends GridPlotWorld {
@Override @Override
public void loadConfiguration(final ConfigurationSection config) { public void loadConfiguration(final ConfigurationSection config) {
if (!config.contains("plot.height")) { if (!config.contains("plot.height")) {
PlotSquared.log(" - &cConfiguration is null? (" + config.getCurrentPath() + ")"); PS.log(" - &cConfiguration is null? (" + config.getCurrentPath() + ")");
} }
this.PLOT_WIDTH = config.getInt("plot.size"); this.PLOT_WIDTH = config.getInt("plot.size");
this.ROAD_WIDTH = config.getInt("road.width"); this.ROAD_WIDTH = config.getInt("road.width");

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/ChunkListener.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -47,7 +47,7 @@ public class ChunkListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (!PlotSquared.getInstance().isPlotWorld(chunk.getWorld().getName())) { if (!PS.get().isPlotWorld(chunk.getWorld().getName())) {
return; return;
} }
Entity[] entities = chunk.getEntities(); Entity[] entities = chunk.getEntities();
@ -85,7 +85,7 @@ public class ChunkListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (!PlotSquared.getInstance().isPlotWorld(chunk.getWorld().getName())) { if (!PS.get().isPlotWorld(chunk.getWorld().getName())) {
return; return;
} }
Entity[] entities = chunk.getEntities(); Entity[] entities = chunk.getEntities();
@ -108,7 +108,7 @@ public class ChunkListener implements Listener {
if (!chunk.isLoaded()) { if (!chunk.isLoaded()) {
Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex)); Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
TaskManager.tasks.remove(currentIndex); TaskManager.tasks.remove(currentIndex);
PlotSquared.log("[PlotSquared] &aSuccessfully processed and unloaded chunk!"); PS.log("[PlotSquared] &aSuccessfully processed and unloaded chunk!");
chunk.unload(true, true); chunk.unload(true, true);
return; return;
} }
@ -116,7 +116,7 @@ public class ChunkListener implements Listener {
if (tiles.length == 0) { if (tiles.length == 0) {
Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex)); Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
TaskManager.tasks.remove(currentIndex); TaskManager.tasks.remove(currentIndex);
PlotSquared.log("[PlotSquared] &aSuccessfully processed and unloaded chunk!"); PS.log("[PlotSquared] &aSuccessfully processed and unloaded chunk!");
chunk.unload(true, true); chunk.unload(true, true);
return; return;
} }
@ -126,7 +126,7 @@ public class ChunkListener implements Listener {
if (i >= tiles.length) { if (i >= tiles.length) {
Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex)); Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
TaskManager.tasks.remove(currentIndex); TaskManager.tasks.remove(currentIndex);
PlotSquared.log("[PlotSquared] &aSuccessfully processed and unloaded chunk!"); PS.log("[PlotSquared] &aSuccessfully processed and unloaded chunk!");
chunk.unload(true, true); chunk.unload(true, true);
return; return;
} }
@ -139,7 +139,7 @@ public class ChunkListener implements Listener {
} }
public boolean processChunk(Chunk chunk, boolean unload) { public boolean processChunk(Chunk chunk, boolean unload) {
if (!PlotSquared.getInstance().isPlotWorld(chunk.getWorld().getName())) { if (!PS.get().isPlotWorld(chunk.getWorld().getName())) {
return false; return false;
} }
Entity[] entities = chunk.getEntities(); Entity[] entities = chunk.getEntities();
@ -150,11 +150,11 @@ public class ChunkListener implements Listener {
ent.remove(); ent.remove();
} }
} }
PlotSquared.log("[PlotSquared] &a detected unsafe chunk and processed: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4)); PS.log("[PlotSquared] &a detected unsafe chunk and processed: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4));
} }
if (tiles.length > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES) { if (tiles.length > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES) {
if (unload) { if (unload) {
PlotSquared.log("[PlotSquared] &c detected unsafe chunk: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4)); PS.log("[PlotSquared] &c detected unsafe chunk: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4));
cleanChunk(chunk); cleanChunk(chunk);
return true; return true;
} }

90
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -81,7 +81,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onRedstoneEvent(BlockRedstoneEvent event) { public void onRedstoneEvent(BlockRedstoneEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
if (!PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (!PS.get().isPlotWorld(loc.getWorld())) {
return; return;
} }
Plot plot = MainUtil.getPlot(loc); Plot plot = MainUtil.getPlot(loc);
@ -144,7 +144,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onPhysicsEvent(BlockPhysicsEvent event) { public void onPhysicsEvent(BlockPhysicsEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
if (!PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (!PS.get().isPlotWorld(loc.getWorld())) {
return; return;
} }
switch (block.getType()) { switch (block.getType()) {
@ -180,7 +180,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onProjectileHit(ProjectileHitEvent event) { public void onProjectileHit(ProjectileHitEvent event) {
Projectile entity = event.getEntity(); Projectile entity = event.getEntity();
Location loc = BukkitUtil.getLocation(entity); Location loc = BukkitUtil.getLocation(entity);
if (!PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (!PS.get().isPlotWorld(loc.getWorld())) {
return; return;
} }
Plot plot = MainUtil.getPlot(loc); Plot plot = MainUtil.getPlot(loc);
@ -264,7 +264,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final UUID uuid = pp.getUUID(); final UUID uuid = pp.getUUID();
UUIDHandler.add(name, uuid); UUIDHandler.add(name, uuid);
ExpireManager.dates.put(uuid, System.currentTimeMillis()); ExpireManager.dates.put(uuid, System.currentTimeMillis());
if (PlotSquared.getInstance().worldEdit != null) { if (PS.get().worldEdit != null) {
if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) { if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
WEManager.bypass.add(pp.getName()); WEManager.bypass.add(pp.getName());
} }
@ -291,7 +291,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
TaskManager.TELEPORT_QUEUE.remove(player.getName()); TaskManager.TELEPORT_QUEUE.remove(player.getName());
} }
final String worldname = t.getWorld(); final String worldname = t.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(worldname)) { if (!PS.get().isPlotWorld(worldname)) {
return; return;
} }
if (MainUtil.worldBorder.containsKey(worldname)) { if (MainUtil.worldBorder.containsKey(worldname)) {
@ -348,10 +348,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onChat(final AsyncPlayerChatEvent event) { public void onChat(final AsyncPlayerChatEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final String world = player.getWorld().getName(); final String world = player.getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotPlayer plr = BukkitUtil.getPlayer(player); final PlotPlayer plr = BukkitUtil.getPlayer(player);
if (!plotworld.PLOT_CHAT && (plr.getMeta("chat") == null || !(Boolean) plr.getMeta("chat"))) { if (!plotworld.PLOT_CHAT && (plr.getMeta("chat") == null || !(Boolean) plr.getMeta("chat"))) {
return; return;
@ -381,7 +381,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void BlockDestroy(final BlockBreakEvent event) { public void BlockDestroy(final BlockBreakEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final String world = player.getWorld().getName(); final String world = player.getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation()); final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
@ -431,7 +431,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onBigBoom(final EntityExplodeEvent event) { public void onBigBoom(final EntityExplodeEvent event) {
Location loc = BukkitUtil.getLocation(event.getLocation()); Location loc = BukkitUtil.getLocation(event.getLocation());
final String world = loc.getWorld(); final String world = loc.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
@ -463,7 +463,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onWorldChanged(final PlayerChangedWorldEvent event) { public void onWorldChanged(final PlayerChangedWorldEvent event) {
final PlotPlayer player = BukkitUtil.getPlayer(event.getPlayer()); final PlotPlayer player = BukkitUtil.getPlayer(event.getPlayer());
if (PlotSquared.getInstance().worldEdit != null) { if (PS.get().worldEdit != null) {
if (!Permissions.hasPermission(player, "plots.worldedit.bypass")) { if (!Permissions.hasPermission(player, "plots.worldedit.bypass")) {
WEManager.bypass.remove(player.getName()); WEManager.bypass.remove(player.getName());
} }
@ -478,7 +478,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPeskyMobsChangeTheWorldLikeWTFEvent(final EntityChangeBlockEvent event) { public void onPeskyMobsChangeTheWorldLikeWTFEvent(final EntityChangeBlockEvent event) {
final String world = event.getBlock().getWorld().getName(); final String world = event.getBlock().getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final Entity e = event.getEntity(); final Entity e = event.getEntity();
@ -528,7 +528,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onEntityBlockForm(final EntityBlockFormEvent e) { public void onEntityBlockForm(final EntityBlockFormEvent e) {
final String world = e.getBlock().getWorld().getName(); final String world = e.getBlock().getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
if ((!(e.getEntity() instanceof Player))) { if ((!(e.getEntity() instanceof Player))) {
@ -542,7 +542,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onBS(final BlockSpreadEvent e) { public void onBS(final BlockSpreadEvent e) {
final Block b = e.getBlock(); final Block b = e.getBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) { if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true); e.setCancelled(true);
} }
@ -553,7 +553,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onBF(final BlockFormEvent e) { public void onBF(final BlockFormEvent e) {
final Block b = e.getBlock(); final Block b = e.getBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) { if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true); e.setCancelled(true);
} }
@ -565,14 +565,14 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (player == null) { if (player == null) {
final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation()); final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) { if (MainUtil.isPlotRoad(loc)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }
final String world = player.getWorld().getName(); final String world = player.getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation()); final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
@ -622,7 +622,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onFade(final BlockFadeEvent e) { public void onFade(final BlockFadeEvent e) {
final Block b = e.getBlock(); final Block b = e.getBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) { if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true); e.setCancelled(true);
} }
@ -633,7 +633,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onChange(final BlockFromToEvent e) { public void onChange(final BlockFromToEvent e) {
final Block b = e.getToBlock(); final Block b = e.getToBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) { if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true); e.setCancelled(true);
} }
@ -650,7 +650,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onGrow(final BlockGrowEvent e) { public void onGrow(final BlockGrowEvent e) {
final Block b = e.getBlock(); final Block b = e.getBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) { if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true); e.setCancelled(true);
} }
@ -662,7 +662,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final Block block = event.getBlock(); final Block block = event.getBlock();
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
String world = loc.getWorld(); String world = loc.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
Plot plot = MainUtil.getPlot(loc); Plot plot = MainUtil.getPlot(loc);
@ -704,7 +704,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final Block block = event.getBlock(); final Block block = event.getBlock();
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
String world = loc.getWorld(); String world = loc.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
if (block.getType() != Material.PISTON_STICKY_BASE && block.getType() != Material.PISTON_BASE && block.getType() != Material.PISTON_MOVING_PIECE) { if (block.getType() != Material.PISTON_STICKY_BASE && block.getType() != Material.PISTON_BASE && block.getType() != Material.PISTON_MOVING_PIECE) {
@ -740,7 +740,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onStructureGrow(final StructureGrowEvent e) { public void onStructureGrow(final StructureGrowEvent e) {
if (!PlotSquared.getInstance().isPlotWorld(e.getWorld().getName())) { if (!PS.get().isPlotWorld(e.getWorld().getName())) {
return; return;
} }
final List<BlockState> blocks = e.getBlocks(); final List<BlockState> blocks = e.getBlocks();
@ -778,7 +778,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final String world = player.getWorld().getName(); final String world = player.getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final Location loc = BukkitUtil.getLocation(event.getClickedBlock().getLocation()); final Location loc = BukkitUtil.getLocation(event.getClickedBlock().getLocation());
@ -835,13 +835,13 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
final Location loc = BukkitUtil.getLocation(event.getLocation()); final Location loc = BukkitUtil.getLocation(event.getLocation());
final String world = loc.getWorld(); final String world = loc.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
if (!MainUtil.isPlotArea(loc)) { if (!MainUtil.isPlotArea(loc)) {
return; return;
} }
final PlotWorld pW = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld pW = PS.get().getPlotWorld(world);
final CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason(); final CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
if ((reason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG || reason == CreatureSpawnEvent.SpawnReason.DISPENSE_EGG) && !pW.SPAWN_EGGS) { if ((reason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG || reason == CreatureSpawnEvent.SpawnReason.DISPENSE_EGG) && !pW.SPAWN_EGGS) {
event.setCancelled(true); event.setCancelled(true);
@ -868,7 +868,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
Block block = event.getBlock(); Block block = event.getBlock();
World world = block.getWorld(); World world = block.getWorld();
String worldname = world.getName(); String worldname = world.getName();
if (!PlotSquared.getInstance().isPlotWorld(worldname)) { if (!PS.get().isPlotWorld(worldname)) {
return; return;
} }
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
@ -966,7 +966,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} else { } else {
return; return;
} }
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
if (e.getCause() == BlockIgniteEvent.IgniteCause.LIGHTNING) { if (e.getCause() == BlockIgniteEvent.IgniteCause.LIGHTNING) {
@ -1022,7 +1022,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final Location t = BukkitUtil.getLocation(event.getTo()); final Location t = BukkitUtil.getLocation(event.getTo());
final Location q = new Location(t.getWorld(), t.getX(), 64, t.getZ()); final Location q = new Location(t.getWorld(), t.getX(), 64, t.getZ());
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (PlotSquared.getInstance().isPlotWorld(q.getWorld())) { if (PS.get().isPlotWorld(q.getWorld())) {
final Plot plot = MainUtil.getPlot(q); final Plot plot = MainUtil.getPlot(q);
if (plot != null) { if (plot != null) {
final PlotPlayer pp = BukkitUtil.getPlayer(player); final PlotPlayer pp = BukkitUtil.getPlayer(player);
@ -1056,7 +1056,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final BlockFace bf = e.getBlockFace(); final BlockFace bf = e.getBlockFace();
final Block b = e.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ()).getBlock(); final Block b = e.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ()).getBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
final PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer()); final PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
Plot plot = MainUtil.getPlot(loc); Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
@ -1126,17 +1126,17 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer()); PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
ExpireManager.dates.put(pp.getUUID(), System.currentTimeMillis()); ExpireManager.dates.put(pp.getUUID(), System.currentTimeMillis());
EventUtil.unregisterPlayer(pp); EventUtil.unregisterPlayer(pp);
if (PlotSquared.getInstance().worldEdit != null) { if (PS.get().worldEdit != null) {
WEManager.bypass.remove(pp.getName()); WEManager.bypass.remove(pp.getName());
} }
if (Settings.DELETE_PLOTS_ON_BAN && event.getPlayer().isBanned()) { if (Settings.DELETE_PLOTS_ON_BAN && event.getPlayer().isBanned()) {
final Collection<Plot> plots = PlotSquared.getInstance().getPlots(pp.getName()).values(); final Collection<Plot> plots = PS.get().getPlots(pp.getName()).values();
for (final Plot plot : plots) { for (final Plot plot : plots) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(plot.world); final PlotManager manager = PS.get().getPlotManager(plot.world);
manager.clearPlot(plotworld, plot, true, null); manager.clearPlot(plotworld, plot, true, null);
DBFunc.delete(plot.world, plot); DBFunc.delete(plot.world, plot);
PlotSquared.log(String.format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned", plot.getId(), event.getPlayer().getName())); PS.log(String.format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned", plot.getId(), event.getPlayer().getName()));
} }
} }
BukkitUtil.removePlayer(pp.getName()); BukkitUtil.removePlayer(pp.getName());
@ -1146,7 +1146,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onBucketFill(final PlayerBucketFillEvent e) { public void onBucketFill(final PlayerBucketFillEvent e) {
final Block b = e.getBlockClicked(); final Block b = e.getBlockClicked();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
Plot plot = MainUtil.getPlot(loc); Plot plot = MainUtil.getPlot(loc);
@ -1190,7 +1190,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void onHangingPlace(final HangingPlaceEvent e) { public void onHangingPlace(final HangingPlaceEvent e) {
final Block b = e.getBlock(); final Block b = e.getBlock();
final Location loc = BukkitUtil.getLocation(b.getLocation()); final Location loc = BukkitUtil.getLocation(b.getLocation());
if (PlotSquared.getInstance().isPlotWorld(loc.getWorld())) { if (PS.get().isPlotWorld(loc.getWorld())) {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
Plot plot = MainUtil.getPlot(loc); Plot plot = MainUtil.getPlot(loc);
@ -1232,7 +1232,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
final Player p = (Player) r; final Player p = (Player) r;
final Location l = BukkitUtil.getLocation(e.getEntity()); final Location l = BukkitUtil.getLocation(e.getEntity());
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
if (PlotSquared.getInstance().isPlotWorld(l.getWorld())) { if (PS.get().isPlotWorld(l.getWorld())) {
Plot plot = MainUtil.getPlot(l); Plot plot = MainUtil.getPlot(l);
if (plot == null) { if (plot == null) {
if (MainUtil.isPlotAreaAbs(l)) { if (MainUtil.isPlotAreaAbs(l)) {
@ -1269,7 +1269,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerInteractEntity(final PlayerInteractEntityEvent e) { public void onPlayerInteractEntity(final PlayerInteractEntityEvent e) {
final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation()); final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
if (PlotSquared.getInstance().isPlotWorld(l.getWorld())) { if (PS.get().isPlotWorld(l.getWorld())) {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
Plot plot = MainUtil.getPlot(l); Plot plot = MainUtil.getPlot(l);
@ -1328,11 +1328,11 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onVehicleDestroy(final VehicleDestroyEvent e) { public void onVehicleDestroy(final VehicleDestroyEvent e) {
final Location l = BukkitUtil.getLocation(e.getVehicle()); final Location l = BukkitUtil.getLocation(e.getVehicle());
if (PlotSquared.getInstance().isPlotWorld(l.getWorld())) { if (PS.get().isPlotWorld(l.getWorld())) {
final Entity d = e.getAttacker(); final Entity d = e.getAttacker();
if (d instanceof Player) { if (d instanceof Player) {
final Player p = (Player) d; final Player p = (Player) d;
PlotSquared.getInstance().getPlotWorld(l.getWorld()); PS.get().getPlotWorld(l.getWorld());
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
Plot plot = MainUtil.getPlot(l); Plot plot = MainUtil.getPlot(l);
if (plot == null) { if (plot == null) {
@ -1382,7 +1382,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
TaskManager.TELEPORT_QUEUE.remove(name); TaskManager.TELEPORT_QUEUE.remove(name);
} }
} }
if (PlotSquared.getInstance().isPlotWorld(l.getWorld())) { if (PS.get().isPlotWorld(l.getWorld())) {
Player p = null; Player p = null;
Projectile projectile = null; Projectile projectile = null;
if (damager instanceof Player) { if (damager instanceof Player) {
@ -1421,7 +1421,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
if (p != null) { if (p != null) {
final boolean aPlr = victim instanceof Player; final boolean aPlr = victim instanceof Player;
final PlotWorld pW = PlotSquared.getInstance().getPlotWorld(l.getWorld()); final PlotWorld pW = PS.get().getPlotWorld(l.getWorld());
if (!aPlr && pW.PVE && (!(victim instanceof ItemFrame) && !(victim.getType().getTypeId() == 30))) { if (!aPlr && pW.PVE && (!(victim instanceof ItemFrame) && !(victim.getType().getTypeId() == 30))) {
return; return;
} else if (aPlr && pW.PVP) { } else if (aPlr && pW.PVP) {
@ -1491,7 +1491,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerEggThrow(final PlayerEggThrowEvent e) { public void onPlayerEggThrow(final PlayerEggThrowEvent e) {
final Location l = BukkitUtil.getLocation(e.getEgg().getLocation()); final Location l = BukkitUtil.getLocation(e.getEgg().getLocation());
if (PlotSquared.getInstance().isPlotWorld(l.getWorld())) { if (PS.get().isPlotWorld(l.getWorld())) {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
Plot plot = MainUtil.getPlot(l); Plot plot = MainUtil.getPlot(l);
@ -1528,7 +1528,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
public void BlockCreate(final BlockPlaceEvent event) { public void BlockCreate(final BlockPlaceEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final String world = player.getWorld().getName(); final String world = player.getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final PlotPlayer pp = BukkitUtil.getPlayer(player); final PlotPlayer pp = BukkitUtil.getPlayer(player);

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -36,7 +36,7 @@ public class PlayerEvents_1_8 extends PlotListener implements Listener {
return; return;
} }
HumanEntity entity = event.getWhoClicked(); HumanEntity entity = event.getWhoClicked();
if (!(entity instanceof Player) || !PlotSquared.getInstance().isPlotWorld(entity.getWorld().getName())) { if (!(entity instanceof Player) || !PS.get().isPlotWorld(entity.getWorld().getName())) {
return; return;
} }
Player player = (Player) entity; Player player = (Player) entity;
@ -123,7 +123,7 @@ public class PlayerEvents_1_8 extends PlotListener implements Listener {
} }
final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation()); final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
String world = l.getWorld(); String world = l.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
Plot plot = MainUtil.getPlot(l); Plot plot = MainUtil.getPlot(l);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8_3.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagManager;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -20,7 +20,7 @@ public class PlayerEvents_1_8_3 implements Listener {
Block block = event.getBlock(); Block block = event.getBlock();
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
final String world = loc.getWorld(); final String world = loc.getWorld();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent;
@ -48,7 +48,7 @@ import java.util.UUID;
*/ */
public class PlotListener extends APlotListener { public class PlotListener extends APlotListener {
public void textures(final Player p) { public void textures(final Player p) {
if ((Settings.PLOT_SPECIFIC_RESOURCE_PACK.length() > 1) && PlotSquared.getInstance().isPlotWorld(p.getWorld().getName())) { if ((Settings.PLOT_SPECIFIC_RESOURCE_PACK.length() > 1) && PS.get().isPlotWorld(p.getWorld().getName())) {
p.setResourcePack(Settings.PLOT_SPECIFIC_RESOURCE_PACK); p.setResourcePack(Settings.PLOT_SPECIFIC_RESOURCE_PACK);
} }
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/TNTListener.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagManager;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -33,7 +33,7 @@ public class TNTListener implements Listener {
} }
World world = entity.getWorld(); World world = entity.getWorld();
String worldname = world.getName(); String worldname = world.getName();
if (!PlotSquared.getInstance().isPlotWorld(worldname)) { if (!PS.get().isPlotWorld(worldname)) {
return; return;
} }
Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(entity)); Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(entity));

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners; package com.intellectualcrafters.plot.listeners;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotGenerator;
import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
import org.bukkit.World; import org.bukkit.World;
@ -31,10 +31,10 @@ public class WorldEvents implements Listener {
final ChunkGenerator gen = world.getGenerator(); final ChunkGenerator gen = world.getGenerator();
if (gen instanceof PlotGenerator) { if (gen instanceof PlotGenerator) {
// //
PlotSquared.getInstance().loadWorld(name, (PlotGenerator) gen); PS.get().loadWorld(name, (PlotGenerator) gen);
} else { } else {
if (PlotSquared.getInstance().config.contains("worlds." + name)) { if (PS.get().config.contains("worlds." + name)) {
PlotSquared.getInstance().loadWorld(name, null); PS.get().loadWorld(name, null);
} }
} }
lastWorld = null; lastWorld = null;

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/ProcessedWEExtent.java
View File

@ -2,7 +2,7 @@ package com.intellectualcrafters.plot.listeners.worldedit;
import java.util.HashSet; import java.util.HashSet;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.RegionWrapper;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
@ -72,7 +72,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
BScount++; BScount++;
if (BScount > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES) { if (BScount > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES) {
BSblocked = true; BSblocked = true;
PlotSquared.log("&cPlotSquared detected unsafe WorldEdit: " + (location.getBlockX()) + "," + (location.getBlockZ())); PS.log("&cPlotSquared detected unsafe WorldEdit: " + (location.getBlockX()) + "," + (location.getBlockZ()));
} }
} }
} }
@ -90,7 +90,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
Ecount++; Ecount++;
if (Ecount > Settings.CHUNK_PROCESSOR_MAX_ENTITIES) { if (Ecount > Settings.CHUNK_PROCESSOR_MAX_ENTITIES) {
Eblocked = true; Eblocked = true;
PlotSquared.log("&cPlotSquared detected unsafe WorldEdit: " + (location.getBlockX()) + "," + (location.getBlockZ())); PS.log("&cPlotSquared detected unsafe WorldEdit: " + (location.getBlockX()) + "," + (location.getBlockZ()));
} }
if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockZ())) { if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockZ())) {
return super.createEntity(location, entity); return super.createEntity(location, entity);

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners.worldedit; package com.intellectualcrafters.plot.listeners.worldedit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -93,7 +93,7 @@ public class WEListener implements Listener {
} }
public boolean checkSelection(Player p, PlotPlayer pp, int modifier, long max, Cancellable e) { public boolean checkSelection(Player p, PlotPlayer pp, int modifier, long max, Cancellable e) {
final Selection selection = PlotSquared.getInstance().worldEdit.getSelection(p); final Selection selection = PS.get().worldEdit.getSelection(p);
if (selection == null) { if (selection == null) {
return true; return true;
} }
@ -137,7 +137,7 @@ public class WEListener implements Listener {
public boolean onPlayerCommand(final PlayerCommandPreprocessEvent e) { public boolean onPlayerCommand(final PlayerCommandPreprocessEvent e) {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p); final PlotPlayer pp = BukkitUtil.getPlayer(p);
if (!PlotSquared.getInstance().isPlotWorld(p.getWorld().getName())) { if (!PS.get().isPlotWorld(p.getWorld().getName())) {
return true; return true;
} }
String cmd = e.getMessage().toLowerCase(); String cmd = e.getMessage().toLowerCase();

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEManager.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners.worldedit; package com.intellectualcrafters.plot.listeners.worldedit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -26,7 +26,7 @@ public class WEManager {
public static HashSet<RegionWrapper> getMask(PlotPlayer player) { public static HashSet<RegionWrapper> getMask(PlotPlayer player) {
HashSet<RegionWrapper> regions = new HashSet<>(); HashSet<RegionWrapper> regions = new HashSet<>();
UUID uuid = player.getUUID(); UUID uuid = player.getUUID();
for (Plot plot : PlotSquared.getInstance().getPlots(player.getLocation().getWorld()).values()) { for (Plot plot : PS.get().getPlots(player.getLocation().getWorld()).values()) {
if (!plot.settings.getMerged(0) && !plot.settings.getMerged(3)) { if (!plot.settings.getMerged(0) && !plot.settings.getMerged(3)) {
if (Settings.WE_ALLOW_HELPER ? plot.isAdded(uuid) : (plot.isOwner(uuid) || plot.trusted.contains(uuid))) { if (Settings.WE_ALLOW_HELPER ? plot.isAdded(uuid) : (plot.isOwner(uuid) || plot.trusted.contains(uuid))) {
Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1); Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WESubscriber.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.listeners.worldedit; package com.intellectualcrafters.plot.listeners.worldedit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -19,7 +19,7 @@ public class WESubscriber {
@Subscribe(priority=Priority.VERY_EARLY) @Subscribe(priority=Priority.VERY_EARLY)
public void onEditSession(EditSessionEvent event) { public void onEditSession(EditSessionEvent event) {
String world = event.getWorld().getName(); String world = event.getWorld().getName();
if (!PlotSquared.getInstance().isPlotWorld(world)) { if (!PS.get().isPlotWorld(world)) {
return; return;
} }
Actor actor = event.getActor(); Actor actor = event.getActor();

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.object; package com.intellectualcrafters.plot.object;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.listeners.WorldEvents; import com.intellectualcrafters.plot.listeners.WorldEvents;
import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ChunkManager;
import org.bukkit.World; import org.bukkit.World;
@ -71,8 +71,8 @@ public abstract class PlotGenerator extends ChunkGenerator {
public List<BlockPopulator> getDefaultPopulators(World world) { public List<BlockPopulator> getDefaultPopulators(World world) {
try { try {
if (!loaded) { if (!loaded) {
PlotSquared.getInstance().loadWorld(WorldEvents.getName(world), this); PS.get().loadWorld(WorldEvents.getName(world), this);
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(WorldEvents.getName(world)); PlotWorld plotworld = PS.get().getPlotWorld(WorldEvents.getName(world));
if (!plotworld.MOB_SPAWNING) { if (!plotworld.MOB_SPAWNING) {
if (!plotworld.SPAWN_EGGS) { if (!plotworld.SPAWN_EGGS) {
world.setSpawnFlags(false, false); world.setSpawnFlags(false, false);
@ -103,7 +103,7 @@ public abstract class PlotGenerator extends ChunkGenerator {
public short[][] generateExtBlockSections(World world, Random r, int cx, int cz, BiomeGrid biomes) { public short[][] generateExtBlockSections(World world, Random r, int cx, int cz, BiomeGrid biomes) {
try { try {
if (!loaded) { if (!loaded) {
PlotSquared.getInstance().loadWorld(WorldEvents.getName(world), this); PS.get().loadWorld(WorldEvents.getName(world), this);
loaded = true; loaded = true;
} }
final int prime = 13; final int prime = 13;
@ -115,7 +115,7 @@ public abstract class PlotGenerator extends ChunkGenerator {
this.X = cx << 4; this.X = cx << 4;
this.Z = cz << 4; this.Z = cz << 4;
if (ChunkManager.FORCE_PASTE) { if (ChunkManager.FORCE_PASTE) {
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world.getName()); PlotWorld plotworld = PS.get().getPlotWorld(world.getName());
Biome biome = Biome.valueOf(plotworld.PLOT_BIOME); Biome biome = Biome.valueOf(plotworld.PLOT_BIOME);
for (short x = 0; x < 16; x++) { for (short x = 0; x < 16; x++) {
for (short z = 0; z < 16; z++) { for (short z = 0; z < 16; z++) {

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.object; package com.intellectualcrafters.plot.object;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Configuration; import com.intellectualcrafters.plot.config.Configuration;
import com.intellectualcrafters.plot.config.ConfigurationNode; import com.intellectualcrafters.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
@ -110,7 +110,7 @@ public abstract class PlotWorld {
return false; return false;
} }
PlotWorld plotworld = (PlotWorld) obj; PlotWorld plotworld = (PlotWorld) obj;
ConfigurationSection section = PlotSquared.getInstance().config.getConfigurationSection("worlds"); ConfigurationSection section = PS.get().config.getConfigurationSection("worlds");
for (ConfigurationNode setting : plotworld.getSettingNodes()) { for (ConfigurationNode setting : plotworld.getSettingNodes()) {
Object constant = section.get(plotworld.worldname + "." + setting.getConstant()); Object constant = section.get(plotworld.worldname + "." + setting.getConstant());
if (constant == null) { if (constant == null) {
@ -185,7 +185,7 @@ public abstract class PlotWorld {
this.DEFAULT_FLAGS = FlagManager.parseFlags(flags); this.DEFAULT_FLAGS = FlagManager.parseFlags(flags);
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log("&cInvalid default flags for " + this.worldname + ": " + StringUtils.join(flags, ",")); PS.log("&cInvalid default flags for " + this.worldname + ": " + StringUtils.join(flags, ","));
this.DEFAULT_FLAGS = new HashMap<>(); this.DEFAULT_FLAGS = new HashMap<>();
} }
this.PVP = config.getBoolean("event.pvp"); this.PVP = config.getBoolean("event.pvp");

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java
View File

@ -31,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.util.EulerAngle; import org.bukkit.util.EulerAngle;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
public class EntityWrapper { public class EntityWrapper {
public short id; public short id;
@ -212,7 +212,7 @@ public class EntityWrapper {
return; return;
} }
default: { default: {
PlotSquared.log("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType()); PS.log("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
return; return;
} }
// MISC // // MISC //
@ -469,7 +469,7 @@ public class EntityWrapper {
return entity; return entity;
} }
default: { default: {
PlotSquared.log("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType()); PS.log("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
return entity; return entity;
} }
// MISC // // MISC //

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/titles/HackTitle.java
View File

@ -2,7 +2,7 @@ package com.intellectualcrafters.plot.titles;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.BukkitPlayer; import com.intellectualcrafters.plot.object.BukkitPlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -16,7 +16,7 @@ public class HackTitle extends AbstractTitle {
title.setSubtitleColor(sub_color); title.setSubtitleColor(sub_color);
title.send(((BukkitPlayer) player).player); title.send(((BukkitPlayer) player).player);
} catch (final Throwable e) { } catch (final Throwable e) {
PlotSquared.log("&cYour server version does not support titles!"); PS.log("&cYour server version does not support titles!");
Settings.TITLES = false; Settings.TITLES = false;
AbstractTitle.TITLE_CLASS = null; AbstractTitle.TITLE_CLASS = null;
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BukkitSchematicHandler.java
View File

@ -38,7 +38,7 @@ import com.intellectualcrafters.jnbt.ListTag;
import com.intellectualcrafters.jnbt.ShortTag; import com.intellectualcrafters.jnbt.ShortTag;
import com.intellectualcrafters.jnbt.StringTag; import com.intellectualcrafters.jnbt.StringTag;
import com.intellectualcrafters.jnbt.Tag; import com.intellectualcrafters.jnbt.Tag;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.schematic.StateWrapper; import com.intellectualcrafters.plot.object.schematic.StateWrapper;
@ -61,13 +61,13 @@ public class BukkitSchematicHandler extends SchematicHandler {
for (j = (pos1.getZ() / 16) * 16; j < (16 + ((pos2.getZ() / 16) * 16)); j += 16) { for (j = (pos1.getZ() / 16) * 16; j < (16 + ((pos2.getZ() / 16) * 16)); j += 16) {
boolean result = ChunkManager.manager.loadChunk(world, new ChunkLoc(i, j)); boolean result = ChunkManager.manager.loadChunk(world, new ChunkLoc(i, j));
if (!result) { if (!result) {
PlotSquared.log("&cIllegal selection. Cannot save non-existent chunk at " + (i / 16) + ", " + (j / 16)); PS.log("&cIllegal selection. Cannot save non-existent chunk at " + (i / 16) + ", " + (j / 16));
return null; return null;
} }
} }
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&cIllegal selection. Cannot save corrupt chunk at " + (i / 16) + ", " + (j / 16)); PS.log("&cIllegal selection. Cannot save corrupt chunk at " + (i / 16) + ", " + (j / 16));
return null; return null;
} }
final int width = (pos2.getX() - pos1.getX()) + 1; final int width = (pos2.getX() - pos1.getX()) + 1;

28
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.generator.AugmentedPopulator; import com.intellectualcrafters.plot.generator.AugmentedPopulator;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
@ -44,8 +44,8 @@ public class ClusterManager {
final PlotId center = getCenterPlot(cluster); final PlotId center = getCenterPlot(cluster);
toReturn = MainUtil.getPlotHome(cluster.world, center); toReturn = MainUtil.getPlotHome(cluster.world, center);
if (toReturn.getY() == 0) { if (toReturn.getY() == 0) {
final PlotManager manager = PlotSquared.getInstance().getPlotManager(cluster.world); final PlotManager manager = PS.get().getPlotManager(cluster.world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(cluster.world); final PlotWorld plotworld = PS.get().getPlotWorld(cluster.world);
final Location loc = manager.getSignLoc(plotworld, MainUtil.getPlot(cluster.world, center)); final Location loc = manager.getSignLoc(plotworld, MainUtil.getPlot(cluster.world, center));
toReturn.setY(loc.getY()); toReturn.setY(loc.getY());
} }
@ -67,15 +67,15 @@ public class ClusterManager {
public static Location getClusterBottom(final PlotCluster cluster) { public static Location getClusterBottom(final PlotCluster cluster) {
final String world = cluster.world; final String world = cluster.world;
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
return manager.getPlotBottomLocAbs(plotworld, cluster.getP1()); return manager.getPlotBottomLocAbs(plotworld, cluster.getP1());
} }
public static Location getClusterTop(final PlotCluster cluster) { public static Location getClusterTop(final PlotCluster cluster) {
final String world = cluster.world; final String world = cluster.world;
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
return manager.getPlotTopLocAbs(plotworld, cluster.getP2()); return manager.getPlotTopLocAbs(plotworld, cluster.getP2());
} }
@ -93,8 +93,8 @@ public class ClusterManager {
public static boolean contains(final PlotCluster cluster, final Location loc) { public static boolean contains(final PlotCluster cluster, final Location loc) {
final String world = loc.getWorld(); final String world = loc.getWorld();
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final Location bot = manager.getPlotBottomLocAbs(plotworld, cluster.getP1()); final Location bot = manager.getPlotBottomLocAbs(plotworld, cluster.getP1());
final Location top = manager.getPlotTopLocAbs(plotworld, cluster.getP2()).add(1, 0, 1); final Location top = manager.getPlotTopLocAbs(plotworld, cluster.getP2()).add(1, 0, 1);
return (bot.getX() < loc.getX()) && (bot.getZ() < loc.getZ()) && (top.getX() > loc.getX()) && (top.getZ() > loc.getZ()); return (bot.getX() < loc.getX()) && (bot.getZ() < loc.getZ()) && (top.getX() > loc.getX()) && (top.getZ() > loc.getZ());
@ -148,8 +148,8 @@ public class ClusterManager {
public static PlotCluster getCluster(final Location loc) { public static PlotCluster getCluster(final Location loc) {
final String world = loc.getWorld(); final String world = loc.getWorld();
PlotManager manager = PlotSquared.getInstance().getPlotManager(world); PlotManager manager = PS.get().getPlotManager(world);
PlotId id = manager.getPlotIdAbs(PlotSquared.getInstance().getPlotWorld(world), loc.getX(), loc.getY(), loc.getZ()); PlotId id = manager.getPlotIdAbs(PS.get().getPlotWorld(world), loc.getX(), loc.getY(), loc.getZ());
if (id != null) { if (id != null) {
return getCluster(world, id); return getCluster(world, id);
} }
@ -210,12 +210,12 @@ public class ClusterManager {
int xw; int xw;
int zw; int zw;
final String world = loc.getWorld(); final String world = loc.getWorld();
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (plotworld == null) { if (plotworld == null) {
xw = 39; xw = 39;
zw = 39; zw = 39;
} else { } else {
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final Location al = manager.getPlotBottomLocAbs(plotworld, a); final Location al = manager.getPlotBottomLocAbs(plotworld, a);
final Location bl = manager.getPlotBottomLocAbs(plotworld, b); final Location bl = manager.getPlotBottomLocAbs(plotworld, b);
xw = bl.getX() - al.getX(); xw = bl.getX() - al.getX();
@ -235,7 +235,7 @@ public class ClusterManager {
int i = 0; int i = 0;
final Random rand = new Random(); final Random rand = new Random();
final World world = Bukkit.getWorld(cluster.world); final World world = Bukkit.getWorld(cluster.world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(cluster.world); final PlotWorld plotworld = PS.get().getPlotWorld(cluster.world);
final Location bot = getClusterBottom(cluster); final Location bot = getClusterBottom(cluster);
final Location top = getClusterTop(cluster); final Location top = getClusterTop(cluster);
final int minChunkX = bot.getX() >> 4; final int minChunkX = bot.getX() >> 4;

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.object.*;
@ -17,7 +17,7 @@ public abstract class EventUtil {
SetupUtils.setupMap.remove(name); SetupUtils.setupMap.remove(name);
} }
CmdConfirm.removePending(name); CmdConfirm.removePending(name);
PlotSquared.getInstance().IMP.unregister(player); PS.get().IMP.unregister(player);
} }
public abstract boolean callClaim(final PlotPlayer player, final Plot plot, final boolean auto); public abstract boolean callClaim(final PlotPlayer player, final Plot plot, final boolean auto);

44
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -43,7 +43,7 @@ public class ExpireManager {
public void run() { public void run() {
try { try {
final List<Plot> plots = getOldPlots(world); final List<Plot> plots = getOldPlots(world);
PlotSquared.log("&7[&5Expire&dManager&7] &3Found " + plots.size() + " expired plots for " + world + "!"); PS.log("&7[&5Expire&dManager&7] &3Found " + plots.size() + " expired plots for " + world + "!");
expiredPlots.put(world, plots); expiredPlots.put(world, plots);
updatingPlots.put(world, false); updatingPlots.put(world, false);
} }
@ -64,24 +64,24 @@ public class ExpireManager {
@Override @Override
public void run() { public void run() {
try { try {
for (final String world : PlotSquared.getInstance().getPlotWorldsString()) { for (final String world : PS.get().getPlotWorldsString()) {
if (!ExpireManager.updatingPlots.containsKey(world)) { if (!ExpireManager.updatingPlots.containsKey(world)) {
ExpireManager.updatingPlots.put(world, false); ExpireManager.updatingPlots.put(world, false);
} }
final Boolean updating = ExpireManager.updatingPlots.get(world); final Boolean updating = ExpireManager.updatingPlots.get(world);
if (updating) { if (updating) {
PlotSquared.log("&7[&5Expire&dManager&7] &3Waiting on fetch..."); PS.log("&7[&5Expire&dManager&7] &3Waiting on fetch...");
return; return;
} }
if (!expiredPlots.containsKey(world)) { if (!expiredPlots.containsKey(world)) {
PlotSquared.log("&7[&5Expire&dManager&7] &3Updating expired plots for: " + world); PS.log("&7[&5Expire&dManager&7] &3Updating expired plots for: " + world);
updateExpired(world); updateExpired(world);
return; return;
} }
final List<Plot> plots = expiredPlots.get(world); final List<Plot> plots = expiredPlots.get(world);
if ((plots == null) || (plots.size() == 0)) { if ((plots == null) || (plots.size() == 0)) {
if (updateExpired(world)) { if (updateExpired(world)) {
PlotSquared.log("&7[&5Expire&dManager&7] &3Re-evaluating expired plots for: " + world); PS.log("&7[&5Expire&dManager&7] &3Re-evaluating expired plots for: " + world);
return; return;
} }
continue; continue;
@ -89,7 +89,7 @@ public class ExpireManager {
final Plot plot = plots.iterator().next(); final Plot plot = plots.iterator().next();
if (!isExpired(plot)) { if (!isExpired(plot)) {
expiredPlots.get(world).remove(plot); expiredPlots.get(world).remove(plot);
PlotSquared.log("&7[&5Expire&dManager&7] &bSkipping no longer expired: " + plot); PS.log("&7[&5Expire&dManager&7] &bSkipping no longer expired: " + plot);
return; return;
} }
for (final UUID helper : plot.trusted) { for (final UUID helper : plot.trusted) {
@ -104,26 +104,26 @@ public class ExpireManager {
MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.id.toString()); MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.id.toString());
} }
} }
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
if (manager == null) { if (manager == null) {
PlotSquared.log("&7[&5Expire&dManager&7] &cThis is a friendly reminder to create or delete " + world +" as it is currently setup incorrectly"); PS.log("&7[&5Expire&dManager&7] &cThis is a friendly reminder to create or delete " + world +" as it is currently setup incorrectly");
expiredPlots.get(world).remove(plot); expiredPlots.get(world).remove(plot);
return; return;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
RunnableVal run = new RunnableVal<Integer>() { RunnableVal run = new RunnableVal<Integer>() {
@Override @Override
public void run() { public void run() {
int changed = this.value; int changed = this.value;
if (Settings.MIN_BLOCKS_CHANGED_IGNORED > 0 || Settings.MIN_BLOCKS_CHANGED > 0 && manager instanceof ClassicPlotManager) { if (Settings.MIN_BLOCKS_CHANGED_IGNORED > 0 || Settings.MIN_BLOCKS_CHANGED > 0 && manager instanceof ClassicPlotManager) {
if (changed >= Settings.MIN_BLOCKS_CHANGED && Settings.MIN_BLOCKS_CHANGED > 0) { if (changed >= Settings.MIN_BLOCKS_CHANGED && Settings.MIN_BLOCKS_CHANGED > 0) {
PlotSquared.log("&7[&5Expire&dManager&7] &bKeep flag added to: " + plot.id + (changed != -1 ? " (changed " + value + ")" : "")); PS.log("&7[&5Expire&dManager&7] &bKeep flag added to: " + plot.id + (changed != -1 ? " (changed " + value + ")" : ""));
FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("keep"), true)); FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("keep"), true));
expiredPlots.get(world).remove(plot); expiredPlots.get(world).remove(plot);
return; return;
} }
else if (changed >= Settings.MIN_BLOCKS_CHANGED_IGNORED && Settings.MIN_BLOCKS_CHANGED_IGNORED > 0) { else if (changed >= Settings.MIN_BLOCKS_CHANGED_IGNORED && Settings.MIN_BLOCKS_CHANGED_IGNORED > 0) {
PlotSquared.log("&7[&5Expire&dManager&7] &bIgnoring modified plot: " + plot.id + (changed != -1 ? " (changed " + value + ")" : "")); PS.log("&7[&5Expire&dManager&7] &bIgnoring modified plot: " + plot.id + (changed != -1 ? " (changed " + value + ")" : ""));
FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("modified-blocks"), value)); FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("modified-blocks"), value));
expiredPlots.get(world).remove(plot); expiredPlots.get(world).remove(plot);
return; return;
@ -135,14 +135,14 @@ public class ExpireManager {
manager.clearPlot(plotworld, plot, false, null); manager.clearPlot(plotworld, plot, false, null);
MainUtil.removeSign(plot); MainUtil.removeSign(plot);
DBFunc.delete(world, plot); DBFunc.delete(world, plot);
PlotSquared.getInstance().removePlot(world, plot.id, false); PS.get().removePlot(world, plot.id, false);
expiredPlots.get(world).remove(plot); expiredPlots.get(world).remove(plot);
PlotSquared.log("&7[&5Expire&dManager&7] &cDeleted expired plot: " + plot.id + (changed != -1 ? " (changed " + value + ")" : "")); PS.log("&7[&5Expire&dManager&7] &cDeleted expired plot: " + plot.id + (changed != -1 ? " (changed " + value + ")" : ""));
PlotSquared.log("&3 - World: " + plot.world); PS.log("&3 - World: " + plot.world);
if (plot.hasOwner()) { if (plot.hasOwner()) {
PlotSquared.log("&3 - Owner: " + UUIDHandler.getName(plot.owner)); PS.log("&3 - Owner: " + UUIDHandler.getName(plot.owner));
} else { } else {
PlotSquared.log("&3 - Owner: Unowned"); PS.log("&3 - Owner: Unowned");
} }
} }
}; };
@ -150,7 +150,7 @@ public class ExpireManager {
Flag flag = FlagManager.getPlotFlagAbs(plot, "modified-blocks"); Flag flag = FlagManager.getPlotFlagAbs(plot, "modified-blocks");
if (flag != null) { if (flag != null) {
if ((Integer) flag.getValue() > Settings.MIN_BLOCKS_CHANGED_IGNORED) { if ((Integer) flag.getValue() > Settings.MIN_BLOCKS_CHANGED_IGNORED) {
PlotSquared.log("&7[&5Expire&dManager&7] &bSkipping modified: " + plot); PS.log("&7[&5Expire&dManager&7] &bSkipping modified: " + plot);
expiredPlots.get(world).remove(plot); expiredPlots.get(world).remove(plot);
this.run(); this.run();
return; return;
@ -215,7 +215,7 @@ public class ExpireManager {
} }
public static List<Plot> getOldPlots(final String world) { public static List<Plot> getOldPlots(final String world) {
final Collection<Plot> plots = PlotSquared.getInstance().getPlots(world).values(); final Collection<Plot> plots = PS.get().getPlots(world).values();
final List<Plot> toRemove = new ArrayList<>(); final List<Plot> toRemove = new ArrayList<>();
Iterator<Plot> iter = plots.iterator(); Iterator<Plot> iter = plots.iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
@ -238,7 +238,7 @@ public class ExpireManager {
final String worldname = Bukkit.getWorlds().get(0).getName(); final String worldname = Bukkit.getWorlds().get(0).getName();
String foldername; String foldername;
String filename = null; String filename = null;
if (PlotSquared.getInstance().IMP.checkVersion(1, 7, 5)) { if (PS.get().IMP.checkVersion(1, 7, 5)) {
foldername = "playerdata"; foldername = "playerdata";
try { try {
final OfflinePlotPlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid); final OfflinePlotPlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid);
@ -256,7 +256,7 @@ public class ExpireManager {
if (filename != null) { if (filename != null) {
final File playerFile = new File(worldname + File.separator + foldername + File.separator + filename); final File playerFile = new File(worldname + File.separator + foldername + File.separator + filename);
if (!playerFile.exists()) { if (!playerFile.exists()) {
PlotSquared.log("Could not find file: " + filename); PS.log("Could not find file: " + filename);
} else { } else {
try { try {
long last = playerFile.lastModified(); long last = playerFile.lastModified();
@ -265,7 +265,7 @@ public class ExpireManager {
continue; continue;
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("Please disable disk checking in old plot auto clearing; Could not read file: " + filename); PS.log("Please disable disk checking in old plot auto clearing; Could not read file: " + filename);
} }
} }
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Logger.java
View File

@ -28,7 +28,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
/** /**
@ -51,7 +51,7 @@ public class Logger {
} }
reader.close(); reader.close();
} catch (final IOException e) { } catch (final IOException e) {
PlotSquared.log(C.PREFIX.s() + "File setup error Logger#setup"); PS.log(C.PREFIX.s() + "File setup error Logger#setup");
} }
} }

188
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -50,7 +50,7 @@ public class MainUtil {
static PseudoRandom random = new PseudoRandom(); static PseudoRandom random = new PseudoRandom();
public static boolean isPlotArea(final Location location) { public static boolean isPlotArea(final Location location) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(location.getWorld()); final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
if (plotworld.TYPE == 2) { if (plotworld.TYPE == 2) {
return ClusterManager.getCluster(location) != null; return ClusterManager.getCluster(location) != null;
} }
@ -90,21 +90,21 @@ public class MainUtil {
} }
else { else {
if (worldname == null) { if (worldname == null) {
if (PlotSquared.getInstance().getPlotWorlds().size() == 0) { if (PS.get().getPlotWorlds().size() == 0) {
if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD); if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
return null; return null;
} }
worldname = PlotSquared.getInstance().getPlotWorlds().iterator().next(); worldname = PS.get().getPlotWorlds().iterator().next();
} }
for (Plot p : PlotSquared.getInstance().getPlots(worldname).values()) { for (Plot p : PS.get().getPlots(worldname).values()) {
String name = p.settings.getAlias(); String name = p.settings.getAlias();
if (name.length() != 0 && name.equalsIgnoreCase(arg)) { if (name.length() != 0 && name.equalsIgnoreCase(arg)) {
return p; return p;
} }
} }
for (String world : PlotSquared.getInstance().getPlotWorlds()) { for (String world : PS.get().getPlotWorlds()) {
if (!world.endsWith(worldname)) { if (!world.endsWith(worldname)) {
for (Plot p : PlotSquared.getInstance().getPlots(world).values()) { for (Plot p : PS.get().getPlots(world).values()) {
String name = p.settings.getAlias(); String name = p.settings.getAlias();
if (name.length() != 0 && name.equalsIgnoreCase(arg)) { if (name.length() != 0 && name.equalsIgnoreCase(arg)) {
return p; return p;
@ -113,7 +113,7 @@ public class MainUtil {
} }
} }
} }
if (worldname == null || !PlotSquared.getInstance().isPlotWorld(worldname)) { if (worldname == null || !PS.get().isPlotWorld(worldname)) {
if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD); if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
System.out.print("INVALID WORLD: "); System.out.print("INVALID WORLD: ");
return null; return null;
@ -137,7 +137,7 @@ public class MainUtil {
* @return boolean * @return boolean
*/ */
public static boolean mergePlots(final PlotPlayer player, final String world, final ArrayList<PlotId> plotIds) { public static boolean mergePlots(final PlotPlayer player, final String world, final ArrayList<PlotId> plotIds) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if ((EconHandler.manager != null) && plotworld.USE_ECONOMY) { if ((EconHandler.manager != null) && plotworld.USE_ECONOMY) {
final double cost = plotIds.size() * plotworld.MERGE_PRICE; final double cost = plotIds.size() * plotworld.MERGE_PRICE;
if (cost > 0d) { if (cost > 0d) {
@ -161,11 +161,11 @@ public class MainUtil {
if (!result) { if (!result) {
return false; return false;
} }
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
manager.startPlotUnlink(plotworld, ids); manager.startPlotUnlink(plotworld, ids);
for (final PlotId id : ids) { for (final PlotId id : ids) {
final Plot myplot = PlotSquared.getInstance().getPlots(world).get(id); final Plot myplot = PS.get().getPlots(world).get(id);
if (plot == null) { if (plot == null) {
continue; continue;
} }
@ -212,7 +212,7 @@ public class MainUtil {
} }
public static boolean isPlotAreaAbs(final Location location) { public static boolean isPlotAreaAbs(final Location location) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(location.getWorld()); final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
if (plotworld.TYPE == 2) { if (plotworld.TYPE == 2) {
return ClusterManager.getClusterAbs(location) != null; return ClusterManager.getClusterAbs(location) != null;
} }
@ -220,19 +220,19 @@ public class MainUtil {
} }
public static boolean isPlotRoad(final Location location) { public static boolean isPlotRoad(final Location location) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(location.getWorld()); final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
if (plotworld.TYPE == 2) { if (plotworld.TYPE == 2) {
PlotCluster cluster = ClusterManager.getCluster(location); PlotCluster cluster = ClusterManager.getCluster(location);
if (cluster == null) { if (cluster == null) {
return false; return false;
} }
} }
PlotManager manager = PlotSquared.getInstance().getPlotManager(location.getWorld()); PlotManager manager = PS.get().getPlotManager(location.getWorld());
return manager.getPlotId(plotworld, location.getX(), location.getY(), location.getZ()) == null; return manager.getPlotId(plotworld, location.getX(), location.getY(), location.getZ()) == null;
} }
public static boolean isPlotArea(final Plot plot) { public static boolean isPlotArea(final Plot plot) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
if (plotworld.TYPE == 2) { if (plotworld.TYPE == 2) {
return ClusterManager.getCluster(plot) != null; return ClusterManager.getCluster(plot) != null;
} }
@ -253,8 +253,8 @@ public class MainUtil {
public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) { public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) {
final Plot plot1 = PlotSquared.getInstance().getPlots(world).get(pos1); final Plot plot1 = PS.get().getPlots(world).get(pos1);
final Plot plot2 = PlotSquared.getInstance().getPlots(world).get(pos2); final Plot plot2 = PS.get().getPlots(world).get(pos2);
if (plot1 != null) { if (plot1 != null) {
pos1 = getBottomPlot(plot1).id; pos1 = getBottomPlot(plot1).id;
@ -293,7 +293,7 @@ public class MainUtil {
public static int getPlayerPlotCount(final String world, final PlotPlayer plr) { public static int getPlayerPlotCount(final String world, final PlotPlayer plr) {
final UUID uuid = plr.getUUID(); final UUID uuid = plr.getUUID();
int count = 0; int count = 0;
for (final Plot plot : PlotSquared.getInstance().getPlots(world).values()) { for (final Plot plot : PS.get().getPlots(world).values()) {
if (plot.hasOwner() && plot.owner.equals(uuid) && plot.countsTowardsMax) { if (plot.hasOwner() && plot.owner.equals(uuid) && plot.countsTowardsMax) {
count++; count++;
} }
@ -303,17 +303,17 @@ public class MainUtil {
public static int getPlayerPlotCount(final PlotPlayer plr) { public static int getPlayerPlotCount(final PlotPlayer plr) {
int count = 0; int count = 0;
for (final String world : PlotSquared.getInstance().getPlotWorldsString()) { for (final String world : PS.get().getPlotWorldsString()) {
count += getPlayerPlotCount(world, plr); count += getPlayerPlotCount(world, plr);
} }
return count; return count;
} }
public static Location getDefaultHome(Plot plot) { public static Location getDefaultHome(Plot plot) {
PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plot.world); PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
if (plotworld.DEFAULT_HOME != null) { if (plotworld.DEFAULT_HOME != null) {
final Location bot = getPlotBottomLoc(plot.world, plot.id); final Location bot = getPlotBottomLoc(plot.world, plot.id);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(plot.world); final PlotManager manager = PS.get().getPlotManager(plot.world);
final int x; final int x;
final int z; final int z;
if (plotworld.DEFAULT_HOME.x == Integer.MAX_VALUE && plotworld.DEFAULT_HOME.z == Integer.MAX_VALUE) { if (plotworld.DEFAULT_HOME.x == Integer.MAX_VALUE && plotworld.DEFAULT_HOME.z == Integer.MAX_VALUE) {
@ -325,15 +325,15 @@ public class MainUtil {
x = bot.getX() + plotworld.DEFAULT_HOME.x; x = bot.getX() + plotworld.DEFAULT_HOME.x;
z = bot.getZ() + plotworld.DEFAULT_HOME.z; z = bot.getZ() + plotworld.DEFAULT_HOME.z;
} }
final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PlotSquared.getInstance().getPlotWorld(plot.world), plot).getY()); final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PS.get().getPlotWorld(plot.world), plot).getY());
return new Location(plot.world, x, y + 1, z); return new Location(plot.world, x, y + 1, z);
} }
final Location top = getPlotTopLoc(plot.world, plot.id); final Location top = getPlotTopLoc(plot.world, plot.id);
final Location bot = getPlotBottomLoc(plot.world, plot.id); final Location bot = getPlotBottomLoc(plot.world, plot.id);
final int x = ((top.getX() - bot.getX()) / 2) + bot.getX(); final int x = ((top.getX() - bot.getX()) / 2) + bot.getX();
final int z = bot.getZ(); final int z = bot.getZ();
PlotManager manager = PlotSquared.getInstance().getPlotManager(plot.world); PlotManager manager = PS.get().getPlotManager(plot.world);
final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PlotSquared.getInstance().getPlotWorld(plot.world), plot).getY()); final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PS.get().getPlotWorld(plot.world), plot).getY());
return new Location(plot.world, x, y + 1, z); return new Location(plot.world, x, y + 1, z);
} }
@ -344,7 +344,7 @@ public class MainUtil {
if (result) { if (result) {
final Location location; final Location location;
if (PlotSquared.getInstance().getPlotWorld(plot.world).HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) { if (PS.get().getPlotWorld(plot.world).HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
location = MainUtil.getPlotHome(bot.world, bot); location = MainUtil.getPlotHome(bot.world, bot);
} }
else { else {
@ -380,21 +380,21 @@ public class MainUtil {
public static int getBorder(final String worldname) { public static int getBorder(final String worldname) {
if (worldBorder.containsKey(worldname)) { if (worldBorder.containsKey(worldname)) {
PlotSquared.getInstance().getPlotWorld(worldname); PS.get().getPlotWorld(worldname);
return worldBorder.get(worldname) + 16; return worldBorder.get(worldname) + 16;
} }
return Integer.MAX_VALUE; return Integer.MAX_VALUE;
} }
public static void setupBorder(final String world) { public static void setupBorder(final String world) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (!plotworld.WORLD_BORDER) { if (!plotworld.WORLD_BORDER) {
return; return;
} }
if (!worldBorder.containsKey(world)) { if (!worldBorder.containsKey(world)) {
worldBorder.put(world, 0); worldBorder.put(world, 0);
} }
for (final Plot plot : PlotSquared.getInstance().getPlots(world).values()) { for (final Plot plot : PS.get().getPlots(world).values()) {
updateWorldBorder(plot); updateWorldBorder(plot);
} }
} }
@ -484,8 +484,8 @@ public class MainUtil {
} }
final PlotId pos1 = plotIds.get(0); final PlotId pos1 = plotIds.get(0);
final PlotId pos2 = plotIds.get(plotIds.size() - 1); final PlotId pos2 = plotIds.get(plotIds.size() - 1);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
boolean result = EventUtil.manager.callMerge(world, getPlot(world, pos1), plotIds); boolean result = EventUtil.manager.callMerge(world, getPlot(world, pos1), plotIds);
if (!result) { if (!result) {
@ -498,7 +498,7 @@ public class MainUtil {
final boolean lx = x < pos2.x; final boolean lx = x < pos2.x;
final boolean ly = y < pos2.y; final boolean ly = y < pos2.y;
final PlotId id = new PlotId(x, y); final PlotId id = new PlotId(x, y);
final Plot plot = PlotSquared.getInstance().getPlots(world).get(id); final Plot plot = PS.get().getPlots(world).get(id);
Plot plot2 = null; Plot plot2 = null;
if (removeRoads) { if (removeRoads) {
removeSign(plot); removeSign(plot);
@ -512,7 +512,7 @@ public class MainUtil {
} }
} }
if (!plot.settings.getMerged(1)) { if (!plot.settings.getMerged(1)) {
plot2 = PlotSquared.getInstance().getPlots(world).get(new PlotId(x + 1, y)); plot2 = PS.get().getPlots(world).get(new PlotId(x + 1, y));
mergePlot(world, plot, plot2, removeRoads); mergePlot(world, plot, plot2, removeRoads);
plot.settings.setMerged(1, true); plot.settings.setMerged(1, true);
plot2.settings.setMerged(3, true); plot2.settings.setMerged(3, true);
@ -520,7 +520,7 @@ public class MainUtil {
} }
if (ly) { if (ly) {
if (!plot.settings.getMerged(2)) { if (!plot.settings.getMerged(2)) {
plot2 = PlotSquared.getInstance().getPlots(world).get(new PlotId(x, y + 1)); plot2 = PS.get().getPlots(world).get(new PlotId(x, y + 1));
mergePlot(world, plot, plot2, removeRoads); mergePlot(world, plot, plot2, removeRoads);
plot.settings.setMerged(2, true); plot.settings.setMerged(2, true);
plot2.settings.setMerged(0, true); plot2.settings.setMerged(0, true);
@ -531,7 +531,7 @@ public class MainUtil {
for (int x = pos1.x; x <= pos2.x; x++) { for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) { for (int y = pos1.y; y <= pos2.y; y++) {
final PlotId id = new PlotId(x, y); final PlotId id = new PlotId(x, y);
final Plot plot = PlotSquared.getInstance().getPlots(world).get(id); final Plot plot = PS.get().getPlots(world).get(id);
DBFunc.setMerged(world, plot, plot.settings.getMerged()); DBFunc.setMerged(world, plot, plot.settings.getMerged());
} }
} }
@ -553,7 +553,7 @@ public class MainUtil {
ChunkManager.manager.regenerateRegion(pos1, pos2, null); ChunkManager.manager.regenerateRegion(pos1, pos2, null);
} }
else { else {
PlotSquared.getInstance().getPlotManager(plot.world).removeRoadSouthEast(plotworld, plot); PS.get().getPlotManager(plot.world).removeRoadSouthEast(plotworld, plot);
} }
} }
@ -571,7 +571,7 @@ public class MainUtil {
ChunkManager.manager.regenerateRegion(pos1, pos2, null); ChunkManager.manager.regenerateRegion(pos1, pos2, null);
} }
else { else {
PlotSquared.getInstance().getPlotManager(plot.world).removeRoadEast(plotworld, plot); PS.get().getPlotManager(plot.world).removeRoadEast(plotworld, plot);
} }
} }
@ -589,7 +589,7 @@ public class MainUtil {
ChunkManager.manager.regenerateRegion(pos1, pos2, null); ChunkManager.manager.regenerateRegion(pos1, pos2, null);
} }
else { else {
PlotSquared.getInstance().getPlotManager(plot.world).removeRoadSouth(plotworld, plot); PS.get().getPlotManager(plot.world).removeRoadSouth(plotworld, plot);
} }
} }
@ -603,7 +603,7 @@ public class MainUtil {
* @param greaterPlot * @param greaterPlot
*/ */
public static void mergePlot(final String world, final Plot lesserPlot, final Plot greaterPlot, final boolean removeRoads) { public static void mergePlot(final String world, final Plot lesserPlot, final Plot greaterPlot, final boolean removeRoads) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (lesserPlot.id.x.equals(greaterPlot.id.x)) { if (lesserPlot.id.x.equals(greaterPlot.id.x)) {
if (!lesserPlot.settings.getMerged(2)) { if (!lesserPlot.settings.getMerged(2)) {
lesserPlot.settings.setMerged(2, true); lesserPlot.settings.setMerged(2, true);
@ -625,8 +625,8 @@ public class MainUtil {
public static void removeSign(final Plot p) { public static void removeSign(final Plot p) {
final String world = p.world; final String world = p.world;
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
if (!plotworld.ALLOW_SIGNS) { if (!plotworld.ALLOW_SIGNS) {
return; return;
} }
@ -638,8 +638,8 @@ public class MainUtil {
if (name == null) { if (name == null) {
name = "unknown"; name = "unknown";
} }
final PlotManager manager = PlotSquared.getInstance().getPlotManager(p.world); final PlotManager manager = PS.get().getPlotManager(p.world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(p.world); final PlotWorld plotworld = PS.get().getPlotWorld(p.world);
if (plotworld.ALLOW_SIGNS) { if (plotworld.ALLOW_SIGNS) {
final Location loc = manager.getSignLoc(plotworld, p); final Location loc = manager.getSignLoc(plotworld, p);
final String id = p.id.x + ";" + p.id.y; final String id = p.id.x + ";" + p.id.y;
@ -715,7 +715,7 @@ public class MainUtil {
final PlotId id_min = plots.get(0); final PlotId id_min = plots.get(0);
final PlotId id_max = plots.get(plots.size() - 1); final PlotId id_max = plots.get(plots.size() - 1);
for (final PlotId myid : plots) { for (final PlotId myid : plots) {
final Plot myplot = PlotSquared.getInstance().getPlots(world).get(myid); final Plot myplot = PS.get().getPlots(world).get(myid);
if ((myplot == null) || myplot.owner == null || !(myplot.owner.equals(uuid))) { if ((myplot == null) || myplot.owner == null || !(myplot.owner.equals(uuid))) {
return false; return false;
} }
@ -736,8 +736,8 @@ public class MainUtil {
return; return;
} }
final String world = plot.world; final String world = plot.world;
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final Location bot = manager.getPlotBottomLocAbs(plotworld, plot.id); final Location bot = manager.getPlotBottomLocAbs(plotworld, plot.id);
final Location top = manager.getPlotTopLocAbs(plotworld, plot.id); final Location top = manager.getPlotTopLocAbs(plotworld, plot.id);
final int border = worldBorder.get(plot.world); final int border = worldBorder.get(plot.world);
@ -757,7 +757,7 @@ public class MainUtil {
updateWorldBorder(plot); updateWorldBorder(plot);
} }
final Plot p = createPlotAbs(uuid, plot); final Plot p = createPlotAbs(uuid, plot);
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(plot.world); final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
if (plotworld.AUTO_MERGE) { if (plotworld.AUTO_MERGE) {
autoMerge(plot.world, p, uuid); autoMerge(plot.world, p, uuid);
} }
@ -770,7 +770,7 @@ public class MainUtil {
public static Plot createPlotAbs(final UUID uuid, final Plot plot) { public static Plot createPlotAbs(final UUID uuid, final Plot plot) {
final String w = plot.world; final String w = plot.world;
final Plot p = new Plot(plot.id, uuid, new ArrayList<UUID>(), new ArrayList<UUID>(), w); final Plot p = new Plot(plot.id, uuid, new ArrayList<UUID>(), new ArrayList<UUID>(), w);
PlotSquared.getInstance().updatePlot(p); PS.get().updatePlot(p);
DBFunc.createPlotAndSettings(p); DBFunc.createPlotAndSettings(p);
return p; return p;
} }
@ -809,7 +809,7 @@ public class MainUtil {
} }
public static void clear(final String world, final Plot plot, final boolean isDelete, final Runnable whenDone) { public static void clear(final String world, final Plot plot, final boolean isDelete, final Runnable whenDone) {
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1); final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
final int prime = 31; final int prime = 31;
int h = 1; int h = 1;
@ -817,7 +817,7 @@ public class MainUtil {
h = (prime * h) + pos1.getZ(); h = (prime * h) + pos1.getZ();
state = h; state = h;
System.currentTimeMillis(); System.currentTimeMillis();
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
runners.put(plot, 1); runners.put(plot, 1);
if (plotworld.TERRAIN != 0 || Settings.FAST_CLEAR) { if (plotworld.TERRAIN != 0 || Settings.FAST_CLEAR) {
final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id); final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
@ -948,7 +948,7 @@ public class MainUtil {
final Plot plot = getPlot(w, plotid); final Plot plot = getPlot(w, plotid);
final BlockLoc home = plot.settings.getPosition(); final BlockLoc home = plot.settings.getPosition();
final Location bot = getPlotBottomLoc(w, plotid); final Location bot = getPlotBottomLoc(w, plotid);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(w); final PlotManager manager = PS.get().getPlotManager(w);
if ((home == null) || ((home.x == 0) && (home.z == 0))) { if ((home == null) || ((home.x == 0) && (home.z == 0))) {
return getDefaultHome(plot); return getDefaultHome(plot);
} else { } else {
@ -981,8 +981,8 @@ public class MainUtil {
* @return Location top * @return Location top
*/ */
public static Location getPlotTopLocAbs(final String world, final PlotId id) { public static Location getPlotTopLocAbs(final String world, final PlotId id) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
return manager.getPlotTopLocAbs(plotworld, id); return manager.getPlotTopLocAbs(plotworld, id);
} }
@ -996,8 +996,8 @@ public class MainUtil {
* @return Location bottom * @return Location bottom
*/ */
public static Location getPlotBottomLocAbs(final String world, final PlotId id) { public static Location getPlotBottomLocAbs(final String world, final PlotId id) {
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
return manager.getPlotBottomLocAbs(plotworld, id); return manager.getPlotBottomLocAbs(plotworld, id);
} }
@ -1023,12 +1023,12 @@ public class MainUtil {
* @return Location top of mega plot * @return Location top of mega plot
*/ */
public static Location getPlotTopLoc(final String world, PlotId id) { public static Location getPlotTopLoc(final String world, PlotId id) {
final Plot plot = PlotSquared.getInstance().getPlots(world).get(id); final Plot plot = PS.get().getPlots(world).get(id);
if (plot != null) { if (plot != null) {
id = getTopPlot(plot).id; id = getTopPlot(plot).id;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
return manager.getPlotTopLocAbs(plotworld, id); return manager.getPlotTopLocAbs(plotworld, id);
} }
@ -1042,12 +1042,12 @@ public class MainUtil {
* @return Location bottom of mega plot * @return Location bottom of mega plot
*/ */
public static Location getPlotBottomLoc(final String world, PlotId id) { public static Location getPlotBottomLoc(final String world, PlotId id) {
final Plot plot = PlotSquared.getInstance().getPlots(world).get(id); final Plot plot = PS.get().getPlots(world).get(id);
if (plot != null) { if (plot != null) {
id = getBottomPlot(plot).id; id = getBottomPlot(plot).id;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
return manager.getPlotBottomLocAbs(plotworld, id); return manager.getPlotBottomLocAbs(plotworld, id);
} }
@ -1083,8 +1083,8 @@ public class MainUtil {
for (int x = pos1.x; x <= pos2.x; x++) { for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) { for (int y = pos1.y; y <= pos2.y; y++) {
final PlotId id = new PlotId(x, y); final PlotId id = new PlotId(x, y);
if (PlotSquared.getInstance().getPlots(world).get(id) != null) { if (PS.get().getPlots(world).get(id) != null) {
if (PlotSquared.getInstance().getPlots(world).get(id).owner != null) { if (PS.get().getPlots(world).get(id).owner != null) {
return false; return false;
} }
} }
@ -1094,8 +1094,8 @@ public class MainUtil {
} }
public static boolean swap(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) { public static boolean swap(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) {
Plot p1 = PlotSquared.getInstance().getPlots(world).get(current); Plot p1 = PS.get().getPlots(world).get(current);
Plot p2 = PlotSquared.getInstance().getPlots(world).get(newPlot); Plot p2 = PS.get().getPlots(world).get(newPlot);
if (p1==null || p2 == null || p1.owner == null || !p1.owner.equals(p2.owner)) { if (p1==null || p2 == null || p1.owner == null || !p1.owner.equals(p2.owner)) {
return false; return false;
} }
@ -1107,20 +1107,20 @@ public class MainUtil {
p1.id.y = p2.id.y.intValue(); p1.id.y = p2.id.y.intValue();
p2.id.x = temp.x; p2.id.x = temp.x;
p2.id.y = temp.y; p2.id.y = temp.y;
PlotSquared.getInstance().getPlots(world).remove(p1.id); PS.get().getPlots(world).remove(p1.id);
PlotSquared.getInstance().getPlots(world).remove(p2.id); PS.get().getPlots(world).remove(p2.id);
p1.id.recalculateHash(); p1.id.recalculateHash();
p2.id.recalculateHash(); p2.id.recalculateHash();
PlotSquared.getInstance().getPlots(world).put(p1.id, p1); PS.get().getPlots(world).put(p1.id, p1);
PlotSquared.getInstance().getPlots(world).put(p2.id, p2); PS.get().getPlots(world).put(p2.id, p2);
// Swap database // Swap database
DBFunc.dbManager.swapPlots(p2, p1); DBFunc.dbManager.swapPlots(p2, p1);
return true; return true;
} }
public static boolean swapData(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) { public static boolean swapData(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) {
Plot p1 = PlotSquared.getInstance().getPlots(world).get(current); Plot p1 = PS.get().getPlots(world).get(current);
Plot p2 = PlotSquared.getInstance().getPlots(world).get(newPlot); Plot p2 = PS.get().getPlots(world).get(newPlot);
if (p1 == null || p1.owner == null) { if (p1 == null || p1.owner == null) {
if (p2 != null && p2.owner != null) { if (p2 != null && p2.owner != null) {
moveData(p2, p1, whenDone); moveData(p2, p1, whenDone);
@ -1141,12 +1141,12 @@ public class MainUtil {
p1.id.y = p2.id.y.intValue(); p1.id.y = p2.id.y.intValue();
p2.id.x = temp.x; p2.id.x = temp.x;
p2.id.y = temp.y; p2.id.y = temp.y;
PlotSquared.getInstance().getPlots(world).remove(p1.id); PS.get().getPlots(world).remove(p1.id);
PlotSquared.getInstance().getPlots(world).remove(p2.id); PS.get().getPlots(world).remove(p2.id);
p1.id.recalculateHash(); p1.id.recalculateHash();
p2.id.recalculateHash(); p2.id.recalculateHash();
PlotSquared.getInstance().getPlots(world).put(p1.id, p1); PS.get().getPlots(world).put(p1.id, p1);
PlotSquared.getInstance().getPlots(world).put(p2.id, p2); PS.get().getPlots(world).put(p2.id, p2);
// Swap database // Swap database
DBFunc.dbManager.swapPlots(p2, p1); DBFunc.dbManager.swapPlots(p2, p1);
TaskManager.runTask(whenDone); TaskManager.runTask(whenDone);
@ -1170,12 +1170,12 @@ public class MainUtil {
final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id); final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
for (final PlotId id : selection) { for (final PlotId id : selection) {
DBFunc.movePlot(getPlot(plot1.world, new PlotId(id.x, id.y)), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y))); DBFunc.movePlot(getPlot(plot1.world, new PlotId(id.x, id.y)), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y)));
final Plot plot = PlotSquared.getInstance().getPlots(plot1.world).get(id); final Plot plot = PS.get().getPlots(plot1.world).get(id);
PlotSquared.getInstance().getPlots(plot1.world).remove(id); PS.get().getPlots(plot1.world).remove(id);
plot.id.x += offset_x; plot.id.x += offset_x;
plot.id.y += offset_y; plot.id.y += offset_y;
plot.id.recalculateHash(); plot.id.recalculateHash();
PlotSquared.getInstance().getPlots(plot2.world).put(plot.id, plot); PS.get().getPlots(plot2.world).put(plot.id, plot);
} }
TaskManager.runTaskLater(whenDone, 1); TaskManager.runTaskLater(whenDone, 1);
return true; return true;
@ -1200,12 +1200,12 @@ public class MainUtil {
for (final PlotId id : selection) { for (final PlotId id : selection) {
String worldOriginal = plot1.world; String worldOriginal = plot1.world;
PlotId idOriginal = new PlotId(id.x, id.y); PlotId idOriginal = new PlotId(id.x, id.y);
final Plot plot = PlotSquared.getInstance().getPlots(plot1.world).get(id); final Plot plot = PS.get().getPlots(plot1.world).get(id);
PlotSquared.getInstance().getPlots(plot1.world).remove(id); PS.get().getPlots(plot1.world).remove(id);
plot.id.x += offset_x; plot.id.x += offset_x;
plot.id.y += offset_y; plot.id.y += offset_y;
plot.id.recalculateHash(); plot.id.recalculateHash();
PlotSquared.getInstance().getPlots(plot2.world).put(plot.id, plot); PS.get().getPlots(plot2.world).put(plot.id, plot);
DBFunc.movePlot(getPlot(worldOriginal, idOriginal), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y))); DBFunc.movePlot(getPlot(worldOriginal, idOriginal), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y)));
} }
ChunkManager.manager.copyRegion(bot1, top, bot2, new Runnable() { ChunkManager.manager.copyRegion(bot1, top, bot2, new Runnable() {
@ -1268,7 +1268,7 @@ public class MainUtil {
DBFunc.setDenied(world, plot, denied); DBFunc.setDenied(world, plot, denied);
} }
} }
PlotSquared.getInstance().getPlots(world).put(plot.id, plot); PS.get().getPlots(world).put(plot.id, plot);
} }
ChunkManager.manager.copyRegion(bot1, top, bot2, whenDone); ChunkManager.manager.copyRegion(bot1, top, bot2, whenDone);
return true; return true;
@ -1310,7 +1310,7 @@ public class MainUtil {
final String prefixStr = colorise('&', C.PREFIX.s()); final String prefixStr = colorise('&', C.PREFIX.s());
if ((msg.length() > 0) && !msg.equals("")) { if ((msg.length() > 0) && !msg.equals("")) {
if (plr == null) { if (plr == null) {
PlotSquared.log(prefixStr + msg); PS.log(prefixStr + msg);
} else { } else {
sendMessageWrapped(plr, prefixStr + msg); sendMessageWrapped(plr, prefixStr + msg);
} }
@ -1425,7 +1425,7 @@ public class MainUtil {
} }
} }
if (plr == null) { if (plr == null) {
PlotSquared.log(colorise('&', msg)); PS.log(colorise('&', msg));
} else { } else {
sendMessage(plr, msg, c.usePrefix()); sendMessage(plr, msg, c.usePrefix());
} }
@ -1435,14 +1435,14 @@ public class MainUtil {
public static Plot getBottomPlot(final Plot plot) { public static Plot getBottomPlot(final Plot plot) {
if (plot.settings.getMerged(0)) { if (plot.settings.getMerged(0)) {
final Plot p = PlotSquared.getInstance().getPlots(plot.world).get(new PlotId(plot.id.x, plot.id.y - 1)); final Plot p = PS.get().getPlots(plot.world).get(new PlotId(plot.id.x, plot.id.y - 1));
if (p == null) { if (p == null) {
return plot; return plot;
} }
return getBottomPlot(p); return getBottomPlot(p);
} }
if (plot.settings.getMerged(3)) { if (plot.settings.getMerged(3)) {
final Plot p = PlotSquared.getInstance().getPlots(plot.world).get(new PlotId(plot.id.x - 1, plot.id.y)); final Plot p = PS.get().getPlots(plot.world).get(new PlotId(plot.id.x - 1, plot.id.y));
if (p == null) { if (p == null) {
return plot; return plot;
} }
@ -1453,14 +1453,14 @@ public class MainUtil {
public static Plot getTopPlot(final Plot plot) { public static Plot getTopPlot(final Plot plot) {
if (plot.settings.getMerged(2)) { if (plot.settings.getMerged(2)) {
final Plot p = PlotSquared.getInstance().getPlots(plot.world).get(new PlotId(plot.id.x, plot.id.y + 1)); final Plot p = PS.get().getPlots(plot.world).get(new PlotId(plot.id.x, plot.id.y + 1));
if (p == null) { if (p == null) {
return plot; return plot;
} }
return getTopPlot(p); return getTopPlot(p);
} }
if (plot.settings.getMerged(1)) { if (plot.settings.getMerged(1)) {
final Plot p = PlotSquared.getInstance().getPlots(plot.world).get(new PlotId(plot.id.x + 1, plot.id.y)); final Plot p = PS.get().getPlots(plot.world).get(new PlotId(plot.id.x + 1, plot.id.y));
if (p == null) { if (p == null) {
return plot; return plot;
} }
@ -1487,8 +1487,8 @@ public class MainUtil {
if (id == null) { if (id == null) {
return null; return null;
} }
if (PlotSquared.getInstance().getPlots(world).containsKey(id)) { if (PS.get().getPlots(world).containsKey(id)) {
return PlotSquared.getInstance().getPlots(world).get(id); return PS.get().getPlots(world).get(id);
} }
return new Plot(id, null, new ArrayList<UUID>(), new ArrayList<UUID>(), world); return new Plot(id, null, new ArrayList<UUID>(), new ArrayList<UUID>(), world);
} }
@ -1500,11 +1500,11 @@ public class MainUtil {
*/ */
public static PlotId getPlotAbs(final Location loc) { public static PlotId getPlotAbs(final Location loc) {
final String world = loc.getWorld(); final String world = loc.getWorld();
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
if (manager == null) { if (manager == null) {
return null; return null;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
return manager.getPlotIdAbs(plotworld, loc.getX(), loc.getY(), loc.getZ()); return manager.getPlotIdAbs(plotworld, loc.getX(), loc.getY(), loc.getZ());
} }
@ -1515,11 +1515,11 @@ public class MainUtil {
*/ */
public static PlotId getPlotId(final Location loc) { public static PlotId getPlotId(final Location loc) {
final String world = loc.getWorld(); final String world = loc.getWorld();
final PlotManager manager = PlotSquared.getInstance().getPlotManager(world); final PlotManager manager = PS.get().getPlotManager(world);
if (manager == null) { if (manager == null) {
return null; return null;
} }
final PlotWorld plotworld = PlotSquared.getInstance().getPlotWorld(world); final PlotWorld plotworld = PS.get().getPlotWorld(world);
final PlotId id = manager.getPlotId(plotworld, loc.getX(), loc.getY(), loc.getZ()); final PlotId id = manager.getPlotId(plotworld, loc.getX(), loc.getY(), loc.getZ());
if ((id != null) && (plotworld.TYPE == 2)) { if ((id != null) && (plotworld.TYPE == 2)) {
if (ClusterManager.getCluster(world, id) == null) { if (ClusterManager.getCluster(world, id) == null) {

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotSquaredException.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
/** /**
* Created 2014-09-29 for PlotSquared * Created 2014-09-29 for PlotSquared
@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.PlotSquared;
public class PlotSquaredException extends RuntimeException { public class PlotSquaredException extends RuntimeException {
public PlotSquaredException(final PlotError error, final String details) { public PlotSquaredException(final PlotError error, final String details) {
super("PlotError >> " + error.getHeader() + ": " + details); super("PlotError >> " + error.getHeader() + ": " + details);
PlotSquared.log("&cPlotError &6>> &c" + error.getHeader() + ": &6" + details); PS.log("&cPlotError &6>> &c" + error.getHeader() + ": &6" + details);
} }
public static enum PlotError { public static enum PlotError {

20
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
View File

@ -1,7 +1,7 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.jnbt.*; import com.intellectualcrafters.jnbt.*;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
@ -64,7 +64,7 @@ public abstract class SchematicHandler {
else { else {
directory = outputDir.getPath(); directory = outputDir.getPath();
} }
if (PlotSquared.getInstance().worldEdit != null) { if (PS.get().worldEdit != null) {
new WorldEditSchematic().saveSchematic(directory + File.separator + name + ".schematic", plot.world, plot.id); new WorldEditSchematic().saveSchematic(directory + File.separator + name + ".schematic", plot.world, plot.id);
} }
else { else {
@ -104,7 +104,7 @@ public abstract class SchematicHandler {
*/ */
public boolean paste(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset) { public boolean paste(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset) {
if (schematic == null) { if (schematic == null) {
PlotSquared.log("Schematic == null :|"); PS.log("Schematic == null :|");
return false; return false;
} }
try { try {
@ -152,7 +152,7 @@ public abstract class SchematicHandler {
public boolean pasteStates(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset) { public boolean pasteStates(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset) {
if (schematic == null) { if (schematic == null) {
PlotSquared.log("Schematic == null :|"); PS.log("Schematic == null :|");
return false; return false;
} }
HashSet<PlotItem> items = schematic.getItems(); HashSet<PlotItem> items = schematic.getItems();
@ -236,14 +236,14 @@ public abstract class SchematicHandler {
*/ */
public Schematic getSchematic(final String name) { public Schematic getSchematic(final String name) {
{ {
final File parent = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "schematics"); final File parent = new File(PS.get().IMP.getDirectory() + File.separator + "schematics");
if (!parent.exists()) { if (!parent.exists()) {
if (!parent.mkdir()) { if (!parent.mkdir()) {
throw new RuntimeException("Could not create schematic parent directory"); throw new RuntimeException("Could not create schematic parent directory");
} }
} }
} }
final File file = new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "schematics" + File.separator + name + ".schematic"); final File file = new File(PS.get().IMP.getDirectory() + File.separator + "schematics" + File.separator + name + ".schematic");
return getSchematic(file); return getSchematic(file);
} }
@ -256,7 +256,7 @@ public abstract class SchematicHandler {
*/ */
public Schematic getSchematic(File file) { public Schematic getSchematic(File file) {
if (!file.exists()) { if (!file.exists()) {
PlotSquared.log(file.toString() + " doesn't exist"); PS.log(file.toString() + " doesn't exist");
return null; return null;
} }
try { try {
@ -266,7 +266,7 @@ public abstract class SchematicHandler {
stream.close(); stream.close();
return getSchematic(tag, file); return getSchematic(tag, file);
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log(file.toString() + " is not in GZIP format"); PS.log(file.toString() + " is not in GZIP format");
return null; return null;
} }
} }
@ -281,7 +281,7 @@ public abstract class SchematicHandler {
*/ */
public boolean save(final CompoundTag tag, final String path) { public boolean save(final CompoundTag tag, final String path) {
if (tag == null) { if (tag == null) {
PlotSquared.log("&cCannot save empty tag"); PS.log("&cCannot save empty tag");
return false; return false;
} }
try { try {
@ -308,7 +308,7 @@ public abstract class SchematicHandler {
* @return tag * @return tag
*/ */
public CompoundTag getCompoundTag(final String world, final PlotId id) { public CompoundTag getCompoundTag(final String world, final PlotId id) {
if (!PlotSquared.getInstance().getPlots(world).containsKey(id)) { if (!PS.get().getPlots(world).containsKey(id)) {
return null; return null;
} }
final Location pos1 = MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1); final Location pos1 = MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.generator.AugmentedPopulator; import com.intellectualcrafters.plot.generator.AugmentedPopulator;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotBlock;
@ -62,7 +62,7 @@ public class SetBlockQueue {
return; return;
} }
if (blocks.size() == 0) { if (blocks.size() == 0) {
PlotSquared.getInstance().TASK.cancelTask(TaskManager.tasks.get(current)); PS.get().TASK.cancelTask(TaskManager.tasks.get(current));
for (Runnable runnable : runnables) { for (Runnable runnable : runnables) {
TaskManager.runTask(runnable); TaskManager.runTask(runnable);
} }

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.lang.mutable.MutableInt;
import java.util.HashMap; import java.util.HashMap;
@ -14,20 +14,20 @@ public abstract class TaskManager {
public static int runTaskRepeat(final Runnable r, final int interval) { public static int runTaskRepeat(final Runnable r, final int interval) {
if (r != null) { if (r != null) {
return PlotSquared.getInstance().TASK.taskRepeat(r, interval); return PS.get().TASK.taskRepeat(r, interval);
} }
return -1; return -1;
} }
public static void runTaskAsync(final Runnable r) { public static void runTaskAsync(final Runnable r) {
if (r != null) { if (r != null) {
PlotSquared.getInstance().TASK.taskAsync(r); PS.get().TASK.taskAsync(r);
} }
} }
public static void runTask(final Runnable r) { public static void runTask(final Runnable r) {
if (r != null) { if (r != null) {
PlotSquared.getInstance().TASK.task(r); PS.get().TASK.task(r);
} }
} }
@ -38,13 +38,13 @@ public abstract class TaskManager {
*/ */
public static void runTaskLater(final Runnable r, final int delay) { public static void runTaskLater(final Runnable r, final int delay) {
if (r != null) { if (r != null) {
PlotSquared.getInstance().TASK.taskLater(r, delay); PS.get().TASK.taskLater(r, delay);
} }
} }
public static void runTaskLaterAsync(final Runnable r, final int delay) { public static void runTaskLaterAsync(final Runnable r, final int delay) {
if (r != null) { if (r != null) {
PlotSquared.getInstance().TASK.taskLaterAsync(r, delay); PS.get().TASK.taskLaterAsync(r, delay);
} }
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/WorldEditSchematic.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util; package com.intellectualcrafters.plot.util;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
import com.sk89q.worldedit.CuboidClipboard; import com.sk89q.worldedit.CuboidClipboard;
@ -20,7 +20,7 @@ public class WorldEditSchematic {
CuboidClipboard clipboard = new CuboidClipboard(size, origin); CuboidClipboard clipboard = new CuboidClipboard(size, origin);
Vector pos1 = new Vector(bot.getX(), bot.getY(), bot.getZ()); Vector pos1 = new Vector(bot.getX(), bot.getY(), bot.getZ());
Vector pos2 = new Vector(top.getX(), top.getY(), top.getZ()); Vector pos2 = new Vector(top.getX(), top.getY(), top.getZ());
EditSession session = PlotSquared.getInstance().worldEdit.getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorld(world)), 999999999); EditSession session = PS.get().worldEdit.getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorld(world)), 999999999);
clipboard.copy(session); clipboard.copy(session);
try { try {
clipboard.saveSchematic(new File(file)); clipboard.saveSchematic(new File(file));

72
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
View File

@ -45,7 +45,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import com.intellectualcrafters.plot.BukkitMain; import com.intellectualcrafters.plot.BukkitMain;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.listeners.APlotListener; import com.intellectualcrafters.plot.listeners.APlotListener;
import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.BlockLoc;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
@ -118,7 +118,7 @@ public class BukkitChunkManager extends ChunkManager {
public void run() { public void run() {
final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca"; final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
final File file = new File(directory); final File file = new File(directory);
PlotSquared.log("&6 - Deleting region: " + file.getName() + " (approx 1024 chunks)"); PS.log("&6 - Deleting region: " + file.getName() + " (approx 1024 chunks)");
if (file.exists()) { if (file.exists()) {
file.delete(); file.delete();
} }
@ -137,7 +137,7 @@ public class BukkitChunkManager extends ChunkManager {
for (ChunkLoc loc : chunks) { for (ChunkLoc loc : chunks) {
final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca"; final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
final File file = new File(directory); final File file = new File(directory);
PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)"); PS.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
if (file.exists()) { if (file.exists()) {
file.delete(); file.delete();
} }
@ -469,7 +469,7 @@ public class BukkitChunkManager extends ChunkManager {
try { try {
entity.spawn(world, x_offset, z_offset); entity.spawn(world, x_offset, z_offset);
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("Failed to restore entity " + entity.x + "," + entity.y + "," + entity.z + " : " + entity.id + " : " + EntityType.fromId(entity.id)); PS.log("Failed to restore entity " + entity.x + "," + entity.y + "," + entity.z + " : " + entity.id + " : " + EntityType.fromId(entity.id));
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -485,10 +485,10 @@ public class BukkitChunkManager extends ChunkManager {
chest.getInventory().setContents(chestContents.get(loc)); chest.getInventory().setContents(chestContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate chest: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate chest: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate chest: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate chest: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : signContents.keySet()) { for (final BlockLoc loc : signContents.keySet()) {
@ -504,10 +504,10 @@ public class BukkitChunkManager extends ChunkManager {
} }
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate sign: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate sign: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate sign: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate sign: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : dispenserContents.keySet()) { for (final BlockLoc loc : dispenserContents.keySet()) {
@ -518,10 +518,10 @@ public class BukkitChunkManager extends ChunkManager {
((Dispenser) (state)).getInventory().setContents(dispenserContents.get(loc)); ((Dispenser) (state)).getInventory().setContents(dispenserContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : dropperContents.keySet()) { for (final BlockLoc loc : dropperContents.keySet()) {
@ -532,10 +532,10 @@ public class BukkitChunkManager extends ChunkManager {
((Dropper) (state)).getInventory().setContents(dropperContents.get(loc)); ((Dropper) (state)).getInventory().setContents(dropperContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate dispenser: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : beaconContents.keySet()) { for (final BlockLoc loc : beaconContents.keySet()) {
@ -546,10 +546,10 @@ public class BukkitChunkManager extends ChunkManager {
((Beacon) (state)).getInventory().setContents(beaconContents.get(loc)); ((Beacon) (state)).getInventory().setContents(beaconContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate beacon: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate beacon: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate beacon: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate beacon: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : jukeDisc.keySet()) { for (final BlockLoc loc : jukeDisc.keySet()) {
@ -560,10 +560,10 @@ public class BukkitChunkManager extends ChunkManager {
((Jukebox) (state)).setPlaying(Material.getMaterial(jukeDisc.get(loc))); ((Jukebox) (state)).setPlaying(Material.getMaterial(jukeDisc.get(loc)));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to restore jukebox: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore jukebox: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate jukebox: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate jukebox: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : skullData.keySet()) { for (final BlockLoc loc : skullData.keySet()) {
@ -583,10 +583,10 @@ public class BukkitChunkManager extends ChunkManager {
} }
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to restore skull: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore skull: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate skull: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate skull: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : hopperContents.keySet()) { for (final BlockLoc loc : hopperContents.keySet()) {
@ -597,10 +597,10 @@ public class BukkitChunkManager extends ChunkManager {
((Hopper) (state)).getInventory().setContents(hopperContents.get(loc)); ((Hopper) (state)).getInventory().setContents(hopperContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate hopper: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate hopper: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate hopper: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate hopper: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : noteBlockContents.keySet()) { for (final BlockLoc loc : noteBlockContents.keySet()) {
@ -611,10 +611,10 @@ public class BukkitChunkManager extends ChunkManager {
((NoteBlock) (state)).setNote(noteBlockContents.get(loc)); ((NoteBlock) (state)).setNote(noteBlockContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate note block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate note block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate note block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate note block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : brewTime.keySet()) { for (final BlockLoc loc : brewTime.keySet()) {
@ -624,10 +624,10 @@ public class BukkitChunkManager extends ChunkManager {
if (state instanceof BrewingStand) { if (state instanceof BrewingStand) {
((BrewingStand) (state)).setBrewingTime(brewTime.get(loc)); ((BrewingStand) (state)).setBrewingTime(brewTime.get(loc));
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to restore brewing stand cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore brewing stand cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to restore brewing stand cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore brewing stand cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : spawnerData.keySet()) { for (final BlockLoc loc : spawnerData.keySet()) {
@ -638,10 +638,10 @@ public class BukkitChunkManager extends ChunkManager {
((CreatureSpawner) (state)).setCreatureTypeId(spawnerData.get(loc)); ((CreatureSpawner) (state)).setCreatureTypeId(spawnerData.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to restore spawner type: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore spawner type: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to restore spawner type: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore spawner type: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : cmdData.keySet()) { for (final BlockLoc loc : cmdData.keySet()) {
@ -652,10 +652,10 @@ public class BukkitChunkManager extends ChunkManager {
((CommandBlock) (state)).setCommand(cmdData.get(loc)); ((CommandBlock) (state)).setCommand(cmdData.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to restore command block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore command block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to restore command block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore command block: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : brewingStandContents.keySet()) { for (final BlockLoc loc : brewingStandContents.keySet()) {
@ -666,10 +666,10 @@ public class BukkitChunkManager extends ChunkManager {
((BrewingStand) (state)).getInventory().setContents(brewingStandContents.get(loc)); ((BrewingStand) (state)).getInventory().setContents(brewingStandContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate brewing stand: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate brewing stand: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate brewing stand: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate brewing stand: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : furnaceTime.keySet()) { for (final BlockLoc loc : furnaceTime.keySet()) {
@ -681,10 +681,10 @@ public class BukkitChunkManager extends ChunkManager {
((Furnace) (state)).setBurnTime(time[0]); ((Furnace) (state)).setBurnTime(time[0]);
((Furnace) (state)).setCookTime(time[1]); ((Furnace) (state)).setCookTime(time[1]);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to restore furnace cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore furnace cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to restore furnace cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to restore furnace cooking: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : furnaceContents.keySet()) { for (final BlockLoc loc : furnaceContents.keySet()) {
@ -695,10 +695,10 @@ public class BukkitChunkManager extends ChunkManager {
((Furnace) (state)).getInventory().setContents(furnaceContents.get(loc)); ((Furnace) (state)).getInventory().setContents(furnaceContents.get(loc));
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate furnace: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate furnace: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate furnace: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate furnace: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
for (final BlockLoc loc : bannerBase.keySet()) { for (final BlockLoc loc : bannerBase.keySet()) {
@ -715,10 +715,10 @@ public class BukkitChunkManager extends ChunkManager {
} }
state.update(true); state.update(true);
} else { } else {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate banner: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate banner: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("&c[WARN] Plot clear failed to regenerate banner: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset); PS.log("&c[WARN] Plot clear failed to regenerate banner: " + loc.x + x_offset + "," + loc.y + "," + loc.z + z_offset);
} }
} }
} }

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java
View File

@ -20,7 +20,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.util.bukkit; package com.intellectualcrafters.plot.util.bukkit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
@ -85,8 +85,8 @@ public class BukkitPlayerFunctions {
} }
public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) { public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) {
final Plot plot1 = PlotSquared.getInstance().getPlots(world).get(pos1); final Plot plot1 = PS.get().getPlots(world).get(pos1);
final Plot plot2 = PlotSquared.getInstance().getPlots(world).get(pos2); final Plot plot2 = PS.get().getPlots(world).get(pos2);
if (plot1 != null) { if (plot1 != null) {
pos1 = MainUtil.getBottomPlot(plot1).id; pos1 = MainUtil.getBottomPlot(plot1).id;
} }
@ -110,7 +110,7 @@ public class BukkitPlayerFunctions {
* @return boolean * @return boolean
*/ */
public static Plot getCurrentPlot(final Player player) { public static Plot getCurrentPlot(final Player player) {
if (!PlotSquared.getInstance().isPlotWorld(player.getWorld().getName())) { if (!PS.get().isPlotWorld(player.getWorld().getName())) {
return null; return null;
} }
final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(player)); final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(player));
@ -118,8 +118,8 @@ public class BukkitPlayerFunctions {
if (id == null) { if (id == null) {
return null; return null;
} }
if (PlotSquared.getInstance().getPlots(world).containsKey(id)) { if (PS.get().getPlots(world).containsKey(id)) {
return PlotSquared.getInstance().getPlots(world).get(id); return PS.get().getPlots(world).get(id);
} }
return new Plot(id, null, new ArrayList<UUID>(), new ArrayList<UUID>(), world); return new Plot(id, null, new ArrayList<UUID>(), new ArrayList<UUID>(), world);
} }
@ -132,7 +132,7 @@ public class BukkitPlayerFunctions {
* @return boolean * @return boolean
*/ */
public static Set<Plot> getPlayerPlots(final String world, final Player plr) { public static Set<Plot> getPlayerPlots(final String world, final Player plr) {
final Set<Plot> p = PlotSquared.getInstance().getPlots(world, plr.getName()); final Set<Plot> p = PS.get().getPlots(world, plr.getName());
if (p == null) { if (p == null) {
return new HashSet<>(); return new HashSet<>();
} }

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util.bukkit; package com.intellectualcrafters.plot.util.bukkit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.ConfigurationNode; import com.intellectualcrafters.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotGenerator;
import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PlotWorld;
@ -28,7 +28,7 @@ public class BukkitSetupUtils extends SetupUtils {
if (plugin.isEnabled()) { if (plugin.isEnabled()) {
final ChunkGenerator generator = plugin.getDefaultWorldGenerator(testWorld, ""); final ChunkGenerator generator = plugin.getDefaultWorldGenerator(testWorld, "");
if (generator != null) { if (generator != null) {
PlotSquared.getInstance().removePlotWorld(testWorld); PS.get().removePlotWorld(testWorld);
final String name = plugin.getDescription().getName(); final String name = plugin.getDescription().getName();
// final PlotGenerator pgen = (PlotGenerator) generator; // final PlotGenerator pgen = (PlotGenerator) generator;
// if (pgen.getPlotManager() instanceof SquarePlotManager) { // if (pgen.getPlotManager() instanceof SquarePlotManager) {
@ -46,14 +46,14 @@ public class BukkitSetupUtils extends SetupUtils {
final ConfigurationNode[] steps = object.step; final ConfigurationNode[] steps = object.step;
final String world = object.world; final String world = object.world;
for (final ConfigurationNode step : steps) { for (final ConfigurationNode step : steps) {
PlotSquared.getInstance().config.set("worlds." + world + "." + step.getConstant(), step.getValue()); PS.get().config.set("worlds." + world + "." + step.getConstant(), step.getValue());
} }
if (object.type != 0) { if (object.type != 0) {
PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.type", object.type); PS.get().config.set("worlds." + world + "." + "generator.type", object.type);
PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.terrain", object.terrain); PS.get().config.set("worlds." + world + "." + "generator.terrain", object.terrain);
PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.plugin", object.plotManager); PS.get().config.set("worlds." + world + "." + "generator.plugin", object.plotManager);
if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) { if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
PlotSquared.getInstance().config.set("worlds." + world + "." + "generator.init", object.setupGenerator); PS.get().config.set("worlds." + world + "." + "generator.init", object.setupGenerator);
} }
ChunkGenerator gen = generators.get(object.setupGenerator); ChunkGenerator gen = generators.get(object.setupGenerator);
if (gen instanceof PlotGenerator) { if (gen instanceof PlotGenerator) {
@ -61,7 +61,7 @@ public class BukkitSetupUtils extends SetupUtils {
} }
} }
try { try {
PlotSquared.getInstance().config.save(PlotSquared.getInstance().configFile); PS.get().config.save(PS.get().configFile);
} catch (final IOException e) { } catch (final IOException e) {
e.printStackTrace(); e.printStackTrace();
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/Metrics.java
View File

@ -49,7 +49,7 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
public class Metrics { public class Metrics {
/** /**
@ -525,7 +525,7 @@ public class Metrics {
connection.addRequestProperty("Connection", "close"); connection.addRequestProperty("Connection", "close");
connection.setDoOutput(true); connection.setDoOutput(true);
if (this.debug) { if (this.debug) {
PlotSquared.log("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length); PS.log("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
} }
// Write the data // Write the data
final OutputStream os = connection.getOutputStream(); final OutputStream os = connection.getOutputStream();

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SendChunk.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util.bukkit; package com.intellectualcrafters.plot.util.bukkit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor; import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor;
@ -29,7 +29,7 @@ public class SendChunk {
private static final RefClass classChunkCoordIntPair = getRefClass("{nms}.ChunkCoordIntPair"); private static final RefClass classChunkCoordIntPair = getRefClass("{nms}.ChunkCoordIntPair");
private static final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk"); private static final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
private static final RefClass classChunk = getRefClass("{nms}.Chunk"); private static final RefClass classChunk = getRefClass("{nms}.Chunk");
private static boolean v1_7_10 = PlotSquared.getInstance().IMP.checkVersion(1, 7, 10) && !PlotSquared.getInstance().IMP.checkVersion(1, 8, 0); private static boolean v1_7_10 = PS.get().IMP.checkVersion(1, 7, 10) && !PS.get().IMP.checkVersion(1, 8, 0);
// Ref Method // Ref Method
private static RefMethod methodGetHandle; private static RefMethod methodGetHandle;
// Ref Field // Ref Field

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java
View File

@ -1,6 +1,6 @@
package com.intellectualcrafters.plot.util.bukkit; package com.intellectualcrafters.plot.util.bukkit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.generator.AugmentedPopulator; import com.intellectualcrafters.plot.generator.AugmentedPopulator;
import com.intellectualcrafters.plot.util.SetupUtils; import com.intellectualcrafters.plot.util.SetupUtils;
import org.bukkit.World; import org.bukkit.World;
@ -15,7 +15,7 @@ import java.util.Iterator;
public class SetGenCB { public class SetGenCB {
public static void setGenerator(World world) throws Exception { public static void setGenerator(World world) throws Exception {
SetupUtils.manager.updateGenerators(); SetupUtils.manager.updateGenerators();
PlotSquared.getInstance().removePlotWorldAbs(world.getName()); PS.get().removePlotWorldAbs(world.getName());
ChunkGenerator gen = world.getGenerator(); ChunkGenerator gen = world.getGenerator();
if (gen == null) { if (gen == null) {
return; return;
@ -49,6 +49,6 @@ public class SetGenCB {
} }
} }
} }
PlotSquared.getInstance().loadWorld(world.getName(), null); PS.get().loadWorld(world.getName(), null);
} }
} }

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/UUIDHandler.java
View File

@ -4,7 +4,7 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.google.common.io.InputSupplier; import com.google.common.io.InputSupplier;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -90,7 +90,7 @@ public class UUIDHandler {
public static HashSet<UUID> getAllUUIDS() { public static HashSet<UUID> getAllUUIDS() {
HashSet<UUID> uuids = new HashSet<UUID>(); HashSet<UUID> uuids = new HashSet<UUID>();
for (Plot plot : PlotSquared.getInstance().getPlotsRaw()) { for (Plot plot : PS.get().getPlotsRaw()) {
for (UUID uuid : plot.trusted) { for (UUID uuid : plot.trusted) {
uuids.add(uuid); uuids.add(uuid);
} }
@ -116,12 +116,12 @@ public class UUIDHandler {
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@Override @Override
public void run() { public void run() {
PlotSquared.log(C.PREFIX.s() + "&6Starting player data caching for: " + world); PS.log(C.PREFIX.s() + "&6Starting player data caching for: " + world);
final HashMap<StringWrapper, UUID> toAdd = new HashMap<>(); final HashMap<StringWrapper, UUID> toAdd = new HashMap<>();
toAdd.put(new StringWrapper("*"), DBFunc.everyone); toAdd.put(new StringWrapper("*"), DBFunc.everyone);
if (Settings.TWIN_MODE_UUID) { if (Settings.TWIN_MODE_UUID) {
HashSet<UUID> all = getAllUUIDS(); HashSet<UUID> all = getAllUUIDS();
PlotSquared.log("&aFast mod UUID caching enabled!"); PS.log("&aFast mod UUID caching enabled!");
final File playerdataFolder = new File(container, world + File.separator + "playerdata"); final File playerdataFolder = new File(container, world + File.separator + "playerdata");
String[] dat = playerdataFolder.list(new FilenameFilter() { String[] dat = playerdataFolder.list(new FilenameFilter() {
@Override @Override
@ -147,7 +147,7 @@ public class UUIDHandler {
} }
} catch (final Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
PlotSquared.log(C.PREFIX.s() + "Invalid playerdata: " + current); PS.log(C.PREFIX.s() + "Invalid playerdata: " + current);
} }
} }
} }
@ -176,7 +176,7 @@ public class UUIDHandler {
final UUID uuid = UUID.fromString(s); final UUID uuid = UUID.fromString(s);
uuids.add(uuid); uuids.add(uuid);
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log(C.PREFIX.s() + "Invalid playerdata: " + current); PS.log(C.PREFIX.s() + "Invalid playerdata: " + current);
} }
} }
break; break;
@ -214,7 +214,7 @@ public class UUIDHandler {
ExpireManager.dates.put(uuid, last); ExpireManager.dates.put(uuid, last);
toAdd.put(new StringWrapper(name), uuid); toAdd.put(new StringWrapper(name), uuid);
} catch (final Throwable e) { } catch (final Throwable e) {
PlotSquared.log(C.PREFIX.s() + "&6Invalid playerdata: " + uuid.toString() + ".dat"); PS.log(C.PREFIX.s() + "&6Invalid playerdata: " + uuid.toString() + ".dat");
} }
} }
for (final String name : names) { for (final String name : names) {
@ -245,7 +245,7 @@ public class UUIDHandler {
for (Entry<StringWrapper, UUID> entry : toAdd.entrySet()) { for (Entry<StringWrapper, UUID> entry : toAdd.entrySet()) {
add(entry.getKey(), entry.getValue()); add(entry.getKey(), entry.getValue());
} }
PlotSquared.log(C.PREFIX.s() + "&6Cached a total of: " + UUIDHandler.uuidMap.size() + " UUIDs"); PS.log(C.PREFIX.s() + "&6Cached a total of: " + UUIDHandler.uuidMap.size() + " UUIDs");
} }
}); });
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java
View File

@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.BukkitOfflinePlayer;
import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -83,7 +83,7 @@ public class LowerOfflineUUIDWrapper extends UUIDWrapper {
return p.toArray(new Player[0]); return p.toArray(new Player[0]);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("Failed to resolve online players"); PS.log("Failed to resolve online players");
this.getOnline = null; this.getOnline = null;
return Bukkit.getOnlinePlayers().toArray(new Player[0]); return Bukkit.getOnlinePlayers().toArray(new Player[0]);
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java
View File

@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.BukkitOfflinePlayer;
import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
@ -83,7 +83,7 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
return p.toArray(new Player[0]); return p.toArray(new Player[0]);
} }
} catch (final Exception e) { } catch (final Exception e) {
PlotSquared.log("Failed to resolve online players"); PS.log("Failed to resolve online players");
this.getOnline = null; this.getOnline = null;
return Bukkit.getOnlinePlayers().toArray(new Player[0]); return Bukkit.getOnlinePlayers().toArray(new Player[0]);
} }

4
PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java
View File

@ -1,6 +1,6 @@
package com.intellectualsites.translation.bukkit; package com.intellectualsites.translation.bukkit;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PS;
import com.intellectualsites.translation.TranslationAsset; import com.intellectualsites.translation.TranslationAsset;
import com.intellectualsites.translation.TranslationLanguage; import com.intellectualsites.translation.TranslationLanguage;
import com.intellectualsites.translation.TranslationManager; import com.intellectualsites.translation.TranslationManager;
@ -33,7 +33,7 @@ public class BukkitTranslation {
* @return parent folder * @return parent folder
*/ */
public static File getParent() { public static File getParent() {
return new File(PlotSquared.getInstance().IMP.getDirectory() + File.separator + "translations"); return new File(PS.get().IMP.getDirectory() + File.separator + "translations");
} }
/** /**