diff options
| author | Richard Hendricks <richardhendricks@pobox.com> | 2019-03-11 22:29:02 -0500 |
|---|---|---|
| committer | Richard Hendricks <richardhendricks@pobox.com> | 2019-03-12 01:49:56 -0500 |
| commit | 75404252d7a3040e0e9d4d00d78bb74d3c2b53e1 (patch) | |
| tree | 7bda8df6916c1106b9dbc7f751144c4815e5bffa /src/main/java/gregtech/common/tileentities/machines/multi | |
| parent | fd5cb51c6299cb5e39f9651953dbd1836460b160 (diff) | |
| download | GT5-Unofficial-75404252d7a3040e0e9d4d00d78bb74d3c2b53e1.tar.gz GT5-Unofficial-75404252d7a3040e0e9d4d00d78bb74d3c2b53e1.tar.bz2 GT5-Unofficial-75404252d7a3040e0e9d4d00d78bb74d3c2b53e1.zip | |
Cherry pick multiamp dynamo support for multiblock generators. Removed local explosion checks from large turbine and plasma turbine. Large turbs now support buffered 4A dynamos.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 4bc5e5ed9a..3797806460 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -175,6 +175,8 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M } else { this.mMaxProgresstime = 1; this.mEfficiencyIncrease = 10; + // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here. + /* if(this.mDynamoHatches.size()>0){ for(GT_MetaTileEntity_Hatch dynamo:mDynamoHatches) if(isValidMetaTileEntity(dynamo) && dynamo.maxEUOutput() < mEUt) { @@ -182,6 +184,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M explodeMultiblock(); } } + */ return true; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index b80f01a85e..fb3f58efd5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -192,6 +192,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar } else { this.mMaxProgresstime = 20; this.mEfficiencyIncrease = 200; + // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here. + /* if(this.mDynamoHatches.size()>0){ for(GT_MetaTileEntity_Hatch dynamo:mDynamoHatches) if(isValidMetaTileEntity(dynamo) && dynamo.maxEUOutput() < mEUt) { @@ -199,6 +201,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar explodeMultiblock(); } } + */ return true; } } |