Skip to content

Commit

Permalink
Refactored BioLab and Radio Hatch Recipes (GTNewHorizons#3515)
Browse files Browse the repository at this point in the history 
Co-authored-by: Maya <[email protected]>
  • Loading branch information
@Nockyx @serenibyss
Nockyx and serenibyss authored Dec 9, 2024
1 parent 5c297fb commit 69e4f9c
Show file tree
Hide file tree
Showing 2 changed files with 199 additions and 62 deletions.
257 changes: 197 additions & 60 deletions src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_HV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_IV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_LuV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_MAX;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UEV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UHV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UIV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UMV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UXV;
import static gregtech.api.enums.MetaTileEntityIDs.BioLab_ZPM;
import static gregtech.api.enums.MetaTileEntityIDs.BioVat;
import static gregtech.api.enums.MetaTileEntityIDs.LESU;
Expand All @@ -19,13 +17,7 @@
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_HV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_IV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_LuV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_MAX;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UEV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UHV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UIV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UMV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UXV;
import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_ZPM;
import static gregtech.api.enums.MetaTileEntityIDs.Windmill;
import static gregtech.api.enums.Mods.IndustrialCraft2;
Expand All @@ -48,9 +40,9 @@
import bartworks.system.material.Werkstoff;
import bartworks.system.material.WerkstoffLoader;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.ISubTagContainer;
import gregtech.api.util.GTModHandler;
Expand Down Expand Up @@ -408,58 +400,203 @@ public void run() {
"circuit" + Materials.EV, 'K', GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), 'H',
ItemList.MACHINE_HULLS[3].get(1L) });

ItemStack[] Pistons2 = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L),
ItemList.Electric_Piston_IV.get(1L), ItemList.Electric_Piston_LuV.get(1L),
ItemList.Electric_Piston_ZPM.get(1L), ItemList.Electric_Piston_UV.get(1L) };
ItemStack[] BioLab2 = new ItemStack[GTValues.VN.length - 3];
ItemStack[] RadioHatch2 = new ItemStack[GTValues.VN.length - 3];
Materials[] cables2 = { Materials.Gold, Materials.Aluminium, Materials.Tungsten, Materials.VanadiumGallium,
Materials.Naquadah, Materials.NaquadahAlloy, Materials.SuperconductorUHV };
Materials[] hulls2 = { Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome,
Materials.Iridium, Materials.Osmium, Materials.Naquadah };
Materials[] wireMat2 = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah,
Materials.NaquadahAlloy, Materials.SuperconductorUHV };
Materials[] circuits2 = { Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM,
Materials.UV };

int[] BioLab = new int[] { BioLab_HV.ID, BioLab_EV.ID, BioLab_IV.ID, BioLab_LuV.ID, BioLab_ZPM.ID, BioLab_UV.ID,
BioLab_UHV.ID, BioLab_UEV.ID, BioLab_UIV.ID, BioLab_UMV.ID, BioLab_UXV.ID, BioLab_MAX.ID };
int[] RadioHatch = new int[] { RadioHatch_HV.ID, RadioHatch_EV.ID, RadioHatch_IV.ID, RadioHatch_LuV.ID,
RadioHatch_ZPM.ID, RadioHatch_UV.ID, RadioHatch_UHV.ID, RadioHatch_UEV.ID, RadioHatch_UIV.ID,
RadioHatch_UMV.ID, RadioHatch_UXV.ID, RadioHatch_MAX.ID };

