aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2024-07-25Fix Compact Fusion and Fusion and Cyclotron sound (#2738)evgengoldwar
* Fix sound for Compact Fusion * Fix sound for Cyclotron * Fix sound for Fusion * Apply spotless
2024-07-25Update multi-machines to display running mode in GUI (#2755)Mary
* Framework for mode text in gui * Add getMachineModeName to all multimachines * Changed lang file for MFE because "Electromagnetic Polarizer" and "Electromagnetic Separator" are too long and make the GUI look bad * Removed leftover code * Removed more leftover code... oops * Moved logic to base class and made mode switch chat message localizable * Merge caused spotless to fail, I guess * Reverted logic from parent class * ahhhh spotless
2024-07-24Second batch of fixes for new multis (#2759)Mary
* Fixed MFE appearing as header for its NEI recipe categories over singleblock machines, also fixed showing multiamp hatch in NEI preview * Same fix to recipe categories for TurboCan * Locked maghatch to a specific casing to prevent clever wallsharing setups that would allow you to duplicate magnet usage * spotless * Tooltip adjusted for new hatch placement
2024-07-24MFE bugfix (#2754)Mary
* Fix class of MFE for multiamp * Obsolete dependency * Added to canner as well * spotless...
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-20Beamline (#2619)Raven Szewczyk
* Beamline * Remove hardcoded dreamcraft items and spotless * Remove logs and fix auto structure check * Remove logs and fix auto structure check * Fix typo and synchrotron high MF scaling * sa (cherry picked from commit b2796d95538a1b683b4a98bf6cb0f8fe21404fbd) * Add multi textures, add structuredesc info, remove test TC input, add synchrotron/input/output recipes * Spotless * Prevent mob spawning on casings * Fix LINAC glass requirement, make synchrotron structure less ugly, add last recipe * Spotless * Add placeholder particle textures * Add some mask recipes I missed * Spotless apply for branch lanth-beamline for #2619 (#2630) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add further error messages to LINAC and Synchrotron, fix MM & LaB6 recipes * Spotless apply for branch lanth-beamline for #2619 (#2648) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Minor changes, add more multi error messages & 9x U-238 SC recipe * Spotless apply for branch lanth-beamline for #2619 (#2651) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Missed a change * Spotless apply for branch lanth-beamline for #2619 (#2652) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Update beamline desc * Remove comments, move coolant fluid check to Util class * Spotless * Spotless apply for branch lanth-beamline for #2619 (#2666) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Fix Mu-Metal recipe output amount, tool stats for MM & LaB6 * Spotless * Fix multi hatch textures * Spotless apply for branch lanth-beamline for #2619 (#2676) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Increase Synchrotron output rate eut & antenna tier scaling, in general improve output rates, buff all TC recipes' processing time * Fix misleading BL tooltip * update * remove import * Buff higher-tier wafer recipes for each IC, from a 4x to 3x increase of recipe amount per two wafer tier increases * Remove RA1 calls in beamline (#2716) * Spotless apply for branch lanth-beamline for #2619 (#2717) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix * Spotless apply for branch lanth-beamline for #2619 (#2733) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: unknown <gtandemmodding@gmail.com> Co-authored-by: Elisis <jarrad.thomson@gmail.com> Co-authored-by: Martin Robertz <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-19Fix hatches voiding if they fail an output check (#2734)Sampsa
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 wireless computation and data stick hatches (#2724)NotAPenguin
* start on wireless computation * initial implementation of wireless computation hatch * Implement wireless data sticks * Fix wireless computation by simplifying the implementation greatly * Delete dead code * Add scanner output for wireless computation in network * Rename wireless computation hatch to cloud hatch * Final rename to client/server
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-18Add a multiblock for Fluid Canner/Canner (#2729)Mary
* Ported changes from canner-dev branch because I have thoroughly messed up my branch management. * Renamed multi, fixed textures, spotless
2024-07-15Add DroneHatch to fusion reactor (#2670)RealSilverMoon
* Add DroneHatch to fusion reactor * Reduce input hatch requirement * Change location to avoid conflict
2024-07-12Implement cache limits on ME Output Hatch & Bus (#2718)Sampsa
* Implement cache limits on ME output hatches and buses * Make void excess actually void excess * Spotless my beloved * Add method to change base capacity * Make existing hatches have infinite cache and implement dynamic tooltip for current cache size * Improve dynamic tooltip and allow persisitng base cache modifications * Spotless spotless spotless spotless * Remove some unused code
2024-07-09MultiTileEntityBlock workJason Mitchell
* Merge MultiTileEntityBlockRegistryInternal into MultiTileEntityBlock * Add a hard dep on NEID for meta extension * Use in world block meta for MuTE ID * Use one block per MuTE Registry * Add WeakTargetRef * Migrate `controller` reference for parts over to a non non cachable WeakTargetRef * Migrate controller WeakReference usage to WeakTargetRef
2024-07-09RefactorsJason Mitchell
2024-07-09Firebrick fixes (#2712)chochem
* fix firebrick * fix forgehammer recipe
2024-07-06Add config to spray can (#2710)HoleFish
2024-07-02Fix DTPF convergence void protection machine crash (#2703)GDCloud
fix crash with void protection
2024-07-02Removal of the GT Arrows (#2692)boubou19
* remove arrows * remove arrow classes * remove arrow usages in ItemList * less bullshit * sa --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-07-02Add Dimensional Convergence, a new DTPF mode (#2669)GDCloud
* store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * Add bonus for using higher tier CoAl casings (#2668) * add bonus for higher tier casings * add tooltip info * Fix a vat recipe conflict (#2677) add circuit * update * Fix EBF & multi smelter scanner info (#2681) fix * Put some sanity in GT_MetaGenerated_Item_01 (#2649) * set coin ids in enum * extract coin shapeless recipes * Arrows * splitting more * mold shapes * big split * split behaviors * spotless * enumerated shapes * more enum work * continuing enum work * new batch of enum work * last enum work * Sort enum by IDs * move enum into its own class * public field * Put some sanity in GT_MetaGenerated_Item_02/03 and in 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 * Add oredict for LV and HV circuits (try no 2) (#2682) * 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 * Clean crafting achievements (#2662) * clean up crafting achievements * spotless * make crop tooltip appropriate (#2684) change tooltip * Move some mixins to hodgepodge (#2633) * Move some mixins to hodgepodge * store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * add transdimensional alignment matrix * add recipe * require alignment matrix * capital c * fix catalyst tier being off by one * swap some items around * update aligment matrix tooltip --------- Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: HoleFish <48403212+HoleFish@users.noreply.github.com> Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Jason Mitchell <mitchej@gmail.com>
2024-07-01Add an alias to SP_Command (#2701)BlueWeabo
add sp command alias as spaceproject
2024-06-30fix used spray can behavior id (#2699)Caedis
2024-06-29Prevent debug structure writer from setting a negative size value (#2672)Lyfts
prevent debug structure writer from setting a negative size value
2024-06-29Several fixes for Tesla Cover (#2671)RealSilverMoon
* Fix tesla cover memory leak * Fix tesla crash when destroying tesla cover * Add max output display
2024-06-29Fix fog showing when there is no pollution (#2695)Caedis
2024-06-29Add GUI parallel configuration window for transcendent plasma mixer (#2664)GDCloud
add parallel config window
2024-06-29Cribs support capacity of over 2.1G per ingredient (#2654)HoleFish
* Cribs support capacity of over 2.1G per ingredient * spotless * fix mistake
2024-06-29Fix DC memory leak after unloading (#2661)RealSilverMoon
Fix memory leak after unloading
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-24make crop tooltip appropriate (#2684)chochem
change tooltip
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-24Put some sanity in GT_MetaGenerated_Item_01 (#2649)boubou19
* set coin ids in enum * extract coin shapeless recipes * Arrows * splitting more * mold shapes * big split * split behaviors * spotless * enumerated shapes * more enum work * continuing enum work * new batch of enum work * last enum work * Sort enum by IDs * move enum into its own class * public field
2024-06-23Fix EBF & multi smelter scanner info (#2681)HoleFish
fix
2024-06-12Fix random stocking hatch extraction fail (#2655)Jakub
2024-06-12Fix stocking bus division by zero (#2658)NotAPenguin
Fix stocking bus divide by zero when loading a data stick without refreshTime tag
2024-06-08Change percentages in maintenance cover to reflect reality (#2644)Pxx500
change precentages
2024-06-07Maintenance cleanup (#2632)HoleFish
* cleanup * waila * fix & compatibility --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-06-07Allow the controller slots of multiblocks to be automated (#2639)NotAPenguin
Allow multiblock controllers to mark internal slots as automatable, and mark the controller slot of PA, AAL and CAL as such
2024-06-06Update GT_Proxy.java to Remove Natura OreDict Restriction. (#2641)nman1300
2024-05-29Concrete backfiller - Added the ability to fill liquid (#2623)evgengoldwar
* lang file * sa * Update GT_MetaTileEntity_ConcreteBackfillerBase.java remove star imports * Restore original logic * Save and load NBT --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-05-26fix line mode toggle broken on MP (#2611)Glease
* fix line mode toggle broken on MP * fix more client only method * spotless * change to client initiated mode switch instead
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-23Multi Smelter & Ore Factory add batch mode & sub 1t oc (#2604)HoleFish
logic
2024-05-22Implementation: Raw Ore Items as Ore Drops (#2502)Ethryan
* testing * Fix textures * Adding Drops, still need to add furnace recipe * Need to fix the multiple smelting recipes. otherwise stuff works. * part 2 * Remove wip block code I added * Moved it to a new processing file * Fix Oredict and add a stone dust chance output. And added a config option for fortune bonus. * Finally got Spotless to work * fix config system set it in gregtech config with oredropbehaviour in gregtech.cfg * Added new option and an option that returns it to the old behaviour. * Moved the raw ores to meta3 since meta1 was full. (MetaID range fix) * Fixing the MBM to only process small ores with fortune. * New config option * try to fix the recipes not working on Zeta * Implement Caedis Fortune fix * Added comment * Spotless * Fix stone dust amount from macerator * Adding Raw ore to the OreFactory (Untested) * spotless * Update this to actually drop the amount number of stack, instead of the stack set to the amount * New Random function for fortune and shapeless crushing recipes for the raw ores. * Fix * Actually make the block per dimension. * Fix an () issue. And make this actually work ingame. and not just randomly. * Change back drops Ned to look into Silk Touch more * Enable Silk Touch * Wth Spotless?, THIS made you complain?
2024-05-22Drone Center structure adjustments. (#2603)Abdiel Kavash
* Drone Center structure adjustments. * Center -> Middle, to not clash with machine name. * Revert "Center -> Middle, to not clash with machine name." Looks dumb, and "Center" is used in other controller tooltips.
2024-05-21fix drone centre not consuming drone from me input bus (#2602)Glease
2024-05-20Reducing allocation (#2601)Martin Robertz
* Add IAllSidedTexturedTileEntity to reduce memory overhead for ore textures (cherry picked from commit 274918800a3bf728e1db88e2d22b14cb6eb1a2e5) * Cache texture for ore, since it doesn't change during the game obviously (cherry picked from commit 45a2fe43f2cdb33fa7c0b05a4b8e4531fd2706a6) * Reduce allocations for inventory ores rendering (cherry picked from commit 5ed6526436e9b3a0586f37eac460f707636a102d) --------- Co-authored-by: SKProCH <skproch@yandex.ru>
2024-05-18Fix far end asteroids generation (#2598)Oleg Ivanov
* Fix far end asteroids size * Use chunk seed to generate far end asteroids
generated by cgit (git 2.46.0) at 2025-03-06 21:39:13 +0000