From 0f990a7cfd78c3ede4db09a893e1e6edff164a2a Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 15 Aug 2024 15:38:58 +0200 Subject: Cleanup (#2803) * remove dead code * use proper materials for tiered circuits * remove yet another RA1 call * remove deprecated usage * small step toward Research station assline recipes migration * remove dead code * remove dead code * remove dead code * migrate BW recipes * remove some more RA1 code * remove bad search and replace + spotlessapply * yeet deprecated code and change how sieverts for recipes are computed * fix loading * fix bad replacements * spotless apply --- .../java/com/elisis/gtnhlanth/GTNHLanthanides.java | 23 - .../common/register/WerkstoffMaterialPool.java | 53 --- .../gtnhlanth/common/tileentity/Digester.java | 3 - .../common/tileentity/DissolutionTank.java | 13 - .../gtnhlanth/common/tileentity/SourceChamber.java | 2 - .../bartworks/API/BioRecipeAdder.java | 126 ----- .../common/loaders/ArtificialMicaLine.java | 27 +- .../bartworks/common/loaders/BioRecipeLoader.java | 275 +++++------ .../common/loaders/RadioHatchMaterialLoader.java | 508 +++++++++++++-------- .../tileentities/multis/GT_TileEntity_HTGR.java | 24 +- .../processingLoaders/AdditionalRecipes.java | 34 +- .../werkstoff_loaders/recipe/CrushedLoader.java | 31 +- .../bartimaeusnek/bartworks/util/BWRecipes.java | 203 ++------ .../bartimaeusnek/bartworks/util/MurmurHash3.java | 3 - .../accessprioritylist/AccessPriorityList.java | 4 - .../technus/tectech/recipe/TT_recipeAdder.java | 46 +- 16 files changed, 591 insertions(+), 784 deletions(-) delete mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index 8ffdc0b5a1..ddbaa84d6e 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -69,36 +69,13 @@ public class GTNHLanthanides { BeamlineRecipeLoader.load(); BotRecipes.addGTRecipe(); - // RecipeLoader.loadZylonRecipes(); proxy.postInit(e); - // GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName()); - // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray())); - // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray())); - - /* - * GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs( - * WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)))); - */ } @EventHandler public static void onModLoadingComplete(FMLLoadCompleteEvent e) { - // GT_Log.out.print("AAAAAAAAAAAAAA " + new - // ItemStack(LanthItemList.maskMap.get(MaskList.CPU)).getUnlocalizedName()); - // - // GT_Log.out.print("We are done loading"); BotRecipes.removeRecipes(); RecipeLoader.removeCeriumSources(); - - /* - * for (GT_ItemStack stack : BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.keySet()) { - * GT_Log.out.print(" Recipes for: " + stack.mItem.getUnlocalizedName() + ": "); for (GT_Recipe recipe : - * BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.get(stack)) { - * GT_Log.out.print(Arrays.toString(recipe.mOutputs)); } } - */ - - // GT_Log.out.print("blah blah " + - // WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot)); } } diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 4aed254be0..a6e806ca86 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1502,24 +1502,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID4 + 30, TextureSet.SET_FLUID); - // enum Lanthanides { - // Lanthanum, - // Praseodymium, - // Cerium, - // Neodymium, - // Promethium, - // Samarium, - // Europium, - // Gadolinium, - // Terbium, - // Dysprosium, - // Holmium, - // Erbium, - // Thulium, - // Ytterbium, - // Lutetium - // } - // Lanthanides Chloride Concentrate // Lanthanum public static final Werkstoff LanthanumChlorideConcentrate = new Werkstoff( @@ -1739,17 +1721,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID4 + 50, TextureSet.SET_DULL); - // Samarium - // public static final Werkstoff SamariumOreConcentrate = new Werkstoff( - // new short[] { 255, 200, 230 }, - // "Samarium Ore Concentrate", - // subscriptNumbers("??Sm??"), - // new Werkstoff.Stats(), - // Werkstoff.Types.MIXTURE, - // new Werkstoff.GenerationFeatures().disable().onlyDust(), - // offsetID2 + 28, - // TextureSet.SET_DULL); - // Europium public static final Werkstoff EuropiumOreConcentrate = new Werkstoff( new short[] { 240, 200, 240 }, @@ -1882,30 +1853,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID5 + 39, TextureSet.SET_GEM_VERTICAL); - // public static final Werkstoff RawCeriumDopedLutetiumAluminiumGarnetPart = new Werkstoff( - // new short[] { 63, 255, 63 }, - // "Raw Cerium Doped Lutetium Aluminium Garnet Part", - // subscriptNumbers("(Ce)Lu3Al5O12"), - // new Werkstoff.Stats(), - // Werkstoff.Types.MATERIAL, - // new Werkstoff.GenerationFeatures().disable().addGems(), - // offsetID4 + 33, - // TextureSet.SET_GEM_VERTICAL); - - // public static final Werkstoff C272 = new Werkstoff( - // new short[] { 0x29, 0xc2, 0x2a }, - // "C-272", - // subscriptNumbers("(C8H17)2PO2H"), - // new Werkstoff.Stats().setElektrolysis(true), - // Werkstoff.Types.COMPOUND, - // new Werkstoff.GenerationFeatures().disable().addCells(), - // offsetID4 + 59, - // TextureSet.SET_FLUID, - // new Pair<>(Carbon, 16), - // new Pair<>(Phosphorus, 1), - // new Pair<>(Oxygen, 3), - // new Pair<>(Hydrogen, 35)); - public static final Werkstoff Permalloy = new Werkstoff( new short[] { 195, 230, 225 }, "Permalloy", diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index 479569c7f6..239be6a3ea 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -73,9 +73,6 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)) .build(); - // private int mHeat; - // private int mNeededHeat; - public Digester(String name) { super(name); } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index f515024365..e6a714fd00 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -146,19 +146,12 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { null }, - BioCultureLoader.generalPurposeFermentingBacteria, - recipe.mFluidInputs, - recipe.mFluidOutputs, - recipe.mDuration, - recipe.mEUt, - GT_Utility.getTier(recipe.mEUt))); + recipe -> GT_Values.RA.stdBuilder() + .special(BioItemList.getPetriDish(BioCultureLoader.generalPurposeFermentingBacteria)) + .fluidInputs(recipe.mFluidInputs) + .fluidOutputs(recipe.mFluidOutputs) + .duration(recipe.mDuration) + .eut(recipe.mEUt) + .metadata(SIEVERTS, (int) GT_Utility.getTier(recipe.mEUt)) + .addTo(bacterialVatRecipes)); + } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java index d141fe8b65..3a5cd2c9cc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java @@ -1,33 +1,48 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes; +import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS; import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BWRecipes; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +// cursed way of using a recipe map... public class RadioHatchMaterialLoader { public static void run() { for (Werkstoff material : Werkstoff.werkstoffHashSet) { - if (material != null && material.getStats() + if (material == null || !material.getStats() .isRadioactive()) { - int level = (int) material.getStats() - .getProtons(); - short[] rgba = material.getRGBA(); - if (material.hasItemType(OrePrefixes.stick)) - BWRecipes.instance.addRadHatch(material.get(OrePrefixes.stick), level, 1, rgba); - if (material.hasItemType(OrePrefixes.stickLong)) - BWRecipes.instance.addRadHatch(material.get(OrePrefixes.stickLong), level, 2, rgba); + continue; } + + int level = (int) material.getStats() + .getProtons(); + if (material.hasItemType(OrePrefixes.stick)) GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick)) + .duration(1) + .eut(level) + .metadata(DECAY_TICKS, (int) calcDecayTicks(level)) + .noOptimize() + .addTo(radioHatchRecipes); + if (material.hasItemType(OrePrefixes.stickLong)) GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stickLong)) + .duration(2) + .eut(level) + .metadata(DECAY_TICKS, (int) calcDecayTicks(level)) + .noOptimize() + .addTo(radioHatchRecipes); } for (Materials material : Materials.getAll()) { @@ -36,11 +51,24 @@ public class RadioHatchMaterialLoader { && !material.equals(Materials.Naquadah); // Naquadah needs spacial value if (validProton) { int level = (int) material.getProtons(); - short[] rgba = material.getRGBA(); - if (GT_OreDictUnificator.get(OrePrefixes.stick, material, 1) != null) BWRecipes.instance - .addRadHatch(GT_OreDictUnificator.get(OrePrefixes.stick, material, 1), level, 1, rgba); - if (GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1) != null) BWRecipes.instance - .addRadHatch(GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1), level, 2, rgba); + if (GT_OreDictUnificator.get(OrePrefixes.stick, material, 1) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, material, 1)) + .duration(1) + .eut(level) + .metadata(DECAY_TICKS, (int) calcDecayTicks(level)) + .noOptimize() + .addTo(radioHatchRecipes); + } + if (GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1)) + .duration(2) + .eut(level) + .metadata(DECAY_TICKS, (int) calcDecayTicks(level)) + .noOptimize() + .addTo(radioHatchRecipes); + } } } @@ -48,177 +76,291 @@ public class RadioHatchMaterialLoader { int[] spacialValue = { 130, 140, 150 }; for (int i = 0; i < spacialMaterial.length; i++) { - if (GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1) != null) - BWRecipes.instance.addRadHatch( - GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1), - spacialValue[i], - 1, - spacialMaterial[i].mRGBa); - if (GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1) != null) - BWRecipes.instance.addRadHatch( - GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1), - spacialValue[i], - 2, - spacialMaterial[i].mRGBa); - } - - BWRecipes.instance.addRadHatch( - ItemList.ThoriumCell_1.get(1), - (int) Materials.Thorium.getProtons(), - 3, - Materials.Thorium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.ThoriumCell_2.get(1), - (int) Materials.Thorium.getProtons(), - 6, - Materials.Thorium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.ThoriumCell_4.get(1), - (int) Materials.Thorium.getProtons(), - 12, - Materials.Thorium.mRGBa); - - BWRecipes.instance.addRadHatch(ItemList.NaquadahCell_1.get(1), 140, 3, Materials.NaquadahEnriched.mRGBa); - BWRecipes.instance.addRadHatch(ItemList.NaquadahCell_2.get(1), 140, 6, Materials.NaquadahEnriched.mRGBa); - BWRecipes.instance.addRadHatch(ItemList.NaquadahCell_4.get(1), 140, 12, Materials.NaquadahEnriched.mRGBa); - - BWRecipes.instance.addRadHatch( - ItemList.Moxcell_1.get(1), - (int) Materials.Plutonium.getProtons(), - 3, - Materials.Plutonium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.Moxcell_2.get(1), - (int) Materials.Plutonium.getProtons(), - 6, - Materials.Plutonium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.Moxcell_4.get(1), - (int) Materials.Plutonium.getProtons(), - 12, - Materials.Plutonium.mRGBa); - - BWRecipes.instance.addRadHatch( - ItemList.Uraniumcell_1.get(1), - (int) Materials.Uranium.getProtons(), - 3, - Materials.Uranium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.Uraniumcell_2.get(1), - (int) Materials.Uranium.getProtons(), - 6, - Materials.Uranium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.Uraniumcell_4.get(1), - (int) Materials.Uranium.getProtons(), - 12, - Materials.Uranium.mRGBa); - - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial() - .getProtons(), - 3, - WerkstoffLoader.Tiberium.getRGBA()); - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial() - .getProtons(), - 6, - WerkstoffLoader.Tiberium.getRGBA()); - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial() - .getProtons(), - 12, - WerkstoffLoader.Tiberium.getRGBA()); - - BWRecipes.instance - .addRadHatch(BW_NonMeta_MaterialItems.TheCoreCell.get(1), 140, 96, Materials.NaquadahEnriched.mRGBa); - - BWRecipes.instance.addRadHatch( - ItemList.Depleted_Thorium_1.get(1), - (int) Materials.Thorium.getProtons() / 10, - 3, - Materials.Thorium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.Depleted_Thorium_2.get(1), - (int) Materials.Thorium.getProtons() / 10, - 6, - Materials.Thorium.mRGBa); - BWRecipes.instance.addRadHatch( - ItemList.Depleted_Thorium_4.get(1), - (int) Materials.Thorium.getProtons() / 10, - 12, - Materials.Thorium.mRGBa); - - BWRecipes.instance - .addRadHatch(ItemList.Depleted_Naquadah_1.get(1), 140 / 10, 3, Materials.NaquadahEnriched.mRGBa); - BWRecipes.instance - .addRadHatch(ItemList.Depleted_Naquadah_2.get(1), 140 / 10, 6, Materials.NaquadahEnriched.mRGBa); - BWRecipes.instance - .addRadHatch(ItemList.Depleted_Naquadah_4.get(1), 140 / 10, 12, Materials.NaquadahEnriched.mRGBa); - - BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), - (int) Materials.Plutonium.getProtons() / 10, - 3, - Materials.Plutonium.mRGBa); - BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), - (int) Materials.Plutonium.getProtons() / 10, - 6, - Materials.Plutonium.mRGBa); - BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), - (int) Materials.Plutonium.getProtons() / 10, - 12, - Materials.Plutonium.mRGBa); - - BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), - (int) Materials.Uranium.getProtons() / 10, - 3, - Materials.Uranium.mRGBa); - BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), - (int) Materials.Uranium.getProtons() / 10, - 6, - Materials.Uranium.mRGBa); - BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), - (int) Materials.Uranium.getProtons() / 10, - 12, - Materials.Uranium.mRGBa); - - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial() - .getProtons() / 10, - 3, - WerkstoffLoader.Tiberium.getRGBA()); - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial() - .getProtons() / 10, - 6, - WerkstoffLoader.Tiberium.getRGBA()); - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial() - .getProtons() / 10, - 12, - WerkstoffLoader.Tiberium.getRGBA()); + if (GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1)) + .duration(1) + .eut(spacialValue[i]) + .metadata(DECAY_TICKS, (int) calcDecayTicks(spacialValue[i])) + .noOptimize() + .addTo(radioHatchRecipes); + } - BWRecipes.instance - .addRadHatch(BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), 130 / 10, 96, Materials.Naquadah.mRGBa); + if (GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1) != null) { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1)) + .duration(2) + .eut(spacialValue[i]) + .metadata(DECAY_TICKS, (int) calcDecayTicks(spacialValue[i])) + .noOptimize() + .addTo(radioHatchRecipes); + } + } - BWRecipes.instance.addRadHatch(ItemList.MNqCell_1.get(1), 150, 3, Materials.Naquadria.mRGBa); - BWRecipes.instance.addRadHatch(ItemList.MNqCell_2.get(1), 150, 6, Materials.Naquadria.mRGBa); - BWRecipes.instance.addRadHatch(ItemList.MNqCell_4.get(1), 150, 12, Materials.Naquadria.mRGBa); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.ThoriumCell_1.get(1)) + .duration(3) + .eut((int) Materials.Thorium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Thorium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.ThoriumCell_2.get(1)) + .duration(6) + .eut((int) Materials.Thorium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Thorium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.ThoriumCell_4.get(1)) + .duration(12) + .eut((int) Materials.Thorium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Thorium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.NaquadahCell_1.get(1)) + .duration(3) + .eut(140) + .metadata(DECAY_TICKS, (int) calcDecayTicks(140)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.NaquadahCell_2.get(1)) + .duration(6) + .eut(140) + .metadata(DECAY_TICKS, (int) calcDecayTicks(140)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.NaquadahCell_4.get(1)) + .duration(12) + .eut(140) + .metadata(DECAY_TICKS, (int) calcDecayTicks(140)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Moxcell_1.get(1)) + .duration(3) + .eut((int) Materials.Plutonium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Plutonium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Moxcell_2.get(1)) + .duration(6) + .eut((int) Materials.Plutonium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Plutonium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Moxcell_4.get(1)) + .duration(12) + .eut((int) Materials.Plutonium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Plutonium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Uraniumcell_1.get(1)) + .duration(3) + .eut((int) Materials.Uranium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Uranium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Uraniumcell_2.get(1)) + .duration(6) + .eut((int) Materials.Uranium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Uranium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Uraniumcell_4.get(1)) + .duration(12) + .eut((int) Materials.Uranium.getProtons()) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Uranium.getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.TiberiumCell_1.get(1)) + .duration(3) + .eut( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons()) + .metadata( + DECAY_TICKS, + (int) calcDecayTicks( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.TiberiumCell_2.get(1)) + .duration(6) + .eut( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons()) + .metadata( + DECAY_TICKS, + (int) calcDecayTicks( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.TiberiumCell_4.get(1)) + .duration(12) + .eut( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons()) + .metadata( + DECAY_TICKS, + (int) calcDecayTicks( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons())) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.TheCoreCell.get(1)) + .duration(96) + .eut(140) + .metadata(DECAY_TICKS, (int) calcDecayTicks(140)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_Thorium_1.get(1)) + .duration(3) + .eut((int) Materials.Thorium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Thorium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_Thorium_2.get(1)) + .duration(6) + .eut((int) Materials.Thorium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Thorium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_Thorium_4.get(1)) + .duration(12) + .eut((int) Materials.Thorium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Thorium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_Naquadah_1.get(1)) + .duration(3) + .eut(14) + .metadata(DECAY_TICKS, (int) calcDecayTicks(14)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_Naquadah_2.get(1)) + .duration(6) + .eut(14) + .metadata(DECAY_TICKS, (int) calcDecayTicks(14)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_Naquadah_4.get(1)) + .duration(12) + .eut(14) + .metadata(DECAY_TICKS, (int) calcDecayTicks(14)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1)) + .duration(3) + .eut((int) Materials.Plutonium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Plutonium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1)) + .duration(6) + .eut((int) Materials.Plutonium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Plutonium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1)) + .duration(12) + .eut((int) Materials.Plutonium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Plutonium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1)) + .duration(3) + .eut((int) Materials.Uranium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Uranium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1)) + .duration(6) + .eut((int) Materials.Uranium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Uranium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1)) + .duration(12) + .eut((int) Materials.Uranium.getProtons() / 10) + .metadata(DECAY_TICKS, (int) calcDecayTicks((int) Materials.Uranium.getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1)) + .duration(3) + .eut( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10) + .metadata( + DECAY_TICKS, + (int) calcDecayTicks( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1)) + .duration(6) + .eut( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10) + .metadata( + DECAY_TICKS, + (int) calcDecayTicks( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1)) + .duration(12) + .eut( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10) + .metadata( + DECAY_TICKS, + (int) calcDecayTicks( + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1)) + .duration(96) + .eut(13) + .metadata(DECAY_TICKS, (int) calcDecayTicks(13)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.MNqCell_1.get(1)) + .duration(3) + .eut(150) + .metadata(DECAY_TICKS, (int) calcDecayTicks(150)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.MNqCell_2.get(1)) + .duration(6) + .eut(150) + .metadata(DECAY_TICKS, (int) calcDecayTicks(150)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.MNqCell_4.get(1)) + .duration(12) + .eut(150) + .metadata(DECAY_TICKS, (int) calcDecayTicks(150)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_MNq_1.get(1)) + .duration(3) + .eut(15) + .metadata(DECAY_TICKS, (int) calcDecayTicks(15)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_MNq_2.get(1)) + .duration(6) + .eut(15) + .metadata(DECAY_TICKS, (int) calcDecayTicks(15)) + .addTo(radioHatchRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Depleted_MNq_4.get(1)) + .duration(12) + .eut(15) + .metadata(DECAY_TICKS, (int) calcDecayTicks(15)) + .addTo(radioHatchRecipes); - BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_1.get(1), 150 / 10, 3, Materials.Naquadria.mRGBa); - BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_2.get(1), 150 / 10, 6, Materials.Naquadria.mRGBa); - BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_4.get(1), 150 / 10, 12, Materials.Naquadria.mRGBa); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java index 10620084e2..455625b77a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java @@ -9,12 +9,14 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.htgrFakeRecipes; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_VIA_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_Values.AuthorKuba; +import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gregtech.api.util.GT_Utility.filterValidMTEs; @@ -30,7 +32,6 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps; import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.MathUtils; @@ -251,7 +252,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase @Override public RecipeMap getRecipeMap() { // Only for visual - return BartWorksRecipeMaps.htgrFakeRecipes; + return htgrFakeRecipes; } @Override @@ -596,16 +597,15 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase for (@SuppressWarnings("unused") Fuel_ fuel : sHTGR_Fuel) { - BartWorksRecipeMaps.htgrFakeRecipes.addFakeRecipe( - false, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4) }, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5) }, - null, - null, - null, - 72000, - powerUsage, - 0); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4)) + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5)) + .duration(1 * HOURS) + .eut(powerUsage) + .ignoreCollision() + .noOptimize() + .fake() + .addTo(htgrFakeRecipes); i += MATERIALS_PER_FUEL; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index 8c915a2d8a..e51431ab0b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -13,6 +13,7 @@ package com.github.bartimaeusnek.bartworks.system.material.processingLoaders; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes; import static gregtech.api.enums.Mods.Gendustry; import static gregtech.api.enums.OrePrefixes.bolt; @@ -73,7 +74,6 @@ import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.BW_Meta_Items; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.BioCulture; import com.github.bartimaeusnek.bartworks.util.BioDNA; import com.github.bartimaeusnek.bartworks.util.BioData; @@ -87,7 +87,6 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.items.behaviors.Behaviour_DataOrb; @@ -116,11 +115,12 @@ public class AdditionalRecipes { .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) .special(BioItemList.mBioLabParts[0]) .duration(25 * SECONDS) -