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

Rework indium comb processing #967

Merged
merged 7 commits into from
Sep 4, 2024
Merged

Rework indium comb processing #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7312983
thorium fuel indium comb
StaffiX Sep 4, 2024
8e2615b
Indium comb recipes for existing indium sources
StaffiX Sep 4, 2024
623640d
remove accidental star import and spotless
StaffiX Sep 4, 2024
b846eee
Merge branch 'GTNewHorizons:master' into indiumbee
StaffiX Sep 4, 2024
a4ca4c4
Change chemical reactor recipes to LCR only
StaffiX Sep 4, 2024
fc23e18
Merge remote-tracking branch 'origin/indiumbee' into indiumbee
StaffiX Sep 4, 2024
ab22a68
Fix spaces
StaffiX Sep 4, 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
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.58:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.63:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.dreammaster.gthandler.recipes.SifterRecipes;
import com.dreammaster.gthandler.recipes.SpaceAssemblerRecipes;
import com.dreammaster.gthandler.recipes.VacuumFreezerRecipes;
import com.dreammaster.gthandler.recipes.VacuumFurnaceRecipes;
import com.dreammaster.gthandler.recipes.WiremillRecipes;

public class GT_MachineRecipeLoader implements Runnable {
Expand Down Expand Up @@ -82,6 +83,7 @@ public void run() {
new WiremillRecipes().run();
new CrackingRecipes().run();
new SpaceAssemblerRecipes().run();
new VacuumFurnaceRecipes().run();
}

}
17 changes: 17 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/CentrifugeRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

import com.dreammaster.gthandler.CustomItemList;

import bartworks.system.material.WerkstoffLoader;
import goodgenerator.items.GGMaterial;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
Expand All @@ -30,6 +32,8 @@
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.common.items.CombType;
import gregtech.loaders.misc.GTBees;

public class CentrifugeRecipes implements Runnable {

Expand Down Expand Up @@ -590,6 +594,19 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 1L))
.duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes);

GTValues.RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(2), GTBees.combs.getStackForType(CombType.INDIUM, 8))
.fluidInputs(GGMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000))
.itemOutputs(
WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64),
WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 16),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 12))
.outputChances(10000, 8000, 10000, 8000, 3000, 5000).duration(1 * MINUTES + 15 * SECONDS)
.eut(TierEU.RECIPE_EV / 2).addTo(centrifugeRecipes);

GTValues.RA.stdBuilder().itemInputs(ItemList.Cell_Air.get(5L))
.itemOutputs(Materials.Oxygen.getCells(1), ItemList.Cell_Empty.get(4L))
.fluidOutputs(Materials.Nitrogen.getGas(3900L)).duration(1 * MINUTES + 20 * SECONDS).eut(8)
Expand Down
33 changes: 33 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dreammaster.gthandler.recipes;

import static goodgenerator.items.GGMaterial.indiumPhosphate;
import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.Gendustry;
import static gregtech.api.enums.Mods.Genetics;
Expand All @@ -19,6 +20,7 @@
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import com.dreammaster.gthandler.CustomItemList;

Expand All @@ -30,6 +32,8 @@
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.common.items.CombType;
import gregtech.loaders.misc.GTBees;
import ic2.core.Ic2Items;

public class ChemicalReactorRecipes implements Runnable {
Expand Down Expand Up @@ -572,6 +576,35 @@ public static void multiBlockOnly() {
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumAluminate, 64L))
.fluidInputs(Materials.Water.getFluid(16000L)).fluidOutputs(Materials.Hydrogen.getGas(48000L))
.duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36L),
GTBees.combs.getStackForType(CombType.INDIUM, 4),
GTUtility.getIntegratedCircuit(3))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 3L))
.fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 72000))
.fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 72000)).duration(22 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
indiumPhosphate.get(OrePrefixes.dust, 12),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3),
GTBees.combs.getStackForType(CombType.INDIUM, 8),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 6),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5))
.duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(multiblockChemicalReactorRecipes);

GTValues.RA.stdBuilder()
StaffiX marked this conversation as resolved.
Show resolved Hide resolved
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Indium, 4),
GTBees.combs.getStackForType(CombType.INDIUM, 16))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Indium, 12))
.fluidInputs(Materials.PhthalicAcid.getFluid(2688)).duration(14 * SECONDS + 8 * TICKS)
.eut(TierEU.RECIPE_IV).addTo(UniversalChemical);
}

}
63 changes: 63 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package com.dreammaster.gthandler.recipes;

import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes;
import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.ChalcopyriteFlotationFroth;
import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.SphaleriteFlotationFroth;

import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.common.items.CombType;
import gregtech.loaders.misc.GTBees;
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.util.minecraft.FluidUtils;

public class VacuumFurnaceRecipes implements Runnable {

@Override
public void run() {

GTValues.RA.stdBuilder()
.itemInputs(
GTUtility.getIntegratedCircuit(12),
GTBees.combs.getStackForType(CombType.INDIUM, 64),
GTBees.combs.getStackForType(CombType.INDIUM, 64),
GTBees.combs.getStackForType(CombType.INDIUM, 64),
GTBees.combs.getStackForType(CombType.INDIUM, 64))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 52L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 56L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L),
MaterialsElements.getInstance().GERMANIUM.getDust(15))
.fluidInputs(FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000))
.fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
.eut((int) TierEU.RECIPE_LuV).metadata(COIL_HEAT, 5500).duration(2 * MINUTES)
.addTo(vacuumFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(13), GTBees.combs.getStackForType(CombType.INDIUM, 40))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 52L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 56L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 50L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 30L))
.fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000))
.fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
.eut((int) TierEU.RECIPE_IV).metadata(COIL_HEAT, 4500).duration(2 * MINUTES)
.addTo(vacuumFurnaceRecipes);
}
}