JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added in dynamic servermanager updating. 

Added updating of bungeeServers/servers list.
Combined all bungee plugins to Mineplexer

Fixed arcade bug on player quit.
Fixed ServersUI page errors.
This commit is contained in:
Jonathan Williams 2013-09-11 13:53:24 -07:00
parent 0d98868a1f
commit d6bd962768
28 changed files with 647 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plugins/BuildFiles/common.xml
View File

@ -251,5 +251,19 @@
<copy file="../bin/craftbukkit.jar" todir="../Libraries/"/>
<delete dir="../bin/craftbukkit_temp" />
</target>
<target name ="Mineplexer" description="Mineplexer">
<jar jarfile="../bin/Mineplexer.jar">
<fileset dir="../Mineplex.Bungee.Mineplexer/bin">
<include name="**/*.class"/>
</fileset>
<fileset dir="../Mineplex.Bungee.Mineplexer">
<include name="*.yml"/>
</fileset>
<zipfileset src="../Libraries/commons-codec-1.6.jar" />
<zipfileset src="../Libraries/commons-io-2.4.jar" />
</jar>
<copy file="../bin/Mineplexer.jar" todir="../../Testing/Proxy/plugins"/>
</target>
</project>

4
Plugins/Mineplex.Bungee.DynamicServer/plugin.yml
View File

@ -1,4 +0,0 @@
name: DynamicServer
main: mineplex.bungee.dynamicServer.DynamicServer
version: 1
author: defek7

24
Plugins/Mineplex.Bungee.DynamicServer/src/mineplex/bungee/dynamicServer/ReloadServerListCommand.java
View File

@ -1,24 +0,0 @@
package mineplex.bungee.dynamicServer;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
public class ReloadServerListCommand extends Command
{
private DynamicServer _plugin;
public ReloadServerListCommand(DynamicServer plugin)
{
super( "reloaddynamicserver", "bungeecord.command.reloadserverlist" );
_plugin = plugin;
}
@Override
public void execute(CommandSender sender, String[] arg1)
{
_plugin.LoadServers();
sender.sendMessage(ChatColor.BLUE + "DynamicServer>" + ChatColor.GRAY + " Reloaded server list.");
}
}

7
Plugins/Mineplex.Bungee.LobbyBalancer/.classpath
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/BungeeCord.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

11
Plugins/Mineplex.Bungee.LobbyBalancer/.settings/org.eclipse.jdt.core.prefs
View File

@ -1,11 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7

5
Plugins/Mineplex.Bungee.LobbyBalancer/plugin.yml
View File

@ -1,5 +0,0 @@
name: LobbyBalancer
main: mineplex.bungee.lobbyBalancer.LobbyBalancer
version: 1
author: defek7
depends: [DynamicServer]

24
Plugins/Mineplex.Bungee.LobbyBalancer/src/mineplex/bungee/lobbyBalancer/ReloadLobbyServerListCommand.java
View File

@ -1,24 +0,0 @@
package mineplex.bungee.lobbyBalancer;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
public class ReloadLobbyServerListCommand extends Command
{
private LobbyBalancer _plugin;
public ReloadLobbyServerListCommand(LobbyBalancer plugin)
{
super( "reloadlobbybalancer", "bungeecord.command.reloadserverlist" );
_plugin = plugin;
}
@Override
public void execute(CommandSender sender, String[] arg1)
{
_plugin.loadLobbyServers();
sender.sendMessage(ChatColor.BLUE + "LobbyBalancer>" + ChatColor.GRAY + " Reloaded lobby server list.");
}
}

2
Plugins/Mineplex.Bungee.DynamicServer/.classpath → Plugins/Mineplex.Bungee.Mineplexer/.classpath
View File

@ -3,5 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/BungeeCord.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-io-2.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

17
Plugins/Mineplex.Bungee.Mineplexer/.externalToolBuilders/Mineplexer.launch Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="Mineplexer,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="Mineplexer,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="Mineplexer,"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${BUILD_FILES}\common.xml"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Mineplex.Bungee.Mineplexer}"/>
</launchConfiguration>

