aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-01-25 05:22:14 +0000
committerGitHub <noreply@github.com>2023-01-25 05:22:14 +0000
commitd9f473283fa606662f57bbafdd49be37728b0eb0 (patch)
tree3797db9d52f714a5686675ba8a4b5d67c4ce6680 /src/main
parente197a79a0558c6ce1b116d871a71a214962a01a3 (diff)
downloadGT5-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')
-rw-r--r--src/main/java/gregtech/api/enums/Element.java2
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java3
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java30
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java107
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java39
-rw-r--r--src/main/java/gregtech/api/enums/SubTag.java4
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java4
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java8
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java37
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java9
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java32
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java13
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeRegistrator.java20
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java6
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java21
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings1.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java98
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java52
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java15
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java58
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java30
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java159
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java25
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java263
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java337
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java58
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java178
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java40
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java49
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java381
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java175
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java1507
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java79
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java30
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java1
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.pngbin0 -> 10519 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.magnetohydrodynamicallyconstrainedstarmatter.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.pngbin0 -> 2311 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.whitedwarfmatter.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.pngbin0 -> 10752 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.rawstarmatter.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.pngbin0 -> 14644 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.space.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.pngbin0 -> 6262 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.time.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLACKDWARFMATTER.pngbin0 -> 5168 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_WHITEDWARFMATTER.pngbin0 -> 5186 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.pngbin0 -> 6235 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block1.pngbin0 -> 5141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block2.pngbin0 -> 5594 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block3.pngbin0 -> 5427 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block4.pngbin0 -> 5634 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block5.pngbin0 -> 5108 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/block6.pngbin0 -> 5141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/foil.pngbin0 -> 5275 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/frameGt.pngbin0 -> 5333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/ore.pngbin0 -> 5010 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/oreSmall.pngbin0 -> 5132 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeHuge.pngbin0 -> 5144 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeLarge.pngbin0 -> 5048 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeMedium.pngbin0 -> 4991 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeNonuple.pngbin0 -> 4969 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeQuadruple.pngbin0 -> 5116 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSide.pngbin0 -> 4825 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeSmall.pngbin0 -> 4902 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/pipeTiny.pngbin0 -> 4879 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/void.pngbin0 -> 4762 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/WhiteDwarfMatter/wire.pngbin0 -> 5430 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/729.pngbin0 -> 5184 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/730.pngbin0 -> 5213 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/731.pngbin0 -> 5206 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/732.pngbin0 -> 5203 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/733.pngbin0 -> 5200 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/734.pngbin0 -> 5194 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/735.pngbin0 -> 5203 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/736.pngbin0 -> 5190 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/737.pngbin0 -> 5210 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/738.pngbin0 -> 5202 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/739.pngbin0 -> 5206 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/740.pngbin0 -> 5209 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/741.pngbin0 -> 5223 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/742.pngbin0 -> 5123 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/743.pngbin0 -> 5002 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/744.pngbin0 -> 5209 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/745.pngbin0 -> 5217 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/746.pngbin0 -> 5010 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/747.pngbin0 -> 5198 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/748.pngbin0 -> 5191 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/749.pngbin0 -> 5206 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/750.pngbin0 -> 5182 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/751.pngbin0 -> 5187 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/752.pngbin0 -> 5219 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/753.pngbin0 -> 10022 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/754.pngbin0 -> 10011 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/755.pngbin0 -> 10020 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/756.pngbin0 -> 5482 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.pngbin0 -> 3911 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/TURBINE_BLADE_OVERLAY.pngbin0 -> 5408 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.pngbin0 -> 1016 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtPlastic_OVERLAY.pngbin0 -> 729 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.pngbin0 -> 1016 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/arrowGtWood_OVERLAY.pngbin0 -> 726 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.pngbin0 -> 1356 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/bolt_OVERLAY.pngbin0 -> 4896 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.pngbin0 -> 7987 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/casingSmall_OVERLAY.pngbin0 -> 1082 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.pngbin0 -> 1320 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.pngbin0 -> 1320 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cellPlasma_OVERLAY.pngbin0 -> 290 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/MagnetohydrodynamicallyConstrainedStarMatter/cell_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items