From a6ecc11fbd44e50c7d69ec29457a67eb70b332da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Sat, 10 Aug 2024 16:02:03 +0200 Subject: [PATCH 1/2] Fixed neoforge setup --- build.gradle | 2 +- .../neoforge/VillagesAndPillagesNeoForge.java | 3 ++- .../main/resources/META-INF/{neoforge.mods.toml => mods.toml} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename neoforge/src/main/resources/META-INF/{neoforge.mods.toml => mods.toml} (100%) diff --git a/build.gradle b/build.gradle index da1beb3..73fdf5a 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ allprojects { "yungsapiVersion" : yungsapi_version ] - filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml', '*.mixins.json']) { + filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', '*.mixins.json']) { expand expandProps } diff --git a/neoforge/src/main/java/com/faboslav/villagesandpillages/neoforge/VillagesAndPillagesNeoForge.java b/neoforge/src/main/java/com/faboslav/villagesandpillages/neoforge/VillagesAndPillagesNeoForge.java index 48f2abc..a7a6c25 100644 --- a/neoforge/src/main/java/com/faboslav/villagesandpillages/neoforge/VillagesAndPillagesNeoForge.java +++ b/neoforge/src/main/java/com/faboslav/villagesandpillages/neoforge/VillagesAndPillagesNeoForge.java @@ -4,12 +4,13 @@ import com.faboslav.villagesandpillages.platform.neoforge.StructureProcessorTypeRegistryImpl; import com.faboslav.villagesandpillages.platform.neoforge.StructureTypeRegistryImpl; import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; @Mod(VillagesAndPillages.MOD_ID) public final class VillagesAndPillagesNeoForge { - public VillagesAndPillagesNeoForge(IEventBus modEventBus) { + public VillagesAndPillagesNeoForge(ModContainer modContainer, IEventBus modEventBus) { VillagesAndPillages.init(); StructureProcessorTypeRegistryImpl.STRUCTURE_PROCESSOR_TYPES.register(modEventBus); diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/mods.toml similarity index 100% rename from neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to neoforge/src/main/resources/META-INF/mods.toml From b33dd14098eb1a04322ad45db85874bfcdda7754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Sat, 10 Aug 2024 16:04:54 +0200 Subject: [PATCH 2/2] Updated neoforge --- build.gradle | 2 +- .../main/resources/META-INF/{mods.toml => neoforge.mods.toml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename neoforge/src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (100%) diff --git a/build.gradle b/build.gradle index 4f59476..a7259a1 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ allprojects { "yungsapiVersion" : yungsapi_version ] - filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', '*.mixins.json']) { + filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml', '*.mixins.json']) { expand expandProps } diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from neoforge/src/main/resources/META-INF/mods.toml rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml