Many changes for TFM 5.0

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

View File

@ -29,11 +29,11 @@ public final class AdminWorld extends CustomWorld
private static final String GENERATION_PARAMETERS = ConfigEntry.FLATLANDS_GENERATE_PARAMS.getString();
private static final String WORLD_NAME = "adminworld";
//
private final Map<Player, Long> teleportCooldown = new HashMap<Player, Long>();
private final Map<CommandSender, Boolean> accessCache = new HashMap<CommandSender, Boolean>();
private final Map<Player, Long> teleportCooldown = new HashMap<>();
private final Map<CommandSender, Boolean> accessCache = new HashMap<>();
//
private Long cacheLastCleared = null;
private Map<Player, Player> guestList = new HashMap<Player, Player>(); // Guest, Supervisor
private Map<Player, Player> guestList = new HashMap<>(); // Guest, Supervisor
private WorldWeather weather = WorldWeather.OFF;
private WorldTime time = WorldTime.INHERIT;
@ -128,7 +128,7 @@ public final class AdminWorld extends CustomWorld
public String guestListToString()
{
final List<String> output = new ArrayList<String>();
final List<String> output = new ArrayList<>();
final Iterator<Map.Entry<Player, Player>> it = guestList.entrySet().iterator();
while (it.hasNext())
{

View File

@ -215,7 +215,7 @@ public class CleanroomChunkGenerator extends ChunkGenerator
else
{
// This is the default, but just in case default populators change to stock minecraft populators by default...
return new ArrayList<BlockPopulator>();
return new ArrayList<>();
}
}