Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to add bulk recipe w/ alumina for celuag #3526

Merged
merged 8 commits into from
Nov 20, 2024
Merged

Attempt to add bulk recipe w/ alumina for celuag #3526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c277a2
Make bulk alumina recipe
LazyFleshWasTaken Nov 20, 2024
92d05c3
Double cerium use to be in line with 20x of bulk vs small
LazyFleshWasTaken Nov 20, 2024
72dcdbb
Update bulk recipes to be 9x, because wtf
LazyFleshWasTaken Nov 20, 2024
e3db881
spelling :fail:
LazyFleshWasTaken Nov 20, 2024
8b8b0cd
Merge branch 'master' into attempt-to-add-recipe-w/-alumina-for-celuag
LazyFleshWasTaken Nov 20, 2024
ba9fe68
Chembalance, hopefully
LazyFleshWasTaken Nov 20, 2024
f1ae142
attention span fail
LazyFleshWasTaken Nov 20, 2024
b2cadc6
Update chem formula
LazyFleshWasTaken Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down
60 changes: 34 additions & 26 deletions src/main/java/gtnhlanth/loader/RecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading