aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkuba6000 <kuba.123123.6000@gmail.com>2021-09-13 16:38:43 +0200
committerkuba6000 <kuba.123123.6000@gmail.com>2021-09-13 16:38:43 +0200
commita22840c67691d17234eb4643e3759cd03d812c05 (patch)
treedc960b3bf2ec0c6536890320c57bb98628687739 /src
parentc9694a1fc0ea284de1f2a5fe7ecc625bc672bf70 (diff)
downloadGT5-Unofficial-a22840c67691d17234eb4643e3759cd03d812c05.tar.gz
GT5-Unofficial-a22840c67691d17234eb4643e3759cd03d812c05.tar.bz2
GT5-Unofficial-a22840c67691d17234eb4643e3759cd03d812c05.zip
Change mass calculation to match gregtech way
Former-commit-id: 3eda8c976662f213eeb4bee572c21a0eee09de0e
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java6
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)