diff options
Diffstat (limited to 'src/main/java/gregtech')
3 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index bf4c397b7e..3493e640ff 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -571,6 +571,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials SodiumSulfide; public static Materials HydricSulfide; + public static Materials OilExtraHeavy; public static Materials OilHeavy; public static Materials OilMedium; public static Materials OilLight; @@ -948,6 +949,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials TengamRaw; public static Materials DenseSteam = makeDenseSteam(); + private static Materials makeDenseSteam() { return new MaterialBuilder(232, TextureSet.SET_FLUID , "Dense Steam").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).constructMaterial(); } diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java index 831e451231..a614cbddb8 100644 --- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java +++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java @@ -588,6 +588,7 @@ public class MaterialsInit1 { Materials.SodiumSulfide = new Materials( 719, TextureSet.SET_FLUID , 1.0F, 0, 2, 1 , 255, 230, 128, 0, "SodiumSulfide" , "Sodium Sulfide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 1))); Materials.HydricSulfide = new Materials( 460, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 255, 255, 255, 0, "HydricSulfide" , "Hydrogen Sulfide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Sulfur, 1))); + Materials.OilExtraHeavy = new Materials( 570, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "OilExtraHeavy" , "Very Heavy Oil" , 3, 45, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ); Materials.OilHeavy = new Materials( 730, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "OilHeavy" , "Heavy Oil" , 3, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ); Materials.OilMedium = new Materials( 731, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "OilMedium" , "Raw Oil" , 3, 30, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ); Materials.OilLight = new Materials( 732, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "OilLight" , "Light Oil" , 3, 20, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ); diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index d376e02cc4..48921c3bc4 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -860,7 +860,13 @@ public class LoaderGTBlockFluid implements Runnable { Materials.Water.mGas.setTemperature(375) .setGaseous(true); - ItemList.sOilExtraHeavy = GTFluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295); + ItemList.sOilExtraHeavy = GTFluidFactory.builder("liquid_extra_heavy_oil") + .withLocalizedName("Very Heavy Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.OilExtraHeavy) + .registerBContainers(Materials.OilExtraHeavy.getCells(1), Materials.Empty.getCells(1)) + .asFluid(); ItemList.sEpichlorhydrin = GTFluidFactory.builder("liquid_epichlorhydrin") .withLocalizedName("Epichlorohydrin") .withStateAndTemperature(LIQUID, 295) |