Skip to content

Commit

Permalink
fix: NeoForge and Fabric subprojects
Browse files Browse the repository at this point in the history
  • Loading branch information
TonimatasDEV committed Feb 8, 2025
1 parent fe0b0c8 commit 2522dec
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -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);
}
}
2 changes: 2 additions & 0 deletions fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
}
Original file line number Diff line number Diff line change
@@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 2522dec

Please sign in to comment.