From 873df5b92998ebe0d1a6d1ed0edd114442d9852a Mon Sep 17 00:00:00 2001 From: gomeow Date: Thu, 7 Mar 2013 10:57:44 -0800 Subject: [PATCH] Refactor :D --- .../shock => com/drtshock}/playervaults/Listeners.java | 9 +++++---- src/{me/shock => com/drtshock}/playervaults/Main.java | 9 +++++---- .../drtshock}/playervaults/commands/Commands.java | 2 +- .../drtshock}/playervaults/commands/Feedback.java | 2 +- .../drtshock}/playervaults/commands/VaultOperations.java | 7 ++++--- .../drtshock}/playervaults/commands/VaultViewInfo.java | 2 +- .../drtshock}/playervaults/util/Metrics.java | 2 +- .../drtshock}/playervaults/util/Serialization.java | 2 +- .../drtshock}/playervaults/util/Updater.java | 5 +++-- .../drtshock}/playervaults/util/VaultManager.java | 5 +++-- 10 files changed, 25 insertions(+), 20 deletions(-) rename src/{me/shock => com/drtshock}/playervaults/Listeners.java (94%) rename src/{me/shock => com/drtshock}/playervaults/Main.java (95%) rename src/{me/shock => com/drtshock}/playervaults/commands/Commands.java (97%) rename src/{me/shock => com/drtshock}/playervaults/commands/Feedback.java (95%) rename src/{me/shock => com/drtshock}/playervaults/commands/VaultOperations.java (95%) rename src/{me/shock => com/drtshock}/playervaults/commands/VaultViewInfo.java (83%) rename src/{me/shock => com/drtshock}/playervaults/util/Metrics.java (99%) rename src/{me/shock => com/drtshock}/playervaults/util/Serialization.java (98%) rename src/{me/shock => com/drtshock}/playervaults/util/Updater.java (94%) rename src/{me/shock => com/drtshock}/playervaults/util/VaultManager.java (97%) diff --git a/src/me/shock/playervaults/Listeners.java b/src/com/drtshock/playervaults/Listeners.java similarity index 94% rename from src/me/shock/playervaults/Listeners.java rename to src/com/drtshock/playervaults/Listeners.java index cac1a7e..fae3a05 100644 --- a/src/me/shock/playervaults/Listeners.java +++ b/src/com/drtshock/playervaults/Listeners.java @@ -1,10 +1,7 @@ -package me.shock.playervaults; +package com.drtshock.playervaults; import java.io.IOException; -import me.shock.playervaults.commands.Commands; -import me.shock.playervaults.commands.VaultViewInfo; -import me.shock.playervaults.util.VaultManager; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -23,6 +20,10 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.Inventory; +import com.drtshock.playervaults.commands.Commands; +import com.drtshock.playervaults.commands.VaultViewInfo; +import com.drtshock.playervaults.util.VaultManager; + public class Listeners implements Listener { public Main plugin; diff --git a/src/me/shock/playervaults/Main.java b/src/com/drtshock/playervaults/Main.java similarity index 95% rename from src/me/shock/playervaults/Main.java rename to src/com/drtshock/playervaults/Main.java index f64305b..0860140 100644 --- a/src/me/shock/playervaults/Main.java +++ b/src/com/drtshock/playervaults/Main.java @@ -1,4 +1,4 @@ -package me.shock.playervaults; +package com.drtshock.playervaults; import java.io.File; @@ -8,14 +8,15 @@ import java.io.InputStream; import java.util.List; import java.util.logging.Logger; -import me.shock.playervaults.commands.Commands; -import me.shock.playervaults.util.Metrics; -import me.shock.playervaults.util.Updater; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import com.drtshock.playervaults.commands.Commands; +import com.drtshock.playervaults.util.Metrics; +import com.drtshock.playervaults.util.Updater; + public class Main extends JavaPlugin { diff --git a/src/me/shock/playervaults/commands/Commands.java b/src/com/drtshock/playervaults/commands/Commands.java similarity index 97% rename from src/me/shock/playervaults/commands/Commands.java rename to src/com/drtshock/playervaults/commands/Commands.java index d859854..437b047 100644 --- a/src/me/shock/playervaults/commands/Commands.java +++ b/src/com/drtshock/playervaults/commands/Commands.java @@ -1,4 +1,4 @@ -package me.shock.playervaults.commands; +package com.drtshock.playervaults.commands; import java.util.HashMap; diff --git a/src/me/shock/playervaults/commands/Feedback.java b/src/com/drtshock/playervaults/commands/Feedback.java similarity index 95% rename from src/me/shock/playervaults/commands/Feedback.java rename to src/com/drtshock/playervaults/commands/Feedback.java index aa669ee..7bbe0fa 100644 --- a/src/me/shock/playervaults/commands/Feedback.java +++ b/src/com/drtshock/playervaults/commands/Feedback.java @@ -1,4 +1,4 @@ -package me.shock.playervaults.commands; +package com.drtshock.playervaults.commands; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/me/shock/playervaults/commands/VaultOperations.java b/src/com/drtshock/playervaults/commands/VaultOperations.java similarity index 95% rename from src/me/shock/playervaults/commands/VaultOperations.java rename to src/com/drtshock/playervaults/commands/VaultOperations.java index 4ec71cb..0e1f2bb 100644 --- a/src/me/shock/playervaults/commands/VaultOperations.java +++ b/src/com/drtshock/playervaults/commands/VaultOperations.java @@ -1,15 +1,16 @@ -package me.shock.playervaults.commands; +package com.drtshock.playervaults.commands; import java.io.IOException; -import me.shock.playervaults.Main; -import me.shock.playervaults.util.VaultManager; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.drtshock.playervaults.Main; +import com.drtshock.playervaults.util.VaultManager; + public class VaultOperations { private static Main plugin; diff --git a/src/me/shock/playervaults/commands/VaultViewInfo.java b/src/com/drtshock/playervaults/commands/VaultViewInfo.java similarity index 83% rename from src/me/shock/playervaults/commands/VaultViewInfo.java rename to src/com/drtshock/playervaults/commands/VaultViewInfo.java index 995b13a..4e7787a 100644 --- a/src/me/shock/playervaults/commands/VaultViewInfo.java +++ b/src/com/drtshock/playervaults/commands/VaultViewInfo.java @@ -1,4 +1,4 @@ -package me.shock.playervaults.commands; +package com.drtshock.playervaults.commands; public class VaultViewInfo { diff --git a/src/me/shock/playervaults/util/Metrics.java b/src/com/drtshock/playervaults/util/Metrics.java similarity index 99% rename from src/me/shock/playervaults/util/Metrics.java rename to src/com/drtshock/playervaults/util/Metrics.java index fa83065..0733408 100644 --- a/src/me/shock/playervaults/util/Metrics.java +++ b/src/com/drtshock/playervaults/util/Metrics.java @@ -1,4 +1,4 @@ -package me.shock.playervaults.util; +package com.drtshock.playervaults.util; /* * Copyright 2011 Tyler Blair. All rights reserved. diff --git a/src/me/shock/playervaults/util/Serialization.java b/src/com/drtshock/playervaults/util/Serialization.java similarity index 98% rename from src/me/shock/playervaults/util/Serialization.java rename to src/com/drtshock/playervaults/util/Serialization.java index 8258196..e8a3f14 100644 --- a/src/me/shock/playervaults/util/Serialization.java +++ b/src/com/drtshock/playervaults/util/Serialization.java @@ -1,4 +1,4 @@ -package me.shock.playervaults.util; +package com.drtshock.playervaults.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/me/shock/playervaults/util/Updater.java b/src/com/drtshock/playervaults/util/Updater.java similarity index 94% rename from src/me/shock/playervaults/util/Updater.java rename to src/com/drtshock/playervaults/util/Updater.java index 004923f..df066f6 100644 --- a/src/me/shock/playervaults/util/Updater.java +++ b/src/com/drtshock/playervaults/util/Updater.java @@ -1,11 +1,12 @@ -package me.shock.playervaults.util; +package com.drtshock.playervaults.util; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; import java.net.UnknownHostException; -import me.shock.playervaults.Main; +import com.drtshock.playervaults.Main; + public class Updater extends Main { diff --git a/src/me/shock/playervaults/util/VaultManager.java b/src/com/drtshock/playervaults/util/VaultManager.java similarity index 97% rename from src/me/shock/playervaults/util/VaultManager.java rename to src/com/drtshock/playervaults/util/VaultManager.java index f9698e8..b2731b5 100644 --- a/src/me/shock/playervaults/util/VaultManager.java +++ b/src/com/drtshock/playervaults/util/VaultManager.java @@ -1,9 +1,8 @@ -package me.shock.playervaults.util; +package com.drtshock.playervaults.util; import java.io.File; import java.io.IOException; -import me.shock.playervaults.Main; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -13,6 +12,8 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; +import com.drtshock.playervaults.Main; + public class VaultManager { public Main plugin;