diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-06-17 16:09:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 16:09:55 +0200 |
| commit | 5b193cde280d9ed243cd594c43b2a41913205b5a (patch) | |
| tree | 4c3ad4d0cce3743e5dbec4c0b1cd4f0e28ab1a66 /src/Java/gtPlusPlus/xmod/gregtech/common | |
| parent | f04f7dc10459c321364677ffbbac673b05093992 (diff) | |
| parent | fb13341289028ef0c97d2bb42f9631f70f311897 (diff) | |
| download | GT5-Unofficial-5b193cde280d9ed243cd594c43b2a41913205b5a.tar.gz GT5-Unofficial-5b193cde280d9ed243cd594c43b2a41913205b5a.tar.bz2 GT5-Unofficial-5b193cde280d9ed243cd594c43b2a41913205b5a.zip | |
Merge pull request #6 from GTNewHorizons/GlodBlock-patch-1
make it accept bart's new coil block
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java index 2891741b2c..44c580fe4f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java @@ -244,7 +244,7 @@ public class StaticFields59 { if (aBlock == GregTech_API.sBlockCasings1 && (aMeta >= 12 && aMeta <= 14)) { return aMeta == 12 ? 1 : aMeta == 13 ? 2 : 3; } - else if (aBlock == getBlockCasings5() && (aMeta >= 0 && aMeta <= 8)) { + else if (aBlock == getBlockCasings5() && (aMeta >= 0 && aMeta <= 10)) { return aMeta; } return 0; @@ -285,15 +285,19 @@ public class StaticFields59 { case 8: mHeatingCapacity = 10800; break; + case 9: + mHeatingCapacity = 6300; + break; + case 10: + mHeatingCapacity = 9000; + break; default: Logger.INFO("Heating Coils are bad."); mHeatingCapacity = 0; } - if (CORE.GTNH && aCoilTier <= 6) { + if (CORE.GTNH && aCoilTier <= 10) { mHeatingCapacity += 1; } return mHeatingCapacity; } - - } |