From e4010f76bb73842c55433e1e43bd219b933bc2ba Mon Sep 17 00:00:00 2001 From: boy0001 Date: Mon, 16 Feb 2015 23:14:06 +1100 Subject: [PATCH] commented out some stuff --- PlotSquared/pom.xml | 5 - .../plot/commands/Condense.java | 14 +-- .../plot/object/PlotHologram.java | 98 +++++++++---------- .../plot/util/PlotHelper.java | 1 - 4 files changed, 50 insertions(+), 68 deletions(-) diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml index f55f498e0..e02a5a146 100644 --- a/PlotSquared/pom.xml +++ b/PlotSquared/pom.xml @@ -77,11 +77,6 @@ bukkit 1.8-R0.1-SNAPSHOT - - com.gmail.filoghost.holographicdisplays - HolographicDisplays - 2.1.4 - net.milkbowl.vault Vault diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java index 59bdf4028..321696f3d 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java @@ -21,35 +21,23 @@ package com.intellectualcrafters.plot.commands; -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import com.intellectualcrafters.plot.PlotMain; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.generator.HybridPlotManager; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; -import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.ExpireManager; import com.intellectualcrafters.plot.util.PlayerFunctions; import com.intellectualcrafters.plot.util.PlotHelper; -import com.intellectualcrafters.plot.util.TaskManager; public class Condense extends SubCommand { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHologram.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHologram.java index 33c8ba3f3..bb6b97007 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHologram.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHologram.java @@ -1,49 +1,49 @@ -package com.intellectualcrafters.plot.object; - -import java.util.Collection; - -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; - -import com.gmail.filoghost.holographicdisplays.api.Hologram; -import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; -import com.intellectualcrafters.plot.PlotMain; -import com.intellectualcrafters.plot.util.PlotHelper; - -/** - * Created 2015-02-14 for PlotSquared - * - * @author Citymonstret - */ -public class PlotHologram { - - private static JavaPlugin plugin; - private final PlotId id; - private final String world; - private Hologram hologram; - - public PlotHologram(final String world, final PlotId id) { - this.id = id; - this.world = world; - this.hologram = createHologram(PlotMain.getPlotManager(world).getSignLoc(Bukkit.getWorld(world), PlotMain.getWorldSettings(world), PlotHelper.getPlot(Bukkit.getWorld(world), id))); - } - - public static Hologram createHologram(final org.bukkit.Location location) { - return HologramsAPI.createHologram(getPlugin(), location); - } - - public static JavaPlugin getPlugin() { - if (plugin == null) { - plugin = JavaPlugin.getPlugin(PlotMain.class); - } - return plugin; - } - - public static void removeAll() { - final Collection holograms = HologramsAPI.getHolograms(getPlugin()); - for (final Hologram h : holograms) { - h.delete(); - } - } - -} +//package com.intellectualcrafters.plot.object; +// +//import java.util.Collection; +// +//import org.bukkit.Bukkit; +//import org.bukkit.plugin.java.JavaPlugin; +// +//import com.gmail.filoghost.holographicdisplays.api.Hologram; +//import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; +//import com.intellectualcrafters.plot.PlotMain; +//import com.intellectualcrafters.plot.util.PlotHelper; +// +///** +// * Created 2015-02-14 for PlotSquared +// * +// * @author Citymonstret +// */ +//public class PlotHologram { +// +// private static JavaPlugin plugin; +// private final PlotId id; +// private final String world; +// private Hologram hologram; +// +// public PlotHologram(final String world, final PlotId id) { +// this.id = id; +// this.world = world; +// this.hologram = createHologram(PlotMain.getPlotManager(world).getSignLoc(Bukkit.getWorld(world), PlotMain.getWorldSettings(world), PlotHelper.getPlot(Bukkit.getWorld(world), id))); +// } +// +// public static Hologram createHologram(final org.bukkit.Location location) { +// return HologramsAPI.createHologram(getPlugin(), location); +// } +// +// public static JavaPlugin getPlugin() { +// if (plugin == null) { +// plugin = JavaPlugin.getPlugin(PlotMain.class); +// } +// return plugin; +// } +// +// public static void removeAll() { +// final Collection holograms = HologramsAPI.getHolograms(getPlugin()); +// for (final Hologram h : holograms) { +// h.delete(); +// } +// } +// +//} diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java index 96fb8c053..4b56d4a46 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java @@ -29,7 +29,6 @@ import java.util.UUID; import net.milkbowl.vault.economy.Economy; -import org.apache.logging.log4j.core.pattern.IntegerPatternConverter; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location;