fix: bus converter off by 1 when reading redwires

MrTJP · May 15, 2022 · fb0ea91 · fb0ea91
1 parent 4bdfe55
commit fb0ea91
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.../projectred/textures/gui/ic_workbench.png → ...fabrication/textures/gui/ic_workbench.png b/.../projectred/textures/gui/ic_workbench.png → ...fabrication/textures/gui/ic_workbench.png
diff --git a/src/integration/scala/mrtjp/projectred/integration/gatepartbundled.scala b/src/integration/scala/mrtjp/projectred/integration/gatepartbundled.scala
@@ -380,7 +380,7 @@ class BusConverter extends BundledGatePart(GateType.BUS_CONVERTER)
         var changed = false
 
         val oldRSIn = rsIn
-        rsIn = if (shape == 0) getRedstoneInput(2)/17 else 0
+        rsIn = if (shape == 0) getAnalogRedstoneInput(2) else 0
         if (oldRSIn != rsIn) changed = true
 
         val oldBIn = bIn

diff --git a/src/integration/scala/mrtjp/projectred/integration/gatepartrs.scala b/src/integration/scala/mrtjp/projectred/integration/gatepartrs.scala
@@ -119,6 +119,10 @@ abstract class RedstoneGatePart(gateType:GateType) extends GatePart(gateType) wi
         else calcMaxSignal(ar, true, false)
     }
 
+    def getAnalogRedstoneInput(r:Int):Int = {
+        (getRedstoneInput(r) + 16) / 17
+    }
+
     override def resolveSignal(part:Any, r:Int) = part match
     {
         case re:IRedwireEmitter => re.getRedwireSignal(r)

diff --git a/src/integration/scala/mrtjp/projectred/integration/gatepartseq.scala b/src/integration/scala/mrtjp/projectred/integration/gatepartseq.scala
@@ -696,8 +696,6 @@ class Comparator extends RedstoneGatePart(GateType.COMPARATOR) with INeighborTil
         if (r == 0) state2&0xF
         else 0
 
-    def getAnalogInput(r:Int):Int = (getRedstoneInput(r)+16)/17
-
     def calcInputA:Int = {
         //TODO comparator calculations may not be accurate anymore
 
@@ -708,7 +706,7 @@ class Comparator extends RedstoneGatePart(GateType.COMPARATOR) with INeighborTil
         if (state.hasAnalogOutputSignal)
             return state.getAnalogOutputSignal(world, pos)
 
-        var i = getAnalogInput(2)
+        var i = getAnalogRedstoneInput(2)
 
         if (i < 15 && state.isRedstoneConductor(world, pos)) {
             pos = pos.relative(absDir)
@@ -736,7 +734,7 @@ class Comparator extends RedstoneGatePart(GateType.COMPARATOR) with INeighborTil
         if (list.size == 1) list.get(0) else null
     }
 
-    def calcInput:Int = getAnalogInput(1)<<4|calcInputA<<8|getAnalogInput(3)<<12
+    def calcInput:Int = getAnalogRedstoneInput(1)<<4|calcInputA<<8|getAnalogRedstoneInput(3)<<12
 
     def digitize(analog:Int):Int = {
         var digital = 0