PandacubeFr/PandacraftUtils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lecture de config.yml dans une classe à part (DefaultConfigManager)

Browse Source
This commit is contained in:
Marc Baloup
2015-02-17 00:45:41 -05:00
parent 0b6b288c8d
commit f7f093bc52
20 changed files with 270 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/AutoMessagesManager.java
View File

@@ -6,8 +6,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
@@ -31,8 +31,8 @@ public class AutoMessagesManager extends BukkitRunnable {
@Override
public void run() {
List<AutoMessage> messages = getMessagesFromConfig();
int interval_default = ConfigManager.getInstance().Automessage_interval_default,
interval_players = ConfigManager.getInstance().Automessage_interval_players;
int interval_default = ConfigManager.getInstance().defaultConfig.autoMessages_defaultInterval,
interval_players = ConfigManager.getInstance().defaultConfig.autoMessages_playerInterval;
// message
// permissions

2
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/CommandAliasManager.java
View File

@@ -3,8 +3,8 @@ package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
import java.util.List;
import java.util.Map;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

4
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/PacketOutServerInfoListener.java
View File

@@ -15,8 +15,8 @@ import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.WrappedGameProfile;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
@@ -106,7 +106,7 @@ public class PacketOutServerInfoListener {
event.getPacket().getServerPings().read(0).setMotD(ConfigManager.getInstance().ServerMOTD);
event.getPacket().getServerPings().read(0).setMotD(ConfigManager.getInstance().defaultConfig.pingMOTD);
}
}
);

6
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/AfkManager.java
View File

