Skip to content

Commit

Permalink
refactor: initialization classes
Browse files Browse the repository at this point in the history
  • Loading branch information
WakelessSloth56 committed Oct 11, 2022
1 parent ed1e7d8 commit 38742c1
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 88 deletions.
1 change: 1 addition & 0 deletions src/main/java/org/auioc/mcmod/arnicalib/ArnicaLib.java
Expand Up @@ -5,6 +5,7 @@
import org.apache.logging.log4j.Marker;
import org.auioc.mcmod.arnicalib.base.log.LogUtil;
import org.auioc.mcmod.arnicalib.base.version.VersionUtils;
import org.auioc.mcmod.arnicalib.mod.Initialization;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.fml.common.Mod;

Expand Down
87 changes: 0 additions & 87 deletions src/main/java/org/auioc/mcmod/arnicalib/Initialization.java

This file was deleted.

45 changes: 45 additions & 0 deletions src/main/java/org/auioc/mcmod/arnicalib/mod/Initialization.java
@@ -0,0 +1,45 @@
package org.auioc.mcmod.arnicalib.mod;

import org.auioc.mcmod.arnicalib.game.mod.ExtensionPointUtils;
import org.auioc.mcmod.arnicalib.mod.client.ClientInitialization;
import org.auioc.mcmod.arnicalib.mod.common.tag.HTags;
import org.auioc.mcmod.arnicalib.mod.server.event.AHServerEventHandler;
import org.auioc.mcmod.arnicalib.mod.server.loot.AHGlobalLootModifiers;
import org.auioc.mcmod.arnicalib.mod.server.loot.AHLootItemConditions;
import org.auioc.mcmod.arnicalib.mod.server.loot.AHLootItemFunctions;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLEnvironment;

public final class Initialization {

public static void init() {
registerConfig();
modSetup();
forgeSetup();
if (FMLEnvironment.dist == Dist.CLIENT) {
ClientInitialization.init();
} else {
ExtensionPointUtils.serverOnly();
}
}

private static final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
private static final IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;

private static void registerConfig() {}

private static void modSetup() {
modEventBus.register(AHGlobalLootModifiers.class);
AHLootItemConditions.LOOT_CONDITION_TYPES.register(modEventBus);
AHLootItemFunctions.LOOT_FUNCTION_TYPES.register(modEventBus);
HTags.init();
}

private static void forgeSetup() {
forgeEventBus.register(AHServerEventHandler.class);
}

}
@@ -0,0 +1,38 @@
package org.auioc.mcmod.arnicalib.mod.client;

import org.auioc.mcmod.arnicalib.game.mod.ExtensionPointUtils;
import org.auioc.mcmod.arnicalib.mod.client.config.AHClientConfig;
import org.auioc.mcmod.arnicalib.mod.client.event.AHClientEventHandler;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

@OnlyIn(Dist.CLIENT)
@SuppressWarnings("unused")
public final class ClientInitialization {

public static void init() {
ExtensionPointUtils.clientOnly();
registerConfig();
modSetup();
forgeSetup();
}

private static final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
private static final IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;

private static void registerConfig() {
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, AHClientConfig.CONFIG);
}

private static void modSetup() {}

private static void forgeSetup() {
forgeEventBus.register(AHClientEventHandler.class);
}

}
Expand Up @@ -5,7 +5,7 @@
import org.auioc.mcmod.arnicalib.ArnicaLib;
import org.auioc.mcmod.arnicalib.game.command.DynamicCommandHandler;
import org.auioc.mcmod.arnicalib.game.command.node.VersionCommand;
import org.auioc.mcmod.arnicalib.game.cpw.EnvironmentUtils;
import org.auioc.mcmod.arnicalib.game.mod.EnvironmentUtils;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.tree.CommandNode;
import net.minecraft.commands.CommandSourceStack;
Expand Down

0 comments on commit 38742c1

Please sign in to comment.