aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLéa Gris <lea.gris@noiraude.net>2022-09-21 01:14:54 +0200
committerGitHub <noreply@github.com>2022-09-20 23:14:54 +0000
commit416d7b2ac474b07327e55bc6934ec01fd28bc2fd (patch)
treec2b84547093cd1631d90a32ecf09a7c59074d287 /src/main
parentb7e65b634a490b06c0276f197da818d2a5227ef2 (diff)
downloadGT5-Unofficial-416d7b2ac474b07327e55bc6934ec01fd28bc2fd.tar.gz
GT5-Unofficial-416d7b2ac474b07327e55bc6934ec01fd28bc2fd.tar.bz2
GT5-Unofficial-416d7b2ac474b07327e55bc6934ec01fd28bc2fd.zip
fix(GT_Fluid): GT Fluid temperature seems broken #11355 (#1396)
Addresss issue: https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11355
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java4
-rw-r--r--src/main/java/gregtech/common/fluid/GT_Fluid.java1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 9f5e6a0516..1f0eda5034 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -2505,7 +2505,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
return GT_FluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH))
.withLocalizedName(aMaterial.mDefaultLocalName + " Plasma")
.withTextureName(fluidTexture)
- .withColorRGBA(aMaterial.mRGBa)
+ .withColorRGBA(aMaterial.mMoltenRGBa)
.withStateAndTemperature(PLASMA, 10000)
.buildAndRegister()
.configureMaterials(aMaterial)
@@ -2525,7 +2525,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
return GT_FluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH))
.withLocalizedName("Molten " + aMaterial.mDefaultLocalName)
.withTextureName(fluidTexture)
- .withColorRGBA(aMaterial.mRGBa)
+ .withColorRGBA(aMaterial.mMoltenRGBa)
.withStateAndTemperature(MOLTEN, aMaterial.mMeltingPoint < 0 ? 1000 : aMaterial.mMeltingPoint)
.buildAndRegister()
.configureMaterials(aMaterial)
diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java
index 6d5231fe00..b8bca3116a 100644
--- a/src/main/java/gregtech/common/fluid/GT_Fluid.java
+++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java
@@ -21,7 +21,6 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, Runnable {
private final ResourceLocation flowingIconResourceLocation;
private final short[] colorRGBA;
private final FluidState fluidState;
- private final int temperature;
private Fluid registeredFluid;
/**