diff --git a/Jenkinsfile b/Jenkinsfile index 75d0c553e8..15b665b7ca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,11 +18,13 @@ pipeline { } stages { + /* This resets the checkout on jenkins, but doesn't take branch into account... stage('fetch') { steps { checkout scm } } + */ stage('notify_start') { when { not { @@ -49,6 +51,14 @@ pipeline { } } } + stage('setup') { + steps { + sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup' + script { + env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim() + } + } + } stage('changelog') { when { not { diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index c752c9f7e8..69b0fd6251 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -654,7 +654,7 @@ public class CraftingHelper { if (mod.getSource().isFile()) { - fs = FileSystems.newFileSystem(mod.getSource().toPath(), null); + fs = FileSystems.newFileSystem(mod.getSource().toPath(), (ClassLoader)null); fPath = fs.getPath("/" + base, "_factories.json"); } else if (mod.getSource().isDirectory()) @@ -791,7 +791,7 @@ public class CraftingHelper { { try { - fs = FileSystems.newFileSystem(source.toPath(), null); + fs = FileSystems.newFileSystem(source.toPath(), (ClassLoader)null); root = fs.getPath("/" + base); } catch (IOException e) @@ -885,7 +885,7 @@ public class CraftingHelper { Path fPath = null; if(mod.getSource().isFile()) { - try(FileSystem fs = FileSystems.newFileSystem(mod.getSource().toPath(), null)) + try(FileSystem fs = FileSystems.newFileSystem(mod.getSource().toPath(), (ClassLoader)null)) { fPath = fs.getPath("assets", path.getResourceDomain(), path.getResourcePath()); }