diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-09-15 19:00:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 19:00:09 +0200 |
| commit | 325b57bde8f13a7f4d69b6d2dee554dad6fd1589 (patch) | |
| tree | dc960b3bf2ec0c6536890320c57bb98628687739 | |
| parent | c9694a1fc0ea284de1f2a5fe7ecc625bc672bf70 (diff) | |
| parent | a22840c67691d17234eb4643e3759cd03d812c05 (diff) | |
| download | GT5-Unofficial-325b57bde8f13a7f4d69b6d2dee554dad6fd1589.tar.gz GT5-Unofficial-325b57bde8f13a7f4d69b6d2dee554dad6fd1589.tar.bz2 GT5-Unofficial-325b57bde8f13a7f4d69b6d2dee554dad6fd1589.zip | |
Merge pull request #36 from kuba6000/masschange
Change mass calculation to match gregtech way
Former-commit-id: c1b971b0738768fc757e509e1e21a34b52e40285
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java index 107dec62c6..f66b598788 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java @@ -211,14 +211,18 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } if (this.stats.mass == 0) { long tmpmass = 0; + int count = 0; for (Pair<ISubTagContainer, Integer> p : contents) { if (p.getKey() instanceof Materials) { tmpmass += ((Materials) p.getKey()).getMass() * p.getValue(); + count += p.getValue(); } else if (p.getKey() instanceof Werkstoff) { tmpmass += ((Werkstoff) p.getKey()).getStats().mass * p.getValue(); + count += p.getValue(); } } - this.stats = stats.setMass(tmpmass); + if(count > 0) + this.stats = stats.setMass(tmpmass/count); } if (this.stats.meltingPoint == 0) |