aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorDaniel Mendes <70096037+Steelux8@users.noreply.github.com>2023-07-31 00:02:55 +0100
committerGitHub <noreply@github.com>2023-07-31 01:02:55 +0200
commit20b485713d72415530be0a7c70faab84e15e7297 (patch)
treecb979d18590c7d4a1adf3b83085e0b3a90f35fb8 /src/main/java/gtPlusPlus/core/item
parentcc4040b0753af8984f09701e3b5af208c30bea7b (diff)
downloadGT5-Unofficial-20b485713d72415530be0a7c70faab84e15e7297.tar.gz
GT5-Unofficial-20b485713d72415530be0a7c70faab84e15e7297.tar.bz2
GT5-Unofficial-20b485713d72415530be0a7c70faab84e15e7297.zip
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
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java6
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java2
2 files changed, 7 insertions, 1 deletions
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