@@ -3,8 +3,8 @@ package net.mc_pandacraft.java.plugin.pandacraftutils.modules.player_control;
import java.util.Collection;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
@@ -28,8 +28,6 @@ import org.bukkit.scheduler.BukkitRunnable;
public class AfkManager extends BukkitRunnable implements Listener {
private PandacraftUtils plugin = PandacraftUtils.getInstance();
private int timeoutAutoAfkMessage = ConfigManager.getInstance().AFK_timeoutAutoAfkMessage;
private int timeoutAutoAfkKick = ConfigManager.getInstance().AFK_timeoutAutoAfkKick;
public AfkManager()
@@ -53,6 +51,8 @@ public class AfkManager extends BukkitRunnable implements Listener {
@Override
public void run() {
// methode exécutée toute les secondes
int timeoutAutoAfkMessage = ConfigManager.getInstance().defaultConfig.afk_timeoutAutoMessage;
int timeoutAutoAfkKick = ConfigManager.getInstance().defaultConfig.afk_timeoutAutoKick;
Collection<OnlinePlayer> oPlayers = OnlinePlayerManager.getAll();
for (OnlinePlayer ap : oPlayers.toArray(new OnlinePlayer[oPlayers.size()]))
{ // parcours de tout les joueurs

16
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/ChatAnalysisManager.java
View File

@@ -1,7 +1,7 @@
package net.mc_pandacraft.java.plugin.pandacraftutils.modules.player_control;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
@@ -34,10 +34,10 @@ public class ChatAnalysisManager implements Listener {
long time = System.currentTimeMillis();
if (op.getLast_message() != null)
{
if (op.getLast_message().equals(message) && time - op.getLast_message_time() < ConfigManager.getInstance().ChatAnalysis_timeBeforeResendSameMessage)
if (op.getLast_message().equals(message) && time - op.getLast_message_time() < ConfigManager.getInstance().defaultConfig.chatAnalysis_timeBeforeResendSameMessage)
{
event.getPlayer().sendMessage(ChatColor.RED+"Evitez de renvoyer le même message !");
if (op.getVL() >= ConfigManager.getInstance().ChatAnalysis_maxViolationLevel/2)
if (op.getVL() >= ConfigManager.getInstance().defaultConfig.chatAnalysis_maxViolationLevel/2)
event.setCancelled(true);
else
event.setMessage(analyseString(message, op));
@@ -47,7 +47,7 @@ public class ChatAnalysisManager implements Listener {
else
{
long time_since_last_message = time - op.getLast_message_time();
long timeout_needed = message.length() * ConfigManager.getInstance().ChatAnalysis_timePerCaracterForNewMessage;
long timeout_needed = message.length() * ConfigManager.getInstance().defaultConfig.chatAnalysis_timePerCaracterForNewMessage;
if (time_since_last_message < timeout_needed)
{
@@ -63,7 +63,7 @@ public class ChatAnalysisManager implements Listener {
event.setMessage(message);
op.removeVL(NumberConversions.floor(((time - op.getLast_message_time())/1000)/ConfigManager.getInstance().ChatAnalysis_nbSecondForOneVLDown));
op.removeVL(NumberConversions.floor(((time - op.getLast_message_time())/1000)/ConfigManager.getInstance().defaultConfig.chatAnalysis_nbSecondForOneVLDown));
op.setLast_message(message);
@@ -168,17 +168,17 @@ public class ChatAnalysisManager implements Listener {
{
if (op.getLast_command() != null)
{
if (op.getLast_command().equals(command_line) && time - op.getLast_command_time() < ConfigManager.getInstance().ChatAnalysis_timeBeforeResendSameCommand)
if (op.getLast_command().equals(command_line) && time - op.getLast_command_time() < ConfigManager.getInstance().defaultConfig.chatAnalysis_timeBeforeResendSameCommand)
{
event.getPlayer().sendMessage(ChatColor.RED+"Patientez avant de renvoyer cette commande !");
if (op.getVL() >= ConfigManager.getInstance().ChatAnalysis_maxViolationLevel/2)
if (op.getVL() >= ConfigManager.getInstance().defaultConfig.chatAnalysis_maxViolationLevel/2)
event.setCancelled(true);
op.addVL(5);
event.setMessage(command_line);
return;
}
}
op.removeVL(NumberConversions.floor(((time - op.getLast_command_time())/1000)/ConfigManager.getInstance().ChatAnalysis_nbSecondForOneVLDown));
op.removeVL(NumberConversions.floor(((time - op.getLast_command_time())/1000)/ConfigManager.getInstance().defaultConfig.chatAnalysis_nbSecondForOneVLDown));
op.setLast_command(command_line);
op.setLast_command_time(time);

11
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/EntitySpamManager.java
View File

@@ -1,5 +1,7 @@
package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
import java.util.List;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
@@ -11,8 +13,8 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.ExpBottleEvent;
import org.bukkit.event.vehicle.VehicleCreateEvent;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
public class EntitySpamManager implements Listener {
@@ -79,9 +81,8 @@ public class EntitySpamManager implements Listener {
private boolean isInWorld(Location l) {
World w = l.getWorld();
String config = ConfigManager.getInstance().EntitySpam_worlds;
String[] worlds = config.split(";");
for (String ws : worlds)
List<String> config = ConfigManager.getInstance().defaultConfig.entitySpam_worlds;
for (String ws : config)
if (w.getName().equalsIgnoreCase(ws))
return true;
return false;
@@ -91,7 +92,7 @@ public class EntitySpamManager implements Listener {
private boolean containsTooManyEntity(Chunk c) {
if (!c.isLoaded()) c.load();
Entity[] ents = c.getEntities();
return (ents.length > ConfigManager.getInstance().EntitySpam_limitPerChunks);
return (ents.length > ConfigManager.getInstance().defaultConfig.entitySpam_limitPerChunk);
}
}

4
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/WorldBorderManager.java
View File

@@ -6,8 +6,8 @@ import java.util.List;
import java.util.Map;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager.WorldBorderConfig;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.config.ConfigManager.WorldBorderConfig;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
import net.mc_pandacraft.java.util.bukkit.protocol.ParticleEffect;