From 1ef835a0152a66da37b9259caa22403441f441af Mon Sep 17 00:00:00 2001 From: Motschen Date: Wed, 14 Dec 2022 18:22:32 +0100 Subject: [PATCH] Re-enable Quilt and Forge support --- build.gradle | 2 +- fabric-like/build.gradle | 2 -- .../forge/MidnightLibClientEvents.java | 2 -- .../eu/midnightdust/forge/MidnightLibForge.java | 6 ++++-- .../lib/util/forge/PlatformFunctionsImpl.java | 2 +- gradle.properties | 14 ++++++-------- settings.gradle | 4 ++-- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 5570125..4e230e8 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ subprojects { // The following line declares the mojmap mappings, you may use other mappings as well //mappings loom.officialMojangMappings() // The following line declares the yarn mappings you may select this one as well. - mappings "net.fabricmc:yarn:1.19.3-rc1+build.2:v2" + mappings "net.fabricmc:yarn:1.19.3+build.3:v2" } } diff --git a/fabric-like/build.gradle b/fabric-like/build.gradle index 8d69c87..1b87612 100644 --- a/fabric-like/build.gradle +++ b/fabric-like/build.gradle @@ -11,8 +11,6 @@ loom { dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" modImplementation ("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") compileClasspath(project(path: ":common", configuration: "namedElements")) { transitive false } diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java index ec5e8d0..be13844 100644 --- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java +++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java @@ -25,9 +25,7 @@ public class MidnightLibClientEvents { @SubscribeEvent public void onPostInit(FMLLoadCompleteEvent event) { ModList.get().applyForEachModContainer(modContainer -> { - System.out.println(modContainer.getModId() + " yes"); if (MidnightConfig.configClass.containsKey(modContainer.getModId())) { - modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, modContainer.getModId()))); } diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java index aba40a8..1d0afda 100644 --- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java +++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java @@ -2,7 +2,9 @@ package eu.midnightdust.forge; import eu.midnightdust.core.MidnightLibClient; import eu.midnightdust.core.MidnightLibServer; +import eu.midnightdust.lib.config.MidnightConfig; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.IExtensionPoint; @@ -16,8 +18,8 @@ public class MidnightLibForge { ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (remote, server) -> true)); DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> MidnightLibClient::onInitializeClient); DistExecutor.safeRunWhenOn(Dist.DEDICATED_SERVER, () -> MidnightLibServer::onInitializeServer); - //ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> - // new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "midnightlib"))); + ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> + new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "midnightlib"))); MinecraftForge.EVENT_BUS.register(new MidnightLibClientEvents()); MinecraftForge.EVENT_BUS.register(new MidnightLibServerEvents()); } diff --git a/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java b/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java index a55811d..84471c8 100644 --- a/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java +++ b/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java @@ -23,6 +23,6 @@ public class PlatformFunctionsImpl { return ModList.get().isLoaded(modid); } public static void registerCommand(LiteralArgumentBuilder command) { - // Ignored here, see MidnightLibEvents#registerCommands + // Ignored here, see MidnightLibServerEvents#registerCommands } } diff --git a/gradle.properties b/gradle.properties index b888c54..857af62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,17 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.19.3-rc1 -enabled_platforms=fabric +minecraft_version=1.19.3 +enabled_platforms=quilt,fabric,forge archives_base_name=midnightlib mod_version=1.1.0 maven_group=eu.midnightdust -architectury_version=6.2.43 - fabric_loader_version=0.14.11 fabric_api_version=0.68.1+1.19.3 -forge_version=1.19.2-43.0.8 +forge_version=1.19.3-44.0.18 -quilt_loader_version=0.18.1-beta.9 -quilt_fabric_api_version=4.0.0-beta.7+0.59.0-1.19.2 -mod_menu_version = 5.0.0-alpha.4 +quilt_loader_version=0.18.1-beta.23 +quilt_fabric_api_version=5.0.0-beta.2+0.68.1-1.19.3 +mod_menu_version = 5.0.2 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f83aad5..c86c020 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { include("common") include("fabric-like") include("fabric") -//include("quilt") -//include("forge") +include("quilt") +include("forge") rootProject.name = "midnightlib"