aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2024-08-01Laser Engraver Multi (#2771)Mary
* Laser engraver boilerplate and structure * Made a rough, untextured laser renderer * Laser renderer is kind of functional * Laser renderer follows curve * Laser turns on/off when recipe is running * Sampsa laser * Color changing boilerplate * Registered all gt lenses * Fixed default renderer to white * NBT reading functional * Stole SE code to try and get TE working. It does not * Laser renderer finally functioning with more than 1 laser! * Moved tick count to TileLaser so lasers don't tick each other * Implemented laser source hatch * Structure update + spotless * Switched to the GT_Values tier list * Update tooltip and message player about rendering toggle * Allow fluid input/output * Attempting to give proper name to laser plate * Fixed laser plate name * New laser plate texture * New casing just dropped * Allow UMV glass to use any laser source * Switched laser to a simple line renderer instead of a model * Fixed hatch texture I missed earlier * Spotless * Controller textures * render: New laser renderer - Use GL quad rendering instead of line rendering to fix scaling - Set lightmap coords (Emit bloom glow with shaders) - Set opacity to 1.0 - Slight cleanup * Got rid of the old laser model * Tweaked some numbers on the renderer * Spotless * cleanup * I give up on rotation, I've spent too much time trying to get this to work * Got block item working I think * Fixed tooltip for laser and multicanner * Support bartworks lenses * Finishing touches * Removed unneeded assignment * Allow UXV lasers to do all recipes * Forgot to call super for nbt data... * Replace magic numbers * oops, spotless * Another magic voltage number * Rotations and mirror flips Now with spotless * fixed west/east * ok but actually fixed now, mixed up west/east with north/south * Updated laser source snapping to account for rotation being allowed * Cleanup rotation axis and remove unecessary nbt * Re-added nbt but actually load it properly now * Fix NEI displaying lots of hatches --------- Co-authored-by: LekKit <50500857+LekKit@users.noreply.github.com> Co-authored-by: BucketBrigade <apple12a1@hotmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-01Add multi lathe (#2783)Volence
* first few files outlining new lathe multi * MultiLathe: Attempt to add tiers based on pipes * MultiLathe: Added Item Pipe Casing blocks and tiers * MultiLathe: Finished Machine and its mechanics * MultiLathe: Add recipe map and recipes for new precision lathe mode * MultiLathe: Apply Spotless * Revert recipe map changes * remove a few more recipe additions * revert to basic lathe recipe map for the multi * fix imports and make them all explicit * remove a few more * imports, update tooltip info * Update src/main/java/gregtech/common/blocks/GT_Block_Casings11.java Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com> * Added to the texture list documentation for blocks --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
2024-07-31Fix Algae Farm Compatability casings above UHV (#2791)Volence
* fix machine casing capability * require 1 input hatch and output bus, and make input hatch need to match casing tier * update tooltip * remove excess variable * update recipe generation count so it's not done on the fly
2024-07-31Actually use the Fluid Heater to heat fluids, instead of the Oil Cracker (#2796)Ethryan
* Actually use the Fluid Heater instead of the Oil Cracker * Yeet the Old Cracking Recipes
2024-07-31Fix ME Fluid output hatches using Item storage cells for upgrades (#2801)Sampsa
2024-07-31Adjust to AE2 api changes (#2781)Demiu
* Adjust to AE2 api changes * update --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-30Stop using Json files to save space project data and teams (#2700)BlueWeabo
* Go away from saving to file for space teams * apply spotless * make an additional null check * Add raven's suggestions Co-authored-by: Raven Szewczyk <git@eigenraven.me> --------- Co-authored-by: Raven Szewczyk <git@eigenraven.me>
2024-07-30Fix ABS recipe times for Potin and Tumbaga (#2797)Volence
Changed the melting point to fix automated rrecipe generation
2024-07-30Disable optimize on 8 gtpp recipe maps (#2798)chochem
disable optimize on 8 gtpp recipe maps
2024-07-30Adds lockable output buses (#2787)querns
* Adds output locking for non-ME output buses * Add data stick support for output bus filters * Small optimization to output bus iteration * spotless, my one true enemy
2024-07-29Fix pyro recipes (#2794)chochem
only modify a copy
2024-07-29fix gtpp recycling fluid extracting (#2793)chochem
actually have output
2024-07-29Optimize recipe check forcing and add a button to enable/disable (#2785)Sampsa
Disable expecited recipe check by default and add a button to enable behavior + optimize
2024-07-29Spread multiblocks to 20 buckets to spread recipe checks around (#2789)Sampsa
* Add offset between 1 and 20 to every multiblock to spread recipeChecks around * Change to 100 buckets instead to have even distribution * Make random offset final
2024-07-30fix EyeOfHarmony Recipe Handler Height (#2788)slprime
Co-authored-by: slprime <history-21@yandex.ru>
2024-07-29Remove old integer methods in OC calculator and parallel helper (#2779)HoleFish
remove old integer method
2024-07-29Fix water electrolysis exploit (#2784)chochem
use manual electrolysis recipe
2024-07-29Adds vein type readout to multiblock miners (#2732)querns
* Adds vein type readout to multiblock miners (+metrics) * Spotless, fix weird import * Downgrades VP dep to latest non-pre version * Update dependencies.gradle * Refactor to eliminate dep on VisualProspecting --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-07-28fix semifluidgen recipes (#2776)chochem
2024-07-28Fix plasma mixer power consumption and overflow (#2778)HoleFish
* fix * better fix
2024-07-28Fix steam consumption and improve tooltip of steam water pump (#2780)chochem
fix oversight and improve tooltip
2024-07-28Downgrade Diamond Chipset Forming Press Tier (#2746)Andrey
downgrade BC diamond chipset recipe
2024-07-28Fix T2 PCBFactory NEI structure preview (#2638)RealSilverMoon
* Fix T2 PCBFactory NEI structure preview * compileOnly blockrenderer
2024-07-28Oil rebalance (#2741)Pxx500
* delete conflicting recipes (they never existed anyway?) * oil distillation recipe changes * nerf naphtha burn value * adjust recipe times to the input changes * adjust to 100L oil input * add circ 9 recipes * recipe times * fractions
2024-07-27Fix NPE in the moved bauble event handler (#2775)Raven Szewczyk
2024-07-27Optimize load time (#2774)Raven Szewczyk
* Load time optimization: replace recipe reflection with mixin accessor * Save an inner loop allocation in StaticRecipeChangeLoaders * Move Bauble event handler from individual items to GT++ proxy * Update mobs info with more optimizations
2024-07-27Fix me stocking bus crashes (#2773)CookieBrigade
* Fixes stocking bus crash * Fixes stocking bus crash when switches stocking mode --------- Co-authored-by: BucketBrigade <apple12a1@hotmail.com>
2024-07-27Switch to separateMixinSourceSet for 10x faster incremental builds (#2772)Raven Szewczyk
* Switch to separateMixinSourceSet for 10x faster incremental builds * Update version
2024-07-26Fixes fluid extractor recipes that come from the squeezer (#2770)CookieBrigade
Fixes fluid extractor recipes that come from forestry Co-authored-by: BucketBrigade <apple12a1@hotmail.com>
2024-07-26Remove Cell Chemistry in LFTR and Fix Recipe Tooltip (#2768)Daniel Mendes
* Add LCR recipes and fix ZnF4 output -> Added LCR equivalents to some Dehydrator recipes that forced cell chemistry, to avoid the cell usage; -> Fix one recipe that wasn't outputting Zirconium Tetrafluoride correctly. * LFTR recipe tooltip fix -> Fix the display of energy generation in LFTR recipes, which showed 0 for all recipes due to a mistake in the metadata used. * Spotless apply for branch LFTR_Quick_Fixes for #2768 (#2769) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-07-26Fix Lead Lined Box gui and add ModularUI2 as a dependency (#2767)Raven Szewczyk
2024-07-26Add semi fluid gen recycling (#2766)chochem
* semifluidgen * use CI
2024-07-26fixDream Master
2024-07-25Add expedited recipe checks for autopulling Stocking Hatch and Bus (#2748)Sampsa
* Add expedited recipe checks for autopulling Stocking Hatch and Bus * Change to proper Item and FluidStack comparison operators * Forgot one * And a negation * Spotless apply for branch stockingHatchNotifications for #2748 (#2765) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-07-25Changed tooltips and some logic in Steam Multi (#2747)evgengoldwar
* Change Steam Centrifuge * Change Steam Compressor * Change Steam Macerator * Change Steam Washer * Change Steam Water Pump * Added sounds for Steam Water Pump and Steam Washer * Change recipe ULV input and output hatch * Added sounds
2024-07-25Maintenance hatch wallshareable (#2735)HoleFish
* thing * tweak
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-25Added Steam Forge Hammer (#2736)evgengoldwar
* Added Steam Forge Hammer * fix * Saving tiers in NBT * fix update bs --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
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-24fix vacuum furnace recipes and fusion skip (#2760)NotAPenguin
* fix vacuum furnace recipes and fusion skip * the boubler strikes
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-24Add new textures for circuits (#2757)GDCloud
add new circuit textures
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-23Fix circuits recipe crash, hopefully (#2753)Ethryan
Fix circuits crash on launch
2024-07-22Add some sense to circuit tier enums (#2739)Sampsa
* Add some sense to circuit tier enums * Change CompAss circuit tier names to match the new oreDict * Remove blinkCell override from YOTTAHatch.java (#2737) * Remove blinkCell override from YOTTAHatch.java * update --------- Co-authored-by: Dream Master <dream-master@gmx.net> * Fix CAL weirdness (#2740) * do not save length variable in item nbt * remove implicit recipe lock from cal * Beamline (#2619) * 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> * full RA1 removal (#2713) * 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> * update * Add some sense to circuit tier enums * Change CompAss circuit tier names to match the new oreDict * Fix some UMV and UXV circuit oreDicts * Spotless --------- Co-authored-by: tth05 <36999320+tth05@users.noreply.github.com> Co-authored-by: Dream Master <dream-master@gmx.net> Co-authored-by: NotAPenguin <michiel.vandeginste@gmail.com> Co-authored-by: Raven Szewczyk <git@eigenraven.me> Co-authored-by: unknown <gtandemmodding@gmail.com> Co-authored-by: Elisis <jarrad.thomson@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-07-22Dont show ulv tier for recipes (#2751)chochem
ulv is not real
2024-07-22Add maceration recipes for more meats (#2744)Pxx500
add meat macerating recipes
2024-07-22Beamline Balancing and Fix (#2749)Elisis
* Fix weird t2 antenna issue and partly the electron scaling issue * Decrease LINAC energy scaling but increase max possible energy * Improve antenna tier scaling, make input-output energy curve more shallow at lower input energies * Spotless apply for branch beamline-fixes-1 for #2749 (#2750) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>