Renamed some class files so they match with others.
This commit is contained in:
parent
c9983e8032
commit
47ebbce40e
@ -161,12 +161,12 @@ public class MCore extends MPlugin
|
|||||||
IdUtil.setup();
|
IdUtil.setup();
|
||||||
|
|
||||||
// Register events
|
// Register events
|
||||||
EngineMainMCore.get().activate();
|
MCoreEngineMain.get().activate();
|
||||||
EngineMCoreVariable.get().activate();
|
MCoreEngineVariable.get().activate();
|
||||||
EngineScheduledTeleport.get().activate();
|
EngineScheduledTeleport.get().activate();
|
||||||
EngineTeleportMixinCause.get().activate();
|
EngineTeleportMixinCause.get().activate();
|
||||||
EngineWorldNameSet.get().activate();
|
MCoreEngineWorldNameSet.get().activate();
|
||||||
EngineCommandRegistration.get().activate();
|
MCoreEngineCommandRegistration.get().activate();
|
||||||
PlayerUtil.get().activate();
|
PlayerUtil.get().activate();
|
||||||
|
|
||||||
// Tasks
|
// Tasks
|
||||||
|
@ -14,14 +14,14 @@ import org.bukkit.plugin.Plugin;
|
|||||||
import com.massivecraft.mcore.cmd.MCommand;
|
import com.massivecraft.mcore.cmd.MCommand;
|
||||||
import com.massivecraft.mcore.cmd.MCoreBukkitCommand;
|
import com.massivecraft.mcore.cmd.MCoreBukkitCommand;
|
||||||
|
|
||||||
public class EngineCommandRegistration extends EngineAbstract
|
public class MCoreEngineCommandRegistration extends EngineAbstract
|
||||||
{
|
{
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// INSTANCE & CONSTRUCT
|
// INSTANCE & CONSTRUCT
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
|
|
||||||
private static EngineCommandRegistration i = new EngineCommandRegistration();
|
private static MCoreEngineCommandRegistration i = new MCoreEngineCommandRegistration();
|
||||||
public static EngineCommandRegistration get() { return i; }
|
public static MCoreEngineCommandRegistration get() { return i; }
|
||||||
|
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// OVERRIDE
|
// OVERRIDE
|
@ -36,14 +36,14 @@ import com.massivecraft.mcore.store.SenderColl;
|
|||||||
import com.massivecraft.mcore.util.IdUtil;
|
import com.massivecraft.mcore.util.IdUtil;
|
||||||
import com.massivecraft.mcore.util.SmokeUtil;
|
import com.massivecraft.mcore.util.SmokeUtil;
|
||||||
|
|
||||||
public class EngineMainMCore extends EngineAbstract
|
public class MCoreEngineMain extends EngineAbstract
|
||||||
{
|
{
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// INSTANCE & CONSTRUCT
|
// INSTANCE & CONSTRUCT
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
|
|
||||||
private static EngineMainMCore i = new EngineMainMCore();
|
private static MCoreEngineMain i = new MCoreEngineMain();
|
||||||
public static EngineMainMCore get() { return i; }
|
public static MCoreEngineMain get() { return i; }
|
||||||
|
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// OVERRIDE
|
// OVERRIDE
|
@ -20,14 +20,14 @@ import org.bukkit.plugin.Plugin;
|
|||||||
import com.massivecraft.mcore.util.IdUtil;
|
import com.massivecraft.mcore.util.IdUtil;
|
||||||
import com.massivecraft.mcore.util.Txt;
|
import com.massivecraft.mcore.util.Txt;
|
||||||
|
|
||||||
public class EngineMCoreVariable extends EngineAbstract
|
public class MCoreEngineVariable extends EngineAbstract
|
||||||
{
|
{
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// INSTANCE & CONSTRUCT
|
// INSTANCE & CONSTRUCT
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
|
|
||||||
private static EngineMCoreVariable i = new EngineMCoreVariable();
|
private static MCoreEngineVariable i = new MCoreEngineVariable();
|
||||||
public static EngineMCoreVariable get() { return i; }
|
public static MCoreEngineVariable get() { return i; }
|
||||||
|
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// OVERRIDE
|
// OVERRIDE
|
@ -12,14 +12,14 @@ import org.bukkit.event.world.WorldLoadEvent;
|
|||||||
import org.bukkit.event.world.WorldUnloadEvent;
|
import org.bukkit.event.world.WorldUnloadEvent;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
public class EngineWorldNameSet extends EngineAbstract
|
public class MCoreEngineWorldNameSet extends EngineAbstract
|
||||||
{
|
{
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// INSTANCE & CONSTRUCT
|
// INSTANCE & CONSTRUCT
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
|
|
||||||
private static EngineWorldNameSet i = new EngineWorldNameSet();
|
private static MCoreEngineWorldNameSet i = new MCoreEngineWorldNameSet();
|
||||||
public static EngineWorldNameSet get() { return i; }
|
public static MCoreEngineWorldNameSet get() { return i; }
|
||||||
|
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// OVERRIDE
|
// OVERRIDE
|
@ -1,6 +1,6 @@
|
|||||||
package com.massivecraft.mcore.mcorecmd;
|
package com.massivecraft.mcore.mcorecmd;
|
||||||
|
|
||||||
import com.massivecraft.mcore.EngineMCoreVariable;
|
import com.massivecraft.mcore.MCoreEngineVariable;
|
||||||
import com.massivecraft.mcore.MCorePerm;
|
import com.massivecraft.mcore.MCorePerm;
|
||||||
import com.massivecraft.mcore.cmd.MCommand;
|
import com.massivecraft.mcore.cmd.MCommand;
|
||||||
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
||||||
@ -34,9 +34,9 @@ public class CmdMCoreBufferAdd extends MCommand
|
|||||||
String string = this.argConcatFrom(0);
|
String string = this.argConcatFrom(0);
|
||||||
if (string == null) return;
|
if (string == null) return;
|
||||||
|
|
||||||
String buffer = EngineMCoreVariable.getBuffer(sender);
|
String buffer = MCoreEngineVariable.getBuffer(sender);
|
||||||
buffer += string;
|
buffer += string;
|
||||||
EngineMCoreVariable.setBuffer(sender, buffer);
|
MCoreEngineVariable.setBuffer(sender, buffer);
|
||||||
|
|
||||||
msg("<i>Buffer Add");
|
msg("<i>Buffer Add");
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.massivecraft.mcore.mcorecmd;
|
package com.massivecraft.mcore.mcorecmd;
|
||||||
|
|
||||||
import com.massivecraft.mcore.EngineMCoreVariable;
|
import com.massivecraft.mcore.MCoreEngineVariable;
|
||||||
import com.massivecraft.mcore.MCorePerm;
|
import com.massivecraft.mcore.MCorePerm;
|
||||||
import com.massivecraft.mcore.cmd.MCommand;
|
import com.massivecraft.mcore.cmd.MCommand;
|
||||||
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
||||||
@ -27,7 +27,7 @@ public class CmdMCoreBufferClear extends MCommand
|
|||||||
@Override
|
@Override
|
||||||
public void perform()
|
public void perform()
|
||||||
{
|
{
|
||||||
EngineMCoreVariable.setBuffer(sender, "");
|
MCoreEngineVariable.setBuffer(sender, "");
|
||||||
|
|
||||||
msg("<i>Buffer Clear");
|
msg("<i>Buffer Clear");
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.massivecraft.mcore.mcorecmd;
|
package com.massivecraft.mcore.mcorecmd;
|
||||||
|
|
||||||
import com.massivecraft.mcore.EngineMCoreVariable;
|
import com.massivecraft.mcore.MCoreEngineVariable;
|
||||||
import com.massivecraft.mcore.MCorePerm;
|
import com.massivecraft.mcore.MCorePerm;
|
||||||
import com.massivecraft.mcore.cmd.MCommand;
|
import com.massivecraft.mcore.cmd.MCommand;
|
||||||
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
||||||
@ -27,7 +27,7 @@ public class CmdMCoreBufferPrint extends MCommand
|
|||||||
@Override
|
@Override
|
||||||
public void perform()
|
public void perform()
|
||||||
{
|
{
|
||||||
String buffer = EngineMCoreVariable.getBuffer(sender);
|
String buffer = MCoreEngineVariable.getBuffer(sender);
|
||||||
if (buffer == null || buffer.length() == 0)
|
if (buffer == null || buffer.length() == 0)
|
||||||
{
|
{
|
||||||
msg("<i>Nothing to print. Your buffer is empty.");
|
msg("<i>Nothing to print. Your buffer is empty.");
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.massivecraft.mcore.mcorecmd;
|
package com.massivecraft.mcore.mcorecmd;
|
||||||
|
|
||||||
import com.massivecraft.mcore.EngineMCoreVariable;
|
import com.massivecraft.mcore.MCoreEngineVariable;
|
||||||
import com.massivecraft.mcore.MCorePerm;
|
import com.massivecraft.mcore.MCorePerm;
|
||||||
import com.massivecraft.mcore.cmd.MCommand;
|
import com.massivecraft.mcore.cmd.MCommand;
|
||||||
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
|
||||||
@ -34,7 +34,7 @@ public class CmdMCoreBufferSet extends MCommand
|
|||||||
String string = this.argConcatFrom(0);
|
String string = this.argConcatFrom(0);
|
||||||
if (string == null) return;
|
if (string == null) return;
|
||||||
|
|
||||||
EngineMCoreVariable.setBuffer(sender, string);
|
MCoreEngineVariable.setBuffer(sender, string);
|
||||||
|
|
||||||
msg("<i>Buffer was Set");
|
msg("<i>Buffer was Set");
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.massivecraft.mcore.mcorecmd;
|
package com.massivecraft.mcore.mcorecmd;
|
||||||
|
|
||||||
import com.massivecraft.mcore.EngineMCoreVariable;
|
import com.massivecraft.mcore.MCoreEngineVariable;
|
||||||
import com.massivecraft.mcore.MCorePerm;
|
import com.massivecraft.mcore.MCorePerm;
|
||||||
import com.massivecraft.mcore.cmd.MCommand;
|
import com.massivecraft.mcore.cmd.MCommand;
|
||||||
import com.massivecraft.mcore.cmd.arg.ARInteger;
|
import com.massivecraft.mcore.cmd.arg.ARInteger;
|
||||||
@ -37,9 +37,9 @@ public class CmdMCoreBufferWhitespace extends MCommand
|
|||||||
|
|
||||||
String string = Txt.repeat(" ", times);
|
String string = Txt.repeat(" ", times);
|
||||||
|
|
||||||
String buffer = EngineMCoreVariable.getBuffer(sender);
|
String buffer = MCoreEngineVariable.getBuffer(sender);
|
||||||
buffer += string;
|
buffer += string;
|
||||||
EngineMCoreVariable.setBuffer(sender, buffer);
|
MCoreEngineVariable.setBuffer(sender, buffer);
|
||||||
|
|
||||||
msg("<i>Buffer Whitespace");
|
msg("<i>Buffer Whitespace");
|
||||||
}
|
}
|
||||||
|
@ -48,9 +48,9 @@ import org.bukkit.potion.PotionEffect;
|
|||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
import org.bukkit.projectiles.ProjectileSource;
|
import org.bukkit.projectiles.ProjectileSource;
|
||||||
|
|
||||||
import com.massivecraft.mcore.EngineMainMCore;
|
import com.massivecraft.mcore.MCoreEngineMain;
|
||||||
import com.massivecraft.mcore.MCore;
|
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.Extractor;
|
||||||
import com.massivecraft.mcore.util.extractor.ExtractorPlayer;
|
import com.massivecraft.mcore.util.extractor.ExtractorPlayer;
|
||||||
import com.massivecraft.mcore.util.extractor.ExtractorPlayerName;
|
import com.massivecraft.mcore.util.extractor.ExtractorPlayerName;
|
||||||
@ -454,7 +454,7 @@ public class MUtil
|
|||||||
|
|
||||||
public static String kickReason(PlayerQuitEvent event)
|
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)
|
public static boolean causedByKick(PlayerQuitEvent event)
|
||||||
@ -558,7 +558,7 @@ public class MUtil
|
|||||||
|
|
||||||
public static Set<String> getLoadedWorldNames()
|
public static Set<String> getLoadedWorldNames()
|
||||||
{
|
{
|
||||||
return EngineWorldNameSet.get().getWorldNames();
|
return MCoreEngineWorldNameSet.get().getWorldNames();
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
|
Loading…
Reference in New Issue
Block a user