aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_RecipeAdder.java
AgeCommit message (Collapse)Author
2022-10-01With recent changes, Allow PA to handle cell-less recipes (#1346)BlueWeabo
* add recipe maps, and allow PA to handle more than 1 fluid output * add some null checks * add forestry combs to the recipe map * safety null checks. * spotless
2022-09-19fix derps in GT_RecipeAdder (#1391)Alexdoru
2022-09-01Sodium potassium (#1322)Martin Robertz
* Add a new way get Sodium Potassium Add Fluid Sodium to gt * spotless remove old NAk and Helium cell recipes * derp * add liquid sodium texture (cherry picked from commit bd050330f91e0306e156f6a130783e867661338a) * add liquid sodium cells (cherry picked from commit 45f988cf3bbca43abf3f07a0a8e7ba891b8727a3) * move recipe to core mod (cherry picked from commit 7db15cd792136abac6fb88c9a7fa9d05f1f0619e) * add a heater recipe without a input fluid * Revert "move recipe to core mod" This reverts commit 9d5ff875a00e59c6edb52336b7d9c20889d9bd9b. * use fluid heater recipe without input fluid * Spotless apply for branch Sodium-Potassium for #1322 (#1328) * Two slots wiremill (#1324) * add a circuit slot to wiremil * add circuits to wire recipes * add 2 input slots to Wiremil * exchange circuit and material slot * add 2x-16x wires to wiremil * add missing 12x wires * add slot migration code (#1326) * spotlessApply (#1327) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * spotlessApply Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Revert "Spotless apply for branch Sodium-Potassium for #1322 (#1328)" This reverts commit 5bf31ffddfeddd1c4d161d434abb8402939ec9d6. * spotless * make fluid heater working with <1 fluid (cherry picked from commit 8045cf6f03d0ce030b8e7b2fa6c70dca6d9ccc5d) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2022-08-31Two slots wiremill (#1324)Martin Robertz
* add a circuit slot to wiremil * add circuits to wire recipes * add 2 input slots to Wiremil * exchange circuit and material slot * add 2x-16x wires to wiremil * add missing 12x wires * add slot migration code (#1326) * spotlessApply (#1327) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-27Update buildscript & apply spotless (#1306)Raven Szewczyk
* Update dependencies * Update buildscript, apply spotless
2022-08-05fix input and output (#1209)Yang Xizhi
@GTNH-Colen
2022-07-30Transcendent metal (almost) (#1171)Connor-Colenso
* New recipe methods. * Pulverise tesseracts * New pulveriser method * Cleanup code * Smelting/cooling methods * Super coolant * Add hot ingot Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-05DTPF Laser (#1100)Connor-Colenso
* DTPF Laser * exotic * Structure forms with TT laser, recipe broken. WIP. * Format amps in PA correctly. * Fix incorrect colouring on text. * New DTPF controller textures. * Update spacetime material. * Update DTPF texture * Update DTPF NEI page * Add spacetime wires * Tons of fixes/adjustments. * Localise achievements. * Typos * More fixes + move plasmas to mixer. * Spacetime adjustment * Spacetime blocks. * Spacetime wires. * Localise coils * Adjust DTPF fuels * Adjust DTPF fuels. * Stuff * Fix optimiser * DTPF * Depreciated Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
2022-06-24Kevlar (#1018)Martin Robertz
* add first recipes for Kevlar Line * merge conflict * add more materials and recipes for kevlar line * fix butanol naming (cherry picked from commit 808c91e2904314f67085c8cce2d579d6ac711bbb) * fix more Kevlar recipes (cherry picked from commit 3688dda0a8d4cd79edd76072d04a59fe4e8b3ca4) * fix more recipes (cherry picked from commit a527b22bd815629372c8dca98e579628b1128d46) * add more Kevlar stuff * add more materials for Kevlar Line * add more Materials and recipes for Kevlar (cherry picked from commit 448083f5c1789cd78cc1dc049c859c3bec4c2485) * Merge branch 'Kevlar' into dev # Conflicts: # src/main/java/gregtech/api/enums/Materials.java * add second maven from ic2 * overseen * add more kevlar materials and recipes * fix naming * fix metal block 9 was not set * fix materials and names (cherry picked from commit 3119d83ba53f43de6163de3f01edd6081f318cd6) * Fix Acetylen Material (cherry picked from commit d379365de519c503a78f68ce5ab2a3de02ff7852) * fix recipes (cherry picked from commit 2e2033773e1aa92224932fc93aaadaeacb83e8ba) * remove Calcium Hydroxide Formula * add ALF3 * make Nitrochlorobenzene backwards compatible fix a lot of recipes (cherry picked from commit ca2a59db88f036649f6d8ff4b5e5565c9da400c9) * add more Kevlar materials fix recipes remove Nitrobenzene 3 and 4 * remove 2 Buten 1,4 Diol fix recipes (cherry picked from commit 811549dc9f4f73e77752d5faef2b6d7243e6e625) * add spinnert Item, Woven and fiber kevlar add more materials add more recipes * fix derp (cherry picked from commit dc1e24753c39c70ad262f7bc2ce70d839a655942) * fix materials id derp (cherry picked from commit c7ba51ad846ae466054fb5e002fa8c634e3dfcad) * fix recipes (cherry picked from commit f8e6e32acaee563d3683b79980459bc464c6e716) * fix more recipe add Kevlar material add fiber and woven kevlar recipes (cherry picked from commit cc99809ea80f616ffe5c22e0d3f189a7b5cd7bdb) * add Spinneret recipe (cherry picked from commit 4db8497380b39edda8a00964613eae3a72cebbcb) * add Bromine add Liquid Kevlar Texture fix recipe add more Kevlar Materials (cherry picked from commit e2f96cb825f5ededaff3989b7e087b51b57a913c) * Fix recipes (cherry picked from commit e4f8d0d33f81f94124b733cbeb975ca0b4a33da2) * fix recipes (cherry picked from commit 7c6b7cdd0fd0720f58993faeaa81dd95d1b3757c) * Add more Kevlar recipes add more Materials (cherry picked from commit 9c35ca47e917fb2ac082ba5077e65001a7ab074a) * add more Materials (cherry picked from commit 12c598fe8784198c996eda3d5e072b829cf33ab8) * fix Kevlar recipes add more recipes * finish kevlar line (cherry picked from commit 39567610956ac02d3001f68851ddeb7e5d63aed7) * fix a few more recipes (cherry picked from commit e28283321ce1670d6684a47c0fd3fd263da8a6cb) * fix recipe (cherry picked from commit df89c96bc826b321f81c1c3af521469decdcff22) * try to add back single block distillation recipes * stupid me :) (cherry picked from commit 7fc6c375605d85b7cc791aa9818174a1cb2f7f59) * fix distillation recipes (cherry picked from commit e2351c4390b632b9e361a19ba03225c82766e455) * fix more recipes (cherry picked from commit 0fefb881e80659d41308dec85c59a114862aaf40) * remove not working texture (cherry picked from commit f70cdbf7e0138ed6cc867153693db527f04a78f8) * fix more recipes (cherry picked from commit 6c45aa36d4176af8f41e64a8758e31618ac56ab9) * rename chemicals (cherry picked from commit 4aa52352319b72bca6ec27ea65aba42bd293bb39) * fix recipes (cherry picked from commit 0885006add9ce78614a4a45cc8ae1d46a5b466d8) * remove unused Kevlar Materials (cherry picked from commit 69525c04a6505ef06e1f7cc6166aaba808b0ba26) * add more Kevlar changes (cherry picked from commit a16f12fe71fa65ce7706b049b5e94602cb676b37) * change Kevlar line a bit (cherry picked from commit b06cdb634125465e073adf1e09f1821b8794d243) * add Rhodium as compat metal (cherry picked from commit cfde983db03efec6d83367cbd5c13887eef6aa67) * fix texture set (cherry picked from commit 7f2f5508acb3613505522db98eef948c8e269892) * add more Kevlar recipes disable Rhodium GT dummy (cherry picked from commit 9389fe086e9d8a4bef92115a9eef8816fdf51c43) * fix recipes (cherry picked from commit 7dd26f59af45619c3cf2045edfb6c38198358cb0) * fix more recipes (cherry picked from commit b407abebd0ce1d5351b770a729d75fb3fc7a0e87) * fix more recipes (cherry picked from commit f2c24ea7fe4a2dfb9a95129d9a0c4b03b70f34d5) * fix kevlar recipes (cherry picked from commit fb9f937b7f31ab9f3f958a0a53772c82f0d55b64) * add chemical Formular (cherry picked from commit 5116ee58132bb1723c318e8f2c20b52f97da3b9d) * fix recipe (cherry picked from commit ce10e89e059946f7020219f2a79397862272d2ab) * fix circuit (cherry picked from commit 0ee7d4535dab0bb1a20665160f11bdf01efd411d) * fix most of the Kevelar recipes retier them remove potassium Nitrate its still Saltpeter (cherry picked from commit 49e1eec47c4c86044ce748d96dc5a11d1db68877) * add back Potassium Nitrate for compt reasons (cherry picked from commit eee82dc1783d40fe4b68d87ee0da646cc4ea5262) * fix more Kevlar recipes (cherry picked from commit aaaf2969da671cf923f7213f71e9c8eb89091e87) * fix name in Kevlar line (cherry picked from commit e7a883254d2c89f289453cdcd67be5dc1fc1c53a) * Lowered EU cost on Wood Tar - Lowered EU/t on the Wood Tar DT recipe from 256 to 224 EU/t (value suggested by Dream). The old value is just a bit too high for an HV Semifluid Generator to power the DT with the Creosote output, which forced lower tier generators and spam. * Removed DT Recipes and Added Alternatives - Removed circuits in DT recipes for the HV Oil and Benzene processing; - Added IV recipes to obtain the new chemicals for the Kevlar line (the Dimethylbenzene isomer and Naphthenic Acid), without changing the setup of players that were previously processing those for their early-mid game purposes. * Revert "Removed DT Recipes and Added Alternatives" This reverts commit 165ad2e4d196b5966af0fe282658f1bea3d579a9. * Revert "Lowered EU cost on Wood Tar" This reverts commit 420d0d5cd530d3e29164c3a9c384d4187a46495a. * fix Copper oxide use old Material Shift ids add melting Point (cherry picked from commit 488d6598513307bb4221bbb50904a32e5a0bd069) * Update GT_Loader_Item_Block_And_Fluid.java * MAchine REcipe code too large Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux8 <steelux7@gmail.com>
2022-06-20Added Use for Cactus/Sugar Coke in BBF (#1058)Steelux
* Added Use for Cactus/Sugar Coke in BBF - Added Cactus and Sugar Coke to the first Blast Furnace, with the same recipe time as Coal Coke but with 4x the amount needed, as these Cokes have 1/4 the burn time as Coal Coke. * Fix Item Name in getModItem
2022-06-19Add Plasma Forge (Endgame multi) (#1076)Connor-Colenso
* 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. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-04-08add 4 input and 4 output slots to ebf (#1004)Martin Robertz
(cherry picked from commit 131d67ab7a58a5b0c00a6e711ab4e7558e036d78)
2022-03-03remove hacky circuit oredict code (#955)Yang Xizhi
2021-12-15Move cache registration out of constructor (#806)Glease
2021-12-15Fix TT assline recipe not being recognized (#805)Glease
2021-12-08Fix assline oredict support (#786)Glease
* Fix assline oredict support * Fix assline hash generation depending on transient states
2021-12-08Distillation circuit (#784)Martin Robertz
* add input slots to Distillation Tower * borrow Large chemical reactor code to make it show up in Nei * add itemstack to Distillation multi machine code (cherry picked from commit e6e4203979340fc21f8ef4e1d6e9d0376afd3ef6) * remove unnecessary checks Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-28remove tiny dust in ore processGlodBlock
2021-11-11Add 4 Slots to mixer output at hvMartin Robertz
re add red steel and Blue Steel recipe (hv) change fluid tank in Ev Mixer
2021-10-16Merge pull request #670 from GTNewHorizons/Silicon-Alu-Autoclave-updateMartin Robertz
Silicon alu autoclave update
2021-10-02add Ore Multipler to cryositeDreamMasterXXL
add a fluid output to chembath add a SodiumHydroxide recipes out of Na and Water (cherry picked from commit 4a1618fa07e8dc90b4f5106e1928e2a63d96bd2f)
2021-09-27allow VF to accept fluid inputGlodBlock
2021-09-25add 4 slots to AutoclaveDreamMasterXXL
LV is 1 Slot MV is 2 Slots HV is 3 Slots EV is 4 Slots remove Silicon ebf recipe added new Sio2 recipes
2021-08-27fix(GT)Bender recipe adderDreamMasterXXL
change recipe "Wooden Raols"
2021-08-26rework(RC Rails)DreamMasterXXL
buff recipes for rebars, tracks and rails add circuit support to Bender
2021-08-22Actually fix the typoGlease
2021-08-22Fix typoGlease
2021-08-22Fix OpenComputer microchips related craftingGlease
2021-05-24feat(glow): iconset machines glow supportLéa Gris
- Add glow support for all sides and states of iconset machines (same as with basicmachines). Automated code cleanup with IDEA of: - Optiimise all imports (remove unused, sort) - Reorder all modifiers to the canonical preferred order (as stated in the Java Language Specification) - Add all missing @Override annotations
2021-02-01allow autoclave to have fluid out in recipekorneel vandamme
2021-01-17Remove a bunch of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17Added immutable version of getOres method, which is faster due to not using ↵TimeConqueror
#addAll
2020-05-16fix recipe map autoclaveDreamMasterXXL
2020-05-16fix low gravity recipesDreamMasterXXL
2020-05-16bee changesDreamMasterXXL
Autoclave get a new input slot
2020-04-10Void miner adjustments (#262)bartimaeusnek
* Added all Ores to Voidminer in DeepDark + removed Infinity Ore Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * renormalize line endings Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-01-17Fluxed electrum no mixer recipe, only shapeless #5366Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/5366
2019-06-12complain about null inputsJason Mitchell
2019-05-28reverted Optimised Images due to graphic bugs ingamebartimaeusnek
+this commit undoes https://github.com/GTNewHorizons/GT5-Unofficial/commit/2d8cbff191745bad46125cf492486f73b781e26a Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-05-15redid fake ODbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-03-03restored compability & removed duplicatesbartimaeusnek
+added more adding methodes to the cutting machine Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-03-03add a second intput slots to the cutter to add a circuitDream-Master
2019-02-15Update assemby line/ reserach station info in nei for scanner recipesAlkalus
2019-02-02change Neutronium comb recipe use more eu/t nowDream-Master
changed processing time and tier for cosmic neutronium, infinity catalyst and infinity
2018-12-09Also allow any number to be used while making ore dict thingsTechnus
2018-10-27+added fake oredict for CircuitAssemblerRecipes with Circuitsbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2018-10-06OreDictDuctTapebartimaeusnek
2018-09-08Various fixesbartimaeusnek
+Added GT-FML-Log +Added an Exception if a Nq reactor without recipe map is created +Added the ability to add ReinforcedGlass in the CleanroomWalls (https://github.com/GTNewHorizons/NewHorizons/issues/3584) +Added a config option for changing the ReinforcedGlass percentage +Renamed Materials2 -> GTNH_ExtraMaterials and fixed it
2018-02-04Chlorobenzene cannot be crafted in large chemical reactor #2553Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/2553 remove deprecated recipes change chemical reactor for basic machines a bit
2018-01-07Oredict support for asslineAntifluxfield