diff --git a/build.gradle b/build.gradle index bf5884a4bf..bcf369f83e 100644 --- a/build.gradle +++ b/build.gradle @@ -42,10 +42,10 @@ ext { SPI_VERSION = '5.0.3' ACCESSTRANSFORMERS_VERSION = '8.0.4' COREMODS_VERSION = '5.0.1' - EVENTBUS_VERSION = '5.0.3' - MODLAUNCHER_VERSION = '9.1.6' - SECUREJARHANDLER_VERSION = '1.0.3' - BOOTSTRAPLAUNCHER_VERSION = '1.0.0' + EVENTBUS_VERSION = '6.0.0' + MODLAUNCHER_VERSION = '10.0.1' + SECUREJARHANDLER_VERSION = '1.0.5' + BOOTSTRAPLAUNCHER_VERSION = '1.1.0' ASM_VERSION = '9.3' INSTALLER_VERSION = '2.1.+' MIXIN_VERSION = '0.8.5' diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java index 29b02f75b9..19c08bc8e4 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.LibraryFinder; import net.minecraftforge.fml.loading.VersionInfo; @@ -21,10 +22,9 @@ public abstract class CommonClientLaunchHandler extends CommonLaunchHandler { @Override public boolean isProduction() { return true; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object)arguments); - return null; }; } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java index afe91492bd..24fae56c5f 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java @@ -6,6 +6,7 @@ package net.minecraftforge.fml.loading.targets; import cpw.mods.jarhandling.SecureJar; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.LibraryFinder; import net.minecraftforge.fml.loading.VersionInfo; @@ -23,10 +24,9 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler { @Override public boolean isProduction() { return true; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)arguments); - return null; }; } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientDevLaunchHandler.java index 13b330ee1a..a5c05b33ed 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientDevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -13,12 +14,11 @@ public class FMLClientDevLaunchHandler extends CommonDevLaunchHandler { @Override public Dist getDist() { return Dist.CLIENT; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientUserdevLaunchHandler.java index 0f16a380db..abbd36facc 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -17,12 +18,11 @@ public class FMLClientUserdevLaunchHandler extends FMLUserdevLaunchHandler { public Dist getDist() { return Dist.CLIENT; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLDataUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLDataUserdevLaunchHandler.java index a7171ba681..05dcc57329 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLDataUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLDataUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -20,12 +21,11 @@ public class FMLDataUserdevLaunchHandler extends FMLUserdevLaunchHandler { public boolean isData() { return true; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerDevLaunchHandler.java index ea7b9c99b1..b431bd2c87 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerDevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -13,12 +14,11 @@ public class FMLServerDevLaunchHandler extends CommonDevLaunchHandler { @Override public Dist getDist() { return Dist.DEDICATED_SERVER; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args); - return null; }; } } \ No newline at end of file diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerUserdevLaunchHandler.java index 3246dc1d51..ca6fedaaea 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -14,12 +15,11 @@ public class FMLServerUserdevLaunchHandler extends FMLUserdevLaunchHandler { @Override public Dist getDist() { return Dist.DEDICATED_SERVER; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args); - return null; }; } } \ No newline at end of file diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientDevLaunchHandler.java index a8f3765de6..759f670ee2 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientDevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -13,12 +14,11 @@ public class ForgeClientDevLaunchHandler extends CommonDevLaunchHandler { @Override public Dist getDist() { return Dist.CLIENT; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientUserdevLaunchHandler.java index 98823269aa..7f31b8021c 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeClientUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -17,12 +18,11 @@ public class ForgeClientUserdevLaunchHandler extends ForgeUserdevLaunchHandler { public Dist getDist() { return Dist.CLIENT; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.client.main.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataDevLaunchHandler.java index c3272b8397..ab187e1a9e 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataDevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -15,12 +16,11 @@ public class ForgeDataDevLaunchHandler extends CommonDevLaunchHandler { @Override public boolean isData() { return true; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataUserdevLaunchHandler.java index 8ceeab2845..f16b272029 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDataUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -20,12 +21,11 @@ public class ForgeDataUserdevLaunchHandler extends ForgeUserdevLaunchHandler { public boolean isData() { return true; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(), "net.minecraft.data.Main").getMethod("main", String[].class).invoke(null, (Object) args); - return null; }; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestDevLaunchHandler.java index e7321ea490..8a60ecc364 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestDevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -14,12 +15,11 @@ public class ForgeGametestDevLaunchHandler extends CommonDevLaunchHandler { @Override public Dist getDist() { return Dist.DEDICATED_SERVER; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args); - return null; }; } } \ No newline at end of file diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestUserdevLaunchHandler.java index 411637e756..4b25709f40 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeGametestUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -14,12 +15,11 @@ public class ForgeGametestUserdevLaunchHandler extends ForgeUserdevLaunchHandler @Override public Dist getDist() { return Dist.DEDICATED_SERVER; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("forge").orElseThrow(), "net.minecraftforge.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)args); - return null; }; } } \ No newline at end of file diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerDevLaunchHandler.java index 73627992d8..d74def558e 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerDevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -13,12 +14,11 @@ public class ForgeServerDevLaunchHandler extends CommonDevLaunchHandler { @Override public Dist getDist() { return Dist.DEDICATED_SERVER; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args); - return null; }; } } \ No newline at end of file diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerUserdevLaunchHandler.java index d75e800311..b412560a65 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeServerUserdevLaunchHandler.java @@ -5,6 +5,7 @@ package net.minecraftforge.fml.loading.targets; +import cpw.mods.modlauncher.api.ServiceRunner; import net.minecraftforge.api.distmarker.Dist; import java.util.concurrent.Callable; @@ -14,12 +15,11 @@ public class ForgeServerUserdevLaunchHandler extends ForgeUserdevLaunchHandler { @Override public Dist getDist() { return Dist.DEDICATED_SERVER; } @Override - public Callable launchService(String[] arguments, ModuleLayer layer) { + public ServiceRunner launchService(String[] arguments, ModuleLayer layer) { return () -> { var args = preLaunch(arguments, layer); Class.forName(layer.findModule("minecraft").orElseThrow(),"net.minecraft.server.Main").getMethod("main", String[].class).invoke(null, (Object)args); - return null; }; } } \ No newline at end of file