Skip to content

Commit a4a122e

Browse files
committed
Fix startup error with recent forge versions. Support Minecraft 1.12.1
Fixes #8 and fixes #9
1 parent ae43096 commit a4a122e

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

build.gradle

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'eclipse'
44
sourceCompatibility = '1.6'
55
targetCompatibility = '1.6'
66

7-
version = '0.4.0'
7+
version = '0.5.0'
88

99
repositories {
1010
mavenCentral()
@@ -26,17 +26,27 @@ dependencies {
2626
compile files('C:/Users/Simon/.gradle/caches/minecraft/net/minecraftforge/forge/1.11.2-13.20.0.2227/start')
2727
}
2828

29+
project.ext.supportedVersions = ["1.8.9", "1.10.2", "1.11", "1.11.2", "1.12", "1.12.1"]
30+
31+
task setSupportedVersions(type: Copy) {
32+
from(sourceSets.main.java.srcDirs)
33+
into 'build/sources/java'
34+
filter(org.apache.tools.ant.filters.ReplaceTokens,
35+
tokens: ['supportedVersions': project.ext.supportedVersions.join(",")])
36+
}
37+
38+
compileJava.source = setSupportedVersions.outputs.files
39+
compileJava.dependsOn setSupportedVersions
40+
41+
2942
jar {
3043
manifest {
3144
attributes(
3245
"Main-Class": "com.simon816.sponge.bootstrap.Bootstrap",
3346
"Class-Path": "libraries/net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar"
34-
+ " libraries/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"
35-
+ " minecraft_server.1.8.9.jar"
36-
+ " minecraft_server.1.10.2.jar"
37-
+ " minecraft_server.1.11.jar"
38-
+ " minecraft_server.1.11.2.jar"
39-
+ " minecraft_server.1.12.jar"
47+
+ " libraries/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar"
48+
+ " libraries/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar "
49+
+ project.ext.supportedVersions.collect{ "minecraft_server.${it}.jar" }.join(" ")
4050
)
4151
}
4252
}

src/main/java/com/simon816/sponge/bootstrap/Bootstrap.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,13 @@ public boolean accept(File pathname) {
9898
}
9999

100100
static boolean supportedVersion(String fn) {
101-
return fn.contains("1.8.9") || fn.contains("1.10.2") || fn.contains("1.11") || fn.contains("1.12");
101+
// Replaced by gradle (see build.gradle)
102+
for (String supported : "@supportedVersions@".split(",")) {
103+
if (fn.contains(supported)) {
104+
return true;
105+
}
106+
}
107+
return false;
102108
}
103109

104110
private static File findJar(File directory, String jarName, FileFilter filter) {

0 commit comments

Comments
 (0)