Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
migrate recipes to RA2 (#349)
Browse files Browse the repository at this point in the history 
* deprecate getMachineVoltageFromTier

* migrate assembler recipes

* migrate mixer recipes

* migrate implosion compressor recipes

* migrate forming press recipes

* forgot an assembling recipe

* migrate blast furnace recipes

* migrate universal chemical reactor recipes

* migrate fluid extractor recipes

* migrate bending machine recipes

* migrate assembling line recipes

* migrate autoclave recipes

* migrate chemical bath recipes

* get rid of BW_Util.getMachineVoltageFromTier(3)

* get rid of BW_Util.getMachineVoltageFromTier(1)

* get rid of BW_Util.getMachineVoltageFromTier(2)

* get rid of BW_Util.getMachineVoltageFromTier(4)

* get rid of BW_Util.getMachineVoltageFromTier(5)

* get rid of BW_Util.getMachineVoltageFromTier(6)

* get rid of BW_Util.getMachineVoltageFromTier(7)

* get rid of BW_Util.getMachineVoltageFromTier(8)

* get rid of BW_Util.getMachineVoltageFromTier(9)

* get rid of BW_Util.getMachineVoltageFromTier(10)

* get rid of BW_Util.getMachineVoltageFromTier(11)

* get rid of BW_Util.getMachineVoltageFromTier(12)

* migrate fluid solidifier recipes

* migrate forge hammer recipes

* migrate pulveriser recipes (1/3)

* migrate electrolyser recipes

* migrate electromagnetic separator recipes

* migrate extruder recipes

* migrate packager recipes

* migrate primitive blast furnace recipes

* migrate vacuum freezer recipes

* migrate wiremill recipes

* migrate cutting machine recipes

* migrate lathe recipes

* migrate laser engraver recipes

* migrate fluid canner recipes

* migrate pulverizer recipes (2/3)

* migrate extractor recipes

* migrate arc furnace recipes

* migrate sifter recipes

* migrate compressor recipes

* fix duration

* migrate fluid extractor recipes

* migrate centrifuge recipes

* migrate autoclave recipes

* spotless apply

* resolved build issues related to output chances of recycling "aHTGR_Materials"

* resolved build issues related to output chances of recycling "Burned out TRISO pebble (Uranium)"

* spotless

* migrate fluid heater recipes

* bump GT version

* fix time and eu/t of centrifuge recipes

* fix time and eu/t of centrifuge recipes

* spotlessApply (#356)

Co-authored-by: GitHub GTNH Actions <>

* add a todo for chem rebalance issues in electrolyser recipes

* fix typo

---------

Co-authored-by: Kyium <[email protected]>
Co-authored-by: chochem <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Former-commit-id: b0362b940c88ef5308011a5139ca1c2544d41b4d
  • Loading branch information
@boubou19 @Kyium
@chochem @github-actions
4 people authored Sep 6, 2023
1 parent 5b6a0e6 commit ace0af4
Show file tree
Hide file tree
Showing 44 changed files with 2,016 additions and 2,306 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
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.43.168:dev')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.02:dev')
api("com.github.GTNewHorizons:TecTech:5.2.41:dev")
api("com.github.GTNewHorizons:GalacticGregGT5:1.0.9:dev") {
exclude group:"com.github.GTNewHorizons", module:"bartworks"
Expand Down
31 changes: 10 additions & 21 deletions src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
package com.github.bartimaeusnek.bartworks.API;

import static gregtech.api.enums.Mods.Gendustry;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;

import java.awt.*;

Expand All @@ -28,18 +30,13 @@

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.TierEU;
import gregtech.api.objects.GT_Fluid;
import gregtech.api.util.GT_Utility;

@SuppressWarnings("ALL")
public final class BioObjectAdder {

// @Deprecated
// public static BioCulture createAndRegisterBioCulture(Color color, String name, long ID, BioPlasmid plasmid,
// BioDNA dna, EnumRarity rarity){
// return BioCulture.createAndRegisterBioCulture(color,name,ID,plasmid,dna,rarity);
// }

/**
* @param color the color of the Culture
* @param name the name of the Culture
Expand Down Expand Up @@ -176,22 +173,14 @@ public static void regenerateBioFluids() {
"molten.autogenerated",
new short[] { (short) B.getColor().getRed(), (short) B.getColor().getBlue(),
(short) B.getColor().getGreen() }));
if (!FluidRegistry.registerFluid(B.getFluid()))

if (!FluidRegistry.registerFluid(B.getFluid())) {
new Exception("FAILED TO REGISTER FLUID FOR: " + B.getName()).printStackTrace();
GT_Values.RA.addCentrifugeRecipe(
GT_Utility.getIntegratedCircuit(10),
GT_Values.NI,
new FluidStack(B.getFluid(), 1000),
dnaFluid,
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
null,
500,
120);
}

GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs()
.fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes);
}
}
}
Expand Down
254 changes: 107 additions & 147 deletions src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
package com.github.bartimaeusnek.bartworks.common.loaders;

import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;

import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
Expand All @@ -12,6 +20,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
Expand All @@ -20,157 +29,106 @@ public class ArtificialMicaLine {

public static void runArtificialMicaRecipe() {
// Mg + O = MgO
GT_Values.RA.addChemicalRecipe(
Materials.Magnesium.getDust(1),
null,
Materials.Oxygen.getGas(1000),
null,
Materials.Magnesia.getDust(2),
40,
8);

GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesium.getDust(1)).itemOutputs(Materials.Magnesia.getDust(2))
.fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(2 * SECONDS).eut(8)
.addTo(UniversalChemical);
// Si + 6HF = H2SiF6 + 4H
GT_Values.RA.addChemicalRecipe(
Materials.Silicon.getDust(1),
Materials.Empty.getCells(4),
Materials.HydrofluoricAcid.getFluid(6000),
WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000),
Materials.Hydrogen.getCells(4),
400,
120);

GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), Materials.Empty.getCells(4))
.itemOutputs(Materials.Hydrogen.getCells(4)).fluidInputs(Materials.HydrofluoricAcid.getFluid(6000))
.fluidOutputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)).duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(UniversalChemical);
// K + Cl = KCl
GT_Values.RA.addChemicalRecipe(
Materials.Potassium.getDust(1),
GT_Utility.getIntegratedCircuit(2),
Materials.Chlorine.getGas(1000),
null,
Materials.RockSalt.getDust(2),
20,
8);

GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2))
.itemOutputs(Materials.RockSalt.getDust(2)).fluidInputs(Materials.Chlorine.getGas(1000))
.noFluidOutputs().duration(20 * TICKS).eut(8).addTo(UniversalChemical);

// 2KCl + H2SiF6 = 2HCl + K2SiF6
GT_Values.RA.addMixerRecipe(
Materials.RockSalt.getDust(4),
null,
null,
null,
WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000),
Materials.HydrochloricAcid.getGas(2000),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9),
20,
8);
GT_Values.RA.stdBuilder().itemInputs(Materials.RockSalt.getDust(4))
.itemOutputs(WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9))
.fluidInputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000))
.fluidOutputs(Materials.HydrochloricAcid.getGas(2000)).duration(1 * SECONDS).eut(8)
.addTo(sMixerRecipes);

// 2K + CO2 + O = K2CO3
GT_Values.RA.addChemicalRecipe(
Materials.Potassium.getDust(2),
Materials.CarbonDioxide.getCells(1),
Materials.Oxygen.getGas(1000),
null,
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6),
Materials.Empty.getCells(1),
40,
8);

GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(2), Materials.CarbonDioxide.getCells(1))
.itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1))
.fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(2 * SECONDS).eut(8)
.addTo(UniversalChemical);
// K2O + CO2 = K2CO3
GT_Values.RA.addChemicalRecipe(
Materials.Potash.getDust(3),
Materials.CarbonDioxide.getCells(1),
null,
null,
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6),
Materials.Empty.getCells(1),
40,
8);

GT_Values.RA.stdBuilder().itemInputs(Materials.Potash.getDust(3), Materials.CarbonDioxide.getCells(1))
.itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1))
.noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(8).addTo(UniversalChemical);

// 55Quartz Dust + 20K2SiF6 + 12Al2O3 + 4K2CO3 = 91Raw Fluorophlogopite Dust
GT_Values.RA.addMixerRecipe(
Materials.QuartzSand.getDust(55),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4),
null,
GT_Utility.getIntegratedCircuit(4),
null,
null,
null,
null,
null,
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27),
null,
null,
400,
120);
GT_Values.RA.stdBuilder()
.itemInputs(
Materials.QuartzSand.getDust(55),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4),
GT_Utility.getIntegratedCircuit(4))
.itemOutputs(
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27))
.noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);

// 55Quartzite/Nether Quartz Dust + 20K2SiF6 + 57Al2O3 + 4K2CO3 = 136Raw Fluorophlogopite Dust
GT_Values.RA.addMixerRecipe(
Materials.Quartzite.getDust(55),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4),
null,
GT_Utility.getIntegratedCircuit(4),
null,
null,
null,
null,
null,
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8),
null,
600,
120);
GT_Values.RA.addMixerRecipe(
Materials.NetherQuartz.getDust(55),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4),
null,
GT_Utility.getIntegratedCircuit(4),
null,
null,
null,
null,
null,
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8),
null,
600,
120);
GT_Values.RA.stdBuilder()
.itemInputs(
Materials.Quartzite.getDust(55),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4),
GT_Utility.getIntegratedCircuit(4))
.itemOutputs(
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8))
.fluidInputs().fluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
Materials.NetherQuartz.getDust(55),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4),
GT_Utility.getIntegratedCircuit(4))
.itemOutputs(
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8))
.noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);

// 62Certus Quartz Dust + 10K2SiF6 + 12Al2O3 + 7K2CO3 = 91Raw Fluorophlogopite Dust
GT_Values.RA.addMixerRecipe(
Materials.CertusQuartz.getDust(62),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 7),
null,
GT_Utility.getIntegratedCircuit(4),
null,
null,
null,
null,
null,
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27),
null,
null,
600,
120);
GT_Values.RA.stdBuilder()
.itemInputs(
Materials.CertusQuartz.getDust(62),
WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10),
WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12),
WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 7),
GT_Utility.getIntegratedCircuit(4))
.itemOutputs(
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64),
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27))
.noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);

// MgO(s) = MgO(l)
GT_Values.RA.addFluidExtractionRecipe(
Materials.Magnesia.getDust(1),
null,
Materials.Magnesia.getMolten(144),
0,
20,
120);

GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesia.getDust(1)).noItemOutputs().noFluidInputs()
.fluidOutputs(Materials.Magnesia.getMolten(144)).duration(20 * TICKS).eut(TierEU.RECIPE_MV)
.addTo(sFluidExtractionRecipes);

// 27Raw Fluorophlogopite Dust + 720MgO(l) = 4608Fluorophlogopite(l)
GT_Values.RA.addBlastRecipe(
WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27),
null,
BW_GT_MaterialReference.Magnesia.getMolten(720),
WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608),
Materials.Glass.getDust(1),
null,
600,
480,
1700);
GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27))
.itemOutputs(Materials.Glass.getDust(1)).fluidInputs(BW_GT_MaterialReference.Magnesia.getMolten(720))
.fluidOutputs(WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).metadata(COIL_HEAT, 1700).addTo(sBlastRecipes);

// 144Fluorophlogopite(l) = Fluorophlogopite
GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe(
new GT_Recipe(
Expand All @@ -186,12 +144,14 @@ public static void runArtificialMicaRecipe() {
0));
// Fluorophlogopite = 4Insulator Foil
if (NewHorizonsCoreMod.isModLoaded()) {
GT_Values.RA.addBenderRecipe(
WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1),
GT_Utility.getIntegratedCircuit(1),
GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4),
10,
600);

GT_Values.RA.stdBuilder()
.itemInputs(
WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4))
.noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(600).addTo(sBenderRecipes);

}
}
}
Loading

0 comments on commit ace0af4

Please sign in to comment.