SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformat.

Browse Source
This commit is contained in:
drtshock 2014-12-11 10:05:04 -06:00
parent 125a8c2050
commit 9aecd5f439
39 changed files with 408 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
public class CmdAdmin extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
View File

@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;

1
src/main/java/com/massivecraft/factions/cmd/CmdConvert.java
View File

@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Conf.Backend;
import com.massivecraft.factions.zcore.persist.json.FactionsJSON;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.command.ConsoleCommandSender;
public class CmdConvert extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import java.util.ArrayList;

2
src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
View File

@ -4,9 +4,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
public class CmdDeinvite extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -8,7 +8,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;

1
src/main/java/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.SmokeUtil;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;

2
src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
View File

@ -4,9 +4,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
public class CmdInvite extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdJoin.java
View File

@ -4,7 +4,6 @@ import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
public class CmdJoin extends FCommand {

2
src/main/java/com/massivecraft/factions/cmd/CmdList.java
View File

@ -5,9 +5,7 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
import java.util.ArrayList;

2
src/main/java/com/massivecraft/factions/cmd/CmdMod.java
View File

@ -5,9 +5,7 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
public class CmdMod extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;

2
src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java
View File

@ -4,9 +4,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
public class CmdShowInvites extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdStatus.java
View File

@ -3,7 +3,6 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.apache.commons.lang.time.DurationFormatUtils;
import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdTag.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import java.util.ArrayList;

1
src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
public class CmdUnclaim extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.event.LandUnclaimAllEvent;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
public class CmdUnclaimall extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/FCommand.java
View File

@ -5,7 +5,6 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.MCommand;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;

1
src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

2
src/main/java/com/massivecraft/factions/zcore/MCommand.java
View File

@ -6,9 +6,7 @@ import com.massivecraft.factions.P;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TextUtil;
import mkremins.fanciful.FancyMessage;
import org.apache.commons.lang.time.DurationFormatUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
View File

@ -16,7 +16,6 @@ import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;

1
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
View File

@ -11,7 +11,6 @@ import com.massivecraft.factions.util.LazyLocation;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;

9
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -20,8 +20,8 @@ import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration;
/**
* An enum for requesting strings from the language file.
* The contents of this enum file may be subject to frequent changes.
* An enum for requesting strings from the language file. The contents of this enum file may be subject to frequent
* changes.
*/
public enum TL {
/**
@ -470,11 +470,14 @@ public enum TL {
/**
* Lang enum constructor. Use this when your desired path simply exchanges '_' for '.'
*
* @param start The default string.
*/
TL(String start) {
this.path = this.name().replace('_', '.');
if(this.path.startsWith(".")) path="root"+path;
if (this.path.startsWith(".")) {
path = "root" + path;
}
this.def = start;
}