diff options
| author | Daniel Mendes <70096037+Steelux8@users.noreply.github.com> | 2023-07-17 20:44:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 21:44:54 +0200 |
| commit | ae24c158b21d2394fc7fd1ce292d8fa05041928f (patch) | |
| tree | 28a11fcf552f16ba9c24ddb205163038022f30ff /src/main/java/gtPlusPlus/core | |
| parent | 3582102ae86a5a38046f368e03382be60b7381ae (diff) | |
| download | GT5-Unofficial-ae24c158b21d2394fc7fd1ce292d8fa05041928f.tar.gz GT5-Unofficial-ae24c158b21d2394fc7fd1ce292d8fa05041928f.tar.bz2 GT5-Unofficial-ae24c158b21d2394fc7fd1ce292d8fa05041928f.zip | |
Add QFT Water Line Skips (#693)
* New catalyst definitions
* New catalyst english name and images
* 2 new recipes for waterline skips
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
3 files changed, 15 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 eb623fd248..f975026fee 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -126,11 +126,13 @@ public class GenericChem extends ItemPackage { public static ItemStack mTitaTungstenIndiumCatalyst; public static ItemStack mRadioactivityCatalyst; public static ItemStack mRareEarthGroupCatalyst; + public static ItemStack mLimpidWaterCatalyst; public static ItemStack mSimpleNaquadahCatalyst; public static ItemStack mAdvancedNaquadahCatalyst; public static ItemStack mRawIntelligenceCatalyst; public static ItemStack mUltimatePlasticCatalyst; public static ItemStack mBiologicalIntelligenceCatalyst; + public static ItemStack mFlawlessWaterCatalyst; public static ItemStack TemporalHarmonyCatalyst; public static ItemStack mMillingBallAlumina; @@ -198,6 +200,8 @@ public class GenericChem extends ItemPackage { mUltimatePlasticCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 26, 1); mBiologicalIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 27, 1); TemporalHarmonyCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 28, 1); + mLimpidWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 29, 1); + mFlawlessWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 30, 1); } public void registerOreDict() { @@ -231,6 +235,8 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mUltimatePlasticCatalyst, "catalystUltimatePlastic"); ItemUtils.addItemToOreDictionary(mBiologicalIntelligenceCatalyst, "catalystBiologicalIntelligence"); ItemUtils.addItemToOreDictionary(TemporalHarmonyCatalyst, "catalystTemporalHarmony"); + ItemUtils.addItemToOreDictionary(mLimpidWaterCatalyst, "catalystLimpidWater"); + ItemUtils.addItemToOreDictionary(mFlawlessWaterCatalyst, "catalystFlawlessWater"); } @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 004ae5f3e2..7a39820d12 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 = 29; + private final int aMetaSize = 31; /* * 0 - Red Metal Catalyst //FeCu 1 - Yellow Metal Catalyst //WNi 2 - Blue Metal Catalyst //CoTi 3 - Orange Metal @@ -40,7 +40,8 @@ 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) 28 - Temporal Harmonizer Catalyst (for Eternity processing) + * 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) */ 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 0cfa4e7646..0fa6e7dbec 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1412,6 +1412,12 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) { + return true; + } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) { + return true; + } return false; } |
