diff options
7 files changed, 80 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 baeda0ee59..cbaaf43bcf 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -105,6 +105,7 @@ public class GenericChem extends ItemPackage { public static ItemStack mPinkCatalyst; public static ItemStack mFormaldehydeCatalyst; public static ItemStack mSolidAcidCatalyst; + public static ItemStack mInfiniteMutationCatalyst; public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -155,6 +156,8 @@ public class GenericChem extends ItemPackage { mPotassiumHydroxide = ItemUtils.simpleMetaStack(mGenericChemItem1, 12, 1); mFormaldehydeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 13, 1); mSolidAcidCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 14, 1); + mInfiniteMutationCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 15, 1); + } @@ -175,6 +178,7 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mPotassiumHydroxide, "dustPotassiumHydroxide"); ItemUtils.addItemToOreDictionary(mFormaldehydeCatalyst, "catalystFormaldehyde"); ItemUtils.addItemToOreDictionary(mSolidAcidCatalyst, "catalystSolidAcid"); + ItemUtils.addItemToOreDictionary(mInfiniteMutationCatalyst, "catalystInfiniteMutation"); } @@ -297,6 +301,7 @@ public class GenericChem extends ItemPackage { recipeCatalystPink(); recipeCatalystFormaldehyde(); recipeCatalystSolidAcid(); + recipeCatalystInfiniteMutation(); recipeGrindingBallAlumina(); recipeGrindingBallSoapstone(); @@ -331,7 +336,9 @@ public class GenericChem extends ItemPackage { recipeCarbonDisulfide(); recipeEthylXanthates(); recipePotassiumHydroxide(); - + + recipeMutatedLivingSolder(); + registerFuels(); return true; @@ -484,6 +491,34 @@ public class GenericChem extends ItemPackage { } + private void recipeMutatedLivingSolder() { + + //Endgame soldering alloy meant for the bioware circuit line and beyond. + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { + ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 1), + ItemList.Circuit_Chip_Biocell.get(64), + ItemList.Gravistar.get(8), + Materials.InfinityCatalyst.getDust(2) + + }, + new FluidStack[] { + FluidUtils.getFluidStack("plasma.tin", 18000), + FluidUtils.getFluidStack("plasma.bismuth", 18000), + FluidUtils.getFluidStack("cryotheum", 4000) + }, + new ItemStack[] { + + }, + new FluidStack[] { + MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(40000) + }, + 20*800, + 3842160, + 7); + + } + private static void registerFuels() { @@ -810,6 +845,21 @@ public class GenericChem extends ItemPackage { } + private void recipeCatalystInfiniteMutation() { + // Assembly Recipe + CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { + getTierThreeChip(), + CI.getEmptyCatalyst(5), + Materials.Infinity.getDust(1), + Materials.Naquadria.getDust(10) + }, + GT_Values.NF, + ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 1), + 5 * 20, + 1966080); + + } + private void recipeCadaverineAndPutrescine() { // Basic Recipe 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 55a2301c4e..41b7d4daf1 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -23,7 +23,7 @@ public class ItemGenericChemBase extends Item { final protected IIcon base[]; - final private int aMetaSize = 15; + final private int aMetaSize = 16; /* * 0 - Red Metal Catalyst //FeCu diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index 766b2839d4..534b876478 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -660,4 +660,21 @@ public final class MISC_MATERIALS { new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) }); + + public static final Material MUTATED_LIVING_SOLDER = new Material( + "Mutated Living Solder", + MaterialState.PURE_LIQUID, //State + new short[] {147, 109, 155}, //Material Colour + -200, //Melting Point in C + 500, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "?Sn?Bi?", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().TIN, 1), + new MaterialStack(ELEMENT.getInstance().BISMUTH, 1) + }); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 0f94a820db..32d838b036 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1341,6 +1341,9 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) { + return true; + } if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 7f9889c52e..f0d3eace77 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -930,7 +930,11 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt private void damageCatalyst(ItemStack aStack, int parallelRecipes) { for (int i=0; i<parallelRecipes; i++){ - if (MathUtils.randFloat(0, 10000000)/10000000f < (1.2f - (0.2 * this.mPipeCasingTier))) { + // Awakened Draconium Coils with Tungstensteel Pipe Casings (or above) no longer consume catalysts. + if (this.mCoilTier >= 11 && this.mPipeCasingTier >= 4) { + log("not consuming catalyst"); + } + else if (MathUtils.randFloat(0, 10000000)/10000000f < (1.2f - (0.2 * this.mPipeCasingTier))) { int damage = getDamage(aStack) + 1; log("damage catalyst "+damage); if (damage >= getMaxCatalystDurability()) { diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index abadfbde70..6cb7b27af4 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3389,3 +3389,6 @@ item.miscutils:magicfeather.name=Magical Feather //Added 10/02/22 item.BasicGenericChemItem.14.name=Solid-Acid Catalyst + +//Added 30/05/22 +item.BasicGenericChemItem.15.name=Infinite Mutation Catalyst
\ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/15.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/15.png Binary files differnew file mode 100644 index 0000000000..22f0a4ff73 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/15.png |
