AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-30 03:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many changes for TFM 5.0

Browse Source 
Refractoring
Reworked /saconfig
Reworked part of the command system
Removed unused config sections
Refractored part of the config
Fixed bugs with admin list
Actually allow CONSOLE to have senior perms
This commit is contained in:
JeromSar
2016-03-02 20:28:01 +01:00
parent 19ced05110
commit 055973aa37
143 changed files with 939 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
View File

@ -54,14 +54,15 @@ import org.bukkit.util.FileUtil;
public class FUtil
{
private static final Map<String, Integer> ejectTracker = new HashMap<String, Integer>();
public static final Map<String, EntityType> mobtypes = new HashMap<String, EntityType>();
private static final Map<String, Integer> EJECT_TRACKER = new HashMap<>();
private static final Random RANDOM = new Random();
//
public static final String SAVED_FLAGS_FILENAME = "savedflags.dat";
public static final Map<String, EntityType> MOB_TYPES = new HashMap<>();
// See https://github.com/TotalFreedom/License - None of the listed names may be removed.
public static final List<String> DEVELOPERS = Arrays.asList("Madgeek1450", "Prozza", "Wild1145", "WickedGamingUK");
private static final Random RANDOM = new Random();
public static String DATE_STORAGE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z";
public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<String, ChatColor>();
public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
ChatColor.DARK_BLUE,
ChatColor.DARK_GREEN,
@ -86,7 +87,7 @@ public class FUtil
{
if (Creature.class.isAssignableFrom(type.getEntityClass()))
{
mobtypes.put(DepreciationAggregator.getName_EntityType(type).toLowerCase(), type);
MOB_TYPES.put(DepreciationAggregator.getName_EntityType(type).toLowerCase(), type);
}
}
}
@ -316,12 +317,12 @@ public class FUtil
{
mobname = mobname.toLowerCase().trim();
if (!FUtil.mobtypes.containsKey(mobname))
if (!FUtil.MOB_TYPES.containsKey(mobname))
{
throw new Exception();
}
return FUtil.mobtypes.get(mobname);
return FUtil.MOB_TYPES.get(mobname);
}
/**
@ -366,15 +367,15 @@ public class FUtil
EjectMethod method = EjectMethod.STRIKE_ONE;
final String ip = Ips.getIp(player);
if (!FUtil.ejectTracker.containsKey(ip))
if (!FUtil.EJECT_TRACKER.containsKey(ip))
{
FUtil.ejectTracker.put(ip, 0);
FUtil.EJECT_TRACKER.put(ip, 0);
}
int kicks = FUtil.ejectTracker.get(ip);
int kicks = FUtil.EJECT_TRACKER.get(ip);
kicks += 1;
FUtil.ejectTracker.put(ip, kicks);
FUtil.EJECT_TRACKER.put(ip, kicks);
if (kicks <= 1)
{
@ -541,7 +542,7 @@ public class FUtil
public static String playerListToNames(Set<OfflinePlayer> players)
{
List<String> names = new ArrayList<String>();
List<String> names = new ArrayList<>();
for (OfflinePlayer player : players)
{
names.add(player.getName());
@ -554,7 +555,7 @@ public class FUtil
{
Map<String, Boolean> flags = null;
File input = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SAVED_FLAGS_FILENAME);
File input = new File(TotalFreedomMod.plugin.getDataFolder(), SAVED_FLAGS_FILENAME);
if (input.exists())
{
try
@ -604,14 +605,14 @@ public class FUtil
if (flags == null)
{
flags = new HashMap<String, Boolean>();
flags = new HashMap<>();
}
flags.put(flag, value);
try
{
final FileOutputStream fos = new FileOutputStream(new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SAVED_FLAGS_FILENAME));
final FileOutputStream fos = new FileOutputStream(new File(TotalFreedomMod.plugin.getDataFolder(), SAVED_FLAGS_FILENAME));
final ObjectOutputStream oos = new ObjectOutputStream(fos);
oos.writeObject(flags);
oos.close();
@ -717,7 +718,7 @@ public class FUtil
public static List<String> removeDuplicates(List<String> oldList)
{
List<String> newList = new ArrayList<String>();
List<String> newList = new ArrayList<>();
for (String entry : oldList)
{
if (!newList.contains(entry))