0
Plugins/Mineplex.Bungee.DynamicServer/.settings/org.eclipse.jdt.core.prefs → Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs
View File

4
Plugins/Mineplex.Bungee.Mineplexer/plugin.yml Normal file
View File

@ -0,0 +1,4 @@
name: Mineplexer
main: mineplex.bungee.Mineplexer
version: 1
author: defek7

33
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java Normal file
View File

@ -0,0 +1,33 @@
package mineplex.bungee;
import mineplex.bungee.bungeeSigns.BungeeSigns;
import mineplex.bungee.dynamicServer.DynamicServer;
import mineplex.bungee.lobbyBalancer.LobbyBalancer;
import mineplex.bungee.playerCount.PlayerCount;
import mineplex.bungee.updater.Updater;
import net.md_5.bungee.api.plugin.Plugin;
public class Mineplexer extends Plugin
{
private DynamicServer _dynamicServers;
private LobbyBalancer _lobbyBalancer;
private PlayerCount _playerCount;
@Override
public void onEnable()
{
new BungeeSigns(this);
new Updater(this);
_dynamicServers = new DynamicServer(this);
_lobbyBalancer = new LobbyBalancer(this);
_playerCount = new PlayerCount(this);
}
public void ReloadServerLists()
{
_dynamicServers.LoadServers();
_lobbyBalancer.loadLobbyServers();
_playerCount.LoadBungeeServers();
}
}

17
Plugins/BungeeSigns/src/mineplex/bungee/BungeeSigns/BungeeSigns.java → Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/bungeeSigns/BungeeSigns.java
View File

