From ba6bc0844281558f35cce72b54267064f6d86208 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:03:38 +0100 Subject: Plasma forge fixes (#1086) * Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. * Update/fix plasma forge recipes. * Increase max hatch count. * Increase max hatch count and fix mixing energy hatches. Plus quick check for processing time. * Fix spacetime recipe. * Update spacetime textures and add new item textures. * Remove manual spacetime fluid addition. * Add custom fluid texture override ability. * Update infinity and spacetime to use new custom fluid override texture. * Depreciate old recipe adding methods. * Refactor GT NEI handler. * Remove unnecessary import. * Remove debug comment. * Clean up auto generated fluid code. * Fix NPE and add a few comments. * Refactor GT NEI handler. * Update NEI GUIs. * More NEI fixes. * Update LCR NEI GUI. * Update error message. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz --- src/main/java/gregtech/api/enums/Materials.java | 25 +- src/main/java/gregtech/api/enums/TextureSet.java | 12 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 15 +- src/main/java/gregtech/api/util/GT_Recipe.java | 2 +- src/main/java/gregtech/common/GT_Proxy.java | 38 +- .../multi/GT_MetaTileEntity_PlasmaForge.java | 11 +- .../loaders/postload/GT_MachineRecipeLoader.java | 81 +-- .../preload/GT_Loader_Item_Block_And_Fluid.java | 3 - .../java/gregtech/nei/GT_NEI_DefaultHandler.java | 622 ++++++--------------- .../blocks/fluids/fluid.molten.infinity.png | Bin 0 -> 4446 bytes .../blocks/fluids/fluid.molten.infinity.png.mcmeta | 37 ++ .../blocks/fluids/fluid.molten.spacetime.png | Bin 0 -> 17362 bytes .../fluids/fluid.molten.spacetime.png.mcmeta | 5 + .../textures/blocks/fluids/fluid.spacetime.png | Bin 17362 -> 0 bytes .../blocks/fluids/fluid.spacetime.png.mcmeta | 5 - .../materialicons/CUSTOM/spacetime/block1.png | Bin 0 -> 37428 bytes .../CUSTOM/spacetime/block1.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/block2.png | Bin 0 -> 38658 bytes .../CUSTOM/spacetime/block2.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/block3.png | Bin 0 -> 39350 bytes .../CUSTOM/spacetime/block3.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/block4.png | Bin 0 -> 39582 bytes .../CUSTOM/spacetime/block4.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/block5.png | Bin 0 -> 36288 bytes .../CUSTOM/spacetime/block5.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/block6.png | Bin 0 -> 37428 bytes .../CUSTOM/spacetime/block6.png.mcmeta | 1 + .../blocks/materialicons/CUSTOM/spacetime/foil.png | Bin 0 -> 27270 bytes .../materialicons/CUSTOM/spacetime/foil.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/frameGt.png | Bin 0 -> 26948 bytes .../CUSTOM/spacetime/frameGt.png.mcmeta | 1 + .../blocks/materialicons/CUSTOM/spacetime/ore.png | Bin 0 -> 6179 bytes .../materialicons/CUSTOM/spacetime/ore.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/oreSmall.png | Bin 0 -> 7001 bytes .../CUSTOM/spacetime/oreSmall.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeHuge.png | Bin 0 -> 29367 bytes .../CUSTOM/spacetime/pipeHuge.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeLarge.png | Bin 0 -> 33539 bytes .../CUSTOM/spacetime/pipeLarge.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeMedium.png | Bin 0 -> 33060 bytes .../CUSTOM/spacetime/pipeMedium.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeNonuple.png | Bin 0 -> 30021 bytes .../CUSTOM/spacetime/pipeNonuple.png.mcmeta | 1 + .../CUSTOM/spacetime/pipeQuadruple.png | Bin 0 -> 30481 bytes .../CUSTOM/spacetime/pipeQuadruple.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeSide.png | Bin 0 -> 29492 bytes .../CUSTOM/spacetime/pipeSide.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeSmall.png | Bin 0 -> 32169 bytes .../CUSTOM/spacetime/pipeSmall.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/pipeTiny.png | Bin 0 -> 31149 bytes .../CUSTOM/spacetime/pipeTiny.png.mcmeta | 1 + .../blocks/materialicons/CUSTOM/spacetime/void.png | Bin 0 -> 310 bytes .../materialicons/CUSTOM/spacetime/void.png.mcmeta | 1 + .../blocks/materialicons/CUSTOM/spacetime/wire.png | Bin 0 -> 35699 bytes .../materialicons/CUSTOM/spacetime/wire.png.mcmeta | 1 + .../gregtech/textures/gui/basicmachines/LCRNEI.png | Bin 0 -> 4969 bytes .../textures/gui/basicmachines/PlasmaForge.png | Bin 5010 -> 4969 bytes .../CUSTOM/spacetime/TURBINE_BLADE.png | Bin 0 -> 12557 bytes .../CUSTOM/spacetime/TURBINE_BLADE.png.mcmeta | 1 + .../CUSTOM/spacetime/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/arrowGtPlastic.png | Bin 0 -> 3583 bytes .../CUSTOM/spacetime/arrowGtPlastic.png.mcmeta | 1 + .../CUSTOM/spacetime/arrowGtPlastic_OVERLAY.png | Bin 0 -> 283 bytes .../materialicons/CUSTOM/spacetime/arrowGtWood.png | Bin 0 -> 3583 bytes .../CUSTOM/spacetime/arrowGtWood.png.mcmeta | 1 + .../CUSTOM/spacetime/arrowGtWood_OVERLAY.png | Bin 0 -> 294 bytes .../items/materialicons/CUSTOM/spacetime/bolt.png | Bin 0 -> 3207 bytes .../materialicons/CUSTOM/spacetime/bolt.png.mcmeta | 1 + .../CUSTOM/spacetime/bolt_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/casingSmall.png | Bin 0 -> 22934 bytes .../CUSTOM/spacetime/casingSmall.png.mcmeta | 1 + .../CUSTOM/spacetime/casingSmall_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/cell.png | Bin 0 -> 4178 bytes .../materialicons/CUSTOM/spacetime/cell.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/cellPlasma.png | Bin 0 -> 4178 bytes .../CUSTOM/spacetime/cellPlasma.png.mcmeta | 1 + .../CUSTOM/spacetime/cellPlasma_OVERLAY.png | Bin 0 -> 290 bytes .../CUSTOM/spacetime/cell_OVERLAY.png | Bin 0 -> 309 bytes .../materialicons/CUSTOM/spacetime/crateGtDust.png | Bin 0 -> 5380 bytes .../CUSTOM/spacetime/crateGtDust.png.mcmeta | 1 + .../CUSTOM/spacetime/crateGtDust_OVERLAY.png | Bin 0 -> 506 bytes .../materialicons/CUSTOM/spacetime/crateGtGem.png | Bin 0 -> 5264 bytes .../CUSTOM/spacetime/crateGtGem.png.mcmeta | 1 + .../CUSTOM/spacetime/crateGtGem_OVERLAY.png | Bin 0 -> 526 bytes .../CUSTOM/spacetime/crateGtIngot.png | Bin 0 -> 5246 bytes .../CUSTOM/spacetime/crateGtIngot.png.mcmeta | 1 + .../CUSTOM/spacetime/crateGtIngot_OVERLAY.png | Bin 0 -> 517 bytes .../CUSTOM/spacetime/crateGtPlate.png | Bin 0 -> 6430 bytes .../CUSTOM/spacetime/crateGtPlate.png.mcmeta | 1 + .../CUSTOM/spacetime/crateGtPlate_OVERLAY.png | Bin 0 -> 449 bytes .../materialicons/CUSTOM/spacetime/crushed.png | Bin 0 -> 16266 bytes .../CUSTOM/spacetime/crushed.png.mcmeta | 1 + .../CUSTOM/spacetime/crushedCentrifuged.png | Bin 0 -> 15211 bytes .../CUSTOM/spacetime/crushedCentrifuged.png.mcmeta | 1 + .../spacetime/crushedCentrifuged_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/crushedPurified.png | Bin 0 -> 17937 bytes .../CUSTOM/spacetime/crushedPurified.png.mcmeta | 1 + .../CUSTOM/spacetime/crushedPurified_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/crushed_OVERLAY.png | Bin 0 -> 480 bytes .../items/materialicons/CUSTOM/spacetime/dust.png | Bin 0 -> 12878 bytes .../materialicons/CUSTOM/spacetime/dust.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/dustImpure.png | Bin 0 -> 12878 bytes .../CUSTOM/spacetime/dustImpure.png.mcmeta | 1 + .../CUSTOM/spacetime/dustImpure_OVERLAY.png | Bin 0 -> 430 bytes .../materialicons/CUSTOM/spacetime/dustPure.png | Bin 0 -> 12878 bytes .../CUSTOM/spacetime/dustPure.png.mcmeta | 1 + .../CUSTOM/spacetime/dustPure_OVERLAY.png | Bin 0 -> 424 bytes .../materialicons/CUSTOM/spacetime/dustSmall.png | Bin 0 -> 6928 bytes .../CUSTOM/spacetime/dustSmall.png.mcmeta | 1 + .../CUSTOM/spacetime/dustSmall_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/dustTiny.png | Bin 0 -> 4089 bytes .../CUSTOM/spacetime/dustTiny.png.mcmeta | 1 + .../CUSTOM/spacetime/dustTiny_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/dust_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/foil.png | Bin 0 -> 17631 bytes .../materialicons/CUSTOM/spacetime/foil.png.mcmeta | 1 + .../CUSTOM/spacetime/foil_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/gearGt.png | Bin 0 -> 19146 bytes .../CUSTOM/spacetime/gearGt.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/gearGtSmall.png | Bin 0 -> 10024 bytes .../CUSTOM/spacetime/gearGtSmall.png.mcmeta | 1 + .../CUSTOM/spacetime/gearGtSmall_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/gearGt_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/gem.png | Bin 0 -> 21056 bytes .../materialicons/CUSTOM/spacetime/gem.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/gemChipped.png | Bin 0 -> 14911 bytes .../CUSTOM/spacetime/gemChipped.png.mcmeta | 1 + .../CUSTOM/spacetime/gemChipped_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/gemExquisite.png | Bin 0 -> 26974 bytes .../CUSTOM/spacetime/gemExquisite.png.mcmeta | 1 + .../CUSTOM/spacetime/gemExquisite_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/gemFlawed.png | Bin 0 -> 17411 bytes .../CUSTOM/spacetime/gemFlawed.png.mcmeta | 1 + .../CUSTOM/spacetime/gemFlawed_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/gemFlawless.png | Bin 0 -> 19394 bytes .../CUSTOM/spacetime/gemFlawless.png.mcmeta | 1 + .../CUSTOM/spacetime/gemFlawless_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/gem_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/handleMallet.png | Bin 0 -> 6727 bytes .../CUSTOM/spacetime/handleMallet.png.mcmeta | 1 + .../CUSTOM/spacetime/handleMallet_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/ingot.png | Bin 0 -> 19265 bytes .../CUSTOM/spacetime/ingot.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/ingotDouble.png | Bin 0 -> 25917 bytes .../CUSTOM/spacetime/ingotDouble.png.mcmeta | 1 + .../CUSTOM/spacetime/ingotDouble_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/ingotHot.png | Bin 0 -> 18967 bytes .../CUSTOM/spacetime/ingotHot.png.mcmeta | 1 + .../CUSTOM/spacetime/ingotHot_OVERLAY.png | Bin 0 -> 309 bytes .../CUSTOM/spacetime/ingotQuadruple.png | Bin 0 -> 31010 bytes .../CUSTOM/spacetime/ingotQuadruple.png.mcmeta | 1 + .../CUSTOM/spacetime/ingotQuadruple_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/ingotQuintuple.png | Bin 0 -> 32076 bytes .../CUSTOM/spacetime/ingotQuintuple.png.mcmeta | 1 + .../CUSTOM/spacetime/ingotQuintuple_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/ingotTriple.png | Bin 0 -> 28166 bytes .../CUSTOM/spacetime/ingotTriple.png.mcmeta | 1 + .../CUSTOM/spacetime/ingotTriple_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/ingot_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/lens.png | Bin 0 -> 15361 bytes .../materialicons/CUSTOM/spacetime/lens.png.mcmeta | 1 + .../CUSTOM/spacetime/lens_OVERLAY.png | Bin 0 -> 567 bytes .../materialicons/CUSTOM/spacetime/nugget.png | Bin 0 -> 6781 bytes .../CUSTOM/spacetime/nugget.png.mcmeta | 1 + .../CUSTOM/spacetime/nugget_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/plate.png | Bin 0 -> 16213 bytes .../CUSTOM/spacetime/plate.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/plateDense.png | Bin 0 -> 17976 bytes .../CUSTOM/spacetime/plateDense.png.mcmeta | 1 + .../CUSTOM/spacetime/plateDense_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/plateDouble.png | Bin 0 -> 18400 bytes .../CUSTOM/spacetime/plateDouble.png.mcmeta | 1 + .../CUSTOM/spacetime/plateDouble_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/plateQuadruple.png | Bin 0 -> 21739 bytes .../CUSTOM/spacetime/plateQuadruple.png.mcmeta | 1 + .../CUSTOM/spacetime/plateQuadruple_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/plateQuintuple.png | Bin 0 -> 22520 bytes .../CUSTOM/spacetime/plateQuintuple.png.mcmeta | 1 + .../CUSTOM/spacetime/plateQuintuple_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/plateTriple.png | Bin 0 -> 20218 bytes .../CUSTOM/spacetime/plateTriple.png.mcmeta | 1 + .../CUSTOM/spacetime/plateTriple_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/plate_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/ring.png | Bin 0 -> 9786 bytes .../materialicons/CUSTOM/spacetime/ring.png.mcmeta | 1 + .../CUSTOM/spacetime/ring_OVERLAY.png | Bin 0 -> 174 bytes .../items/materialicons/CUSTOM/spacetime/rotor.png | Bin 0 -> 11822 bytes .../CUSTOM/spacetime/rotor.png.mcmeta | 1 + .../CUSTOM/spacetime/rotor_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/round.png | Bin 0 -> 4338 bytes .../CUSTOM/spacetime/round.png.mcmeta | 1 + .../CUSTOM/spacetime/round_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/screw.png | Bin 0 -> 4316 bytes .../CUSTOM/spacetime/screw.png.mcmeta | 1 + .../CUSTOM/spacetime/screw_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/spring.png | Bin 0 -> 18630 bytes .../CUSTOM/spacetime/spring.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/springSmall.png | Bin 0 -> 7526 bytes .../CUSTOM/spacetime/springSmall.png.mcmeta | 1 + .../CUSTOM/spacetime/springSmall_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/spring_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/stick.png | Bin 0 -> 5553 bytes .../CUSTOM/spacetime/stick.png.mcmeta | 1 + .../materialicons/CUSTOM/spacetime/stickLong.png | Bin 0 -> 2894 bytes .../CUSTOM/spacetime/stickLong.png.mcmeta | 1 + .../CUSTOM/spacetime/stickLong_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/stick_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadArrow.png | Bin 0 -> 7372 bytes .../CUSTOM/spacetime/toolHeadArrow.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadArrow_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/toolHeadAxe.png | Bin 0 -> 6553 bytes .../CUSTOM/spacetime/toolHeadAxe.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadAxe_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadBuzzSaw.png | Bin 0 -> 19146 bytes .../CUSTOM/spacetime/toolHeadBuzzSaw.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadBuzzSaw_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadChainsaw.png | Bin 0 -> 8184 bytes .../CUSTOM/spacetime/toolHeadChainsaw.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadChainsaw_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadDrill.png | Bin 0 -> 8150 bytes .../CUSTOM/spacetime/toolHeadDrill.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadDrill_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadFile.png | Bin 0 -> 7096 bytes .../CUSTOM/spacetime/toolHeadFile.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadFile_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadHammer.png | Bin 0 -> 6599 bytes .../CUSTOM/spacetime/toolHeadHammer.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadHammer_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/toolHeadHoe.png | Bin 0 -> 4471 bytes .../CUSTOM/spacetime/toolHeadHoe.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadHoe_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadMallet.png | Bin 0 -> 5126 bytes .../CUSTOM/spacetime/toolHeadMallet.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadMallet_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadPickaxe.png | Bin 0 -> 7394 bytes .../CUSTOM/spacetime/toolHeadPickaxe.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadPickaxe_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadPlow.png | Bin 0 -> 7591 bytes .../CUSTOM/spacetime/toolHeadPlow.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadPlow_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/toolHeadSaw.png | Bin 0 -> 6586 bytes .../CUSTOM/spacetime/toolHeadSaw.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadSaw_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadScrewdriver.png | Bin 0 -> 5360 bytes .../spacetime/toolHeadScrewdriver.png.mcmeta | 1 + .../spacetime/toolHeadScrewdriver_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadSense.png | Bin 0 -> 4509 bytes .../CUSTOM/spacetime/toolHeadSense.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadSense_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadShovel.png | Bin 0 -> 5461 bytes .../CUSTOM/spacetime/toolHeadShovel.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadShovel_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadSoldering.png | Bin 0 -> 4781 bytes .../CUSTOM/spacetime/toolHeadSoldering.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadSoldering_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadSword.png | Bin 0 -> 7808 bytes .../CUSTOM/spacetime/toolHeadSword.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadSword_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadUniversalSpade.png | Bin 0 -> 5745 bytes .../spacetime/toolHeadUniversalSpade.png.mcmeta | 1 + .../spacetime/toolHeadUniversalSpade_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/toolHeadWrench.png | Bin 0 -> 6316 bytes .../CUSTOM/spacetime/toolHeadWrench.png.mcmeta | 1 + .../CUSTOM/spacetime/toolHeadWrench_OVERLAY.png | Bin 0 -> 143 bytes .../CUSTOM/spacetime/turbineBlade.png | Bin 0 -> 12557 bytes .../CUSTOM/spacetime/turbineBlade.png.mcmeta | 1 + .../CUSTOM/spacetime/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/CUSTOM/spacetime/void.png | Bin 0 -> 310 bytes .../materialicons/CUSTOM/spacetime/void.png.mcmeta | 1 + .../CUSTOM/spacetime/void_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/CUSTOM/spacetime/wireFine.png | Bin 0 -> 12053 bytes .../CUSTOM/spacetime/wireFine.png.mcmeta | 1 + .../CUSTOM/spacetime/wireFine_OVERLAY.png | Bin 0 -> 271 bytes 273 files changed, 420 insertions(+), 528 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.infinity.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.infinity.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.spacetime.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.spacetime.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spacetime.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spacetime.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/LCRNEI.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/TURBINE_BLADE.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/TURBINE_BLADE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/TURBINE_BLADE_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtPlastic.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtPlastic.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtPlastic_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtWood.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtWood.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtWood_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/bolt.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/bolt.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/bolt_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/casingSmall.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/casingSmall.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/casingSmall_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cell.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cellPlasma.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cellPlasma.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cellPlasma_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cell_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtDust.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtDust.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtDust_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtGem.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtGem.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtGem_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtIngot.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtIngot.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtIngot_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtPlate.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtPlate.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtPlate_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushed.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushed.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedCentrifuged.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedCentrifuged.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedCentrifuged_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedPurified.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedPurified.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedPurified_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushed_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dust.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dust.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustImpure.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustImpure.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustImpure_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustPure.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustPure.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustPure_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustSmall.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustSmall.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustSmall_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustTiny.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustTiny.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustTiny_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dust_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/foil.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/foil.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/foil_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGt.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGt.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGtSmall.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGtSmall.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGtSmall_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGt_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gem.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gem.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemChipped.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemChipped.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemChipped_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemExquisite.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemExquisite.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemExquisite_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemFlawed.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemFlawed.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemFlawed_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemFlawless.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemFlawless.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemFlawless_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gem_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/handleMallet.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/handleMallet.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/handleMallet_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingot.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingot.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotHot.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotHot.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotHot_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingot_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/lens.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/lens.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/lens_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/nugget.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/nugget.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/nugget_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plate.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plate.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateDense.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateDense.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateDense_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateDouble.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateDouble.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateDouble_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateQuadruple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateQuadruple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateQuadruple_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateQuintuple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateQuintuple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateQuintuple_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateTriple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateTriple.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plateTriple_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/plate_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ring.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ring.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ring_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/rotor.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/rotor.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/rotor_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/round.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/round.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/round_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/screw.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/screw.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/screw_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/spring.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/spring.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/springSmall.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/springSmall.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/springSmall_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/spring_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/stick.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/stick.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/stickLong.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/stickLong.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/stickLong_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/stick_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadArrow.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadArrow.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadArrow_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadAxe.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadAxe.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadAxe_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadBuzzSaw.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadBuzzSaw.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadBuzzSaw_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadChainsaw.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadChainsaw.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadChainsaw_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadDrill.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadDrill.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadDrill_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadFile.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadFile.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadFile_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadHammer.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadHammer.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadHammer_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadHoe.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadHoe.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadHoe_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadMallet.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadMallet.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadMallet_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadPickaxe.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadPickaxe.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadPickaxe_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadPlow.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadPlow.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadPlow_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSaw.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSaw.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSaw_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadScrewdriver_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSense.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSense.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSense_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadShovel.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadShovel.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadShovel_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSoldering.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSoldering.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSoldering_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSword.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSword.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadSword_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadUniversalSpade.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadUniversalSpade.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadUniversalSpade_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadWrench.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadWrench.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/toolHeadWrench_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/turbineBlade.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/turbineBlade.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/turbineBlade_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/void.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/void.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/void_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/wireFine.png create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/wireFine.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/wireFine_OVERLAY.png (limited to 'src') diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index a2069f0d05..4b36ce74ee 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -817,7 +817,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { */ //TODO: add other op materials? maybe some new ores or new only fusion made op materials from op materials??? like neutronium bedrockium alloy etc. public static Materials InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ); - public static Materials Infinity = new Materials( 397, TextureSet.SET_CUSTOM("infinity"), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ); + public static Materials Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ); public static Materials Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial(); public static Materials Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 51200, 8, 1|2 |8 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeLightGray ).disableAutoGeneratedBlastFurnaceRecipes(); public static Materials Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 7, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ); @@ -859,7 +859,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials DimensionallyTranscendentResidue = new Materials( 589, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 0, 1, "DimensionallyTranscendentResidue" , "Dimensionally Transcendent Residue" , -1, -1, 25, 1, false, true, 1, 1, 1, Dyes.dyeBlack); - public static Materials SpaceTime = new Materials( 588, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 255, 240, "SpaceTime" , "SpaceTime" , -1, -1, 14, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))); + public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 1.0F, 0, 2, 1|2|16|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 14, 0, false, true, 2, 1, 1, Dyes._NULL , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))); + /** * Materials which are renamed automatically @@ -2256,10 +2257,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addHasGasFluid(Materials aMaterial, String aConfigPath) { - if (aMaterial.mHasPlasma = GregTech_API.sMaterialProperties.get(aConfigPath, "AddPlasma", aMaterial.mHasPlasma)) - GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(aMaterial); - if (aMaterial.mHasGas = GregTech_API.sMaterialProperties.get(aConfigPath, "AddGas", aMaterial.mHasGas)) - GT_Mod.gregtechproxy.addFluid(aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName, aMaterial, 2, aMaterial.mGasTemp); +// System.out.println("ABC4321 " + aMaterial.mDefaultLocalName + " " + aMaterial.mIconSet.is_custom + " " + aMaterial.mName); +// if (aMaterial.mDefaultLocalName.toLowerCase().contains("spacetime")) { +//// GT_Mod.gregtechproxy.addFluid("molten.spacetime", "Molten SpaceTime", Materials.SpaceTime, 0, 0, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SpaceTime, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 100); +// System.out.println("TESTING 1234"); +// System.out.println("ABC4321 " + aMaterial.mDefaultLocalName + " " + aMaterial.mIconSet.is_custom + " " + aMaterial.mName + " " + aMaterial.mHasPlasma + " " + aMaterial.mHasGas); +// return; +// } + + if (aMaterial.mIconSet.is_custom) { + return; + } else { + if (aMaterial.mHasPlasma = GregTech_API.sMaterialProperties.get(aConfigPath, "AddPlasma", aMaterial.mHasPlasma)) + GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(aMaterial); + if (aMaterial.mHasGas = GregTech_API.sMaterialProperties.get(aConfigPath, "AddGas", aMaterial.mHasGas)) + GT_Mod.gregtechproxy.addFluid(aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName, aMaterial, 2, aMaterial.mGasTemp); + } } private static void addInternalStuff(Materials aMaterial, String aConfigPath) { diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index fd82fd676e..6e6ef99e36 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -1,12 +1,9 @@ package gregtech.api.enums; - import gregtech.api.interfaces.IIconContainer; public class TextureSet { - public static final TextureSet SET_CUSTOM(String aTextureFileName) { - return new TextureSet("CUSTOM/" + aTextureFileName); - } + public boolean is_custom = false; public static final TextureSet SET_NONE = new TextureSet("NONE"), @@ -56,6 +53,7 @@ public class TextureSet { private static final String aTextVoidDir = "/void"; public TextureSet(String aSetName) { + boolean is_custom = false; mSetName = aSetName; mTextures[0] = new Textures.ItemIcons.CustomIcon(aTextMatIconDir + mSetName + "/dustTiny"); mTextures[1] = new Textures.ItemIcons.CustomIcon(aTextMatIconDir + mSetName + "/dustSmall"); @@ -186,4 +184,10 @@ public class TextureSet { mTextures[126] = new Textures.ItemIcons.CustomIcon(aTextMatIconDir + mSetName + "/handleMallet"); mTextures[127] = new Textures.ItemIcons.CustomIcon(aTextMatIconDir + mSetName + "/toolHeadMallet"); } + + public TextureSet(String aSetName, boolean is_custom) { + this("CUSTOM/" + aSetName); + this.is_custom = is_custom; + } + } diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index fb2f15f49a..4f4f174330 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -23,21 +23,22 @@ public interface IGT_RecipeAdder { * @param aEnergyNeededForStartingFusion = EU needed for heating the Reactor up (must be >= 0) * @return true if the Recipe got added, otherwise false. */ + + @Deprecated boolean addFusionReactorRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion); /** * Adds a Fusion Reactor Recipe * - * @param FluidOutputArray : Array of input fluids. - * @param FluidOutputArray : Array of output fluids. + * @param FluidOutputArray : Array of input fluids. Up to 16. + * @param FluidOutputArray : Array of output fluids. Up to 16. * @param aFusionDurationInTicks : How many ticks the Fusion lasts (must be > 0). - * @param aFusionEnergyPerTick : The EU generated per Tick (can even be negative!). - * @param aEnergyNeededForStartingFusion : EU needed for heating the Reactor up (must be >= 0). - * @return true if the Recipe got added, otherwise false. + * @param aFusionEnergyPerTick : The EU consumed per tick to keep the reaction going. + * @param aEnergyNeededForStartingFusion : EU needed to initialize the fusion reaction. (must be >= 0). + * @return true if the recipe got added, otherwise false. */ boolean addFusionReactorRecipe(FluidStack[] FluidInputArray, FluidStack[] FluidOutputArray, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion); - /** * Adds a Centrifuge Recipe * @@ -656,11 +657,13 @@ public interface IGT_RecipeAdder { /** * Adds a Recipe for the Laser Engraver. */ + @Deprecated boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt); /** * Adds a Recipe for the Laser Engraver. */ + @Deprecated boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt, boolean aCleanroom); /** diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 833059f195..1907245715 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1966,7 +1966,7 @@ public class GT_Recipe implements Comparable { private static final int FLUID_OUTPUT_COUNT = 4; public GT_Recipe_Map_LargeChemicalReactor() { - super(new HashSet<>(1000), "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, RES_PATH_GUI + "basicmachines/Default", 2, OUTPUT_COUNT, 0, 0, 1, E, 1, E, true, true); + super(new HashSet<>(1000), "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, RES_PATH_GUI + "basicmachines/LCRNEI", 2, OUTPUT_COUNT, 0, 0, 1, E, 1, E, true, true); } @Override diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 8491ea328c..dc8ca19220 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1821,25 +1821,42 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { return 0; } + + // ------------------------ Adds all fluids corresponding to materials ------------------------ + public Fluid addAutoGeneratedCorrespondingFluid(Materials aMaterial){ - return addFluid(aMaterial.mName.toLowerCase(Locale.ENGLISH), "molten.autogenerated", aMaterial.mDefaultLocalName, aMaterial, - aMaterial.mRGBa, 1, aMaterial.getLiquidTemperature(), GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L), 1000); - } + // If the fluid is registered as custom inside the Material's constructor then to add custom fluid + // textures go to blocks/fluids and place the .png. File should be called fluid.fluid.{unlocalised_name}.png. All lower case. + Str