aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorSteelux <70096037+Steelux8@users.noreply.github.com>2022-12-22 18:20:15 +0000
committerGitHub <noreply@github.com>2022-12-22 19:20:15 +0100
commita5a444ebc4a2488ca850b3cf3eae3659a81659e2 (patch)
treee28ee42aed46a02c1ab7bc9f07dbe201bdd999f4 /src/main/java/gtPlusPlus/core/item
parent44be046709c7e997698992973f9a28b897d5a24c (diff)
downloadGT5-Unofficial-a5a444ebc4a2488ca850b3cf3eae3659a81659e2.tar.gz
GT5-Unofficial-a5a444ebc4a2488ca850b3cf3eae3659a81659e2.tar.bz2
GT5-Unofficial-a5a444ebc4a2488ca850b3cf3eae3659a81659e2.zip
Add the Quantum Force Transformer (Endgame Chemline Skipper) (#399)
* First Code Implementation * First Textures Implementation * Texture Name Fixes * spotlessApply (#400) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Controller ID Fix * spotlessApply (#401) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Reworked Recipe Map, Started Rework on recipes * spotless * fix recipe to actually use eternal singularity, make sure we can have a null fluid output * add new blocks and some new textures * Spotless apply for branch Chem_Line_Skipper for #399 (#406) * fix material localization (#395) * fix material localization * spotlessApply * Revert the Nerf to Algae Farm Casing Cost (#397) - Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi; - Adjusted the controller recipe for the Farm to also be MV. * Fix Amount of Infinite Mutation Catalyst Output (#398) - Changed output from 1 to 5 catalysts, to match the input of 5 carriers. * Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402) * fix frame box and block cant localized (#404) * fix double plate and long rod cant localized (#405) * fix double plate and long rod cant localized * sa * spotlessApply Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * First Changes to Add Chemplant Catalysts * Spotless apply for branch Chem_Line_Skipper for #399 (#407) * fix material localization (#395) * fix material localization * spotlessApply * Revert the Nerf to Algae Farm Casing Cost (#397) - Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi; - Adjusted the controller recipe for the Farm to also be MV. * Fix Amount of Infinite Mutation Catalyst Output (#398) - Changed output from 1 to 5 catalysts, to match the input of 5 carriers. * Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402) * fix frame box and block cant localized (#404) * fix double plate and long rod cant localized (#405) * fix double plate and long rod cant localized * sa * spotlessApply Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Multi Forms with Catalyst Housing and Recipes in NEI * spotless * Remove Mufflers and Pollution * New textures and make new casing to be used in the multi * Make a working recipe check, add a Fluid only output mode * Do not allow the ME Input Bus bug again. fixing it early * replace the current glass with a new one a real texture needs to be made * fix catalysts being able to be used in the input bus and fix recipes not start from a second input bus * Spotless apply for branch Chem_Line_Skipper for #399 (#412) * fix material localization (#395) * fix material localization * spotlessApply * Revert the Nerf to Algae Farm Casing Cost (#397) - Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi; - Adjusted the controller recipe for the Farm to also be MV. * Fix Amount of Infinite Mutation Catalyst Output (#398) - Changed output from 1 to 5 catalysts, to match the input of 5 carriers. * Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402) * fix frame box and block cant localized (#404) * fix double plate and long rod cant localized (#405) * fix double plate and long rod cant localized * sa * Update chemplant manual for TPV (#409) * Update chemplant manual for TPV * update BS Co-authored-by: Martin Robertz <dream-master@gmx.net> * fix crop manager log spam (#408) * Recipe fixes 2022/10/25 (#410) * Remove reflection from RTG Hatch (#411) * Fix Material Progression and Semifluid Gen Cost (#403) - Changed some materials used in GT++ material tier progression, because they require EBF coils above what is possible for the tier; - Changed fluid input on LV Semifluid Generator recipe from Bronze to Tin, since Bronze cannot be fluid extracted in LV; - Reduced the input count of items for those recipes, to bring it closer to the other generators. * spotlessApply Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * fix overclocking with 1 energy hatch * fix merging from master * allow tectech energy hatches * Update GT * NEI migration & cleanup Deprecate GTPP_Recipe_Map_Internal#sMappingsEx and delegate to GT_Recipe_Map#sMappings instead Remove recipe modification check * allow for parallel crafting in the QFT * Plasma consumption and their respective hatches * Initial Placeholders for QFT Recipes * spotless * get the fluids the correct way and make sure focusing requires neptunium * Boiler * New Plasma Recipes * Remove Unused Catalyst Code * Remove More Unused Code for Catalyst and Glass * Refactor Crafting and Focusing Tiers * spotlessApply (#441) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * remove useless code, make the structure definition static and final. * it works. * address review * spotlessApply (#442) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * there are no catalyst housing, no mufflers either. and no need to override more than needed * Crafting Casings Texture Update * address more reviews. also preemptive fix for constant neptunium consumption i am not doing more until tomorrow * Small cleanups * Programmed Circuit & Super Bus * I dare you use mName for shapes again. * Lower the number of fluid slots for multi mixer NEI * Updated Focusing Textures and Added Statics * Implementation of New Catalysts * Recipes for Everything * Spotless apply for branch Chem_Line_Skipper for #399 (#444) * make structure definition fields static (#443) * spotlessApply Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * add in a config option to change between animated and static textures * More Recipe Additions * spotless again * merge dev fixes. maybe this was it? this is hell * update how fluid mode works * update NEI * update gt dep * update gt version to the correct one. We need MUI god damnit * set animated textures on by default * BS+SA+fix * just a normal gt++ pr * Add Remaining Catalysts * FIXES * miozune request * update dependencies * add dense plates to be auto-genned * rework recipes of the QFT, make the recipe map accept it as a catalyst * add missed items to recipes * change around some recipes. fix NEI. fix some localization * do not set the recipe map for those hatches oops * hatches are pain * life a circle of pain * change the placement of the Fermium and Neptunium Hatch. add tooltip information about it * Add Kevlar recipe using bee comb Adds additional bonus and solely for kevlar * Fixed controller texture * do some fixes. updata dependencies * fix a small oopsie * wait what * Fix catalyst recipes * fix not building * quick spotless * Some tooltip fixes * Increase Fluid Input p/Tier on Recipe Tier Casings * Buff t1 costs * Increase Catalyst Costs to Near the QFT Cost * Some last bug fixes * Minimum energy hatches fix * Change last return statement * Spotless * Oil is not required in the QFT * Spotless again * prepare texture names for Sampsa * Sampsa's textures * Restore Old Unused Texture Changes * Update build.gradle * force field renderer and some fixes * forgot to make it render when working * make client side * remove uneeded things. add variables as local * fix parallels * spotless * fix parallels * quick thing to fix and prevent in the future * forgot to use the same item damage oops * fix to fluid mode. just edit the stacksize * use copyAmountUnsafe * update dependencies. fix overclocking * correct overclocking * lower amps you can use by 1/5th instead of 1/20th * Update dependencies.gradle * update BS * remove jitpack Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Runakai1 <Runatson@gmail.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java3
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java15
4 files changed, 67 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 25877d250c..1f59ecf2b1 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -426,10 +426,11 @@ public class BaseItemComponent extends Item {
PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma", OrePrefixes.cellPlasma),
CELL("Cell", " Cell", "cell", OrePrefixes.cell),
NUGGET("Nugget", " Nugget", "nugget", OrePrefixes.nugget),
- PLATEHEAVY("HeavyPlate", "Heavy@Plate", "plateHeavy", OrePrefixes.plateDense),
+ PLATEHEAVY("HeavyPlate", "Heavy@Plate", "plateHeavy", OrePrefixes.plateQuadruple),
SPRING("Spring", " Spring", "spring", OrePrefixes.spring),
SMALLSPRING("SmallSpring", "Small@Spring", "springSmall", OrePrefixes.springSmall),
FINEWIRE("FineWire", "Fine@Wire", "wireFine", OrePrefixes.wireFine),
+ PLATEDENSE("PlateDense", "Dense@Plate", "plateDense", OrePrefixes.plateDense),
;
private String COMPONENT_NAME;
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java
new file mode 100644
index 0000000000..580e028c00
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java
@@ -0,0 +1,11 @@
+package gtPlusPlus.core.item.base.plates;
+
+import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.material.Material;
+
+public class BaseItemPlateDense extends BaseItemComponent {
+
+ public BaseItemPlateDense(Material material) {
+ super(material, ComponentTypes.PLATEDENSE);
+ }
+}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 31e2492259..cabd9542f8 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -109,6 +109,20 @@ public class GenericChem extends ItemPackage {
public static ItemStack mSolidAcidCatalyst;
public static ItemStack mInfiniteMutationCatalyst;
+ // QFT Catalysts
+ public static ItemStack mPlatinumGroupCatalyst;
+ public static ItemStack mPlasticPolymerCatalyst;
+ public static ItemStack mRubberPolymerCatalyst;
+ public static ItemStack mAdhesionPromoterCatalyst;
+ public static ItemStack mTitaTungstenIndiumCatalyst;
+ public static ItemStack mRadioactivityCatalyst;
+ public static ItemStack mRareEarthGroupCatalyst;
+ public static ItemStack mSimpleNaquadahCatalyst;
+ public static ItemStack mAdvancedNaquadahCatalyst;
+ public static ItemStack mRawIntelligenceCatalyst;
+ public static ItemStack mUltimatePlasticCatalyst;
+ public static ItemStack mBiologicalIntelligenceCatalyst;
+
public static ItemStack mMillingBallAlumina;
public static ItemStack mMillingBallSoapstone;
@@ -156,6 +170,20 @@ public class GenericChem extends ItemPackage {
mFormaldehydeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 13, 1);
mSolidAcidCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 14, 1);
mInfiniteMutationCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 15, 1);
+
+ // QFT Catalysts
+ mPlatinumGroupCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 16, 1);
+ mPlasticPolymerCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 17, 1);
+ mRubberPolymerCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 18, 1);
+ mAdhesionPromoterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 19, 1);
+ mTitaTungstenIndiumCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 20, 1);
+ mRadioactivityCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 21, 1);
+ mRareEarthGroupCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 22, 1);
+ mSimpleNaquadahCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 23, 1);
+ mAdvancedNaquadahCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 24, 1);
+ mRawIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 25, 1);
+ mUltimatePlasticCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 26, 1);
+ mBiologicalIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 27, 1);
}
public void registerOreDict() {
@@ -176,6 +204,18 @@ public class GenericChem extends ItemPackage {
ItemUtils.addItemToOreDictionary(mFormaldehydeCatalyst, "catalystFormaldehyde");
ItemUtils.addItemToOreDictionary(mSolidAcidCatalyst, "catalystSolidAcid");
ItemUtils.addItemToOreDictionary(mInfiniteMutationCatalyst, "catalystInfiniteMutation");
+ ItemUtils.addItemToOreDictionary(mPlatinumGroupCatalyst, "catalystPlatinumGroup");
+ ItemUtils.addItemToOreDictionary(mPlasticPolymerCatalyst, "catalystPlasticPolymer");
+ ItemUtils.addItemToOreDictionary(mRubberPolymerCatalyst, "catalystRubberPolymer");
+ ItemUtils.addItemToOreDictionary(mAdhesionPromoterCatalyst, "catalystAdhesionPromoter");
+ ItemUtils.addItemToOreDictionary(mTitaTungstenIndiumCatalyst, "catalystTitaTungstenIndium");
+ ItemUtils.addItemToOreDictionary(mRadioactivityCatalyst, "catalystRadioactivity");
+ ItemUtils.addItemToOreDictionary(mRareEarthGroupCatalyst, "catalystRareEarthGroup");
+ ItemUtils.addItemToOreDictionary(mSimpleNaquadahCatalyst, "catalystSimpleNaquadah");
+ ItemUtils.addItemToOreDictionary(mAdvancedNaquadahCatalyst, "catalystAdvancedNaquadah");
+ ItemUtils.addItemToOreDictionary(mRawIntelligenceCatalyst, "catalystRawIntelligence");
+ ItemUtils.addItemToOreDictionary(mUltimatePlasticCatalyst, "catalystUltimatePlastic");
+ ItemUtils.addItemToOreDictionary(mBiologicalIntelligenceCatalyst, "catalystBiologicalIntelligence");
}
@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 35204999d1..b8a1bc4041 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -22,7 +22,7 @@ public class ItemGenericChemBase extends Item {
protected final IIcon base[];
- private final int aMetaSize = 16;
+ private final int aMetaSize = 28;
/*
* 0 - Red Metal Catalyst //FeCu
@@ -40,6 +40,19 @@ public class ItemGenericChemBase extends Item {
* 12 - Potassium Hydroxide // KOH
* 13 - Formaldehyde Catalyst //Fe16V1
* 14 - Solid Acid Catalyst //H2SO4
+ * 15 - Infinite Mutation Catalyst (for Mutated Living Solder)
+ * 16 - Platinum Group Catalyst (for platline skip)
+ * 17 - Plastic Polymer Catalyst (for early plastics skip)
+ * 18 - Rubber Polymer Catalyst (for early rubbers skip)
+ * 19 - Adhesion Promoter Catalyst (for glue/solder skip)
+ * 20 - Tita-Tungsten Indium Catalyst (for titanium/tungsten/indium skip)
+ * 21 - Radioactivity Catalyst (for 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)
*/
public ItemGenericChemBase() {