diff options
| author | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-01-22 15:00:31 +0000 |
|---|---|---|
| committer | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-01-22 15:00:31 +0000 |
| commit | 01816ab5302caa238935cf40ff43d6c35126a20a (patch) | |
| tree | 8c2bc6b60f2bac84bff90f8565ef085cf55012e8 | |
| parent | 4fec7c748cc082bde53734bbe214e2908574af6e (diff) | |
| parent | e74db3e1eeb5e4f55ad4923e074799c368872192 (diff) | |
| download | GT5-Unofficial-01816ab5302caa238935cf40ff43d6c35126a20a.tar.gz GT5-Unofficial-01816ab5302caa238935cf40ff43d6c35126a20a.tar.bz2 GT5-Unofficial-01816ab5302caa238935cf40ff43d6c35126a20a.zip | |
Merge remote-tracking branch 'origin/CelestialThingy' into CelestialThingy
4 files changed, 16 insertions, 1 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index b8a7280196..22303644de 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.209:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.217-pre:dev') compile('com.github.GTNewHorizons:ModularUI:1.0.38:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java index 5deccd87e0..e25877817d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java @@ -101,6 +101,11 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc } @Override + public ConnectionType getConnectionType() { + return ConnectionType.LASER; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Hatch_DynamoTunnel(mName, mTier, Amperes, mDescription, mTextures); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 854cf496e0..2039c9bec6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -107,6 +107,11 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch } @Override + public long maxWorkingAmperesIn() { + return Amperes; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Hatch_EnergyMulti(mName, mTier, Amperes, mDescription, mTextures); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java index 791b79cef8..ff46211db5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java @@ -99,6 +99,11 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc } @Override + public ConnectionType getConnectionType() { + return ConnectionType.LASER; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Hatch_EnergyTunnel(mName, mTier, Amperes, mDescription, mTextures); } |