@ -1,4 +1,4 @@
package mineplex.bungee.BungeeSigns;
package mineplex.bungee.bungeeSigns;
import java.io.ByteArrayInputStream;
import java.io.DataInput;
@ -21,13 +21,16 @@ import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
public class BungeeSigns extends Plugin implements Listener
public class BungeeSigns implements Listener
{
@Override
public void onEnable()
private Plugin _plugin;
public BungeeSigns(Plugin plugin)
{
getProxy().getPluginManager().registerListener(this, this);
getProxy().registerChannel("BungeeSigns");
_plugin = plugin;
_plugin.getProxy().getPluginManager().registerListener(_plugin, this);
_plugin.getProxy().registerChannel("BungeeSigns");
}
@EventHandler
@ -40,7 +43,7 @@ public class BungeeSigns extends Plugin implements Listener
try
{
in = new DataInputStream(new ByteArrayInputStream(event.getData()));
final ServerInfo serverInfo = getProxy().getServerInfo(in.readUTF());
final ServerInfo serverInfo = _plugin.getProxy().getServerInfo(in.readUTF());
in.close();

14
Plugins/Mineplex.Bungee.DynamicServer/src/mineplex/bungee/dynamicServer/DynamicServer.java → Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/dynamicServer/DynamicServer.java
View File

@ -10,15 +10,17 @@ import java.net.InetSocketAddress;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin;
public class DynamicServer extends Plugin implements Listener
public class DynamicServer implements Listener
{
@Override
public void onEnable()
private Plugin _plugin;
public DynamicServer(Plugin plugin)
{
_plugin = plugin;
LoadServers();
getProxy().getPluginManager().registerListener(this, this);
getProxy().getPluginManager().registerCommand(this, new ReloadServerListCommand(this));
_plugin.getProxy().getPluginManager().registerListener(_plugin, this);
}
public void LoadServers()
@ -44,7 +46,7 @@ public class DynamicServer extends Plugin implements Listener
Integer port = Integer.parseInt(line.split(",")[1].split(":")[1]);
InetSocketAddress socketAddress = new InetSocketAddress(address, port);
getProxy().getServers().put(name, getProxy().constructServerInfo(name, socketAddress, "DynamicServer", false));
_plugin.getProxy().getServers().put(name, _plugin.getProxy().constructServerInfo(name, socketAddress, "DynamicServer", false));
line = br.readLine();
}
}

150
Plugins/Mineplex.Bungee.LobbyBalancer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java → Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
View File

@ -18,19 +18,23 @@ import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.event.EventHandler;
public class LobbyBalancer extends Plugin implements Listener, Runnable
public class LobbyBalancer implements Listener, Runnable
{
private Plugin _plugin;
private HashMap<String, Integer> _lobbyServers = new HashMap<String, Integer>();
@Override
public void onEnable()
private String _bestServer = "Lobby";
private static Object _serverLock = new Object();
public LobbyBalancer(Plugin plugin)
{
_plugin = plugin;
loadLobbyServers();
getProxy().getPluginManager().registerListener(this, this);
getProxy().getScheduler().schedule(this, this, 1L, 1L, TimeUnit.SECONDS);
getProxy().getPluginManager().registerCommand(this, new ReloadLobbyServerListCommand(this));
_plugin.getProxy().getPluginManager().registerListener(_plugin, this);
_plugin.getProxy().getScheduler().schedule(_plugin, this, 1L, 1L, TimeUnit.SECONDS);
}
@EventHandler
@ -39,54 +43,59 @@ public class LobbyBalancer extends Plugin implements Listener, Runnable
if (!event.getTarget().getName().equalsIgnoreCase("Lobby"))
return;
String bestServer = null;
Entry<String, Integer> leastPlayerServer = null;
for (Entry<String, Integer> entry : _lobbyServers.entrySet())
{
if (entry.getValue() == 999)
continue;
if (bestServer == null)
{
bestServer = entry.getKey();
leastPlayerServer = entry;
}
else if (entry.getValue() > _lobbyServers.get(bestServer) && entry.getValue() < 80)
bestServer = entry.getKey();
if (entry.getValue() < leastPlayerServer.getValue())
{
leastPlayerServer = entry;
}
}
if (_lobbyServers.get(bestServer) > 80)
{
bestServer = leastPlayerServer.getKey();
}
event.setTarget(getProxy().getServerInfo(bestServer));
event.setTarget(_plugin.getProxy().getServerInfo(_bestServer));
}
public void run()
{
for (String name : _lobbyServers.keySet())
{
try
{
UpdateServerCount(name);
}
catch (IOException e)
{
e.printStackTrace();
}
}
synchronized (_serverLock)
{
for (String name : _lobbyServers.keySet())
{
try
{
UpdateServerCount(name);
}
catch (IOException e)
{
e.printStackTrace();
}
}
String bestServer = null;
Entry<String, Integer> leastPlayerServer = null;
for (Entry<String, Integer> entry : _lobbyServers.entrySet())
{
if (entry.getValue() == 999)
continue;
if (bestServer == null)
{
bestServer = entry.getKey();
leastPlayerServer = entry;
}
else if (entry.getValue() > _lobbyServers.get(bestServer) && entry.getValue() < 80)
bestServer = entry.getKey();
if (entry.getValue() < leastPlayerServer.getValue())
{
leastPlayerServer = entry;
}
}
if (_lobbyServers.get(bestServer) > 80)
{
bestServer = leastPlayerServer.getKey();
}
_bestServer = bestServer;
}
}
protected void UpdateServerCount(String name) throws IOException
{
InetSocketAddress address = getProxy().getServerInfo(name).getAddress();
InetSocketAddress address = _plugin.getProxy().getServerInfo(name).getAddress();
Socket socket = null;
DataInputStream dataInputStream = null;
@ -125,24 +134,36 @@ public class LobbyBalancer extends Plugin implements Listener, Runnable
{
var27 = var6.substring(1).split("\u0000");
if (var27[3].contains("Restarting"))
_lobbyServers.put(name, 999);
else
_lobbyServers.put(name, Integer.parseInt(var27[4]));
synchronized (_serverLock)
{
if (var27[3].contains("Restarting"))
_lobbyServers.put(name, 999);
else
_lobbyServers.put(name, Integer.parseInt(var27[4]));
}
}
}
catch (SocketTimeoutException e)
{
_lobbyServers.put(name, 999);
synchronized (_serverLock)
{
_lobbyServers.put(name, 999);
}
}
catch (ConnectException e)
{
_lobbyServers.put(name, 999);
synchronized (_serverLock)
{
_lobbyServers.put(name, 999);
}
}
catch (IOException e)
{
System.out.println("[LobbyBalancer IOException] Error pinging " + address.getHostString() + ":" + address.getPort());
_lobbyServers.put(name, 999);
synchronized (_serverLock)
{
_lobbyServers.put(name, 999);
}
throw e;
}
finally
@ -225,14 +246,17 @@ public class LobbyBalancer extends Plugin implements Listener, Runnable
public void loadLobbyServers()
{
_lobbyServers.clear();
synchronized (_serverLock)
{
_lobbyServers.clear();
for (String key : getProxy().getServers().keySet())
{
if (key.toUpperCase().contains("LOBBY"))
{
_lobbyServers.put(key, 0);
}
}
for (String key : _plugin.getProxy().getServers().keySet())
{
if (key.toUpperCase().contains("LOBBY"))
{
_lobbyServers.put(key, 0);
}
}
}
}
}

