diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-11-03 17:10:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-03 10:10:59 +0100 |
| commit | e93559ce1dde69a1f09484d0136544502066d7da (patch) | |
| tree | f341b3788146da7d5bab8306b5b85c71f937af04 /src | |
| parent | ef9a7d98528af0463e2bc3e169c33b82ee8034b1 (diff) | |
| download | GT5-Unofficial-e93559ce1dde69a1f09484d0136544502066d7da.tar.gz GT5-Unofficial-e93559ce1dde69a1f09484d0136544502066d7da.tar.bz2 GT5-Unofficial-e93559ce1dde69a1f09484d0136544502066d7da.zip | |
a proper implementation for material from fluid (#1502)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 24 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/fluid/GT_Fluid.java | 1 |
2 files changed, 5 insertions, 20 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 6cd1d96943..1ed45dc2f0 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -2357,7 +2357,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG final String fluidTexture = aMaterial.mIconSet.is_custom ? "fluid." + aMaterial.mName.toLowerCase() : "autogenerated"; - Fluid fluid = GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) + return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) .withLocalizedName(aMaterial.mDefaultLocalName) .withTextureName(fluidTexture) .withColorRGBA(aMaterial.mRGBa) @@ -2367,10 +2367,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L)) .asFluid(); - - Materials.FLUID_MAP.put(fluid, aMaterial); - - return fluid; } public Fluid addAutoGeneratedCorrespondingGas(Materials aMaterial) { @@ -2380,7 +2376,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG final String fluidTexture = aMaterial.mIconSet.is_custom ? ("gas." + aMaterial.mName.toLowerCase()) : "autogenerated"; - Fluid fluid = GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) + return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) .withLocalizedName(aMaterial.mDefaultLocalName) .withTextureName(fluidTexture) .withColorRGBA(aMaterial.mRGBa) @@ -2390,10 +2386,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L)) .asFluid(); - - Materials.FLUID_MAP.put(fluid, aMaterial); - - return fluid; } public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { @@ -2403,7 +2395,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG final String fluidTexture = aMaterial.mIconSet.is_custom ? ("plasma." + aMaterial.mName.toLowerCase()) : "plasma.autogenerated"; - Fluid fluid = GT_FluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) + return GT_FluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) .withLocalizedName(aMaterial.mDefaultLocalName + " Plasma") .withTextureName(fluidTexture) .withColorRGBA(aMaterial.mMoltenRGBa) @@ -2415,10 +2407,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.Cell_Empty.get(1L), aMaterial.getMolten(1) != null ? 144 : 1000) .asFluid(); - - Materials.FLUID_MAP.put(fluid, aMaterial); - - return fluid; } public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { @@ -2428,7 +2416,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG final String fluidTexture = aMaterial.mIconSet.is_custom ? ("molten." + aMaterial.mName.toLowerCase()) : "molten.autogenerated"; - Fluid fluid = GT_FluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) + return GT_FluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) .withLocalizedName("Molten " + aMaterial.mDefaultLocalName) .withTextureName(fluidTexture) .withColorRGBA(aMaterial.mMoltenRGBa) @@ -2440,10 +2428,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.Cell_Empty.get(1L), 144) .asFluid(); - - Materials.FLUID_MAP.put(fluid, aMaterial); - - return fluid; } // ------------------------------------------------------------------------------------------------------------ diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java index dc40d35024..10caccbcd0 100644 --- a/src/main/java/gregtech/common/fluid/GT_Fluid.java +++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java @@ -163,6 +163,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R material.mFluid = registeredFluid; break; } + Materials.FLUID_MAP.put(registeredFluid, material); } return this; } |