diff --git a/build.gradle b/build.gradle index 83ce5272d5..b960ea82fb 100644 --- a/build.gradle +++ b/build.gradle @@ -285,9 +285,9 @@ def sharedDeps = { moduleonly("org.ow2.asm:asm-analysis:${ASM_VERSION}") moduleonly("cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}") moduleonly("net.minecraftforge:JarJarFileSystems:${JARJAR_VERSION}") - moduleonly("com.google.jimfs:jimfs:${JIMFS_VERSION}") { - transitive = false - } + moduleonly("com.google.jimfs:jimfs:${JIMFS_VERSION}") { transitive = false } + moduleonly("com.google.guava:guava:${GUAVA_VERSION}") { transitive = false } // Need by jimfs + moduleonly("com.google.guava:failureaccess:1.0.1"){ transitive = false} // Needed by guava installer "cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}" installer "org.ow2.asm:asm:${ASM_VERSION}" diff --git a/src/main/java/net/minecraftforge/gametest/ForgeGameTestHooks.java b/src/main/java/net/minecraftforge/gametest/ForgeGameTestHooks.java index 7b898b1274..1b02647e27 100644 --- a/src/main/java/net/minecraftforge/gametest/ForgeGameTestHooks.java +++ b/src/main/java/net/minecraftforge/gametest/ForgeGameTestHooks.java @@ -14,6 +14,7 @@ import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.ModLoader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.loading.FMLLoader; +import net.minecraftforge.fml.util.ObfuscationReflectionHelper; import net.minecraftforge.forgespi.language.ModFileScanData; import net.minecraftforge.forgespi.language.ModFileScanData.AnnotationData; import org.apache.logging.log4j.LogManager; @@ -153,8 +154,8 @@ public class ForgeGameTestHooks { private static String getDefaultBatch() { try { - return (String)GameTest.class.getDeclaredMethod("batch").getDefaultValue(); - } catch (NoSuchMethodException | SecurityException e) { + return (String)ObfuscationReflectionHelper.findMethod(GameTest.class, "m_177043" + '_').getDefaultValue(); + } catch (Exception e) { e.printStackTrace(); // Should never happen, but just in case. return "defaultBatch"; }