Implement module loader, blacklist this build from loading.
This commit is contained in:
parent
93cf50b4e1
commit
a426a5ec22
@ -39,6 +39,11 @@ public class Bootstrap
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
System.out.println( "This version is not ready for production use, please download #788 or below" );
|
||||||
|
if (true){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
|
if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
|
||||||
{
|
{
|
||||||
System.err.println( "*** ERROR *** BungeeCord requires Java 7 or above to function!" );
|
System.err.println( "*** ERROR *** BungeeCord requires Java 7 or above to function!" );
|
||||||
|
4
pom.xml
4
pom.xml
@ -102,8 +102,8 @@
|
|||||||
<artifactId>gitdescribe-maven-plugin</artifactId>
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
||||||
<version>1.3</version>
|
<version>1.3</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<outputPrefix>git-${project.name}-${project.version}-</outputPrefix>
|
<outputPrefix>git:${project.name}:${project.version}:</outputPrefix>
|
||||||
<outputPostfix>-${build.number}</outputPostfix>
|
<outputPostfix>:${build.number}</outputPostfix>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
@ -124,6 +124,7 @@ public class BungeeCord extends ProxyServer
|
|||||||
public final Gson gson = new Gson();
|
public final Gson gson = new Gson();
|
||||||
@Getter
|
@Getter
|
||||||
private ConnectionThrottle connectionThrottle;
|
private ConnectionThrottle connectionThrottle;
|
||||||
|
private final ModuleManager moduleManager = new ModuleManager();
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -187,6 +188,8 @@ public class BungeeCord extends ProxyServer
|
|||||||
{
|
{
|
||||||
ResourceLeakDetector.setEnabled( false ); // Eats performance
|
ResourceLeakDetector.setEnabled( false ); // Eats performance
|
||||||
|
|
||||||
|
moduleManager.load( this );
|
||||||
|
|
||||||
pluginsFolder.mkdir();
|
pluginsFolder.mkdir();
|
||||||
pluginManager.detectPlugins( pluginsFolder );
|
pluginManager.detectPlugins( pluginsFolder );
|
||||||
config.load();
|
config.load();
|
||||||
|
38
proxy/src/main/java/net/md_5/bungee/ModuleManager.java
Normal file
38
proxy/src/main/java/net/md_5/bungee/ModuleManager.java
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
package net.md_5.bungee;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.List;
|
||||||
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
|
|
||||||
|
public class ModuleManager
|
||||||
|
{
|
||||||
|
|
||||||
|
private class ModuleSpec
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public void load(ProxyServer proxy) throws Exception
|
||||||
|
{
|
||||||
|
String version = proxy.getVersion();
|
||||||
|
version = "git:BungeeCord-Proxy:1.7-SNAPSHOT:\"93cf50b\":1337";
|
||||||
|
|
||||||
|
int lastColon = version.lastIndexOf( ':' );
|
||||||
|
int secondLastColon = version.lastIndexOf( ':', lastColon - 1 );
|
||||||
|
String buildNumber = version.substring( lastColon + 1, version.length() );
|
||||||
|
String gitCommit = version.substring( secondLastColon + 1, lastColon ).replaceAll( "\"", "" );
|
||||||
|
|
||||||
|
File moduleDirectory = new File( "modules" );
|
||||||
|
moduleDirectory.mkdir();
|
||||||
|
|
||||||
|
List<ModuleSpec> modules = null;
|
||||||
|
|
||||||
|
// TODO: Use filename filter here and in PluginManager
|
||||||
|
for ( File file : moduleDirectory.listFiles() )
|
||||||
|
{
|
||||||
|
if ( file.isFile() && file.getName().endsWith( ".jar" ) )
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user