fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fabric-1.16

Browse Source 
# Conflicts:
#	gradle.properties
#	src/main/java/appeng/block/AEBaseBlock.java
#	src/main/java/appeng/block/misc/QuartzFixtureBlock.java
#	src/main/java/appeng/block/misc/TinyTNTBlock.java
#	src/main/java/appeng/block/networking/CableBusBlock.java
#	src/main/java/appeng/helpers/AEMaterials.java
#	src/unported/java/appeng/block/misc/ChargerBlock.java
#	src/unported/java/appeng/block/networking/CreativeEnergyCellBlock.java
#	src/unported/java/appeng/block/networking/EnergyCellBlock.java
#	src/unported/java/appeng/block/networking/WirelessBlock.java
#	src/unported/java/appeng/block/paint/PaintSplotchesBlock.java
#	src/unported/java/appeng/block/qnb/QuantumLinkChamberBlock.java
#	src/unported/java/appeng/block/spatial/SpatialPylonBlock.java
#	src/unported/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
#	src/unported/java/appeng/tile/storage/ChestBlockEntity.java
This commit is contained in:
Sebastian Hartte
2020-07-02 12:25:39 +02:00
parent 295e720d37 1a7bac1fcc
commit fee1c18afe
27 changed files with 121 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/CableBusContainer.java
+3 -8
View File
@@ -624,14 +624,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
}
@Override
public boolean canConnectRedstone(final EnumSet<Direction> enumSet) {
for (final Direction dir : enumSet) {
final IPart part = this.getPart(dir);
if (part != null && part.canConnectRedstone()) {
return true;
}
}
return false;
public boolean canConnectRedstone(final Direction opposite) {
final IPart part = this.getPart(opposite);
return part != null && part.canConnectRedstone();
}
@Override
src/main/java/appeng/parts/ICableBusContainer.java
+1 -2
View File
@@ -18,7 +18,6 @@
package appeng.parts;
import java.util.EnumSet;
import java.util.Random;
import net.fabricmc.api.EnvType;
@@ -43,7 +42,7 @@ public interface ICableBusContainer {
int isProvidingWeakPower(Direction opposite);
boolean canConnectRedstone(EnumSet<Direction> of);
boolean canConnectRedstone(Direction opposite);
void onEntityCollision(Entity e);
src/main/java/appeng/parts/NullCableBusContainer.java
+1 -2
View File
@@ -18,7 +18,6 @@
package appeng.parts;
import java.util.EnumSet;
import java.util.Random;
import net.minecraft.entity.Entity;
@@ -48,7 +47,7 @@ public class NullCableBusContainer implements ICableBusContainer {
}
@Override
public boolean canConnectRedstone(final EnumSet<Direction> of) {
public boolean canConnectRedstone(final Direction opposite) {
return false;
}