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
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ dependencies {
runtimeOnly("mrtjp:ProjectRed:${projred_version}:core")
runtimeOnly("mrtjp:ProjectRed:${projred_version}:transmission")

// Immersive Engineering
compileOnly("maven.modrinth:immersiveengineering:${immersiveengineering_version}")
runtimeOnly("maven.modrinth:immersiveengineering:${immersiveengineering_version}")

testImplementation("com.typesafe:config:1.4.5")
testImplementation("org.scala-lang:scala-library:2.13.12")
testImplementation("org.scalatest:scalatest_2.13:3.2.18")
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ sable_companion_version=1.6.0
sable_version=2.0.5+mc1.21.1
sable_version_range=[2.0,3)
aeronautics_version=1.3.2+mc1.21.1
immersiveengineering_version=12.4.2-194
# Publishing
curse_project_id=1634364
modrinth_project_id=YiAbZis2
3 changes: 3 additions & 0 deletions src/main/scala/li/cil/oc/integration/Mods.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ object Mods {
val OpenComputers = new SimpleMod(IDs.OpenComputers)
val EnderStorage = new SimpleMod(IDs.EnderStorage)
val ProjectRedTransmission = new SimpleMod(IDs.ProjectRedTransmission)
val ImmersiveEngineering = new SimpleMod(IDs.ImmersiveEngineering)

// ----------------------------------------------------------------------- //

Expand All @@ -43,6 +44,7 @@ object Mods {
integration.appeng.ModAppliedEnergistics2.INSTANCE,
integration.enderstorage.ModEnderStorage,
integration.projectred.ModProjectRed,
integration.immersiveengineering.ModImmersiveEngineering,

// We go late to ensure all other mod integration is done, e.g. to
// allow properly checking if wireless redstone is present.
Expand Down Expand Up @@ -107,6 +109,7 @@ object Mods {
final val OpenComputers = "opencomputers"
final val EnderStorage = "enderstorage"
final val ProjectRedTransmission = "projectred_transmission"
final val ImmersiveEngineering = "immersiveengineering"
}

// ----------------------------------------------------------------------- //
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package li.cil.oc.integration.immersiveengineering

import blusunrize.immersiveengineering.common.blocks.metal.ConnectorBundledBlockEntity.IBundledProvider
import li.cil.oc.common.blockentity.traits.BundledRedstoneAware
import net.minecraft.core.{BlockPos, Direction}
import net.minecraft.world.level.Level

class BundledProviderImmersiveEngineering extends IBundledProvider {

override def getEmittedState(level: Level, blockPos: BlockPos, direction: Direction): Array[Byte] = {
val tileEntity = level.getBlockEntity(blockPos)
if(!tileEntity.isInstanceOf[BundledRedstoneAware]) return null
tileEntity.asInstanceOf[BundledRedstoneAware].getBundledOutput(direction).map(value => math.min(math.max(value, 0), 255).toByte)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package li.cil.oc.integration.immersiveengineering

import blusunrize.immersiveengineering.common.blocks.metal.ConnectorBundledBlockEntity
import blusunrize.immersiveengineering.common.register.IEBlockEntities
import li.cil.oc.integration.util.BundledRedstone
import li.cil.oc.integration.util.BundledRedstone.RedstoneProvider
import li.cil.oc.integration.{ModProxy, Mods}
import li.cil.oc.util.BlockPosition
import net.minecraft.core.Direction

object ModImmersiveEngineering extends ModProxy with RedstoneProvider {
override def getMod = Mods.ImmersiveEngineering

override def preInitialize(): Unit = {
ConnectorBundledBlockEntity.EXTRA_SOURCES.add(new BundledProviderImmersiveEngineering)
}

override def initialize(): Unit = {
BundledRedstone.addProvider(this)
}

override def computeInput(pos: BlockPosition, side: Direction): Int = 0

override def computeBundledInput(pos: BlockPosition, side: Direction): Array[Int] = {
val tileEntity = pos.world.get.getBlockEntity(pos.toBlockPos.relative(side), IEBlockEntities.CONNECTOR_BUNDLED.get)
if(tileEntity.isEmpty) return null
(for (i <- 0 until 16) yield tileEntity.get.getValue(i).toInt).toArray
}
}
Loading