Merge branch '1.20.4' into 1.21

* 1.20.4: Fixed neoforge setup
Faboslav · Aug 10, 2024 · b797e81 · b797e81
2 parents dcff515 + a6ecc11
commit b797e81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,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/.../src/main/java/com/faboslav/villagesandpillages/neoforge/VillagesAndPillagesNeoForge.java b/.../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/...ain/resources/META-INF/neoforge.mods.toml → ...rge/src/main/resources/META-INF/mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...rge/src/main/resources/META-INF/mods.toml