diff options
| author | miozune <miozune@gmail.com> | 2022-08-14 16:14:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-14 09:14:55 +0200 |
| commit | 2e7b50ecfa20153126f02a30d991bea6a2fb4226 (patch) | |
| tree | cba06678b5d98ae649076c24b30eefda7c8db888 /src | |
| parent | cb9274cacbed31df2169438c2d0ffcb2bb9471b6 (diff) | |
| download | GT5-Unofficial-2e7b50ecfa20153126f02a30d991bea6a2fb4226.tar.gz GT5-Unofficial-2e7b50ecfa20153126f02a30d991bea6a2fb4226.tar.bz2 GT5-Unofficial-2e7b50ecfa20153126f02a30d991bea6a2fb4226.zip | |
Fix wrong ternary operator causing electrolyzer recipes disappear (#1255)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index f6120f4697..1aa06a39ab 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -101,6 +101,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_FR; guiFactory = "gregtech.client.GT_GuiFactory", dependencies = " required-after:IC2;" + " required-after:structurelib;" + + " required-after:gtnhlib;" + " after:dreamcraft;" + " after:Forestry;" + " after:PFAAGeologica;" + diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 68df42ebc1..085a4a440e 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2176,7 +2176,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void addDensityValues(Materials aMaterial, String aConfigPath) { aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties.get(aConfigPath, "DensityMultiplier", aMaterial.mDensityMultiplier); aMaterial.mDensityDivider = GregTech_API.sMaterialProperties.get(aConfigPath, "DensityDivider", aMaterial.mDensityDivider); - aMaterial.mDensity = GregTech_API.sMaterialProperties.get(aConfigPath, "Density", (M * aMaterial.mDensityMultiplier) / aMaterial.mDensityDivider != 0 ? aMaterial.mDensityDivider : 1); + aMaterial.mDensity = (long) GregTech_API.sMaterialProperties.get(aConfigPath, "Density", ((double) M * aMaterial.mDensityMultiplier) / (aMaterial.mDensityDivider != 0 ? aMaterial.mDensityDivider : 1)); } private static void addColorValues(Materials aMaterial, String aConfigPath) { |