From 2522dec4066af2be78e5f5ae9192382ff4248a56 Mon Sep 17 00:00:00 2001 From: tonimatasdev Date: Sat, 8 Feb 2025 19:17:57 +0100 Subject: [PATCH] fix: NeoForge and Fabric subprojects --- .../krystalcraft/client/KrystalCraftClient.java | 17 +++++++++++++++++ fabric/build.gradle.kts | 2 ++ .../fabric/KrystalCraftClientFabric.java | 12 ++---------- .../krystalcraft/fabric/KrystalCraftFabric.java | 2 +- .../neoforge/KrystalCraftClientForge.java | 17 +++++------------ .../datagen/KrystalCraftDataGenerator.java | 4 ++-- 6 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 common/src/main/java/dev/tonimatas/krystalcraft/client/KrystalCraftClient.java diff --git a/common/src/main/java/dev/tonimatas/krystalcraft/client/KrystalCraftClient.java b/common/src/main/java/dev/tonimatas/krystalcraft/client/KrystalCraftClient.java new file mode 100644 index 0000000..80ba2ec --- /dev/null +++ b/common/src/main/java/dev/tonimatas/krystalcraft/client/KrystalCraftClient.java @@ -0,0 +1,17 @@ +package dev.tonimatas.krystalcraft.client; + +import dev.architectury.registry.menu.MenuRegistry; +import dev.tonimatas.krystalcraft.client.screen.*; +import dev.tonimatas.krystalcraft.registry.ModMenus; + +public class KrystalCraftClient { + public static void init() { + MenuRegistry.registerScreenFactory(ModMenus.COMBINING_STATION_MENU.get(), CombiningStationScreen::new); + MenuRegistry.registerScreenFactory(ModMenus.COMBINING_FACTORY_MENU.get(), CombiningFactoryScreen::new); + MenuRegistry.registerScreenFactory(ModMenus.CRUSHING_STATION_MENU.get(), CrushingStationScreen::new); + MenuRegistry.registerScreenFactory(ModMenus.CRUSHING_FACTORY_MENU.get(), CrushingFactoryScreen::new); + MenuRegistry.registerScreenFactory(ModMenus.CUTTING_STATION_MENU.get(), CuttingStationScreen::new); + MenuRegistry.registerScreenFactory(ModMenus.CUTTING_FACTORY_MENU.get(), CuttingFactoryScreen::new); + MenuRegistry.registerScreenFactory(ModMenus.COMBUSTION_GENERATOR_MENU.get(), CombustionGeneratorScreen::new); + } +} diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 3b91d6f..981b5fc 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -13,6 +13,8 @@ val modVersion: String by extra dependencies { modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion") + modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion+$minecraftVersion") + //modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}" //modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${rei_version}" //modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:${rei_version}" diff --git a/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftClientFabric.java b/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftClientFabric.java index c8eeccd..92151c5 100644 --- a/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftClientFabric.java +++ b/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftClientFabric.java @@ -1,19 +1,11 @@ package dev.tonimatas.krystalcraft.fabric; +import dev.tonimatas.krystalcraft.client.KrystalCraftClient; import net.fabricmc.api.ClientModInitializer; -import net.minecraft.client.gui.screens.MenuScreens; -import dev.tonimatas.krystalcraft.client.screen.*; -import dev.tonimatas.krystalcraft.registry.ModMenus; public class KrystalCraftClientFabric implements ClientModInitializer { @Override public void onInitializeClient() { - MenuScreens.register(ModMenus.COMBINING_STATION_MENU.get(), CombiningStationScreen::new); - MenuScreens.register(ModMenus.COMBINING_FACTORY_MENU.get(), CombiningFactoryScreen::new); - MenuScreens.register(ModMenus.CRUSHING_STATION_MENU.get(), CrushingStationScreen::new); - MenuScreens.register(ModMenus.CRUSHING_FACTORY_MENU.get(), CrushingFactoryScreen::new); - MenuScreens.register(ModMenus.CUTTING_STATION_MENU.get(), CuttingStationScreen::new); - MenuScreens.register(ModMenus.CUTTING_FACTORY_MENU.get(), CuttingFactoryScreen::new); - MenuScreens.register(ModMenus.COMBUSTION_GENERATOR_MENU.get(), CombustionGeneratorScreen::new); + KrystalCraftClient.init(); } } diff --git a/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftFabric.java b/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftFabric.java index 066e648..7460f46 100644 --- a/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftFabric.java +++ b/fabric/src/main/java/dev/tonimatas/krystalcraft/fabric/KrystalCraftFabric.java @@ -27,6 +27,6 @@ public void onInitialize() { private void addOre(String name) { BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, - ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(KrystalCraft.MOD_ID, name))); + ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.tryBuild(KrystalCraft.MOD_ID, name))); } } \ No newline at end of file diff --git a/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/KrystalCraftClientForge.java b/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/KrystalCraftClientForge.java index 57ff4d9..c59d1cc 100644 --- a/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/KrystalCraftClientForge.java +++ b/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/KrystalCraftClientForge.java @@ -1,23 +1,16 @@ package dev.tonimatas.krystalcraft.neoforge; +import dev.tonimatas.krystalcraft.KrystalCraft; +import dev.tonimatas.krystalcraft.client.KrystalCraftClient; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; -import dev.tonimatas.krystalcraft.KrystalCraft; -import dev.tonimatas.krystalcraft.client.screen.*; -import dev.tonimatas.krystalcraft.registry.ModMenus; -@Mod.EventBusSubscriber(modid = KrystalCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = KrystalCraft.MOD_ID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD) public class KrystalCraftClientForge { @SubscribeEvent public static void onClientSetup(RegisterMenuScreensEvent event) { - event.register(ModMenus.COMBINING_STATION_MENU.get(), CombiningStationScreen::new); - event.register(ModMenus.COMBINING_FACTORY_MENU.get(), CombiningFactoryScreen::new); - event.register(ModMenus.CRUSHING_STATION_MENU.get(), CrushingStationScreen::new); - event.register(ModMenus.CRUSHING_FACTORY_MENU.get(), CrushingFactoryScreen::new); - event.register(ModMenus.CUTTING_STATION_MENU.get(), CuttingStationScreen::new); - event.register(ModMenus.CUTTING_FACTORY_MENU.get(), CuttingFactoryScreen::new); - event.register(ModMenus.COMBUSTION_GENERATOR_MENU.get(), CombustionGeneratorScreen::new); + KrystalCraftClient.init(); } } diff --git a/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/datagen/KrystalCraftDataGenerator.java b/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/datagen/KrystalCraftDataGenerator.java index 190389e..05f52c5 100644 --- a/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/datagen/KrystalCraftDataGenerator.java +++ b/neoforge/src/main/java/dev/tonimatas/krystalcraft/neoforge/datagen/KrystalCraftDataGenerator.java @@ -5,14 +5,14 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; import java.util.concurrent.CompletableFuture; @SuppressWarnings("unused") -@Mod.EventBusSubscriber(modid = KrystalCraft.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = KrystalCraft.MOD_ID, bus = EventBusSubscriber.Bus.MOD) public class KrystalCraftDataGenerator { @SubscribeEvent public static void gatherData(GatherDataEvent event) {