for (int i = 3; i < GTValues.VN.length - 1; i++) {
BioLab2[i - 3] = new MTEBioLab(
BioLab[i - 3],
"bw.biolab" + GTValues.VN[i],
GTValues.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"),
i).getStackForm(1L);
RadioHatch2[i - 3] = new GT_MetaTileEntity_RadioHatch(
RadioHatch[i - 3],
"bw.radiohatch" + GTValues.VN[i],
GTValues.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"),
i).getStackForm(1L);
try {
ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L);
GTModHandler.addCraftingRecipe(
BioLab2[i - 3],
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
GTOreDictUnificator.get(OrePrefixes.frameGt, hulls2[i - 3], 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, wireMat2[i - 3], 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
"circuit" + circuits2[i - 3], 'C', machinehull });
GTModHandler.addCraftingRecipe(
RadioHatch2[i - 3],
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C', machinehull, 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, cables2[i - 3], 1L), 'P', Pistons2[i - 3] });
} catch (ArrayIndexOutOfBoundsException ignored) {
// BioLabs
GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_HV.ID, "bw.biolabHV", StatCollector.translateToLocal("tile.biolab.name"), 3)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

}
}
GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_EV.ID, "bw.biolabEV", StatCollector.translateToLocal("tile.biolab.name"), 4)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_IV.ID, "bw.biolabIV", StatCollector.translateToLocal("tile.biolab.name"), 5)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_LuV.ID, "bw.biolabLuV", StatCollector.translateToLocal("tile.biolab.name"), 6)
.getStackForm(1L),
RecipeLoader.BITSD,
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_ZPM.ID, "bw.biolabZPM", StatCollector.translateToLocal("tile.biolab.name"), 7)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UV.ID, "bw.biolabUV", StatCollector.translateToLocal("tile.biolab.name"), 8)
.getStackForm(1L),
RecipeLoader.BITSD,
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UHV.ID, "bw.biolabUHV", StatCollector.translateToLocal("tile.biolab.name"), 9)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UEV.ID, "bw.biolabUEV", StatCollector.translateToLocal("tile.biolab.name"), 10)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UIV.ID, "bw.biolabUIV", StatCollector.translateToLocal("tile.biolab.name"), 11)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UMV.ID, "bw.biolabUMV", StatCollector.translateToLocal("tile.biolab.name"), 12)
.getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "PFP", "WCW", "OGO", 'F',
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) });

// Radio Hatches
GTModHandler.addCraftingRecipe(
new GT_MetaTileEntity_RadioHatch(
RadioHatch_HV.ID,
"bw.radiohatchHV",
"HV " + StatCollector.translateToLocal("tile.radiohatch.name"),
3).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C',
ItemList.MACHINE_HULLS[3].get(1L), 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Gold, 1L), 'P',
ItemList.Electric_Piston_HV.get(1) });

GTModHandler.addCraftingRecipe(
new GT_MetaTileEntity_RadioHatch(
RadioHatch_EV.ID,
"bw.radiohatchEV",
"EV " + StatCollector.translateToLocal("tile.radiohatch.name"),
4).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C',
ItemList.MACHINE_HULLS[4].get(1L), 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Aluminium, 1L), 'P',
ItemList.Electric_Piston_EV.get(1) });

GTModHandler.addCraftingRecipe(
new GT_MetaTileEntity_RadioHatch(
RadioHatch_IV.ID,
"bw.radiohatchIV",
"IV " + StatCollector.translateToLocal("tile.radiohatch.name"),
5).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C',
ItemList.MACHINE_HULLS[5].get(1L), 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Tungsten, 1L), 'P',
ItemList.Electric_Piston_IV.get(1) });

GTModHandler.addCraftingRecipe(
new GT_MetaTileEntity_RadioHatch(
RadioHatch_LuV.ID,
"bw.radiohatchLuV",
"LuV " + StatCollector.translateToLocal("tile.radiohatch.name"),
6).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C',
ItemList.MACHINE_HULLS[6].get(1L), 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.VanadiumGallium, 1L), 'P',
ItemList.Electric_Piston_LuV.get(1) });

GTModHandler.addCraftingRecipe(
new GT_MetaTileEntity_RadioHatch(
RadioHatch_ZPM.ID,
"bw.radiohatchZPM",
"ZPM " + StatCollector.translateToLocal("tile.radiohatch.name"),
7).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C',
ItemList.MACHINE_HULLS[7].get(1L), 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Naquadah, 1L), 'P',
ItemList.Electric_Piston_ZPM.get(1) });

GTModHandler.addCraftingRecipe(
new GT_MetaTileEntity_RadioHatch(
RadioHatch_UV.ID,
"bw.radiohatchUV",
"UV " + StatCollector.translateToLocal("tile.radiohatch.name"),
8).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "DPD", "DCD", "DKD", 'D',
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C',
ItemList.MACHINE_HULLS[8].get(1L), 'K',
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.NaquadahAlloy, 1L), 'P',
ItemList.Electric_Piston_UV.get(1) });

}
}
4 changes: 2 additions & 2 deletions src/main/java/gregtech/api/enums/ItemList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2583,8 +2583,8 @@ public enum ItemList implements IItemContainer {
Spray_Color_Used_14, Spray_Color_Used_15 },
TRANSFORMERS = { Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV,
Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV },
MACHINE_HULLS = { Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV,
Hull_MAX },
MACHINE_HULLS = { Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX,
Hull_UEV, Hull_UIV, Hull_UMV, Hull_UXV, Hull_MAXV },
HATCHES_DYNAMO = { Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV,
Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_UHV },
HATCHES_ENERGY = { Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV,
Expand Down

0 comments on commit 69e4f9c

Please sign in to comment.