73
Plugins/Mineplex.Bungee.PlayerCount/src/mineplex/bungee/PlayerCount/PlayerCount.java → Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java
View File

@ -1,4 +1,4 @@
package mineplex.bungee.PlayerCount;
package mineplex.bungee.playerCount;
import java.io.BufferedReader;
import java.io.DataInput;
@ -22,8 +22,10 @@ import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.event.EventHandler;
public class PlayerCount extends Plugin implements Listener, Runnable
public class PlayerCount implements Listener, Runnable
{
private Plugin _plugin;
private HashMap<String, InetSocketAddress> _otherBungeeInstances;
private int _totalPlayers;
private int _totalMaxPlayers;
@ -31,38 +33,41 @@ public class PlayerCount extends Plugin implements Listener, Runnable
private int _tempPlayers;
private int _tempMaxPlayers;
@Override
public void onEnable()
private static Object _serverLock = new Object();
public PlayerCount(Plugin plugin)
{
_plugin = plugin;
_otherBungeeInstances = new HashMap<String, InetSocketAddress>();
LoadBungeeServers();
getProxy().getScheduler().schedule(this, this, 1L, 1L, TimeUnit.SECONDS);
getProxy().getPluginManager().registerListener(this, this);
getProxy().getPluginManager().registerCommand(this, new ReloadPlayerCountListCommand(this));
_plugin.getProxy().getScheduler().schedule(_plugin, this, 1L, 1L, TimeUnit.SECONDS);
_plugin.getProxy().getPluginManager().registerListener(_plugin, this);
}
public void run()
{
_tempPlayers = getProxy().getOnlineCount();
_tempPlayers = _plugin.getProxy().getOnlineCount();
_tempMaxPlayers = 0;
for(ListenerInfo li : getProxy().getConfigurationAdapter().getListeners())
for(ListenerInfo li : _plugin.getProxy().getConfigurationAdapter().getListeners())
{
_tempMaxPlayers += li.getMaxPlayers();
}
for (InetSocketAddress address : _otherBungeeInstances.values())
synchronized (_serverLock)
{
try
{
UpdateServerCount(address);
} catch (IOException e)
{
e.printStackTrace();
}
for (InetSocketAddress address : _otherBungeeInstances.values())
{
try
{
UpdateServerCount(address);
} catch (IOException e)
{
e.printStackTrace();
}
}
}
_totalPlayers = _tempPlayers;
@ -96,17 +101,18 @@ public class PlayerCount extends Plugin implements Listener, Runnable
dataOutputStream = new DataOutputStream(socket.getOutputStream());
dataOutputStream.writeByte(254);
dataOutputStream.writeByte(1);
dataOutputStream.writeByte(254);
writeString("MC|PingHost", dataOutputStream);
dataOutputStream.writeShort(3 + 2 * address.getAddress().getHostName().length() + 4);
dataOutputStream.writeByte(73);
dataOutputStream.writeByte(74);
writeString(address.getAddress().getHostName(), dataOutputStream);
dataOutputStream.writeInt(address.getPort());
if (dataInputStream.read() != 255)
{
System.out.println("not 255");
System.out.println("Bad message");
return;
}
@ -132,7 +138,7 @@ public class PlayerCount extends Plugin implements Listener, Runnable
}
catch (IOException e)
{
System.out.println("[BungeeSigns] Error pinging " + address.getHostString() + ":" + address.getPort());
System.out.println("[PlayerCount] Error pinging " + address.getHostName() + ":" + address.getPort());
throw e;
}
finally
@ -215,6 +221,11 @@ public class PlayerCount extends Plugin implements Listener, Runnable
public void LoadBungeeServers()
{
synchronized (_serverLock)
{
_otherBungeeInstances.clear();
}
FileInputStream fstream = null;
BufferedReader br = null;
@ -234,7 +245,25 @@ public class PlayerCount extends Plugin implements Listener, Runnable
String address = line.split(":")[0];
Integer port = Integer.parseInt(line.split(":")[1]);
InetSocketAddress socketAddress = new InetSocketAddress(address, port);
_otherBungeeInstances.put(socketAddress.getAddress().getHostAddress(), socketAddress);
boolean addAddress = true;
for (ListenerInfo listenerInfo : _plugin.getProxy().getConfigurationAdapter().getListeners())
{
if (address.equalsIgnoreCase(listenerInfo.getHost().getAddress().getHostAddress()))
{
addAddress = false;
break;
}
}
if (addAddress)
{
synchronized (_serverLock)
{
_otherBungeeInstances.put(socketAddress.getAddress().getHostAddress(), socketAddress);
}
}
line = br.readLine();
}

188
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/updater/Updater.java Normal file
View File

@ -0,0 +1,188 @@
package mineplex.bungee.updater;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import mineplex.bungee.Mineplexer;
public class Updater implements Runnable
{
private Mineplexer _plugin;
private HashMap<String, String> _jarMd5Map = new HashMap<String, String>();
private File _updateDirectory;
private boolean _needUpdate = false;
public Updater(Mineplexer plugin)
{
_plugin = plugin;
_jarMd5Map = new HashMap<String, String>();
getCurrentMd5s();
boolean windows = System.getProperty("os.name").startsWith("Windows");
_updateDirectory = new File((windows ? "C:" : File.separator + "home" + File.separator + "mineplex") + File.separator + "update" + File.separator + "bungee");
_updateDirectory.mkdirs();
_plugin.getProxy().getScheduler().schedule(_plugin, this, 1L, 1L, TimeUnit.SECONDS);
}
private void getCurrentMd5s()
{
File currentDir = new File(".");
FilenameFilter statsFilter = new FilenameFilter()
{
public boolean accept(File paramFile, String paramString)
{
if (paramString.endsWith("dat"))
{
return true;
}
return false;
}
};
for (File f : currentDir.listFiles(statsFilter))
{
FileInputStream fis = null;
try
{
fis = new FileInputStream(f);
_jarMd5Map.put(f.getName(), DigestUtils.md5Hex(fis));
}
catch (Exception ex)
{
System.out.println("Updater: Error parsing dat md5's");
ex.printStackTrace();
}
finally
{
if (fis != null)
{
try
{
fis.close();
}
catch (IOException e)
{
e.printStackTrace();
}
}
}
}
}
@Override
public void run()
{
FilenameFilter statsFilter = new FilenameFilter()
{
public boolean accept(File paramFile, String paramString)
{
if (paramString.endsWith("dat"))
{
return true;
}
return false;
}
};
for (File f : _updateDirectory.listFiles(statsFilter))
{
FileInputStream fis = null;
try
{
if (_jarMd5Map.containsKey(f.getName()))
{
fis = new FileInputStream(f);
String md5 = DigestUtils.md5Hex(fis);
if (!md5.equals(_jarMd5Map.get(f.getName())))
{
_needUpdate = true;
}
}
}
catch (Exception ex)
{
System.out.println("Updater: Error parsing dat md5's");
ex.printStackTrace();
}
finally
{
if (fis != null)
{
try
{
fis.close();
}
catch (IOException e)
{
e.printStackTrace();
}
}
}
}
if (_needUpdate)
{
updateFiles();
}
}
private void updateFiles()
{
_needUpdate = false;
boolean windows = System.getProperty("os.name").startsWith("Windows");
File updateDir = new File((windows ? "C:" : File.separator + "home" + File.separator + "mineplex") + File.separator + "update" + File.separator + "bungee");
File currentDir = new File(".");
updateDir.mkdirs();
FilenameFilter statsFilter = new FilenameFilter()
{
public boolean accept(File paramFile, String paramString)
{
if (paramString.endsWith("dat"))
{
return true;
}
return false;
}
};
for (File f : updateDir.listFiles(statsFilter))
{
try
{
FileUtils.copyFileToDirectory(f, currentDir);
}
catch (Exception ex)
{
System.out.println("Updater: Error updating dats");
ex.printStackTrace();
}
}
getCurrentMd5s();
_plugin.ReloadServerLists();
System.out.println("Updater: Updated with new dat files.");
}
}

7
Plugins/Mineplex.Bungee.PlayerCount/.classpath
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/BungeeCord.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

11
Plugins/Mineplex.Bungee.PlayerCount/.settings/org.eclipse.jdt.core.prefs
View File

@ -1,11 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7

4
Plugins/Mineplex.Bungee.PlayerCount/plugin.yml
View File

@ -1,4 +0,0 @@
name: PlayerCount
main: mineplex.bungee.PlayerCount.PlayerCount
version: 1
author: defek7

24
Plugins/Mineplex.Bungee.PlayerCount/src/mineplex/bungee/PlayerCount/ReloadPlayerCountListCommand.java
View File

@ -1,24 +0,0 @@
package mineplex.bungee.PlayerCount;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
public class ReloadPlayerCountListCommand extends Command
{
private PlayerCount _plugin;
public ReloadPlayerCountListCommand(PlayerCount plugin)
{
super( "reloadplayercount", "bungeecord.command.reloadserverlist" );
_plugin = plugin;
}
@Override
public void execute(CommandSender sender, String[] arg1)
{
_plugin.LoadBungeeServers();
sender.sendMessage(ChatColor.BLUE + "PlayerCount>" + ChatColor.GRAY + " Reloaded player count server list.");
}
}

1
Plugins/Mineplex.Hub/.classpath
View File

@ -10,5 +10,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.Core"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.ClassCombat"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

46
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
View File

@ -11,8 +11,8 @@ import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.bukkit.Bukkit;
@ -47,7 +47,7 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
private Portal _portal;
private PartyManager _partyManager;
private NautHashMap<String, List<ServerInfo>> _serverNpcMap = new NautHashMap<String, List<ServerInfo>>();
private NautHashMap<String, HashSet<ServerInfo>> _serverNpcMap = new NautHashMap<String, HashSet<ServerInfo>>();
private NautHashMap<String, ServerNpcShop> _serverNpcShopMap = new NautHashMap<String, ServerNpcShop>();
private NautHashMap<String, ServerInfo> _serverInfoMap = new NautHashMap<String, ServerInfo>();
private NautHashMap<String, Long> _serverUpdate = new NautHashMap<String, Long>();
@ -69,6 +69,8 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, "BungeeSigns", this);
LoadServers();
new ServerManagerUpdater(this);
}
public void AddCommands()
@ -81,14 +83,16 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
ServerInfo serverInfo = new ServerInfo();
serverInfo.Name = serverName;
_serverNpcMap.get(serverNpcName).add(serverInfo);
if (!_serverInfoMap.containsKey(serverName))
if (_serverInfoMap.containsKey(serverName))
{
_serverInfoMap.put(serverName, serverInfo);
_serverUpdate.put(serverName, System.currentTimeMillis());
_serverInfoMap.remove(serverName);
_serverUpdate.remove(serverName);
}
_serverNpcMap.get(serverNpcName).add(serverInfo);
_serverInfoMap.put(serverName, serverInfo);
_serverUpdate.put(serverName, System.currentTimeMillis());
SaveServers();
}
@ -104,13 +108,13 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
public void AddServerNpc(String serverNpcName)
{
_serverNpcMap.put(serverNpcName, new ArrayList<ServerInfo>());
_serverNpcMap.put(serverNpcName, new HashSet<ServerInfo>());
_serverNpcShopMap.put(serverNpcName, new ServerNpcShop(this, _clientManager, _donationManager, serverNpcName));
}
public void RemoveServerNpc(String serverNpcName)
{
List<ServerInfo> mappedServers = _serverNpcMap.remove(serverNpcName);
Set<ServerInfo> mappedServers = _serverNpcMap.remove(serverNpcName);
_serverNpcShopMap.remove(serverNpcName);
if (mappedServers != null)
@ -140,7 +144,7 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
}
}
public List<ServerInfo> GetServerList(String serverNpcName)
public Collection<ServerInfo> GetServerList(String serverNpcName)
{
return _serverNpcMap.get(serverNpcName);
}
@ -434,11 +438,21 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
public void LoadServers()
{
_serverInfoMap.clear();
_serverUpdate.clear();
for (String npcName : _serverNpcMap.keySet())
{
_serverNpcMap.get(npcName).clear();
}
_loading = true;
FileInputStream fstream = null;
BufferedReader br = null;
HashSet<String> npcNames = new HashSet<String>();
try
{
File npcFile = new File("ServerManager.dat");
@ -461,6 +475,7 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
}
AddServer(serverNpcName, server);
npcNames.add(serverNpcName);
line = br.readLine();
}
@ -498,6 +513,15 @@ public class ServerManager extends MiniPlugin implements PluginMessageListener
_loading = false;
}
for (String npcName : npcNames)
{
if (!_serverNpcShopMap.containsKey(npcName))
_serverNpcShopMap.remove(npcName);
if (!_serverNpcMap.containsKey(npcName))
_serverNpcMap.remove(npcName);
}
}
public int GetRequiredSlots(Player player, String serverType)

