From 66e72759496f48e8eecd0783ec6ae5d998bac0a8 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sun, 22 Feb 2015 17:18:45 +1100 Subject: [PATCH] RUTils --- .../plot/commands/Debug.java | 10 +----- .../plot/util/RUtils.java | 34 ------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java index 54ae8c264..fdf095049 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java @@ -29,6 +29,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.Lag; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.RUtils; +import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; public class Debug extends SubCommand { public Debug() { @@ -66,15 +67,6 @@ public class Debug extends SubCommand { information.append(getSection(section, "PlotWorld")); information.append(getLine(line, "Plot Worlds", worlds)); information.append(getLine(line, "Owned Plots", PlotSquared.getPlots().size())); - // information.append(getLine(line, "PlotWorld Size", - // PlotHelper.getWorldFolderSize() + "MB")); - for (final String worldname : PlotSquared.getPlotWorlds()) { - final World world = Bukkit.getWorld(worldname); - information.append(getLine(line, "World: " + world.getName() + " size", MainUtil.getWorldFolderSize(world))); - information.append(getLine(line, " - Entities", MainUtil.getEntities(world))); - information.append(getLine(line, " - Loaded Tile Entities", MainUtil.getTileEntities(world))); - information.append(getLine(line, " - Loaded Chunks", MainUtil.getLoadedChunks(world))); - } information.append(getSection(section, "RAM")); information.append(getLine(line, "Free Ram", RUtils.getFreeRam() + "MB")); information.append(getLine(line, "Total Ram", RUtils.getTotalRam() + "MB")); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java index 4277c4c1b..8ec02fae4 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java @@ -20,9 +20,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.util; -import org.bukkit.Location; -import org.bukkit.entity.Player; - import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; @@ -78,37 +75,6 @@ public class RUtils { return string.replaceAll("%sec%", s_s).replaceAll("%min%", s_m).replaceAll("%hours%", s_h); } - /** - * Force textures on the client - * - * @param p texture to force - */ - public void forceTexture(final Player p) { - p.setResourcePack(Settings.PLOT_SPECIFIC_RESOURCE_PACK); - } - - public Direction getDirection(final Location l) { - final double d = ((l.getYaw() * 4.0F) / 360.0F) + 0.5D; - final int i = (int) d; - final int x = d < i ? i - 1 : i; - switch (x) { - case 0: - return Direction.SOUTH; - case 1: - return Direction.EAST; - case 2: - return Direction.NORTH; - case 3: - return Direction.WEST; - default: - return null; - } - } - - public boolean compareDirections(final Location l1, final Location l2) { - return getDirection(l1) == getDirection(l2); - } - enum Direction { SOUTH(0), EAST(1),