Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.cyclops.cyclopscore.component.DataComponentCapacityConfig;
import org.cyclops.cyclopscore.component.DataComponentEnergyStorageConfig;
import org.cyclops.cyclopscore.config.ConfigHandlerCommon;
import org.cyclops.cyclopscore.config.ConfigurableTypesForge;
import org.cyclops.cyclopscore.config.DeferredHolderCommon;
import org.cyclops.cyclopscore.gametest.DeferredHolderCommonTest;
import org.cyclops.cyclopscore.gametest.MethodGameTestInstanceConfig;
Expand Down Expand Up @@ -119,8 +118,6 @@ protected LiteralArgumentBuilder<CommandSourceStack> constructBaseCommand(Comman

@Override
protected void onConfigsRegister(ConfigHandlerCommon configHandler) {
ConfigurableTypesForge.load();

super.onConfigsRegister(configHandler);

configHandler.addConfigurable(new GeneralConfig(this));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.apache.logging.log4j.Level;
import org.cyclops.cyclopscore.config.ConfigHandlerCommon;
import org.cyclops.cyclopscore.config.ConfigHandlerForge;
import org.cyclops.cyclopscore.config.ConfigurableTypesForge;
import org.cyclops.cyclopscore.event.RegisterGameTestsForgeEvent;
import org.cyclops.cyclopscore.gametest.GameTestLoaderHelpers;
import org.cyclops.cyclopscore.helper.IModHelpersForge;
Expand All @@ -33,6 +34,10 @@
*/
public abstract class ModBaseForge<T extends ModBaseForge<T>> extends ModBaseCommon<T> {

static {
ConfigurableTypesForge.load();
}

private final ICommonProxyCommon proxy;
private final ConfigHandlerCommon configHandler;
private final FMLJavaModLoadingContext modLoadingContext;
Expand Down
Loading