177
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManagerUpdater.java Normal file
View File

@ -0,0 +1,177 @@
package mineplex.hub.server;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
public class ServerManagerUpdater implements Listener
{
private ServerManager _plugin;
private NautHashMap<String, String> _jarMd5Map = new NautHashMap<String, String>();
private File _updateDirectory;
private boolean _needUpdate = false;
public ServerManagerUpdater(ServerManager plugin)
{
_plugin = plugin;
getCurrentMd5s();
boolean windows = System.getProperty("os.name").startsWith("Windows");
_updateDirectory = new File((windows ? "C:" : File.separator + "home" + File.separator + "mineplex") + File.separator + "update" + File.separator + "lobby");
_updateDirectory.mkdirs();
plugin.GetPluginManager().registerEvents(this, plugin.GetPlugin());
}
private void getCurrentMd5s()
{
File serverManagerDat = new File("ServerManager.dat");
FileInputStream fis = null;
try
{
fis = new FileInputStream(serverManagerDat);
_jarMd5Map.put(serverManagerDat.getName(), DigestUtils.md5Hex(fis));
}
catch (Exception ex)
{
System.out.println("ServerManagerUpdater: Error parsing ServerManager dat md5's");
ex.printStackTrace();
}
finally
{
if (fis != null)
{
try
{
fis.close();
}
catch (IOException e)
{
e.printStackTrace();
}
}
}
}
@EventHandler
public void checkForNewFiles(UpdateEvent event)
{
if (event.getType() != UpdateType.FAST)
return;
FilenameFilter statsFilter = new FilenameFilter()
{
public boolean accept(File paramFile, String paramString)
{
if (paramString.endsWith("dat"))
{
return true;
}
return false;
}
};
for (File f : _updateDirectory.listFiles(statsFilter))
{
FileInputStream fis = null;
try
{
if (_jarMd5Map.containsKey(f.getName()))
{
fis = new FileInputStream(f);
String md5 = DigestUtils.md5Hex(fis);
if (!md5.equals(_jarMd5Map.get(f.getName())))
{
_needUpdate = true;
}
}
}
catch (Exception ex)
{
System.out.println("ServerManagerUpdater: Error parsing dat md5's");
ex.printStackTrace();
}
finally
{
if (fis != null)
{
try
{
fis.close();
}
catch (IOException e)
{
e.printStackTrace();
}
}
}
}
if (_needUpdate)
{
updateFiles();
}
}
private void updateFiles()
{
_needUpdate = false;
boolean windows = System.getProperty("os.name").startsWith("Windows");
File updateDir = new File((windows ? "C:" : File.separator + "home" + File.separator + "mineplex") + File.separator + "update" + File.separator + "lobby");
File currentDir = new File(".");
updateDir.mkdirs();
FilenameFilter statsFilter = new FilenameFilter()
{
public boolean accept(File paramFile, String paramString)
{
if (paramString.endsWith("dat"))
{
return true;
}
return false;
}
};
for (File f : updateDir.listFiles(statsFilter))
{
try
{
FileUtils.copyFileToDirectory(f, currentDir);
}
catch (Exception ex)
{
System.out.println("ServerManagerUpdater: Error updating dats");
ex.printStackTrace();
}
}
getCurrentMd5s();
_plugin.LoadServers();
System.out.println("ServerManagerUpdater: Updated with new dat file.");
}
}

