diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-01-25 05:22:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 05:22:14 +0000 |
commit | d9f473283fa606662f57bbafdd49be37728b0eb0 (patch) | |
tree | 3797db9d52f714a5686675ba8a4b5d67c4ce6680 /src/main/java/gregtech/api/enums/OrePrefixes.java | |
parent | e197a79a0558c6ce1b116d871a71a214962a01a3 (diff) | |
download | GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.tar.gz GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.tar.bz2 GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.zip |
EOH materials + Allow materials to pick their processing tier (#1671)
* Begin addition of tiered material manipulation
* Dwarf matter
* Add hardcoded EU tiers for wider usage.
* New material images etc
* Nugget processing tiers
* Move iron nugget to wrought iron smelting to the correct place
* Add white dwarf shapes
* Add white dwarf shapes
* Additional retiering options for EU consumption on material part generation
* White dwarf matter complete
* Tier neutronium processing at ZPM
* Spotless
* More adjustments
* Renaming files
* Add new overlays for magneto material and more name adjustments
* Add no recipes subtag
* Spotless + name adjustment
* Undo isCustom to maintain potential public variable references in addons.
* Undo isCustom to maintain potential public variable references in addons.
* Fix fluid registry corruption.
* Add rotor EU override
* Add rotor EU override
* Make neutronium mass more reasonable
* Add proper time adjustments to rotor (probably an old oversight)
* Adjust enums to use VP rather than recalculate
* Fix typos on EU usage
* spotlessApply (#1672)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Change setProcessingMaterialTierEU to accept long.
* Small fix
* Add space and time materials
* Add new forge hammer support
* Update tooltip
* Expand laser engraver slots.
* spotlessApply (#1673)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Reserve texture page.
* Modernise GT circuit usage
* Add oversight in assembler frame recipe
* Add missing MHDCSM overlay textures
* Remove small and tiny MHDCSM dusts
* Fix error in ingot texture
* Fix NO_RECIPES not applying to frame boxes
* Restore missing ingot
* Add rod handles for materials
* Fix frame box auto generating with NO_RECIPEs tag
* recipe
* Spotless
* Add MOD_ID_GTPP as modid
* spotlessApply (#1675)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Remove smelting spacetime from furnace (why does this exist?)
* Recipes + new storage blocks for materials
* Bedrockium LuV -> EV
* SpaceTime UMV -> UIV
* TranscendentMetal UIV -> UEV
* MagnetoThingy and dward mats UXV -> UMV
* update buildscript
* yeet magic number that could be
* spotlessApply
* Make the nanite tier 3, colen request
* Up nanite tier
* Comment
* Change name
* Change name
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: adam riondy <adampoplol@gmail.com>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/api/enums/OrePrefixes.java')
-rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 7de2425df0..ffe60675d6 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -3261,6 +3261,21 @@ public enum OrePrefixes { ingot.mNotGeneratedItems.add(Materials.BrickNether); ingot.mNotGeneratedItems.add(Materials.WoodSealed); ingot.mNotGeneratedItems.add(Materials.Wood); + + plateDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + plateTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + plateQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + plateQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + cell.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingotQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + turbine.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dust.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dustSmall.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dustTiny.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + // ingot.mNotGeneratedItems.add(Materials.Ichorium); nugget.mNotGeneratedItems.add(Materials.Gold); plate.mNotGeneratedItems.add(Materials.Paper); @@ -3289,6 +3304,10 @@ public enum OrePrefixes { block.mNotGeneratedItems.add(Materials.Diamond); block.mNotGeneratedItems.add(Materials.Coal); toolHeadArrow.mNotGeneratedItems.add(Materials.Glass); + toolHeadArrow.mNotGeneratedItems.add(Materials.TranscendentMetal); + arrowGtPlastic.mNotGeneratedItems.add(Materials.TranscendentMetal); + arrow.mNotGeneratedItems.add(Materials.TranscendentMetal); + arrowGtWood.mNotGeneratedItems.add(Materials.TranscendentMetal); // ----- @@ -3334,9 +3353,17 @@ public enum OrePrefixes { nanite.mGeneratedItems.add(Materials.Silver); nanite.mGeneratedItems.add(Materials.TranscendentMetal); nanite.mGeneratedItems.add(Materials.Neutronium); + nanite.mGeneratedItems.add(Materials.WhiteDwarfMatter); + nanite.mGeneratedItems.add(Materials.BlackDwarfMatter); nanite.mGeneratedItems.add(Materials.Glowstone); // ----- + gear.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + ingot.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + toolHeadHammer.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + frame.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + frameGt.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + dust.mGeneratedItems.addAll(dustPure.mGeneratedItems); dust.mGeneratedItems.addAll(dustImpure.mGeneratedItems); dust.mGeneratedItems.addAll(dustRefined.mGeneratedItems); @@ -4162,8 +4189,16 @@ public enum OrePrefixes { } public void processOre(Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aMaterial != null - && (aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) + + if (aMaterial == null) { + return; + } + + if (aMaterial.contains(SubTag.NO_RECIPES)) { + return; + } + + if ((aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) && GT_Utility.isStackValid(aStack)) { // if (Materials.mPreventableComponents.contains(this) && !this.mDynamicItems.contains(aMaterial)) return; for (IOreRecipeRegistrator tRegistrator : mOreProcessing) { |