aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-06-07 00:47:29 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-06-07 00:47:29 +0200
commit873503aaffd4f8e00e104e1b8a7d3c8e1a1cdc79 (patch)
tree0695d0848678c854b68f0e0600035511412cca7d
parentd394bcef43fd1fb4f93943fda0eb62e94ca5a73b (diff)
downloadGT5-Unofficial-873503aaffd4f8e00e104e1b8a7d3c8e1a1cdc79.tar.gz
GT5-Unofficial-873503aaffd4f8e00e104e1b8a7d3c8e1a1cdc79.tar.bz2
GT5-Unofficial-873503aaffd4f8e00e104e1b8a7d3c8e1a1cdc79.zip
Fixed Cables
Former-commit-id: 345ef743d831c178a76cd0963b76c920e2fc5a37
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java40
2 files changed, 41 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java
index e89bff4e00..9cc15b6773 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java
@@ -106,7 +106,7 @@ public interface LowPowerLaser extends IMetaTileEntity, IConnectsToEnergyTunnel
}
((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).markUsed();
- } else if (aBaseMetaTileEntity instanceof LowPowerLaser && ((LowPowerLaser) aMetaTileEntity).isTunnel()) {
+ } else if (aMetaTileEntity instanceof LowPowerLaser && ((LowPowerLaser) aMetaTileEntity).isTunnel()) {
if (!((LowPowerLaser) aMetaTileEntity).isConnectedCorrectly(front))
return;
}
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java
index 140359c159..96522d618e 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java
@@ -23,19 +23,26 @@
package com.github.bartimaeusnek.crossmod.tectech.tileentites.tiered;
import com.github.bartimaeusnek.bartworks.util.ChatColorHelper;
+import com.google.common.collect.Sets;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Materials;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_CoverBehavior;
import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Client;
import ic2.core.Ic2Items;
import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
+import java.util.ArrayList;
+import java.util.HashSet;
+
public class TT_MetaTileEntity_Pipe_Energy_LowPower extends GT_MetaPipeEntity_Cable implements LowPowerLaser {
public TT_MetaTileEntity_Pipe_Energy_LowPower(int aID, String aName, String aNameRegional) {
@@ -110,4 +117,37 @@ public class TT_MetaTileEntity_Pipe_Energy_LowPower extends GT_MetaPipeEntity_Ca
public boolean isConnectedCorrectly(byte aSide) {
return this.isConnectedAtSide(aSide) && this.isConnectedAtSide(GT_Utility.getOppositeSide(aSide));
}
+
+ @Override
+ public boolean shouldJoinIc2Enet() {
+ return false;
+ }
+
+ @Override
+ public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
+ return 0L;
+ }
+
+
+ @Override
+ @Deprecated
+ @SuppressWarnings("deprecation")
+ public long transferElectricity(byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList) {
+ return 0L;
+ }
+
+ @Override
+ public long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) {
+ return 0L;
+ }
+
+ @Override
+ public boolean letsIn(GT_CoverBehavior coverBehavior, byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+ return true;
+ }
+
+ @Override
+ public boolean letsOut(GT_CoverBehavior coverBehavior, byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+ return true;
+ }
}