diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-14 20:47:27 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-14 20:47:27 +0200 |
| commit | 9984343fd5002f85a0295c7b457199d9dfbc9953 (patch) | |
| tree | 3bfa43a3de9abd6f962caae8772751f51a62104d /src | |
| parent | b6acd86c9b4452a6870189651dc427c78fcbdcfa (diff) | |
| download | GT5-Unofficial-9984343fd5002f85a0295c7b457199d9dfbc9953.tar.gz GT5-Unofficial-9984343fd5002f85a0295c7b457199d9dfbc9953.tar.bz2 GT5-Unofficial-9984343fd5002f85a0295c7b457199d9dfbc9953.zip | |
Neat feature...
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 19 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index 17cdaec07a..abe3889c20 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -18,6 +18,7 @@ import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Client; +import gregtech.common.blocks.GT_Block_Machines; import ic2.api.energy.tile.IEnergySink; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -279,11 +280,19 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile } if(mOverheat>=mMaxOverheat) { - //if(mInsulated){ - //todo uninsulate - //}else{ - aBaseMetaTileEntity.setToFire(); - //} + if(mInsulated && + GregTech_API.METATILEENTITIES[aBaseMetaTileEntity.getMetaTileID()-10] instanceof GT_MetaPipeEntity_Cable && + ((GT_MetaPipeEntity_Cable)GregTech_API.METATILEENTITIES[aBaseMetaTileEntity.getMetaTileID()-10]).mMaterial==mMaterial){ + aBaseMetaTileEntity.setOnFire(); + aBaseMetaTileEntity.getWorld().setBlock( + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord(), + GT_Block_Machines.getBlockById(aBaseMetaTileEntity.getMetaTileID()-10)); + return; + }else{ + aBaseMetaTileEntity.setToFire(); + } }else if (mOverheat>0) mOverheat--; mTransferredVoltageOK=mTransferredVoltage; diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index ef4fc473af..445c5ba08d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1336,7 +1336,7 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI makeWires(Materials.Lead, 1220, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[1], true, aBoolConst_0); makeWires(Materials.Tin, 1240, bEC ? 1L : 1L, bEC ? 2L : 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, aBoolConst_0); - GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, Materials.Tin, new GT_MetaPipeEntity_CableDebug(1256, aTextWire1 + Materials.Tin.mName.toLowerCase() + ".01d", "1x " + Materials.Tin.mDefaultLocalName + aTextWire2+" Debug", 0.125F, Materials.Tin, 1, 1L, 32, false, false).getStackForm(1L)); + //GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, Materials.Tin, new GT_MetaPipeEntity_CableDebug(1256, aTextWire1 + Materials.Tin.mName.toLowerCase() + ".01d", "1x " + Materials.Tin.mDefaultLocalName + aTextWire2+" Debug", 0.125F, Materials.Tin, 1, 1L, 32, false, false).getStackForm(1L)); makeWires(Materials.Zinc, 1260, bEC ? 1L : 1L, bEC ? 2L : 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, aBoolConst_0); makeWires(Materials.SolderingAlloy, 1280, bEC ? 1L : 1L, bEC ? 2L : 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, aBoolConst_0); |