Skip to content

Commit

Permalink
Turn CC-Tweaked compat module into an early module
Browse files Browse the repository at this point in the history
  • Loading branch information
malte0811 committed May 4, 2024
1 parent 30c06b1 commit 98320a3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
version_minecraft=1.20.4
version_parchment=1.19.3-2023.06.25
version_neoforge=20.4.196
version_neoforge=20.4.234
# This is set to a fixed version since changing the version triggers a decompile, which we do not want to happen at
# "random" times. Updating this should usually be done in sync with updating the NeoForge version as there sometimes are
# cross-dependencies in e.g. argument generation.
Expand Down
Expand Up @@ -8,20 +8,22 @@

package blusunrize.immersiveengineering.common.util.compat;

import blusunrize.immersiveengineering.common.config.EarlyConfigLoader;
import blusunrize.immersiveengineering.common.config.IECommonConfig;
import blusunrize.immersiveengineering.common.util.IELogger;
import blusunrize.immersiveengineering.common.util.compat.computers.cctweaked.ComputerCraftCompatModule;
import com.google.common.collect.Sets;
import dan200.computercraft.api.ComputerCraftAPI;
import mcjty.theoneprobe.TheOneProbe;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModList;
import net.neoforged.fml.config.ModConfig.Type;
import net.neoforged.neoforge.common.ModConfigSpec.BooleanValue;

import javax.annotation.Nullable;
import java.lang.reflect.Constructor;
import java.util.*;
import java.util.Map.Entry;
import java.util.function.Predicate;

public final class IECompatModules
{
Expand All @@ -31,7 +33,7 @@ public final class IECompatModules

static
{
STANDARD_MODULE_CLASSES.put(ComputerCraftAPI.MOD_ID, ComputerCraftCompatModule.class);
EARLY_MODULE_CLASSES.put(ComputerCraftAPI.MOD_ID, ComputerCraftCompatModule.class);
STANDARD_MODULE_CLASSES.put(TheOneProbe.MODID, OneProbeCompatModule.class);
}

Expand Down
Expand Up @@ -11,7 +11,7 @@

import blusunrize.immersiveengineering.common.blocks.metal.ConnectorBundledBlockEntity;
import blusunrize.immersiveengineering.common.register.IEBlocks.Connectors;
import blusunrize.immersiveengineering.common.util.compat.IECompatModules.StandardIECompatModule;
import blusunrize.immersiveengineering.common.util.compat.IECompatModules.EarlyIECompatModule;
import blusunrize.immersiveengineering.common.util.compat.computers.generic.CallbackOwner;
import blusunrize.immersiveengineering.common.util.compat.computers.generic.Callbacks;
import dan200.computercraft.api.ComputerCraftAPI;
Expand All @@ -20,13 +20,21 @@
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;

import java.util.Map.Entry;
import java.util.Objects;

public class ComputerCraftCompatModule extends StandardIECompatModule
public class ComputerCraftCompatModule extends EarlyIECompatModule
{
private final IEventBus modBus;

public ComputerCraftCompatModule(IEventBus modBus)
{
this.modBus = modBus;
}

@Override
public void init()
{
Expand Down Expand Up @@ -57,7 +65,7 @@ public void init()
return channelValues;
});

// TODO: modBus.addListener(ComputerCraftCompatModule::registerCapabilities);
this.modBus.addListener(ComputerCraftCompatModule::registerCapabilities);
}

private static void registerCapabilities(RegisterCapabilitiesEvent event)
Expand Down

0 comments on commit 98320a3

Please sign in to comment.