diff options
Diffstat (limited to 'src/main')
6 files changed, 44 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 99229211ad..ea4c664260 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -131,6 +131,7 @@ public class GenericChem extends ItemPackage { public static ItemStack mFlawlessWaterCatalyst; public static ItemStack TemporalHarmonyCatalyst; public static ItemStack mSynchrotronCapableCatalyst; + public static ItemStack mAlgagenicGrowthPromoterCatalyst; public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -201,6 +202,7 @@ public class GenericChem extends ItemPackage { mFlawlessWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 30, 1); mParticleAccelerationCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 31, 1); mSynchrotronCapableCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 32, 1); + mAlgagenicGrowthPromoterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 33, 1); } public void registerOreDict() { @@ -238,6 +240,7 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mFlawlessWaterCatalyst, "catalystFlawlessWater"); ItemUtils.addItemToOreDictionary(mParticleAccelerationCatalyst, "catalystParticleAcceleration"); ItemUtils.addItemToOreDictionary(mSynchrotronCapableCatalyst, "catalystSynchrotronCapable"); + ItemUtils.addItemToOreDictionary(mAlgagenicGrowthPromoterCatalyst, "catalystAlgagenicGrowthPromoter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 4e076ad57d..1f4c373578 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -25,7 +25,7 @@ public class ItemGenericChemBase extends Item { protected final IIcon base[]; - private final int aMetaSize = 33; + private final int aMetaSize = 34; /* * 0 - Red Metal Catalyst //FeCu 1 - Yellow Metal Catalyst //WNi 2 - Blue Metal Catalyst //CoTi 3 - Orange Metal @@ -41,7 +41,8 @@ public class ItemGenericChemBase extends Item { * (for early naqline skip) 24 - Advanced Naquadah Catalyst (for late naqline skip) 25 - Raw Intelligence Catalyst * (for stem cells skip) 26 - Ultimate Plasticizer Catalyst (for late plastics skip) 27 - Biological Intelligence * Catalyst (for bio cells skip) 28 - Temporal Harmonizer Catalyst (for Eternity processing) 29 - Limpid Water - * Catalyst (for early waterline skip) 30 - Flawless Water Catalyst (for advanced waterline skip) + * Catalyst (for early waterline skip) 30 - Flawless Water Catalyst (for advanced waterline skip) 33 - Algagenic + * Growth Promoter Catalyst (for seaweed skip) */ public ItemGenericChemBase() { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 6e9bd64c61..17a563df93 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1232,6 +1232,9 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) { + return true; + } return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index 6c840baa0e..db7ed24196 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -2,9 +2,12 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.EternalSingularity; +import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -296,6 +299,23 @@ public class RecipeLoader_ChemicalSkips { 200 * 20, (int) TierEU.RECIPE_UIV, 4); + + if (GalaxySpace.isModLoaded()) { + // Seaweed + ItemStack seaweed = GT_Utility + .copyAmountUnsafe(64 * 32, getModItem(GalaxySpace.ID, "tcetiedandelions", 1, 4)); + CORE.RA.addQuantumTransformerRecipe( + new ItemStack[] { GT_OreDictUnificator.get("cropSeaweed", 64), Materials.Mytryl.getDust(16), + ItemUtils.getSimpleStack(GenericChem.mAlgagenicGrowthPromoterCatalyst, 0) }, + new FluidStack[] { FluidUtils.getFluidStack("unknowwater", 25_000) }, + new FluidStack[] { FluidUtils.getFluidStack("seaweedbroth", 50_000), + FluidUtils.getFluidStack("iodine", 64_000) }, + new ItemStack[] { seaweed, getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 16) }, + new int[] { 2_500, 2_500, 2_500, 2_500 }, + 20 * SECONDS, + (int) TierEU.RECIPE_UIV, + 4); + } } private static void fusionReactorRecipes() { @@ -461,6 +481,17 @@ public class RecipeLoader_ChemicalSkips { ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 1), 60 * 20, (int) TierEU.RECIPE_UXV); + + GT_Values.RA.stdBuilder() + .itemInputs( + CI.getNumberedCircuit(10), + CI.getEmptyCatalyst(1), + getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 64), + GT_OreDictUnificator.get("dustIodine", 64), + MaterialsUEVplus.TranscendentMetal.getNanite(1)) + .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mAlgagenicGrowthPromoterCatalyst, 1)) + .fluidInputs(FluidUtils.getFluidStack("molten.shirabon", 92_160)).duration(60 * SECONDS) + .eut(TierEU.RECIPE_UMV).addTo(sAssemblerRecipes); } private static void tieredCasingRecipes() { diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 6a506e9e28..646ef553e7 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3460,4 +3460,7 @@ item.BasicGenericChemItem.30.name=Flawless Water Catalyst //Added 18/07/23 item.BasicGenericChemItem.31.name=Particle Acceleration Catalyst -item.BasicGenericChemItem.32.name=Synchrotron-Capable Catalyst
\ No newline at end of file +item.BasicGenericChemItem.32.name=Synchrotron-Capable Catalyst + +//Added 19/09/23 +item.BasicGenericChemItem.33.name=Algagenic Growth Promoter Catalyst
\ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/33.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/33.png Binary files differnew file mode 100644 index 0000000000..22f0a4ff73 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/33.png |
