aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus
AgeCommit message (Collapse)Author
2024-07-24Fix free energy generation from LFTR (Thorium Reactor) during warm-up (#2743)ChangHwan Lee / 이창환
Update GregtechMTE_NuclearReactor.java
2024-07-24fix wrong list class (#2758)boubou19
2024-07-22Add maceration recipes for more meats (#2744)Pxx500
add meat macerating recipes
2024-07-21full RA1 removal (#2713)boubou19
* remove addExtractionRecipes * remove addPulverisationRecipe * remove thermalcraft fake compat * deprecate addAlloySmelterRecipe * remove fake compat * remove RA1 fusion recipe usage * remove RA1 centrifuge recipe usage * remove RA1 compressor recipe usage * remove RA1 electrolyzer recipe usage * remove RA1 chemical reactor recipe usage * deprecate GT based recipes adders * obliterate RA1 entries in interfaces (1/?) * remove RA1 blast furnace recipe usage * remove RA1 canner recipe usage * remove RA1 alloy smelter recipe usage * remove RA1 circuit assembler recipe usage * obliterate RA1 entries in interfaces (2/?) * remove RA1 bender recipe usage * clean class * remove RA1 cutter recipe usage * remove RA1 fuels recipe usage * remove RA1 implosion compressor recipe usage * remove RA1 thermal centrifuge recipe usage * clean GT_ModHandler * obliterate RA1 entries in interfaces (3/?) * remove RA1 packager recipe usage * remove RA1 lathe recipe usage * remove RA1 vacuum freezer recipe usage * remove RA1 fluid heater recipe usage * remove RA1 nano forge recipe usage * remove RA1 autoclave recipe usage * obliterate RA1 entries in interfaces (4/?) * remove RA1 cracker recipe usage * remove RA1 pyrolyse recipe usage * remove RA1 pulveriser recipe usage * remove RA1 fluid extractor recipe usage * remove RA1 assembly line recipe usage * remove RA1 alloy blast smelter recipe usage * remove RA1 coke oven recipe usage * obliterate RA1 entries in interfaces (5/?) * remove RA1 dehydrator recipe usage * remove deprecated usages * obliterate RA1 entries in interfaces (6/?) * remove RA1 assembler recipe usage * obliterate RA1 entries in interfaces (7/?) * remove RA1 mixer recipe usage * remove RA1 forge hammer recipe usage * remove RA1 wiremill recipe usage * remove RA1 extruder recipe usage * remove RA1 fluid soldifier recipe usage * remove RA1 chemical bath recipe usage * remove RA1 electromagnetic separator recipe usage * remove RA1 sifter recipe usage * remove distillery recipe usage * remove distillation tower usage * remove extractor usage * obliterate RA1 entries in interfaces (8/?) * remove QFT usage * cleaning * remove packager usage * remove fluid heater usage * remove vacuum freezer usage * remove distillery usage * fix QFT chances arrays * remove fission fuel usage * remove cyclotron usage * remove molecular transformer usage * remove chemplant usage * remove coldtrap and reactor processing unit usage * obliterate RA1 entries in interfaces (9/?) * spotlessApply * fixes * remove addRecipe calls * migrate forge of gods recipes * yeet special value calls (1 / 2) * yeet special value calls (2 / 2) * migrate GG Fuel recipes * migrate all GG maps except EHE * CORE.RA is no more * clear GT_RecipeAdder * remove dead code * clean RecipeMap a bit * spotless apply * fix output chances * Update RecipeLoader.java * fix * remove buggy recipe * migrate to enum for IDs * sort enum * move to enum * fix recipes * spotless apply * fix recipe * remove useless recipes * spotless apply * remove unused blocks * fix GT++ recipe * Update RecipeLoader.java * Update RecipeLoader.java * fix imports * Spotless apply for branch remove_RA1_calls for #2713 (#2742) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix recipe (cherry picked from commit a25d3b62997f080e064369e940eaf53a96a300e6) * fix (cherry picked from commit d9af01140f3ee77de2be18be70f04f8fbe4b547f) * temporarily remove panic mode * fix recipes * Revert "temporarily remove panic mode" This reverts commit 483cfcf74371b91e7d545f058f9d25ff4fcec95a. * fix recipes --------- Co-authored-by: Dream Master <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-07-19Mode switch button (#2730)Mary
* Button textures. Once again I am manually pulling changes from a different branch... sorry. If you want to read the full commit history, the modeswitchgui branch has it. * Texture enums * Implementation in ControllerWithOptionalFeatures * Implementation in GT_MetaTileEntity_MultiBlockBase * Implemented into all multi-machines * Lang changes * Added documentation * Added missing clear * Quick polish changes - button base texture is standard instead of pressed, and the click noise works. * MFE compatibility * TurboCan compatibility * Fix misordered icons in canner * Removed redundant code in button * Attempted to refactor with MachineMode enum. Also moved loadNBT and saveNBT logic to base class * sa * fix (cherry picked from commit 1f14a7abf460ad114f10e8ba58b6be44b7b18d48) * Rework machineMode into enum of IMachineMode completely * Fixed breaking typo * Made it stop crashing on normal multis that don't support mode switch * Revert * Finished revert and re-addressed changes from original review * spotless * Load nbt tags in correct order. Fixes backwards compat * Check nbt key on load instead * Run super last and make all MACHINEMODE static --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-07-18Added Water Pump (#2694)evgengoldwar
* Add Water Pump * Added check humidity * Apply spotless * Added tier 2 WaterPump * Added new textures and Fixed the display in nei * Optimizing imports * Fix tooltip * Added craft for Output hatch ULV, Wooden Casing, Water Pump * Apply spotless * sa+update deps * Delete the sky check method * sa * Rewrote WaterPump to SteamMultiBase. * Added a steam hatch to the structure and changed the tooltip * Spotless apply * Changed VoidProtection and calculate water generation * Remove star imports * Rename Wooden Casing to Primitive Wooden Casing * Remove enableMultiblock_WaterPump * Rename static variables * Change variables and tooltip * Sa --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-18Add a Multiblock Electromagnetic Separator (#2726)Mary
* Built multi template with required methods in gt++. * Filled out template based on gt++ electrolyzer code * Refactored into gregtech. Not supposed to add multis to gt++, whoops! * IntelliJ "smartly" deleted all of the imports in GT_Loader_MetaTileEntities and replaced it with a wildcard import... which caused it to fail checkstyle. Thanks so much, IntelliJ. * Figured out how to make IntelliJ Stop Doing That * Added author tag and vac freezer texture for testing. * Registered casing, working on getting texture functional * Added casing texture * Fixed structure check and added processing logic. Multi now forms and can run EMS recipes * Added overlay textures * Made new Casings10 class and added EMS Casings to it. Texture mesh now functions * Made controller match casing mesh * Shifted Casings10 to an actual page number instead of magic number. Now sits on page 16, following where waterline casings will be implemented in future * Added Electromagnet Housing. Has no texture, but you can place an open its inventory * Added electromagnets and their texture files * Multi now requires EM housing and breaks if there are 2 * Electromagnet Housing has proper texture and can be wrenched. Also has a placeholder overlay * Tooltip updates. Added pollution * Electromagnet tiers modify processing logic. Some issues remaining * Prettier switch & spotlessApply * Multi now validates electromagnet before recipe check. Also added a machine casing texture * Pollution fix * Support for exotic energy hatches added. Recipe check fails if electromagnet is too weak * Stack size of 1 for electromagnets * New electromagnet textures * Final pass on EM textures. Also, EM Housing uses IV hull as base texture instead of ULV * Put in placeholder-ish recipes for controller/casings/EM housing * Placeholder recipes for electromagnets. Also fixed structure check, whoops * Renamed multi to Magnetic Flux Exhibitor * MFE can run as a polarizer * Fixed exotic warning getting stuck * Attempted to add assline recipes, not working * Fixed assembling line recipe templates. Thank you chochem <3 * Fancied up tooltips * Fixed parallel issue * Updated recipes. Will have to move them to coremod * Nerfed speed on all electromagnets * sa * Restricted MFE to multiamp non-laser. * Spotless * Animated Mag hatch * Added glow * Removed pollution. I am a gentle soul * Addition to structure check * Disabled wireless laser compatibility * sa (cherry picked from commit 155cf4dd7284ca84bd9be79f11b6f577b38a4e0d) * spotless * Removed all recipes. These have been replaced in the coremod * -Removed unnecessary structure check -MIN_CASING final -Baps author tag -Refactored mMagHatch to not be a list -Added tooltip builder in MagnetTiers * Forgot to run spotless * Last minute tooltip fix for structure accuracy --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-18Fix steam multi (#2657)evgengoldwar
* Fix Bug * Fix Bug * Fix bug * Fix direction bug * Fix vertical rotated washer * Fix static variables
2024-07-15Amazon warehouse is now an unpackager too (#2723)ddoubleo
* Amazon warehouse is now an unpackager too * Fixed unpackager recipes not showing up in NEI for the Warehouse. Edited the tooltip * sa (cherry picked from commit e42861816ba516bd3da1f28d068a1e800e6098ee) --------- Co-authored-by: bdoubleo <user@MacBook-Pro-user.local> Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-14Rework Mega Alloy Blast Smelter bonuses (#2673)GDCloud
* redo mabs bonuses * split bonus calculations
2024-06-30add mold check for solidifier hatch (#2679)Quetz4l
* add mold check for solidifier hatch * code improvement for Solidifier hatch --------- Co-authored-by: Zereff06 <Zereff06@gmail.com>
2024-06-30Remove malus for steel variant of steam multiblocks (#2697)chochem
remove malus for steel variant
2024-06-30Adding information to Waila (#2674)evgengoldwar
* Adding information to Waila * sp * Added mode names to the lang file
2024-06-30fix tgs breaks tools when outputs are full + inversion buses (#2678)Quetz4l
* fix tgs breaks tools when outputs are full * code improvement for TGS * code improvement for TGS 2 --------- Co-authored-by: Zereff06 <Zereff06@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-06-29Fix tooltips and other typos in steam multis (#2696)chochem
* fix tooltip and typos in steam mac+comp * also fix new steam multis and add missing tooltips
2024-06-27Create Enum for gt++ and GG IDs (#2685)boubou19
* enum for goodgen ids * enum for gt++ ids * spotlessApply
2024-06-26LFTR chemistry fixes + samarium (III) chloride chemical formula fix (#2645)hallucinogender
* Update RecipeLoader_Nuclear.java Start of LFTR fixes. * Update MaterialGenerator.java * Corrected chemical formula of Li2CO3 + Ca(OH)2 * Fixed samarium chloride chemical formula * Revert item to fluid ratio change * Second round of fixes - Revert item:fluid ratio change from initial fix attempt - Recipes: - Autoclave: - 1 zirconium dust + 4000 chlorine = 1 zirconium pellet - Blast furnace: - Fixed chemistry of lithium tetrafluoroberyllate - Uses solid rule - Chemical bath: - Fixed chemistry of lithium fluoride from lithium carbonate - Chemical reactor: - Fixed chemistry of producing Li2CO3 + Ca(OH)2 compound dust - Ca(OH)2 is treated as 1 calcium + 2 oxygen + 2 hydrogen rather than 1 calcium + 2 hydroxide - This is for consistency with how it is produced and used elsewhere - Fixed chemistry of lithium fluoride from lithium hydroxide - Fixed chemistry of producing lithium hydroxide fluid - Fixed chemistry of beryllium hydroxide production - Uses solid rule - Fixed chemistry of ammonium bifluoride production - Uses solid rule - Fixed chemistry of sodium fluoride production - Dehydrator: - Fixed chemistry of using Li2CO3 + Ca(OH)2 compound dust - See previous note regarding calcium hydroxide - Fixed chemistry in both recipes for zirconium tetrafluoride dust - Preliminary fix for ammonium tetrafluoroberyllate production - Requires cell volume fix for molten fluids - Otherwise requires migrating to LCR - Preliminary fix for ammonium tetrafluoroberyllate dehydrating - Requires cell volume fix for molten fluids - Otherwise requires migrating to LCR - Macerator: - 1 zirconium pellet = 5 ZrCl4 dust - Mixer: - Fixed chemistry of uranium tetrafluoride production - This breaks LFTR balance, to be fixed once chemistry is fixed * Ammonium tetrafluoroberyllate recipes Fixes ammonium tetrafluoroberyllate recipes to circumvent currently-incorrect cell volumes by using dust forms of beryllium hydroxide, ammonium bifluoride, and beryllium fluoride. * Lithium tetrafluoroberyllate melting fix Reverted previous change to item:fluid ratio for lithium tetrafluoroberyllate. * Chemical formula adjustments Adjusted formula of calcium hydroxide to be consistent with how it is used everywhere (i.e. 1 part calcium, 2 parts oxygen, and 2 parts hydrogen, rather than 1 part calcium and 2 parts hydroxide as the previous formula implied). Also adjusted formula and name of the lithium carbonate + calcium hydroxide compound. * sa+bs * Update WerkstoffMaterialPool.java --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-06-26Remove crates (#2687)boubou19
* remove crates * Add placeholder oreprefix To be used in cases where a prefix is removed that isnt at the end of a list. Causes blank items for existing items * spotless --------- Co-authored-by: Caedis <Caedis@users.noreply.github.com>
2024-06-24Add oredict for LV and HV circuits (try no 2) (#2682)chochem
* blacklist ic2 ciruits from unificator * fix 2 circuit oredicts * move cleanroom assembler recipe * remove unittest that needs nhcoremod to work * fix electronic circuit recipe * move recipe to better place and avoid duplicates * move fluid filter recipe
2024-06-24Put some sanity in GT_MetaGenerated_Item_02/03 and in ↵boubou19
GT_MetaGenerated_Tool_01 (#2659) * enum work * sorting the class * extracting the enum in its own class * initial enum work for GT_MetaGenerated_Item_03 * split * finished enum work * extract enum in its own class * migrate to enum * remove duplicated recipes * sorted enums * extracted enum in its own class * spotless * fix compilation errors * spotless * fix mistake
2024-06-17Sludge fixes (and buff) (#2667)chochem
what a sludge
2024-06-09Fix Mega ABS coils discount (#2646)skyinr
Fix Coil Discount
2024-06-07Maintenance cleanup (#2632)HoleFish
* cleanup * waila * fix & compatibility --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-06-07Add Steam Multi (#2631)evgengoldwar
* add Steam Centrifuge * add Steam Washer * Change Steam Washer * Change Steam Multi * Fix tooltip Washer * Change Washer * Change Steam Multi * add id comment * update deps + sa * Added centrifuge tiers * Added washer tiers * Added compressor tiers * Added macerator tiers * Delete fixAllMaintenanceIssue(); * Delete fixAllMaintenanceIssue(); * Changed recipes * Added meaningful names * sa + update bs --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-06-06Fix Crop Manager description (#2642)Marek Frydrych
2024-06-05Make GT++ weights consistent with the other weights (#2636)boubou19
2024-05-26Mod load check refactors (#2621)chochem
* deprecate LoaderReference * replace all uses of LoaderReference * delete loaderreference * mod loaded checks in gagreg * remove modloaded checks for merged mods
2024-05-25fix fluid name (#2610)chochem
2024-05-24Fix launching the game, spotlessRaven Szewczyk
2024-05-24Fix gradle token references in addonsRaven Szewczyk
2024-05-24Merge addon sourcesRaven Szewczyk