Skip to content

fix: prevent red alloy/insulated wire from becoming unpowerable after a thrown lookup #2006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arsdragonfly wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

fix: prevent red alloy/insulated wire from becoming unpowerable after a thrown lookup #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 26 additions & 22 deletions expansion/src/main/java/mrtjp/projectred/expansion/part/RedstoneTubePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,12 @@ public boolean discoverStraightOverride(int s) {

boolean prevCanConnectRW = RedstonePropagator.canConnectRedwires();
RedstonePropagator.setCanConnectRedwires(false);
boolean discovered = (RedstoneInteractions.otherConnectionMask(level(), pos(), s, false) &
RedstoneInteractions.connectionMask(this, s)) != 0;
RedstonePropagator.setCanConnectRedwires(prevCanConnectRW);
return discovered;
try {
return (RedstoneInteractions.otherConnectionMask(level(), pos(), s, false) &
RedstoneInteractions.connectionMask(this, s)) != 0;
} finally {
RedstonePropagator.setCanConnectRedwires(prevCanConnectRW);
}
}

@Override
Expand Down Expand Up @@ -250,28 +252,30 @@ public int calculateSignal() {

RedstonePropagator.setDustProvidesPower(false);
RedstonePropagator.setRedwiresProvidePower(false);

int signal = 0;
for (int s = 0; s < 6; s++) {
int sig = 0;
if (maskConnectsIn(s)) {
CenterLookup lookup = CenterLookup.lookupInsideFace(level(), pos(), s);
sig = resolveSignal(lookup);

} else if (maskConnectsOut(s)) {
CenterLookup lookup = CenterLookup.lookupStraightCenter(level(), pos(), s);
sig = resolveSignal(lookup);
if (sig == 0) {
sig = RedstoneCenterLookup.resolveVanillaSignal(lookup, this);
try {
int signal = 0;
for (int s = 0; s < 6; s++) {
int sig = 0;
if (maskConnectsIn(s)) {
CenterLookup lookup = CenterLookup.lookupInsideFace(level(), pos(), s);
sig = resolveSignal(lookup);

} else if (maskConnectsOut(s)) {
CenterLookup lookup = CenterLookup.lookupStraightCenter(level(), pos(), s);
sig = resolveSignal(lookup);
if (sig == 0) {
sig = RedstoneCenterLookup.resolveVanillaSignal(lookup, this);
}
}

signal = Math.max(sig, signal);
}

signal = Math.max(sig, signal);
return signal;
} finally {
RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
}

RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
return signal;
}

@Override
Expand Down
54 changes: 28 additions & 26 deletions integration/src/main/java/mrtjp/projectred/integration/part/ArrayGatePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,38 +117,40 @@ public int calculateSignal() {

RedstonePropagator.setDustProvidesPower(false);
RedstonePropagator.setRedwiresProvidePower(false);

int signal = 0;
for (int r = 0; r < 4; r++) {
if ((propagationMask & 1 << r) == 0) { continue; }
int s;

if (maskConnectsCorner(r)) {
FaceLookup lookup = FaceLookup.lookupCorner(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveSignal(lookup, true);

} else if (maskConnectsStraight(r)) {
FaceLookup lookup = FaceLookup.lookupStraight(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveSignal(lookup, true);
if (s == 0) {
try {
int signal = 0;
for (int r = 0; r < 4; r++) {
if ((propagationMask & 1 << r) == 0) { continue; }
int s;

if (maskConnectsCorner(r)) {
FaceLookup lookup = FaceLookup.lookupCorner(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveSignal(lookup, true);

} else if (maskConnectsStraight(r)) {
FaceLookup lookup = FaceLookup.lookupStraight(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveSignal(lookup, true);
if (s == 0) {
s = RedstoneFaceLookup.resolveVanillaSignal(lookup, this, true, true);
}

} else if (maskConnectsInside(r)) {
FaceLookup lookup = FaceLookup.lookupInsideFace(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveSignal(lookup, true);

} else { // For non-connected sides, just do a vanilla signal lookup
FaceLookup lookup = FaceLookup.lookupStraight(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveVanillaSignal(lookup, this, true, true);
}

} else if (maskConnectsInside(r)) {
FaceLookup lookup = FaceLookup.lookupInsideFace(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveSignal(lookup, true);

} else { // For non-connected sides, just do a vanilla signal lookup
FaceLookup lookup = FaceLookup.lookupStraight(level(), pos(), getSide(), r);
s = RedstoneFaceLookup.resolveVanillaSignal(lookup, this, true, true);
signal = Math.max(s, signal);
}

signal = Math.max(s, signal);
return signal;
} finally {
RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
}

RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
return signal;
}

@Override
Expand Down
48 changes: 26 additions & 22 deletions transmission/src/main/java/mrtjp/projectred/transmission/part/FramedRedwirePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,12 @@ public boolean canConnectPart(IConnectable part, int dir) {
public boolean discoverStraightOverride(int s) {
boolean prevCanConnectRW = RedstonePropagator.canConnectRedwires();
RedstonePropagator.setCanConnectRedwires(false);
boolean discovered = (RedstoneInteractions.otherConnectionMask(level(), pos(), s, false) &
RedstoneInteractions.connectionMask(this, s)) != 0;
RedstonePropagator.setCanConnectRedwires(prevCanConnectRW);
return discovered;
try {
return (RedstoneInteractions.otherConnectionMask(level(), pos(), s, false) &
RedstoneInteractions.connectionMask(this, s)) != 0;
} finally {
RedstonePropagator.setCanConnectRedwires(prevCanConnectRW);
}
}

@Override
Expand Down Expand Up @@ -149,28 +151,30 @@ public void onSignalUpdate() {
public int calculateSignal() {
RedstonePropagator.setDustProvidesPower(false);
RedstonePropagator.setRedwiresProvidePower(false);

int signal = 0;
for (int s = 0; s < 6; s++) {
int sig = 0;
if (maskConnectsIn(s)) {
CenterLookup lookup = CenterLookup.lookupInsideFace(level(), pos(), s);
sig = resolveSignal(lookup);

} else if (maskConnectsOut(s)) {
CenterLookup lookup = CenterLookup.lookupStraightCenter(level(), pos(), s);
sig = resolveSignal(lookup);
if (sig == 0) {
sig = RedstoneCenterLookup.resolveVanillaSignal(lookup, this);
try {
int signal = 0;
for (int s = 0; s < 6; s++) {
int sig = 0;
if (maskConnectsIn(s)) {
CenterLookup lookup = CenterLookup.lookupInsideFace(level(), pos(), s);
sig = resolveSignal(lookup);

} else if (maskConnectsOut(s)) {
CenterLookup lookup = CenterLookup.lookupStraightCenter(level(), pos(), s);
sig = resolveSignal(lookup);
if (sig == 0) {
sig = RedstoneCenterLookup.resolveVanillaSignal(lookup, this);
}
}

signal = Math.max(sig, signal);
}

signal = Math.max(sig, signal);
return signal;
} finally {
RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
}

RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
return signal;
}

@Override
Expand Down
77 changes: 40 additions & 37 deletions transmission/src/main/java/mrtjp/projectred/transmission/part/RedwirePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,12 @@ public boolean discoverOpen(int r) {
public boolean discoverStraightOverride(int absDir) {
boolean prevCanConnectRW = RedstonePropagator.canConnectRedwires();
RedstonePropagator.setCanConnectRedwires(true);
boolean discovered = (RedstoneInteractions.otherConnectionMask(level(), pos(), absDir, false) &
RedstoneInteractions.connectionMask(this, absDir)) != 0;
RedstonePropagator.setCanConnectRedwires(prevCanConnectRW);
return discovered;
try {
return (RedstoneInteractions.otherConnectionMask(level(), pos(), absDir, false) &
RedstoneInteractions.connectionMask(this, absDir)) != 0;
} finally {
RedstonePropagator.setCanConnectRedwires(prevCanConnectRW);
}
}

@Override
Expand Down Expand Up @@ -164,46 +166,47 @@ public void setSignal(int signal) {
public int calculateSignal() {
RedstonePropagator.setDustProvidesPower(false);
RedstonePropagator.setRedwiresProvidePower(false);

int signal = 0;

for (int r = 0; r < 4; r++) {
int s = 0;
if (maskConnectsCorner(r)) {
FaceLookup lookup = FaceLookup.lookupCorner(level(), pos(), getSide(), r);
s = resolveSignal(lookup);

} else if (maskConnectsStraight(r)) {
FaceLookup lookup = FaceLookup.lookupStraight(level(), pos(), getSide(), r);
s = resolveSignal(lookup);
if (s <= 0) {
s = RedstoneFaceLookup.resolveVanillaSignal(lookup, this, true, true);
try {
int signal = 0;

for (int r = 0; r < 4; r++) {
int s = 0;
if (maskConnectsCorner(r)) {
FaceLookup lookup = FaceLookup.lookupCorner(level(), pos(), getSide(), r);
s = resolveSignal(lookup);

} else if (maskConnectsStraight(r)) {
FaceLookup lookup = FaceLookup.lookupStraight(level(), pos(), getSide(), r);
s = resolveSignal(lookup);
if (s <= 0) {
s = RedstoneFaceLookup.resolveVanillaSignal(lookup, this, true, true);
}

} else if (maskConnectsInside(r)) {
FaceLookup lookup = FaceLookup.lookupInsideFace(level(), pos(), getSide(), r);
s = resolveSignal(lookup);
}

} else if (maskConnectsInside(r)) {
FaceLookup lookup = FaceLookup.lookupInsideFace(level(), pos(), getSide(), r);
s = resolveSignal(lookup);
signal = Math.max(s, signal);
}

signal = Math.max(s, signal);
}
if (powerUnderside()) {
Direction face = Direction.values()[getSide()];
int s = level().getSignal(pos().relative(face), face) * 17;
signal = Math.max(s, signal);
}

if (powerUnderside()) {
Direction face = Direction.values()[getSide()];
int s = level().getSignal(pos().relative(face), face) * 17;
signal = Math.max(s, signal);
}
if (maskConnectsCenter()) {
FaceLookup lookup = FaceLookup.lookupInsideCenter(level(), pos(), getSide());
int s = resolveSignal(lookup);
signal = Math.max(s, signal);
}

if (maskConnectsCenter()) {
FaceLookup lookup = FaceLookup.lookupInsideCenter(level(), pos(), getSide());
int s = resolveSignal(lookup);
signal = Math.max(s, signal);
return signal;
} finally {
RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);
}

RedstonePropagator.setDustProvidesPower(true);
RedstonePropagator.setRedwiresProvidePower(true);

return signal;
}
//endregion

Expand Down
Loading