diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java index 98d6cb01e42..125f0f283fe 100644 --- a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1844,7 +1844,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff CeriumDopedLutetiumAluminiumOxygenBlend = new Werkstoff( new short[] { 128, 192, 80 }, "Cerium-doped Lutetium Aluminium Oxygen Blend", - subscriptNumbers("(Ce)Lu3Al5O12"), + subscriptNumbers("CeLu3(Al2O3)5"), new Werkstoff.Stats(), Werkstoff.Types.MATERIAL, new Werkstoff.GenerationFeatures().disable() @@ -1856,7 +1856,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff CeriumDopedLutetiumAluminiumGarnet = new Werkstoff( new short[] { 144, 255, 63 }, "Cerium-doped Lutetium Aluminium Garnet (Ce:LuAG)", - subscriptNumbers("(Ce)Lu3Al5O12"), + subscriptNumbers("CeLu3(Al2O3)5"), new Werkstoff.Stats(), Werkstoff.Types.MATERIAL, new Werkstoff.GenerationFeatures().disable() diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index 075bce0e6d4..91800b6a68a 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -3408,63 +3408,71 @@ public static void addRandomChemCrafting() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(4), - Materials.Cerium.getDustTiny(1), + Materials.Cerium.getDust(1), Materials.Lutetium.getDust(3), Materials.Sapphire.getDust(5)) - .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 8)) + .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 9)) .eut(TierEU.RECIPE_UV) .duration(5 * SECONDS) .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(4), - Materials.Cerium.getDustTiny(1), + Materials.Cerium.getDust(1), Materials.Lutetium.getDust(3), - Materials.GreenSapphire.getDust(10)) - .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 8)) + Materials.GreenSapphire.getDust(5)) + .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 9)) .eut(TierEU.RECIPE_UV) .duration(5 * SECONDS) .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(4), - Materials.Cerium.getDustTiny(2), - Materials.Lutetium.getDust(6), - Materials.Aluminiumoxide.getDust(25)) - .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 12)) - .fluidInputs(Materials.Oxygen.getGas(9000)) + Materials.Cerium.getDust(1), + Materials.Lutetium.getDust(3), + Materials.Aluminiumoxide.getDust(5)) + .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 9)) .eut(TierEU.RECIPE_UV) - .duration(400) + .duration(5 * SECONDS) .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(5), - Materials.Cerium.getDust(1), - Materials.Lutetium.getDust(60), - Materials.Sapphire.getDust(64), - Materials.Sapphire.getDust(36)) + Materials.Cerium.getDust(9), + Materials.Lutetium.getDust(27), + Materials.Sapphire.getDust(45)) .itemOutputs( CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), - CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), - CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 32)) + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 17)) .eut(TierEU.RECIPE_UV) - .duration(1800) + .duration(45 * SECONDS) + .noOptimize() .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(5), - Materials.Cerium.getDust(1), - Materials.Lutetium.getDust(60), - Materials.GreenSapphire.getDust(64), - Materials.GreenSapphire.getDust(64), - Materials.GreenSapphire.getDust(64), - Materials.GreenSapphire.getDust(8)) + Materials.Cerium.getDust(9), + Materials.Lutetium.getDust(27), + Materials.GreenSapphire.getDust(45)) .itemOutputs( CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 17)) + .eut(TierEU.RECIPE_UV) + .duration(45 * SECONDS) + .noOptimize() + .addTo(mixerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(5), + Materials.Cerium.getDust(9), + Materials.Lutetium.getDust(27), + Materials.Aluminiumoxide.getDust(45)) + .itemOutputs( CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), - CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 32)) + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 17)) .eut(TierEU.RECIPE_UV) - .duration(1800) + .duration(45 * SECONDS) + .noOptimize() .addTo(mixerRecipes); // Get LuAG Crystal seed