diff options
author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2023-05-17 17:01:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-17 17:01:24 +0200 |
commit | 5f4f6e2281f3163be82043b919d683dd77c44d89 (patch) | |
tree | e7e4ca54bcd73a6a4875a7d974a57d6f89055de6 /src | |
parent | cf0afb6f8246408293f5702c27487cc19aa16b41 (diff) | |
download | GT5-Unofficial-5f4f6e2281f3163be82043b919d683dd77c44d89.tar.gz GT5-Unofficial-5f4f6e2281f3163be82043b919d683dd77c44d89.tar.bz2 GT5-Unofficial-5f4f6e2281f3163be82043b919d683dd77c44d89.zip |
Add Temporal Harmonizer Catalyst (#633)
* add catalyst
* recipes
* not here
Diffstat (limited to 'src')
6 files changed, 19 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 01c4f068d2..230270c15c 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 mRawIntelligenceCatalyst; public static ItemStack mUltimatePlasticCatalyst; public static ItemStack mBiologicalIntelligenceCatalyst; + public static ItemStack TemporalHarmonyCatalyst; public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -196,6 +197,7 @@ public class GenericChem extends ItemPackage { mRawIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 25, 1); mUltimatePlasticCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 26, 1); mBiologicalIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 27, 1); + TemporalHarmonyCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 28, 1); } public void registerOreDict() { @@ -228,6 +230,7 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mRawIntelligenceCatalyst, "catalystRawIntelligence"); ItemUtils.addItemToOreDictionary(mUltimatePlasticCatalyst, "catalystUltimatePlastic"); ItemUtils.addItemToOreDictionary(mBiologicalIntelligenceCatalyst, "catalystBiologicalIntelligence"); + ItemUtils.addItemToOreDictionary(TemporalHarmonyCatalyst, "catalystTemporalHarmony"); } @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 0430b5fd3e..90258da65b 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 = 28; + private final int aMetaSize = 29; /* * 0 - Red Metal Catalyst //FeCu 1 - Yellow Metal Catalyst //WNi 2 - Blue Metal Catalyst //CoTi 3 - Orange Metal @@ -40,7 +40,7 @@ public class ItemGenericChemBase extends Item { * thorium/uranium/plutonium skip) 22 - Rare-Earth Group Catalyst (for monaline skip) 23 - Simple Naquadah Catalyst * (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) + * Catalyst (for bio cells skip) 28 - Temporal Harmonizer Catalyst (for Eternity processing) */ 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 182b2b22ee..6ecc4ab5df 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1435,6 +1435,9 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, 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 959b11c026..6acf234408 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 @@ -224,6 +224,7 @@ public class RecipeLoader_ChemicalSkips { 20 * 20, (int) TierEU.RECIPE_UIV, 4); + } private static void fusionReactorRecipes() { @@ -342,6 +343,15 @@ public class RecipeLoader_ChemicalSkips { ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 1), 60 * 20, (int) TierEU.RECIPE_UMV); + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + GT_OreDictUnificator.get("blockShirabon", 16), MaterialsUEVplus.Universium.getNanite(1), + ItemList.Timepiece.get(1) }, + Materials.DarkIron.getMolten(92160), + ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 1), + 60 * 20, + (int) TierEU.RECIPE_UXV); } 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 2f0f1710fe..21ecde5ee7 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3466,6 +3466,7 @@ item.BasicGenericChemItem.24.name=Advanced Naquadah Catalyst item.BasicGenericChemItem.25.name=Raw Intelligence Catalyst item.BasicGenericChemItem.26.name=Ultimate Plasticizer Catalyst item.BasicGenericChemItem.27.name=Biological Intelligence Catalyst +item.BasicGenericChemItem.28.name=Temporal Harmonizer Catalyst item.ItemCustomSpawnEgg.name=Spawn %s item.itemSimpleFiremaker.message.0=You light the fire pit. diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/28.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/28.png Binary files differnew file mode 100644 index 0000000000..22f0a4ff73 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/28.png |