2
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerSorter.java
View File

@ -22,7 +22,7 @@ public class ServerSorter implements Comparator<ServerInfo>
if ((a.MOTD.contains("Recruiting") || a.MOTD.contains("Waiting") || a.MOTD.contains("Starting") || a.MOTD.contains("Cup")) && !b.MOTD.contains("Recruiting") && !b.MOTD.contains("Waiting") && !b.MOTD.contains("Starting") && !b.MOTD.contains("Cup"))
return -1;
if ((b.MOTD.contains("Recruiting") || b.MOTD.contains("Waiting") || a.MOTD.contains("Starting") || b.MOTD.contains("Cup")) && !a.MOTD.contains("Recruiting") && !a.MOTD.contains("Waiting") && !a.MOTD.contains("Starting") && !a.MOTD.contains("Cup"))
if ((b.MOTD.contains("Recruiting") || b.MOTD.contains("Waiting") || b.MOTD.contains("Starting") || b.MOTD.contains("Cup")) && !a.MOTD.contains("Recruiting") && !a.MOTD.contains("Waiting") && !a.MOTD.contains("Starting") && !a.MOTD.contains("Cup"))
return 1;
if (a.MaxPlayers - a.CurrentPlayers < _requiredSlots && b.MaxPlayers - b.CurrentPlayers >= _requiredSlots)

