EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First pass at using Txt.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-10 10:32:04 +02:00
parent 433d45ae4c
commit 61b526e387
22 changed files with 89 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/massivecraft/factions/zcore/MCommand.java
View File

@@ -10,6 +10,7 @@ import org.bukkit.entity.Player;
import com.massivecraft.factions.zcore.MCommand;
import com.massivecraft.factions.zcore.MPlugin;
import com.massivecraft.factions.zcore.util.TextUtil;
import com.massivecraft.mcore.util.Txt;
public abstract class MCommand<T extends MPlugin>
@@ -221,7 +222,7 @@ public abstract class MCommand<T extends MPlugin>
public String getUseageTemplate(List<MCommand<?>> commandChain, boolean addShortHelp)
{
StringBuilder ret = new StringBuilder();
ret.append(p.txt.parseTags("<c>"));
ret.append(Txt.parse("<c>"));
ret.append('/');
for (MCommand<?> mc : commandChain)
@@ -255,13 +256,13 @@ public abstract class MCommand<T extends MPlugin>
if (args.size() > 0)
{
ret.append(p.txt.parseTags("<p> "));
ret.append(Txt.parse("<p> "));
ret.append(TextUtil.implode(args, " "));
}
if (addShortHelp)
{
ret.append(p.txt.parseTags(" <i>"));
ret.append(Txt.parse(" <i>"));
ret.append(this.getHelpShort());
}
@@ -284,7 +285,7 @@ public abstract class MCommand<T extends MPlugin>
public void msg(String str, Object... args)
{
sender.sendMessage(p.txt.parse(str, args));
sender.sendMessage(Txt.parse(str, args));
}
public void sendMessage(String msg)

19
src/com/massivecraft/factions/zcore/MPlugin.java
View File

@@ -1,9 +1,6 @@
package com.massivecraft.factions.zcore;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.*;
import java.util.Map.Entry;
import java.util.logging.Level;
import org.bukkit.Bukkit;
@@ -14,17 +11,15 @@ import com.massivecraft.factions.zcore.persist.SaveTask;
import com.massivecraft.factions.zcore.util.LibLoader;
import com.massivecraft.factions.zcore.util.PermUtil;
import com.massivecraft.factions.zcore.util.Persist;
import com.massivecraft.factions.zcore.util.TextUtil;
import com.massivecraft.mcore.util.Txt;
import com.massivecraft.mcore.xlib.gson.Gson;
import com.massivecraft.mcore.xlib.gson.GsonBuilder;
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
public abstract class MPlugin extends JavaPlugin
{
// Some utils
public Persist persist;
public TextUtil txt;
public LibLoader lib;
public PermUtil perm;
@@ -60,8 +55,8 @@ public abstract class MPlugin extends JavaPlugin
// if ( ! lib.require("gson.jar", "http://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.1/gson-2.1.jar")) return false;
this.gson = this.getGsonBuilder().create();
this.txt = new TextUtil();
initTXT();
//this.txt = new TextUtil();
//initTXT();
// Create and register listeners
this.mPluginSecretPlayerListener = new MPluginSecretPlayerListener(this);
@@ -119,7 +114,7 @@ public abstract class MPlugin extends JavaPlugin
// -------------------------------------------- //
// LANG AND TAGS
// -------------------------------------------- //
/*
// These are not supposed to be used directly.
// They are loaded and used through the TextUtil instance for the plugin.
public Map<String, String> rawTags = new LinkedHashMap<String, String>();
@@ -151,7 +146,7 @@ public abstract class MPlugin extends JavaPlugin
{
this.txt.tags.put(rawTag.getKey(), TextUtil.parseColor(rawTag.getValue()));
}
}
}*/
// -------------------------------------------- //
// HOOKS
@@ -176,12 +171,12 @@ public abstract class MPlugin extends JavaPlugin
public void log(String str, Object... args)
{
log(Level.INFO, this.txt.parse(str, args));
log(Level.INFO, Txt.parse(str, args));
}
public void log(Level level, String str, Object... args)
{
log(level, this.txt.parse(str, args));
log(level, Txt.parse(str, args));
}
public void log(Level level, Object msg)

3
src/com/massivecraft/factions/zcore/util/PermUtil.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.permissions.Permission;
import com.massivecraft.factions.zcore.Lang;
import com.massivecraft.factions.zcore.MPlugin;
import com.massivecraft.mcore.util.Txt;
public class PermUtil {
@@ -25,7 +26,7 @@ public class PermUtil {
public String getForbiddenMessage(String perm)
{
return p.txt.parse(Lang.permForbidden, getPermissionDescription(perm));
return Txt.parse(Lang.permForbidden, getPermissionDescription(perm));
}
/**