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 biolab recipes to be able to use any circuit o the tier and not just the item any circuit of the tier #3849

Merged
merged 3 commits into from
Jan 23, 2025
Merged

Change biolab recipes to be able to use any circuit o the tier and not just the item any circuit of the tier #3849

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
532137a
Change biolab recipes to be able to use any circuit o the tier and no…
Jan 22, 2025
57dd8b3
Merge branch 'master' into fix-bio-lab-recipes
Bjdufre1 Jan 22, 2025
6340612
Merge branch 'master' into fix-bio-lab-recipes
serenibyss Jan 23, 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
50 changes: 20 additions & 30 deletions src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Kanthal, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), 'C',
ItemList.MACHINE_HULLS[3].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.HV,
'C', ItemList.MACHINE_HULLS[3].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_EV.ID, "bw.biolabEV", StatCollector.translateToLocal("tile.biolab.name"), 4)
Expand All @@ -421,9 +420,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Nichrome, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), 'C',
ItemList.MACHINE_HULLS[4].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.EV,
'C', ItemList.MACHINE_HULLS[4].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_IV.ID, "bw.biolabIV", StatCollector.translateToLocal("tile.biolab.name"), 5)
Expand All @@ -433,9 +431,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.TPV, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), 'C',
ItemList.MACHINE_HULLS[5].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.IV,
'C', ItemList.MACHINE_HULLS[5].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_LuV.ID, "bw.biolabLuV", StatCollector.translateToLocal("tile.biolab.name"), 6)
Expand All @@ -444,9 +441,8 @@ public void run() {
new Object[] { "PFP", "WCW", "OGO", 'F', GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1L),
'W', GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1L), 'C',
ItemList.MACHINE_HULLS[6].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.LuV,
'C', ItemList.MACHINE_HULLS[6].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_ZPM.ID, "bw.biolabZPM", StatCollector.translateToLocal("tile.biolab.name"), 7)
Expand All @@ -456,9 +452,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1L), 'C',
ItemList.MACHINE_HULLS[7].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.ZPM,
'C', ItemList.MACHINE_HULLS[7].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UV.ID, "bw.biolabUV", StatCollector.translateToLocal("tile.biolab.name"), 8)
Expand All @@ -467,9 +462,8 @@ public void run() {
new Object[] { "PFP", "WCW", "OGO", 'F', GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1L),
'W', GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L), 'C',
ItemList.MACHINE_HULLS[8].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UV,
'C', ItemList.MACHINE_HULLS[8].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UHV.ID, "bw.biolabUHV", StatCollector.translateToLocal("tile.biolab.name"), 9)
Expand All @@ -479,9 +473,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.ElectrumFlux, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1L), 'C',
ItemList.MACHINE_HULLS[9].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UHV,
'C', ItemList.MACHINE_HULLS[9].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UEV.ID, "bw.biolabUEV", StatCollector.translateToLocal("tile.biolab.name"), 10)
Expand All @@ -491,9 +484,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Bedrockium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.DraconiumAwakened, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1L), 'C',
ItemList.MACHINE_HULLS[10].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UEV,
'C', ItemList.MACHINE_HULLS[10].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UIV.ID, "bw.biolabUIV", StatCollector.translateToLocal("tile.biolab.name"), 11)
Expand All @@ -503,9 +495,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Infinity, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 1L), 'C',
ItemList.MACHINE_HULLS[11].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UIV,
'C', ItemList.MACHINE_HULLS[11].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UMV.ID, "bw.biolabUMV", StatCollector.translateToLocal("tile.biolab.name"), 12)
Expand All @@ -515,9 +506,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), 'W',
GTOreDictUnificator.get("wireGt01Hypogen", 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 1L), 'C',
ItemList.MACHINE_HULLS[12].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UMV,
'C', ItemList.MACHINE_HULLS[12].get(1L) });

// Radio Hatches
GTModHandler.addCraftingRecipe(
Expand Down
Loading