From 20b485713d72415530be0a7c70faab84e15e7297 Mon Sep 17 00:00:00 2001 From: Daniel Mendes <70096037+Steelux8@users.noreply.github.com> Date: Mon, 31 Jul 2023 00:02:55 +0100 Subject: Particle Acceleration in the QFT (#695) * Define 2 new catalysts for new QFT recipes * Images and EN lang entries for the catalysts * Add 2 new QFT recipes and 2 for the new catalysts * Buff rare particle generation in cyclotron * Fix incorrect chances in waterline skips * Spotless apply * Change necessary plasmas - Changed the ions in the 2nd catalyst recipe to Hydrogen and Helium, both obtainable; - Changed Beryllium to Americium Plasma in the Cyclotron recipe. * Fix beryllium plasma usage in QFT recipe --- .../core/item/chemistry/GenericChem.java | 6 ++++++ .../chemistry/general/ItemGenericChemBase.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 25 +++++++++++++++++----- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 7 ++++++ 4 files changed, 34 insertions(+), 6 deletions(-) (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index f975026fee..3249b2da0e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -130,10 +130,12 @@ public class GenericChem extends ItemPackage { public static ItemStack mSimpleNaquadahCatalyst; public static ItemStack mAdvancedNaquadahCatalyst; public static ItemStack mRawIntelligenceCatalyst; + public static ItemStack mParticleAccelerationCatalyst; public static ItemStack mUltimatePlasticCatalyst; public static ItemStack mBiologicalIntelligenceCatalyst; public static ItemStack mFlawlessWaterCatalyst; public static ItemStack TemporalHarmonyCatalyst; + public static ItemStack mSynchrotronCapableCatalyst; public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -202,6 +204,8 @@ public class GenericChem extends ItemPackage { TemporalHarmonyCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 28, 1); mLimpidWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 29, 1); mFlawlessWaterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 30, 1); + mParticleAccelerationCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 31, 1); + mSynchrotronCapableCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 32, 1); } public void registerOreDict() { @@ -237,6 +241,8 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(TemporalHarmonyCatalyst, "catalystTemporalHarmony"); ItemUtils.addItemToOreDictionary(mLimpidWaterCatalyst, "catalystLimpidWater"); ItemUtils.addItemToOreDictionary(mFlawlessWaterCatalyst, "catalystFlawlessWater"); + ItemUtils.addItemToOreDictionary(mParticleAccelerationCatalyst, "catalystParticleAcceleration"); + ItemUtils.addItemToOreDictionary(mSynchrotronCapableCatalyst, "catalystSynchrotronCapable"); } @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 7a39820d12..4e076ad57d 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 = 31; + private final int aMetaSize = 33; /* * 0 - Red Metal Catalyst //FeCu 1 - Yellow Metal Catalyst //WNi 2 - Blue Metal Catalyst //CoTi 3 - Orange Metal diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 6b5bce553d..39c61d5b90 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1698,26 +1698,41 @@ public class RECIPES_GREGTECH { // Mixed Smash 1 CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(12), - FluidUtils.getFluidStack("plasma.beryllium", 2500), + Materials.Americium.getPlasma(2500), new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.ETA_MESON), Particle.getBaseParticle(Particle.PION), Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON), Particle.getBaseParticle(Particle.LAMBDA), Particle.getBaseParticle(Particle.OMEGA), Particle.getBaseParticle(Particle.HIGGS_BOSON), }, null, - new int[] { 10, 20, 20, 10, 10, 5, 5, 2 }, - 17 * 247 * 32, + new int[] { 50, 50, 50, 40, 30, 20, 20, 10 }, + 1000 * 20, + (int) MaterialUtils.getVoltageForTier(8), + 750 * 20); + + // Mixed Smash 1 + CORE.RA.addCyclotronRecipe( + CI.getNumberedCircuit(12), + new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 2500), + new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON), + Particle.getBaseParticle(Particle.ETA_MESON), Particle.getBaseParticle(Particle.PION), + Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON), + Particle.getBaseParticle(Particle.LAMBDA), Particle.getBaseParticle(Particle.OMEGA), + Particle.getBaseParticle(Particle.HIGGS_BOSON), }, + null, + new int[] { 5000, 200, 200, 100, 80, 60, 40, 30 }, + 100 * 20, (int) MaterialUtils.getVoltageForTier(8), 750 * 20); // Graviton Smash CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(15), - FluidUtils.getFluidStack("plasma.hydrogen", 50), + FluidUtils.getFluidStack("plasma.hydrogen", 100), new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.UNKNOWN) }, null, - new int[] { 15, 100 }, + new int[] { 1000, 100 }, 20 * (90), (int) MaterialUtils.getVoltageForTier(6), 1000 * 20); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 0fa6e7dbec..58832e095b 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1418,6 +1418,13 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) { + return true; + } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { + return true; + } + return false; } -- cgit