18
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
View File

@ -7,6 +7,7 @@ import java.util.List;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.donation.DonationManager;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.page.ShopPageBase;
@ -34,7 +35,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop>
@Override
protected void BuildPage()
{
List<ServerInfo> serverList = Plugin.GetServerList(_serverNpcKey);
List<ServerInfo> serverList = new ArrayList<ServerInfo>(Plugin.GetServerList(_serverNpcKey));
int slots = 1;
@ -43,7 +44,19 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop>
slots = Plugin.GetRequiredSlots(Player, serverList.get(0).ServerType);
}
Collections.sort(serverList, new ServerSorter(slots));
try
{
Collections.sort(serverList, new ServerSorter(slots));
}
catch (Exception exception)
{
exception.printStackTrace();
for (ServerInfo serverInfo : serverList)
{
System.out.println(F.main("ServerNpcPage", ChatColor.YELLOW + serverInfo.Name + ": " + serverInfo.MOTD + " " + serverInfo.CurrentPlayers + "/" + serverInfo.MaxPlayers));
}
}
int slot = 9;
int greenCount = 0;
@ -151,6 +164,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop>
{
ButtonMap.clear();
BuildPage();
System.out.println("Updated " + Player.getName() + "'s page.");
}
public void SelectServer(Player player, ServerInfo serverInfo)

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -587,7 +587,8 @@ public class GameFlagManager implements Listener
GameTeam team = game.GetTeam(event.getPlayer());
team.SetPlayerState(event.getPlayer(), PlayerState.OUT);
if (team != null)
team.SetPlayerState(event.getPlayer(), PlayerState.OUT);
}
@EventHandler

BIN
Website/LOCWebsite.suo
View File

Binary file not shown.