mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-28 04:17:38 +00:00
Code Issues Releases Wiki Activity

Add back MoreRed support

Browse Source 
I removed this in fc834cd97f, way back in
late 2024. Looks like it's been updating in the meantime and I hadn't
noticed, so add it back.

I've simplified the code a little bit, to make use of our NeoForge's new
capability system, but otherwise it's almost exactly the same :D.
This commit is contained in:
Jonathan Coates
2025-02-12 13:40:58 +00:00
parent 1e25fa9bc3
commit 1278246cf7
4 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/forge/src/main/java/dan200/computercraft/ComputerCraft.java
View File

@@ -20,6 +20,7 @@ import dan200.computercraft.shared.config.Config;
import dan200.computercraft.shared.config.ConfigSpec;
import dan200.computercraft.shared.details.FluidData;
import dan200.computercraft.shared.integration.CreateIntegration;
import dan200.computercraft.shared.integration.MoreRedIntegration;
import dan200.computercraft.shared.network.NetworkMessage;
import dan200.computercraft.shared.network.NetworkMessages;
import dan200.computercraft.shared.network.client.ClientNetworkContext;
@@ -70,6 +71,8 @@ public final class ComputerCraft {
var container = ModLoadingContext.get().getActiveContainer();
container.registerConfig(ModConfig.Type.SERVER, ((ForgeConfigFile) ConfigSpec.serverSpec).spec());
container.registerConfig(ModConfig.Type.CLIENT, ((ForgeConfigFile) ConfigSpec.clientSpec).spec());
if (ModList.get().isLoaded(MoreRedIntegration.MOD_ID)) MoreRedIntegration.setup(eventBus);
}
private static void withEventBus(IEventBus eventBus, Runnable task) {

54
projects/forge/src/main/java/dan200/computercraft/shared/integration/MoreRedIntegration.java Normal file
View File

@@ -0,0 +1,54 @@
// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.shared.integration;
import commoble.morered.api.MoreRedAPI;
import dan200.computercraft.api.ComputerCraftAPI;
import dan200.computercraft.shared.common.IBundledRedstoneBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.level.Level;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
public final class MoreRedIntegration {
public static final String MOD_ID = "morered";
private static void onRegisterCapabilities(RegisterCapabilitiesEvent event) {
for (var block : BuiltInRegistries.BLOCK) {
if (!(block instanceof IBundledRedstoneBlock bundledBlock)) continue;
event.registerBlock(
MoreRedAPI.CHANNELED_POWER_CAPABILITY,
(level, pos, state, blockEntity, context) -> (level2, wirePos, wireState, wireFace, channel) -> {
var outputLevel = bundledBlock.getBundledRedstoneOutput(level2, pos, context);
return (outputLevel & (1 << channel)) != 0 ? 31 : 0;
},
block
);
}
}
public static void setup(IEventBus bus) {
bus.addListener(MoreRedIntegration::onRegisterCapabilities);
ComputerCraftAPI.registerBundledRedstoneProvider(MoreRedIntegration::getBundledPower);
}
private static int getBundledPower(Level world, BlockPos pos, Direction side) {
var blockState = world.getBlockState(pos);
// Skip ones already handled by CC. We can do this more efficiently.
if (blockState.getBlock() instanceof IBundledRedstoneBlock) return -1;
var power = world.getCapability(MoreRedAPI.CHANNELED_POWER_CAPABILITY, pos, blockState, null, side);
if (power == null) return -1;
var mask = 0;
for (var i = 0; i < 16; i++) {
mask |= power.getPowerOnChannel(world, pos, blockState, side, i) > 0 ? (1 << i) : 0;
}
return mask;
}
}