diff options
author | DreamMasterXXL <dream-master@gmx.net> | 2021-09-26 02:13:34 +0200 |
---|---|---|
committer | DreamMasterXXL <dream-master@gmx.net> | 2021-09-26 02:14:13 +0200 |
commit | 39ef237333709a343829fd086afd9d63238b0c36 (patch) | |
tree | 95ccd6a09a6de9ffb07fa76b75da5fedb531a0ab /src/main/java/gregtech/api/enums/Materials.java | |
parent | 8d2df21bba290d16b807dd2930707c3e1a398ccd (diff) | |
download | GT5-Unofficial-39ef237333709a343829fd086afd9d63238b0c36.tar.gz GT5-Unofficial-39ef237333709a343829fd086afd9d63238b0c36.tar.bz2 GT5-Unofficial-39ef237333709a343829fd086afd9d63238b0c36.zip |
remove aluminium ebf recipe
add Aluminiumoxide and Hydroxide
Add Cryolite
(cherry picked from commit 1a7c53ef0e17e965c6c52e9c55eb5cba5014ce22)
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index df9c3cb138..116f1cb8a5 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -44,7 +44,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { /** * Direct Elements */ - public static Materials Aluminium = new Materials( 19, TextureSet.SET_DULL , 10.0F, 128, 2, 1|2 |8 |32|64|128 , 128, 200, 240, 0, "Aluminium" , "Aluminium" , 0, 0, 933, 1700, true, false, 3, 1, 1, Dyes.dyeLightBlue , Element.Al , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VOLATUS, 1))); + public static Materials Aluminium = new Materials( 19, TextureSet.SET_DULL , 10.0F, 128, 2, 1|2 |8 |32|64|128 , 128, 200, 240, 0, "Aluminium" , "Aluminium" , 0, 0, 933, 1700, true, false, 3, 1, 1, Dyes.dyeLightBlue , Element.Al , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VOLATUS, 1))).disableAutoGeneratedBlastFurnaceRecipes(); public static Materials Americium = new Materials( 103, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 |8 |32 , 200, 200, 200, 0, "Americium" , "Americium" , 0, 0, 1449, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Element.Am , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); public static Materials Antimony = new Materials( 58, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |8 |32 , 220, 220, 240, 0, "Antimony" , "Antimony" , 0, 0, 903, 0, false, false, 2, 1, 1, Dyes.dyeLightGray , Element.Sb , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.AQUA, 1))); public static Materials Argon = new Materials( 24, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 0, 255, 0, 240, "Argon" , "Argon" , 0, 0, 83, 0, false, true, 5, 1, 1, Dyes.dyeGreen , Element.Ar , Arrays.asList(new TC_AspectStack(TC_Aspects.AER, 2))); @@ -727,7 +727,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials HSSS = new Materials( 374, TextureSet.SET_METALLIC , 14.0F, 3000, 4, 1|2 |64|128 , 102, 0, 51, 0, "HSSS" , "HSS-S" , 0, 0, 5400, 5400, true, false, 4, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(HSSG, 6), new MaterialStack(Iridium, 2), new MaterialStack(Osmium, 1))).disableAutoGeneratedBlastFurnaceRecipes(); public static Materials DilutedSulfuricAcid =new MaterialBuilder(640, TextureSet.SET_FLUID , "Diluted Sulfuric Acid").addCell().addFluid().setRGB(192, 120, 32).setColor(Dyes.dyeOrange).setMaterialList(new MaterialStack(SulfuricAcid, 1)).constructMaterial(); public static Materials EpoxidFiberReinforced = new Materials( 610, TextureSet.SET_DULL ,3.0F, 64, 1, 1|2 |64|128 , 160, 112, 16, 0, "EpoxidFiberReinforced" , "Fiber-Reinforced Epoxy Resin" , 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeBrown , 2, Arrays.asList(new MaterialStack(Epoxid, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2))); - + public static Materials Aluminiumoxide = new Materials( 696, TextureSet.SET_QUARTZ ,1.0F, 64, 1, 1 |8 |64|128 , 255, 255, 255, 0, "AluminiumOxide" , "Alumina" , 0, 0, 2054, 2054, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.GELUM, 2))); + public static Materials Aluminiumhydroxide = new Materials( 697, TextureSet.SET_QUARTZ ,1.0F, 64, 1, 1 |8 |64|128 , 255, 255, 255, 0, "AluminiumHydroxide" , "Aluminium Hydroxide" , 0, 0, 1200, 1200, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Aluminium, 1), new MaterialStack(HydrochloricAcid, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.GELUM, 2))); + public static Materials Cryolite = new Materials( 695, TextureSet.SET_QUARTZ ,1.0F, 64, 1, 1 |8 |64|128 , 191, 239, 255, 0, "Cryolite" , "Cryolite" , 0, 0, 1012, 1012, false, false, 1, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Sodium, 3), new MaterialStack(Aluminium, 1), new MaterialStack(Fluorine, 6)), Arrays.asList(new TC_AspectStack(TC_Aspects.GELUM, 2))); // Polybenzimidazole stuff public static Materials PotassiumNitrade = new MaterialBuilder(590, TextureSet.SET_DULL , "Potassium Nitrade").setName("PotassiumNitrade").addDustItems().setRGB(129, 34, 141).setColor(Dyes.dyePurple).setMaterialList(new MaterialStack(Potassium, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 3)).addElectrolyzerRecipe().constructMaterial(); @@ -1517,6 +1519,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Lithium.addOreByProducts(Lithium); Silicon.addOreByProducts(SiliconDioxide); InfusedGold.addOreByProduct(Gold); + Cryolite.addOreByProduct(Aluminium); } private static void setColors() { |