diff options
| author | Tec <daniel112092@gmail.com> | 2022-01-18 22:33:13 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2022-01-29 21:23:38 +0100 |
| commit | bfc503b010c652be703fc6da016cede6d5b41465 (patch) | |
| tree | 95b1f49ca7e3e7d985a89f95e11b9971378f265b /src/main | |
| parent | 436fdbfdaacbadbb776251fd04b75e5acbe84f4c (diff) | |
| download | GT5-Unofficial-bfc503b010c652be703fc6da016cede6d5b41465.tar.gz GT5-Unofficial-bfc503b010c652be703fc6da016cede6d5b41465.tar.bz2 GT5-Unofficial-bfc503b010c652be703fc6da016cede6d5b41465.zip | |
Minor fixes
(cherry picked from commit 62021d238a0c38401b50211d59e72e169399f444)
Diffstat (limited to 'src/main')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java index e56e31f166..a062fa0dab 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java @@ -48,7 +48,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate { private EMComplexAspectDefinition(boolean check, EMConstantStackMap aspects) throws EMException { if (check && !canTheyBeTogether(aspects)) { - throw new EMException("Hadron Definition error"); + throw new EMException("Complex Aspect Definition error"); } aspectStacks = aspects; float mass = 0; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java index 878c2a6627..37ecb861f8 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java @@ -72,7 +72,7 @@ public final class EMAtomDefinition extends EMComplexTemplate { private final int charge; //int -electric charge in 1/3rds of electron charge for optimization private final int chargeLeptons; - private double rawLifeTime; + private final double rawLifeTime; //generation max present inside - minus if contains any anti quark private final byte type; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java index 70092aa735..c1db8e4460 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java @@ -101,7 +101,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize this.amount = amount; this.charge = charge; this.type = containsAnti ? (byte) -type : (byte) type; - long mult = this.getAmount() * this.getAmount() * (this.getAmount() - 1); + long mult = (long) this.getAmount() * this.getAmount() * (this.getAmount() - 1); mass = mass * 5.543D * mult;//yes it becomes heavier if (mass == protonMass && this.getAmount() == 3) { |