From c49869cff59d255ba22a45f3ca043815cd2a4c25 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 5 Feb 2022 17:02:10 +1100 Subject: First half of end of bastnasite line --- .../common/register/WerkstoffMaterialPool.java | 114 ++++++++++++++++++++- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 94 ++++++++++++++++- 2 files changed, 206 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 7ea70d4368..39d59309b4 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -675,13 +675,14 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff Gangue = new Werkstoff( new short[] {0, 0, 0}, "Gangue", + subscriptNumbers("Useless..."), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID2 + 9, TextureSet.SET_DULL ); - + //TODO: Deal with colouring public static final Werkstoff RoastedRareEarthOxides = new Werkstoff( new short[] {160, 82, 45}, "Roasted Rare Earth Oxides", @@ -712,10 +713,121 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL ); + public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff( + new short[] {160, 82, 49}, + "Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 13, + TextureSet.SET_DULL + ); + public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff( + new short[] {160, 90, 60}, + "Nitrated Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 14, + TextureSet.SET_DULL + ); + public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff( + new short[] {170, 90, 60}, + "Saturated Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 15, + TextureSet.SET_DULL + ); + public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff( + new short[] {170, 90, 60}, + "Samaric Rare Earth Concentrate", + subscriptNumbers("??SmHoTb??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 16, + TextureSet.SET_DULL + ); + public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff( + new short[] {170, 90, 60}, + "Neodymium Rare Earth Concentrate", + subscriptNumbers("??LaNdPr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 17, + TextureSet.SET_DULL + ); + + public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff( + new short[] {170, 90, 60}, + "Fluorinated Neodymium Rare Earths", + subscriptNumbers("??LaNdPr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 18, + TextureSet.SET_DULL + ); + + public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff( + new short[] {82, 112, 102}, + "Praseodymium Tetrafluoride", + subscriptNumbers("PrF4"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 19, + TextureSet.SET_DULL, + Arrays.asList(Materials.Praseodymium, Materials.Fluorine), + new Pair<>(Materials.Praseodymium, 1), + new Pair<>(Materials.Fluorine, 4) + ); + + public static final Werkstoff RareEarthTrifluorides = new Werkstoff( + new short[] {82, 112, 102}, + "Rare Earth Trifluorides", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 20, + TextureSet.SET_DULL + ); + + public static final Werkstoff LanthaniumChloride = new Werkstoff( + new short[] {82, 112, 102}, + "Lanthanium Chloride", + subscriptNumbers("LaCl3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 21, + TextureSet.SET_DULL, + Arrays.asList(Materials.Lanthanum, Materials.Chlorine), + new Pair<>(Materials.Lanthanum, 1), + new Pair<>(Materials.Chlorine, 3) + ); + + public static final Werkstoff NeodymiumOxide = new Werkstoff( + new short[] {82, 112, 102}, + "Neodymium Oxide", + subscriptNumbers("Nd2O3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 22, + TextureSet.SET_DULL, + Arrays.asList(Materials.Neodymium, Materials.Oxygen), + new Pair<>(Materials.Neodymium, 2), + new Pair<>(Materials.Oxygen, 3) + ); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index ef9ebf8880..cb3da87b43 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -644,7 +644,7 @@ public class RecipeLoader { null, null, null, - FluidRegistry.getFluidStack("Kerosene", 1000), + Materials.Acetone.getFluid(1000), null, WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 1), 200, @@ -814,7 +814,99 @@ public class RecipeLoader { 480 ); + GT_Values.RA.addCentrifugeRecipe( + WerkstoffMaterialPool.CeriumOxidisedRareEarthOxides.get(OrePrefixes.dust, 1), + null, + null, + null, + WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1), + null, + null, + null, + null, + new int[] { + 10000, 9000 + }, + 600, + 480 + ); + GT_Values.RA.addMixerRecipe( + WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1), + null, + null, + null, + Materials.NitricAcid.getFluid(400), + WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.getFluidOrGas(1000), + null, + 300, + 480 + ); + + GT_Values.RA.addChemicalRecipe( + WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.get(OrePrefixes.cell, 1), + null, + Materials.Acetone.getFluid(1000), + WerkstoffMaterialPool.SaturatedBastnasiteRarerEarthOxides.getFluidOrGas(1000), + null, + 700, + 480 + ); + + GT_Values.RA.addCentrifugeRecipe( + null, + null, + WerkstoffMaterialPool.SaturatedBastnasiteRarerEarthOxides.getFluidOrGas(1000), + null, + WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1), + null, + null, + null, + null, + new int[] { + 8000, 5000 + }, + 900, + 480 + ); + + + //Nd RE + GT_Values.RA.addChemicalRecipe( + WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1), + null, + Materials.Fluorine.getGas(4000), + null, + WerkstoffMaterialPool.FluorinatedNeodymicRareEarths.get(OrePrefixes.dust, 1), + null, + 450, + 800 + ); + + GT_Values.RA.addBlastRecipe( + WerkstoffMaterialPool.FluorinatedNeodymicRareEarths.get(OrePrefixes.dust, 8), + null, + null, + null, + WerkstoffMaterialPool.PraseodymiumTetrafluoride.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.RareEarthTrifluorides.get(OrePrefixes.dust, 7), + 100, + 480, + 800 + ); + + GT_Values.RA.addChemicalRecipe( + WerkstoffMaterialPool.RareEarthTrifluorides.get(OrePrefixes.dust, 1), + null, + Materials.HydrochloricAcid.getFluid(1000), + null, + WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dustSmall, 2), + WerkstoffMaterialPool.NeodymiumOxide.get(OrePrefixes.dustSmall, 2), + 450, + 800 + ); -- cgit