aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorLazyFleshWasTaken <40587985+LazyFleshWasTaken@users.noreply.github.com>2024-11-20 13:43:01 -0800
committerGitHub <noreply@github.com>2024-11-20 22:43:01 +0100
commitf92e38bb6c0145c6f275973cb4fc7a9952eb9974 (patch)
tree645c3b536e17f1ee3d4ba7af90a4cf683ef7148e /src/main/java
parent36acbb9baed7dae4e19fde7a95852b7d002b2f5c (diff)
downloadGT5-Unofficial-f92e38bb6c0145c6f275973cb4fc7a9952eb9974.tar.gz
GT5-Unofficial-f92e38bb6c0145c6f275973cb4fc7a9952eb9974.tar.bz2
GT5-Unofficial-f92e38bb6c0145c6f275973cb4fc7a9952eb9974.zip
Attempt to add bulk recipe w/ alumina for celuag (#3526)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java4
-rw-r--r--src/main/java/gtnhlanth/loader/RecipeLoader.java60
2 files changed, 36 insertions, 28 deletions
diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java
index 98d6cb01e4..125f0f283f 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 075bce0e6d..91800b6a68 100644
--- a/src/main/java/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java
@@ -3408,63 +3408,71 @@ public class RecipeLoader {
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