From a3bd81324a94fd2bbd85cea544fad82e1ad1008e Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 20 Feb 2022 12:59:53 +1100 Subject: Add holmium, further samarium, terbium --- .../java/com/elisis/gtnhlanth/GTNHLanthanides.java | 4 +- .../common/register/WerkstoffMaterialPool.java | 73 ++++++++++++++++++++-- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 61 ++++++++++++------ 3 files changed, 114 insertions(+), 24 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index ac871508db..c5e6954f73 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -21,7 +21,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; @Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, @@ -81,6 +81,8 @@ public class GTNHLanthanides { GT_Log.out.print("We are done loading"); BotRecipes.removeRecipes(); + GT_Log.out.print("blah blah " + WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot)); + } 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 e653d1b52c..4e6b8cdca6 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -9,6 +9,7 @@ import com.github.bartimaeusnek.bartworks.util.EnumUtils; import com.github.bartimaeusnek.bartworks.util.Pair; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TextureSet; @@ -841,6 +842,69 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Oxygen, 3) ); + public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff( + new short[] {255, 182, 193}, + "Fluorinated Samaric Concentrate", + subscriptNumbers("??SmHo??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 23, + TextureSet.SET_DULL + ); + + public static final Werkstoff CalciumFluoride = new Werkstoff( + new short[] {255, 255, 255}, + "Calcium Fluoride", + subscriptNumbers("CaF2"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(), + offsetID2 + 24, + TextureSet.SET_DULL, + Arrays.asList(Materials.Calcium, Materials.Fluorine), + new Pair<>(Materials.Calcium, 1), + new Pair<>(Materials.Fluorine, 2) + ); + + public static final Werkstoff SamariumTerbiumMixture = new Werkstoff( + new short[] {223, 182, 193}, + "Samarium-Terbium Mixture", + subscriptNumbers("??SmTb??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 25, + TextureSet.SET_DULL + ); + + public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff( + new short[] {223, 182, 193}, + "Nitrated Samarium-Terbium Mixture", + subscriptNumbers("??SmTb??NH4NO3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 26, + TextureSet.SET_DULL + ); + + public static final Werkstoff TerbiumNitrate = new Werkstoff( + new short[] {255, 255, 255}, + "Terbium Nitrate", + subscriptNumbers("TbNO3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 27, + TextureSet.SET_DULL, + Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen), + new Pair<>(Materials.Terbium, 1), + new Pair<>(Materials.Nitrogen, 1), + new Pair<>(Materials.Oxygen, 3) + ); + + @@ -982,13 +1046,12 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff PTMEGElastomer = new Werkstoff( new short[] {255, 255, 255}, "PTMEG Elastomer", - new Werkstoff.Stats().setMeltingPoint(200), + new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMetalItems() + .onlyDust() .addMolten() - .addSimpleMetalWorkingItems() + .addMetalItems() , offsetID3 + 12, TextureSet.SET_METALLIC @@ -1024,7 +1087,7 @@ public class WerkstoffMaterialPool implements Runnable { private static void addSubTags() { - WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY); + //WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY); } diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 9aa6db7b89..9c34ff3190 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -606,7 +606,7 @@ public class RecipeLoader { GT_Values.RA.addElectromagneticSeparatorRecipe( WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dustSmall, 1), + WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dustSmall, 1), // Maybe also holmium null, new int[] { 9000, 1 //Because fuck you @@ -893,36 +893,61 @@ public class RecipeLoader { GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1), null, - Materials.Fluorine.getGas(4000), - null, - WerkstoffMaterialPool.FluorinatedNeodymicRareEarths.get(OrePrefixes.dust, 1), + Materials.HydrochloricAcid.getFluid(1000), null, + WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dustSmall, 2), + WerkstoffMaterialPool.NeodymiumOxide.get(OrePrefixes.dustSmall, 2), 450, - 800 + 800 ); - GT_Values.RA.addBlastRecipe( - WerkstoffMaterialPool.FluorinatedNeodymicRareEarths.get(OrePrefixes.dust, 8), + + //Sm RE + GT_Values.RA.addChemicalRecipe( + WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1), null, + Materials.HydrofluoricAcid.getFluid(2000), null, + WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 1), null, - WerkstoffMaterialPool.PraseodymiumTetrafluoride.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.RareEarthTrifluorides.get(OrePrefixes.dust, 7), - 100, - 480, - 800 + 300, + 480 + ); + + GT_Values.RA.addBlastRecipe( + WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2), + Materials.Calcium.getDust(3), + null, + WerkstoffMaterialPool.CalciumFluoride.getFluidOrGas(3000), + Materials.Holmium.getDustSmall(1), + WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1), + 400, + 1920, + 1200 ); GT_Values.RA.addChemicalRecipe( - WerkstoffMaterialPool.RareEarthTrifluorides.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1), + BotWerkstoffMaterialPool.AmmoniumNitrate.get(OrePrefixes.dust, 1), null, - Materials.HydrochloricAcid.getFluid(1000), null, - WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dustSmall, 2), - WerkstoffMaterialPool.NeodymiumOxide.get(OrePrefixes.dustSmall, 2), - 450, - 800 + WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1), + null, + 600, + 480 ); + + GT_Values.RA.addChemicalRecipe( + WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1), + Materials.Copper.getDustSmall(1), + null, + null, + WerkstoffMaterialPool.TerbiumNitrate.get(OrePrefixes.dustSmall, 2), + WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 2), // Potentially make only Samarium + 800, + 1920 + ); + -- cgit