From 47ebbce40e75b59c926ea4a13e24cdc15c373469 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 4 Jun 2014 08:08:04 +0200 Subject: [PATCH] Renamed some class files so they match with others. --- src/com/massivecraft/mcore/MCore.java | 8 ++++---- ...istration.java => MCoreEngineCommandRegistration.java} | 6 +++--- .../mcore/{EngineMainMCore.java => MCoreEngineMain.java} | 6 +++--- ...{EngineMCoreVariable.java => MCoreEngineVariable.java} | 6 +++--- ...gineWorldNameSet.java => MCoreEngineWorldNameSet.java} | 6 +++--- .../massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java | 6 +++--- .../massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java | 4 ++-- .../massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java | 4 ++-- .../massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java | 4 ++-- .../mcore/mcorecmd/CmdMCoreBufferWhitespace.java | 6 +++--- src/com/massivecraft/mcore/util/MUtil.java | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) rename src/com/massivecraft/mcore/{EngineCommandRegistration.java => MCoreEngineCommandRegistration.java} (90%) rename src/com/massivecraft/mcore/{EngineMainMCore.java => MCoreEngineMain.java} (95%) rename src/com/massivecraft/mcore/{EngineMCoreVariable.java => MCoreEngineVariable.java} (92%) rename src/com/massivecraft/mcore/{EngineWorldNameSet.java => MCoreEngineWorldNameSet.java} (86%) diff --git a/src/com/massivecraft/mcore/MCore.java b/src/com/massivecraft/mcore/MCore.java index ddbd6f63..730fe65f 100644 --- a/src/com/massivecraft/mcore/MCore.java +++ b/src/com/massivecraft/mcore/MCore.java @@ -161,12 +161,12 @@ public class MCore extends MPlugin IdUtil.setup(); // Register events - EngineMainMCore.get().activate(); - EngineMCoreVariable.get().activate(); + MCoreEngineMain.get().activate(); + MCoreEngineVariable.get().activate(); EngineScheduledTeleport.get().activate(); EngineTeleportMixinCause.get().activate(); - EngineWorldNameSet.get().activate(); - EngineCommandRegistration.get().activate(); + MCoreEngineWorldNameSet.get().activate(); + MCoreEngineCommandRegistration.get().activate(); PlayerUtil.get().activate(); // Tasks diff --git a/src/com/massivecraft/mcore/EngineCommandRegistration.java b/src/com/massivecraft/mcore/MCoreEngineCommandRegistration.java similarity index 90% rename from src/com/massivecraft/mcore/EngineCommandRegistration.java rename to src/com/massivecraft/mcore/MCoreEngineCommandRegistration.java index f4fa757e..43bbdee0 100644 --- a/src/com/massivecraft/mcore/EngineCommandRegistration.java +++ b/src/com/massivecraft/mcore/MCoreEngineCommandRegistration.java @@ -14,14 +14,14 @@ import org.bukkit.plugin.Plugin; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.MCoreBukkitCommand; -public class EngineCommandRegistration extends EngineAbstract +public class MCoreEngineCommandRegistration extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static EngineCommandRegistration i = new EngineCommandRegistration(); - public static EngineCommandRegistration get() { return i; } + private static MCoreEngineCommandRegistration i = new MCoreEngineCommandRegistration(); + public static MCoreEngineCommandRegistration get() { return i; } // -------------------------------------------- // // OVERRIDE diff --git a/src/com/massivecraft/mcore/EngineMainMCore.java b/src/com/massivecraft/mcore/MCoreEngineMain.java similarity index 95% rename from src/com/massivecraft/mcore/EngineMainMCore.java rename to src/com/massivecraft/mcore/MCoreEngineMain.java index 74410a59..132a4005 100644 --- a/src/com/massivecraft/mcore/EngineMainMCore.java +++ b/src/com/massivecraft/mcore/MCoreEngineMain.java @@ -36,14 +36,14 @@ import com.massivecraft.mcore.store.SenderColl; import com.massivecraft.mcore.util.IdUtil; import com.massivecraft.mcore.util.SmokeUtil; -public class EngineMainMCore extends EngineAbstract +public class MCoreEngineMain extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static EngineMainMCore i = new EngineMainMCore(); - public static EngineMainMCore get() { return i; } + private static MCoreEngineMain i = new MCoreEngineMain(); + public static MCoreEngineMain get() { return i; } // -------------------------------------------- // // OVERRIDE diff --git a/src/com/massivecraft/mcore/EngineMCoreVariable.java b/src/com/massivecraft/mcore/MCoreEngineVariable.java similarity index 92% rename from src/com/massivecraft/mcore/EngineMCoreVariable.java rename to src/com/massivecraft/mcore/MCoreEngineVariable.java index e9f1d754..80c2056a 100644 --- a/src/com/massivecraft/mcore/EngineMCoreVariable.java +++ b/src/com/massivecraft/mcore/MCoreEngineVariable.java @@ -20,14 +20,14 @@ import org.bukkit.plugin.Plugin; import com.massivecraft.mcore.util.IdUtil; import com.massivecraft.mcore.util.Txt; -public class EngineMCoreVariable extends EngineAbstract +public class MCoreEngineVariable extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static EngineMCoreVariable i = new EngineMCoreVariable(); - public static EngineMCoreVariable get() { return i; } + private static MCoreEngineVariable i = new MCoreEngineVariable(); + public static MCoreEngineVariable get() { return i; } // -------------------------------------------- // // OVERRIDE diff --git a/src/com/massivecraft/mcore/EngineWorldNameSet.java b/src/com/massivecraft/mcore/MCoreEngineWorldNameSet.java similarity index 86% rename from src/com/massivecraft/mcore/EngineWorldNameSet.java rename to src/com/massivecraft/mcore/MCoreEngineWorldNameSet.java index a08ddd96..77a2737e 100644 --- a/src/com/massivecraft/mcore/EngineWorldNameSet.java +++ b/src/com/massivecraft/mcore/MCoreEngineWorldNameSet.java @@ -12,14 +12,14 @@ import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.plugin.Plugin; -public class EngineWorldNameSet extends EngineAbstract +public class MCoreEngineWorldNameSet extends EngineAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static EngineWorldNameSet i = new EngineWorldNameSet(); - public static EngineWorldNameSet get() { return i; } + private static MCoreEngineWorldNameSet i = new MCoreEngineWorldNameSet(); + public static MCoreEngineWorldNameSet get() { return i; } // -------------------------------------------- // // OVERRIDE diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java index bacf4f8d..d1908423 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java +++ b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferAdd.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.mcorecmd; -import com.massivecraft.mcore.EngineMCoreVariable; +import com.massivecraft.mcore.MCoreEngineVariable; import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -34,9 +34,9 @@ public class CmdMCoreBufferAdd extends MCommand String string = this.argConcatFrom(0); if (string == null) return; - String buffer = EngineMCoreVariable.getBuffer(sender); + String buffer = MCoreEngineVariable.getBuffer(sender); buffer += string; - EngineMCoreVariable.setBuffer(sender, buffer); + MCoreEngineVariable.setBuffer(sender, buffer); msg("Buffer Add"); } diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java index bd755bab..5048065f 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java +++ b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferClear.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.mcorecmd; -import com.massivecraft.mcore.EngineMCoreVariable; +import com.massivecraft.mcore.MCoreEngineVariable; import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -27,7 +27,7 @@ public class CmdMCoreBufferClear extends MCommand @Override public void perform() { - EngineMCoreVariable.setBuffer(sender, ""); + MCoreEngineVariable.setBuffer(sender, ""); msg("Buffer Clear"); } diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java index 75135dec..2597eae6 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java +++ b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferPrint.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.mcorecmd; -import com.massivecraft.mcore.EngineMCoreVariable; +import com.massivecraft.mcore.MCoreEngineVariable; import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -27,7 +27,7 @@ public class CmdMCoreBufferPrint extends MCommand @Override public void perform() { - String buffer = EngineMCoreVariable.getBuffer(sender); + String buffer = MCoreEngineVariable.getBuffer(sender); if (buffer == null || buffer.length() == 0) { msg("Nothing to print. Your buffer is empty."); diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java index 9aaae027..6ced4cde 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java +++ b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferSet.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.mcorecmd; -import com.massivecraft.mcore.EngineMCoreVariable; +import com.massivecraft.mcore.MCoreEngineVariable; import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -34,7 +34,7 @@ public class CmdMCoreBufferSet extends MCommand String string = this.argConcatFrom(0); if (string == null) return; - EngineMCoreVariable.setBuffer(sender, string); + MCoreEngineVariable.setBuffer(sender, string); msg("Buffer was Set"); } diff --git a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java index 02d59730..ca231d7f 100644 --- a/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java +++ b/src/com/massivecraft/mcore/mcorecmd/CmdMCoreBufferWhitespace.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.mcorecmd; -import com.massivecraft.mcore.EngineMCoreVariable; +import com.massivecraft.mcore.MCoreEngineVariable; import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARInteger; @@ -37,9 +37,9 @@ public class CmdMCoreBufferWhitespace extends MCommand String string = Txt.repeat(" ", times); - String buffer = EngineMCoreVariable.getBuffer(sender); + String buffer = MCoreEngineVariable.getBuffer(sender); buffer += string; - EngineMCoreVariable.setBuffer(sender, buffer); + MCoreEngineVariable.setBuffer(sender, buffer); msg("Buffer Whitespace"); } diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java index f797329d..b1db96af 100644 --- a/src/com/massivecraft/mcore/util/MUtil.java +++ b/src/com/massivecraft/mcore/util/MUtil.java @@ -48,9 +48,9 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -import com.massivecraft.mcore.EngineMainMCore; +import com.massivecraft.mcore.MCoreEngineMain; import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.EngineWorldNameSet; +import com.massivecraft.mcore.MCoreEngineWorldNameSet; import com.massivecraft.mcore.util.extractor.Extractor; import com.massivecraft.mcore.util.extractor.ExtractorPlayer; import com.massivecraft.mcore.util.extractor.ExtractorPlayerName; @@ -454,7 +454,7 @@ public class MUtil public static String kickReason(PlayerQuitEvent event) { - return EngineMainMCore.kickedPlayerReasons.get(event.getPlayer().getName()); + return MCoreEngineMain.kickedPlayerReasons.get(event.getPlayer().getName()); } public static boolean causedByKick(PlayerQuitEvent event) @@ -558,7 +558,7 @@ public class MUtil public static Set getLoadedWorldNames() { - return EngineWorldNameSet.get().getWorldNames(); + return MCoreEngineWorldNameSet.get().getWorldNames(); } // -------------------------------------------- //