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

Change Bio Vat Recipes to use new metadata #1129

Merged
merged 14 commits into from
Jan 11, 2025
Merged

Change Bio Vat Recipes to use new metadata #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
155b1fd
change recipes to use metadata
StaffiX Dec 27, 2024
1371955
Merge branch 'GTNewHorizons:master' into biovat
StaffiX Dec 27, 2024
1edf20d
fix imports and typo
StaffiX Dec 27, 2024
a42db20
Merge branch 'master' into biovat
Dream-Master Dec 29, 2024
29f7dc2
Merge branch 'master' into biovat
Dream-Master Dec 30, 2024
3880e74
fix name change, and fix coremod radio hatch adder
StaffiX Dec 30, 2024
72fd6bd
spotless
StaffiX Dec 31, 2024
84bdc85
Merge branch 'master' into biovat
Dream-Master Dec 31, 2024
3daf840
Merge branch 'master' into biovat
Dream-Master Dec 31, 2024
53af461
Merge branch 'master' into biovat
Dream-Master Jan 8, 2025
ded78f4
Merge branch 'master' into biovat
Dream-Master Jan 9, 2025
35831fb
sa
Dream-Master Jan 9, 2025
2abab91
Merge branch 'master' into biovat
Dream-Master Jan 10, 2025
4e4ba8a
Merge branch 'master' into biovat
Dream-Master Jan 11, 2025
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
20 changes: 11 additions & 9 deletions src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.dreammaster.bartworksHandler;

import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static bartworks.util.BWRecipes.calcDecayTicks;
import static gregtech.api.util.GTRecipeConstants.DECAY_TICKS;
import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchFakeRecipes;
import static bartworks.common.loaders.RadioHatchMaterialLoader.radioHatchMaterialAdder;
import static gregtech.api.util.GTRecipeConstants.MASS;
import static gregtech.api.util.GTRecipeConstants.SIEVERT;

import net.minecraft.item.ItemStack;

import gregtech.api.enums.GTValues;
import gregtech.api.util.recipe.Sievert;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.util.minecraft.ItemUtils;
Expand All @@ -30,15 +32,15 @@ public static void runRadHatchAdder() {

int level = (int) material.getProtons();
if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) {
GTValues.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level)
.metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
radioHatchMaterialAdder(material.getRod(1), level, (byte) 1);
GTValues.RA.stdBuilder().itemInputs(material.getRod(1)).duration(0).eut(0)
.metadata(SIEVERT, new Sievert(level)).metadata(MASS, 1).fake().addTo(radioHatchFakeRecipes);
}
if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) {
GTValues.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level)
.metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
radioHatchMaterialAdder(material.getLongRod(1), level, (byte) 2);
GTValues.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(0).eut(0)
.metadata(SIEVERT, new Sievert(level)).metadata(MASS, 2).fake().addTo(radioHatchFakeRecipes);
}

}

}
}
85 changes: 50 additions & 35 deletions src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static bartworks.API.BioObjectAdder.*;
import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes;
import static bartworks.util.BWRecipes.computeSieverts;
import static gregtech.api.enums.Materials.*;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.Genetics;
Expand All @@ -20,7 +19,8 @@
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD;
import static gregtech.api.util.GTRecipeConstants.SIEVERTS;
import static gregtech.api.util.GTRecipeConstants.GLASS;
import static gregtech.api.util.GTRecipeConstants.SIEVERT;

import java.awt.Color;
import java.util.LinkedHashMap;
Expand All @@ -35,6 +35,7 @@
import com.dreammaster.gthandler.CustomItemList;

import bartworks.common.loaders.BioItemList;
import bartworks.util.BWUtil;
import bartworks.util.BioCulture;
import bartworks.util.BioDNA;
import bartworks.util.BioData;
Expand All @@ -47,6 +48,7 @@
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.api.util.recipe.Sievert;

public class BacteriaRegistry {

Expand Down Expand Up @@ -267,8 +269,8 @@ private void runGTRecipes() {
private void bacterialVatRecipes() {
GTValues.RA.stdBuilder().itemInputs(AntimonyTrioxide.getDust(16), Osmium.getDust(16))
.special(BioItemList.getPetriDish(CultureSet.get("CombinedBac"))).fluidInputs(Oil.getFluid(20))
.fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV)
.metadata(SIEVERTS, computeSieverts(Materials.NaquadahEnriched, 8, false, false, false)).noOptimize()
.fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV).metadata(GLASS, 8)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
Expand All @@ -279,8 +281,9 @@ private void bacterialVatRecipes() {
Tritanium.getDust(4))
.special(BioItemList.getPetriDish(CultureSet.get("StemCellBac")))
.fluidInputs(GrowthMediumRaw.getFluid(8)).fluidOutputs(BioMediumRaw.getFluid(2)).duration(3 * MINUTES)
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, true, true, false))
.requiresCleanRoom().noOptimize().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -290,8 +293,9 @@ private void bacterialVatRecipes() {
InfinityCatalyst.getDustTiny(4))
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
.fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(5)).duration(3 * MINUTES)
.eut(TierEU.RECIPE_ZPM).metadata(SIEVERTS, computeSieverts(NaquadahEnriched, 7, true, true, false))
.requiresCleanRoom().noOptimize().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_ZPM).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -300,114 +304,125 @@ private void bacterialVatRecipes() {
InfinityCatalyst.getDust(4))
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
.fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(10)).duration(3 * MINUTES)
.eut(TierEU.RECIPE_UV).metadata(SIEVERTS, computeSieverts(Naquadria, 8, true, true, false)).noOptimize()
.requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_UV).metadata(GLASS, 8)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).noOptimize().requiresCleanRoom()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Genetics.ID, "misc", 2L, 4))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).metadata(SIEVERTS, computeSieverts(0, 4, false, false, false)).noOptimize()
.addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4).noOptimize().addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(8L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 4)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Bismuth, 5, false, false, false)).noOptimize()
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(16L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize()
.eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8 * 9))
.duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV)
.metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize()
.duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_HV).metadata(SIEVERTS, computeSieverts(Bismuth, 4, false, false, false)).noOptimize()
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(8L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize()
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(16L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8 * 9)).duration(9 * 15 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 1)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Bismuth, 5, false, false, false)).noOptimize()
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(8L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 2)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 6, false, true, false)).noOptimize()
.requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(16L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4 * 9)).duration(9 * 30 * SECONDS)
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(4L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1))
.duration(1 * MINUTES).eut(TierEU.RECIPE_IV)
.metadata(SIEVERTS, computeSieverts(Uranium, 6, false, true, false)).noOptimize().requiresCleanRoom()
.duration(1 * MINUTES).eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(8L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2))
.duration(1 * MINUTES).eut(TierEU.RECIPE_LuV)
.metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)).noOptimize().requiresCleanRoom()
.duration(1 * MINUTES).eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(8L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2 * 9)).duration(9 * MINUTES)
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);
}

private void bioLabRecipes() {
Expand Down
Loading
Loading