diff --git a/core/build.gradle b/core/build.gradle index ac90354..739cd52 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -30,7 +30,8 @@ dependencies { compile(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion) shadow(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion) { transitive = false } - compile(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: "1.0.1") + compile(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: "1.0.0") + shadow(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: "1.0.0") { transitive = false } compile(group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: "0.9.0") shadow(group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: "0.9.0") { transitive = false } diff --git a/scripts/start.sh b/scripts/start.sh index 6068ba4..948269e 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -7,6 +7,10 @@ FORGE_FILE=${FORGE_FILE#"The server installed successfully, you should now be ab echo FORGE_FILE cp -f "$FORGE_FILE" forge.jar +if [ ! $? -eq 0 ]; then + echo "Error installing forge" + exit 1 +fi echo "installed forge" diff --git a/scripts/test12.sh b/scripts/test12.sh index 3b481c2..6119936 100755 --- a/scripts/test12.sh +++ b/scripts/test12.sh @@ -7,11 +7,15 @@ rm -rf "$RUN/mods" mkdir -p "$RUN/mods" "$PWD/gradlew" :1.12.2:clean :1.12.2:build && cp -f 1.12.2/build/libs/MatterLink-1.12.2-*-dev.jar "$RUN/mods" +if [ ! $? -eq 0 ]; then + echo "Error compiling matterlink" + exit 1 +fi cd "$RUN" -curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.4.2705/forge-1.12.2-14.23.4.2705-installer.jar" -curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2573311/download" +curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2768/forge-1.12.2-14.23.5.2768-installer.jar" +curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2633578/download" $DIR/scripts/start.sh diff --git a/scripts/test7.sh b/scripts/test7.sh index 75831c8..1e51c3e 100755 --- a/scripts/test7.sh +++ b/scripts/test7.sh @@ -7,6 +7,10 @@ rm -rf "$RUN/mods" mkdir -p "$RUN/mods" "$PWD/gradlew" :1.7.10:clean :1.7.10:build && cp -f $DIR/1.7.10/build/libs/MatterLink-1.7.10-*-dev.jar "$RUN/mods" +if [ ! $? -eq 0 ]; then + echo "Error compiling matterlink" + exit 1 +fi cd "$RUN" diff --git a/scripts/test9.sh b/scripts/test9.sh index 5ba0e3f..9946670 100755 --- a/scripts/test9.sh +++ b/scripts/test9.sh @@ -7,6 +7,10 @@ rm -rf "$RUN/mods" mkdir -p "$RUN/mods" "$PWD/gradlew" :1.9.4:clean :1.9.4:build && cp -f 1.9.4/build/libs/MatterLink-1.9.4-*-dev.jar "$RUN/mods" +if [ ! $? -eq 0 ]; then + echo "Error compiling matterlink" + exit 1 +fi cd "$RUN"