From 5a60df3f5ab10f93cf6800f4b2c2dc85bd2b4a92 Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Mon, 20 Jun 2011 19:51:58 -0600
Subject: [PATCH] Rename Compression -> Scaling

---
 .../onarandombox/MultiverseCore/MVTeleport.java    |  4 ++--
 src/com/onarandombox/MultiverseCore/MVWorld.java   |  4 ++--
 .../MultiverseCore/MultiverseCore.java             | 14 +-------------
 .../command/commands/CoordCommand.java             |  2 +-
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/com/onarandombox/MultiverseCore/MVTeleport.java b/src/com/onarandombox/MultiverseCore/MVTeleport.java
index 7de36348..f8c1ec73 100644
--- a/src/com/onarandombox/MultiverseCore/MVTeleport.java
+++ b/src/com/onarandombox/MultiverseCore/MVTeleport.java
@@ -39,8 +39,8 @@ public class MVTeleport {
         double x, y, z;
         
         // Grab the Compression value for each world.
-        double srcComp = plugin.worlds.get(l.getWorld().getName()).compression;
-        double trgComp = plugin.worlds.get(w.getName()).compression;
+        double srcComp = plugin.worlds.get(l.getWorld().getName()).scaling;
+        double trgComp = plugin.worlds.get(w.getName()).scaling;
         
         // MultiverseCore.debugMsg(p.getName() + " -> " + p.getWorld().getName() + "(" + srcComp + ") -> " + w.getName() + "(" + trgComp + ")");
         
diff --git a/src/com/onarandombox/MultiverseCore/MVWorld.java b/src/com/onarandombox/MultiverseCore/MVWorld.java
index 234e53ae..6f77851c 100644
--- a/src/com/onarandombox/MultiverseCore/MVWorld.java
+++ b/src/com/onarandombox/MultiverseCore/MVWorld.java
@@ -35,7 +35,7 @@ public class MVWorld {
     public List<String> editBlacklist; // Contain a list of Players/Groups which cannot edit this World. (Place/Destroy Blocks)
     public List<String> worldBlacklist; // Contain a list of Worlds which Players cannot use to Portal to this World.
     
-    public Double compression; // How stretched/compressed distances are
+    public Double scaling; // How stretched/compressed distances are
     
     public MVWorld(World world, Configuration config, MultiverseCore instance, Long seed) {
         this.config = config;
@@ -52,7 +52,7 @@ public class MVWorld {
         
         this.pvp = config.getBoolean("worlds." + this.name + ".pvp", true);
         
-        this.compression = config.getDouble("worlds." + this.name + ".compression", 1.0);
+        this.scaling = config.getDouble("worlds." + this.name + ".scale", 1.0);
         
         this.joinWhitelist = config.getStringList("worlds." + name + ".playerWhitelist", joinWhitelist);
         this.joinBlacklist = config.getStringList("worlds." + name + ".playerBlacklist", joinBlacklist);
diff --git a/src/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/com/onarandombox/MultiverseCore/MultiverseCore.java
index b71e5cdf..cececef6 100644
--- a/src/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -45,19 +45,7 @@ import com.nijiko.permissions.PermissionHandler;
 import com.nijikokun.bukkit.Permissions.Permissions;
 import com.onarandombox.MultiverseCore.command.CommandManager;
 import com.onarandombox.MultiverseCore.command.QueuedCommand;
-import com.onarandombox.MultiverseCore.command.commands.ConfirmCommand;
-import com.onarandombox.MultiverseCore.command.commands.CoordCommand;
-import com.onarandombox.MultiverseCore.command.commands.CreateCommand;
-import com.onarandombox.MultiverseCore.command.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.command.commands.HelpCommand;
-import com.onarandombox.MultiverseCore.command.commands.ImportCommand;
-import com.onarandombox.MultiverseCore.command.commands.ListCommand;
-import com.onarandombox.MultiverseCore.command.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.command.commands.SetSpawnCommand;
-import com.onarandombox.MultiverseCore.command.commands.SpawnCommand;
-import com.onarandombox.MultiverseCore.command.commands.TeleportCommand;
-import com.onarandombox.MultiverseCore.command.commands.UnloadCommand;
-import com.onarandombox.MultiverseCore.command.commands.WhoCommand;
+import com.onarandombox.MultiverseCore.command.commands.*;
 import com.onarandombox.MultiverseCore.commands.MVModify;
 import com.onarandombox.MultiverseCore.commands.MVReload;
 import com.onarandombox.MultiverseCore.configuration.DefaultConfiguration;
diff --git a/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java b/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java
index f707954b..fdef7108 100644
--- a/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java
+++ b/src/com/onarandombox/MultiverseCore/command/commands/CoordCommand.java
@@ -29,7 +29,7 @@ public class CoordCommand extends BaseCommand {
         if (sender instanceof Player) {
         	Player p = (Player) sender;
             p.sendMessage(ChatColor.RED + "World: " + ChatColor.WHITE + p.getWorld().getName());
-            p.sendMessage(ChatColor.RED + "Compression: " + ChatColor.WHITE + plugin.worlds.get(p.getWorld().getName()).compression);
+            p.sendMessage(ChatColor.RED + "World Scale: " + ChatColor.WHITE + plugin.worlds.get(p.getWorld().getName()).scaling);
             p.sendMessage(ChatColor.RED + "Coordinates: " + ChatColor.WHITE + locMan.strCoords(p.getLocation()));
             p.sendMessage(ChatColor.RED + "Direction: " + ChatColor.WHITE + locMan.getDirection(p.getLocation()));
             p.sendMessage(ChatColor.RED + "Block: " + ChatColor.WHITE + Material.getMaterial(p.getWorld().getBlockTypeIdAt(p.getLocation())));