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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sauilitired 2015-02-16 13:29:50 +01:00
commit 2bb03b5e13
4 changed files with 50 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PlotSquared/pom.xml
View File

@ -78,11 +78,6 @@
<version>1.8-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gmail.filoghost.holographicdisplays</groupId>
<artifactId>HolographicDisplays</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.3.2</version>

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

@ -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 {

98
PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHologram.java
View File

@ -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<Hologram> 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<Hologram> holograms = HologramsAPI.getHolograms(getPlugin());
// for (final Hologram h : holograms) {
// h.delete();
// }
// }
//
//}

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
View File

@ -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;