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

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 void registerItemStacks() {
         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 void registerOreDict() {
         ItemUtils.addItemToOreDictionary(TemporalHarmonyCatalyst, "catalystTemporalHarmony");
         ItemUtils.addItemToOreDictionary(mLimpidWaterCatalyst, "catalystLimpidWater");
         ItemUtils.addItemToOreDictionary(mFlawlessWaterCatalyst, "catalystFlawlessWater");
+        ItemUtils.addItemToOreDictionary(mParticleAccelerationCatalyst, "catalystParticleAcceleration");
+        ItemUtils.addItemToOreDictionary(mSynchrotronCapableCatalyst, "catalystSynchrotronCapable");
     }
 
     @Override

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

src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java

@@ -1698,26 +1698,41 @@ private static void cyclotronRecipes() {
         // 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);

src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java

@@ -1418,6 +1418,13 @@ public static boolean isCatalyst(ItemStack aStack) {
         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;
     }
 

src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java

@@ -1,6 +1,7 @@
 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.GoodGenerator;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.util.GT_ModHandler.getModItem;
@@ -13,6 +14,7 @@
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 
 import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.CombType;
@@ -22,6 +24,7 @@
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -177,7 +180,7 @@ private static void quantumTransformerRecipes() {
                         Materials.Grade2PurifiedWater.getFluid(10000L), Materials.Grade3PurifiedWater.getFluid(5000L),
                         Materials.Grade4PurifiedWater.getFluid(1000L) },
                 new ItemStack[] {},
-                new int[] { 2000, 2000, 2000, 2000, 2000 },
+                new int[] { 2500, 2500, 2500, 2500 },
                 20 * 20,
                 (int) TierEU.RECIPE_UHV,
                 2);
@@ -196,6 +199,19 @@ private static void quantumTransformerRecipes() {
                 (int) TierEU.RECIPE_UEV,
                 3);
 
+        // Unknown Particles
+        CORE.RA.addQuantumTransformerRecipe(
+                new ItemStack[] { ItemUtils.getSimpleStack(GenericChem.mParticleAccelerationCatalyst, 0) },
+                new FluidStack[] { Materials.Hydrogen.getGas(10000L), Materials.Deuterium.getGas(1000L) },
+                new FluidStack[] { FluidUtils.getFluidStack("plasma.hydrogen", 1000) },
+                new ItemStack[] { Particle.getBaseParticle(Particle.UNKNOWN),
+                        Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.PROTON),
+                        Particle.getBaseParticle(Particle.ELECTRON) },
+                new int[] { 2000, 2000, 2000, 2000, 2000 },
+                5 * 20,
+                (int) TierEU.RECIPE_UEV,
+                3);
+
         // Lategame Plastics (Missing Radox Polymer and Heavy Radox)
         CORE.RA.addQuantumTransformerRecipe(
                 new ItemStack[] { Materials.Carbon.getDust(64), Materials.Osmium.getDust(24),
@@ -260,10 +276,26 @@ private static void quantumTransformerRecipes() {
                         Materials.Grade6PurifiedWater.getFluid(10000L), Materials.Grade7PurifiedWater.getFluid(5000L),
                         Materials.Grade8PurifiedWater.getFluid(1000L) },
                 new ItemStack[] {},
-                new int[] { 2000, 2000, 2000, 2000, 2000 },
+                new int[] { 2500, 2500, 2500, 2500 },
                 20 * 20,
                 (int) TierEU.RECIPE_UIV,
                 4);
+
+        // Rare Particles
+        CORE.RA.addQuantumTransformerRecipe(
+                new ItemStack[] { ItemUtils.getSimpleStack(GenericChem.mSynchrotronCapableCatalyst, 0),
+                        GregtechItemList.Laser_Lens_Special.get(1) },
+                new FluidStack[] { FluidUtils.getFluidStack("plasma.hydrogen", 30000),
+                        Materials.Helium.getPlasma(30000L), Materials.Americium.getPlasma(30000L),
+                        new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 30000) },
+                new FluidStack[] {},
+                new ItemStack[] { Particle.getBaseParticle(Particle.Z_BOSON),
+                        Particle.getBaseParticle(Particle.W_BOSON), Particle.getBaseParticle(Particle.LAMBDA),
+                        Particle.getBaseParticle(Particle.OMEGA), Particle.getBaseParticle(Particle.HIGGS_BOSON) },
+                new int[] { 2000, 2000, 2000, 2000, 2000 },
+                200 * 20,
+                (int) TierEU.RECIPE_UIV,
+                4);
     }
 
     private static void fusionReactorRecipes() {
@@ -377,6 +409,15 @@ private static void catalystRecipes() {
                 60 * 20,
                 (int) TierEU.RECIPE_UIV);
 
+        CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+                        GregtechItemList.Laser_Lens_Special.get(64),
+                        GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 10) },
+                MaterialsUEVplus.SpaceTime.getMolten(9216L),
+                ItemUtils.getSimpleStack(GenericChem.mParticleAccelerationCatalyst, 1),
+                60 * 20,
+                (int) TierEU.RECIPE_UIV);
+
         CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), MaterialsKevlar.Kevlar.getDust(64),
                         MaterialsUEVplus.TranscendentMetal.getNanite(1) },
@@ -403,6 +444,15 @@ private static void catalystRecipes() {
                 60 * 20,
                 (int) TierEU.RECIPE_UMV);
 
+        CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+                        Particle.getBaseParticle(Particle.HIGGS_BOSON), Particle.getIon("Helium", 0),
+                        Particle.getIon("Hydrogen", 0), MaterialsUEVplus.Eternity.getNanite(16) },
+                FluidUtils.getFluidStack("molten.shirabon", 92160),
+                ItemUtils.getSimpleStack(GenericChem.mSynchrotronCapableCatalyst, 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),

src/main/resources/assets/miscutils/lang/en_US.lang

@@ -3457,4 +3457,8 @@ item.itemSimpleFiremaker.message.3=Your attemp does nothing.
 
 //Added 17/07/23
 item.BasicGenericChemItem.29.name=Limpid Water Catalyst
-item.BasicGenericChemItem.30.name=Flawless Water Catalyst
+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