aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2024-08-30Add the Research Completer to ItemList (#3004)boubou19
add research completer
2024-08-30Wrap tf dim check in if statement in ore gen (#3003)Caedis
2024-08-30Adjust cleanroom block composition check (#2581)Moses Miller
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-30Move Radox materials to GT5u (#3001)NotAPenguin
Add radox to GT5u to prepare removing it from coremod Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-30Fix global_energy networks resetting on server reboot (#3000)Luke Hohlin
* Fix global_energy networks resetting on server reboot * Update SpaceProjectWorldSavedData.java Replace _NAME in string constants with _NBT * Replace JsonObject with JsonArray in SpaceTeamAdapter --------- Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-30Add duration since last shutdown (#2977)HoleFish
* machine message * fix & prass channel * machine message * fix & prass channel * fix machines that dont use regular onPostTick * follow error fixes and fix hatch check * oops * sa --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-30Split Materials.java initializer to avoid class too large errors (#2961)NotAPenguin
* move elemental material initializers already * move more initializers * move all other initializers --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-30Spotless apply for branch mergeDetrav for #2998 (#2999)github-actions[bot]
spotlessApply Co-authored-by: GitHub GTNH Actions <>
2024-08-30merge sources and fix dependenciesBlueWeabo
2024-08-29Add Mobs Info dependency on EEC recipe (#2997)Jakub
Add dep on recipe too
2024-08-29move NEI capsule hidding from NHCore to GT5U (#2993)boubou19
* move capsule hidding from NHCore * Spotless apply for branch fix/capsule_hiding for #2993 (#2994) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix silly --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-29merge MTEID enums (#2995)boubou19
2024-08-29Added large fluid extractor multi (#2819)RecursivePineapple
* Added large fluid extractor multi * ran spotless * Prevent multi from requesting more than 1A with 1 energy hatch * Moved boro. glass registration to bartworks In GT5u dev environments, borosilicate glass wasn't registered properly. The block was registered, but it wasn't added to allLevelsReverse since registerGlass() was never called. This led to getTier() not working properly (it always returned tier=3). * Changed speed bonuses and added some QoL changes Added a multiplication EU/t cost to solenoid tiers and buffed solenoid parallels. Added an additive EU/t reduction to heating coil tiers. Fixed the glass structure check. Updated the multi's tooltip and sensor info data. * applied spotless * large fluid extractor code cleanup * changed mechanics & improved structure messages * spotless apply --------- Co-authored-by: Mary Hopson <doyoumined@gmail.com> Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-29Compressor Multiblock (#2861)Mary
* Compressor boilerplate * Getting test structure working * Structure fixes * Implemented basic HIP and Black Hole structure elements complete with heat and black hole stabilization mechanics * Cooling glow, also HIP cools much slower than it heats * Got blue cooling texture working * spotless :3 * Force structure checks every 10 seconds like nano forge * Neutronium compressor recipemap created * Various strange changes attempting to get a neutronium compressor map working. Shelved for now * Absolutely going hog wild with neutronium testing * BIG RECIPE * Added Ollie author tag * Added a bunch of neutronium compressor recipes * Deeply cursed recipemap combining * Neutronium compressor structure * Black hole requirement for recipes established * Black hole implementation changed * Added black hole catalyzation * spotless * Removed neutronium compressor recipes from gt5u * Made eternal singularity work somehow * Boilerplate for new hatches * Tinkering * Split the multi in 4 * Fix refactor * Implemented the new black hole mechanic with catalysts. * Give speed bonuses/nerfs to recipes based on black hole. Shuffled some logic around * Imported real structures * Proper HIP implementation with heat sensor * Cut HIP mechanics from Neutronium * Restore Gangue for use in a black hole recipe * Made Gangue blocks load * sa+update deps * Added t1/t2 casings * Temporary casings for neutronium * SA from merge * Temporary HIP Textures * Temporary Black Hole textures * Support machinemode for black hole, support special value for compression * Don't let neutronium compressor do black hole recipes * Get all of the numbers in * Tooltip adjustments for readability * Casing fix and more tooltips * Correct structure tooltips * Improve legibility of HIP tooltip * 1 parallel per tier when overheated * Lost my privates * Fixed modern cast and imported the new textures * Removed very unnecessary logic * Nerf HIP parallels to 4 to make black hole better * Change all special value stuff to proper metadata --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-28Do not register EEC without Mobs Info (#2992)Jakub
Do not register EEC without mobs info
2024-08-28Rework inventory logic of crop manager (#2990)Caedis
rework inventory logic of crop manager
2024-08-28Fix Baryonic Perfection Unit producing too much baryonic matter (#2989)NotAPenguin
* fix baryonic perfection unit producing twice baryonic matter as required * bring back unknown particle --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-28Remove AAL chat spam (#2988)HoleFish
2024-08-28Fix Transcendent Plasma Mixer scanner info (#2967)GDCloud
* fix scanner info * reset duration and consumption to zero when recipe isnt running --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-27Optimize laser/optical pipe rendering (#2987)Serenibyss
Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-27implement whole multiblock hatch configuration copying (#2965)Glease
enable whole multiblock hatch configuration copying does not include crafting bus for now Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-27Fix structurecheck button overlaps (#2957)GDCloud
* fix overlaps * fix more overlaps --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-27Remove IC2 recipe maps for good (#2971)Mary
* Changed conflicting recipe in mass fabricator to a new circuit * Added circuit 1 to assembler recipes for vanilla tools * Removed redundant windmill shaft recipes in gt++. These are loaded in coremod already * Remove redundant canner registration by bartworks * IC2 thermal centrifuge recipes added to GT * IC2 compressor recipes added to GT * IC2 extractor recipes added to GT * IC2 macerator recipes added to GT * /cofh killall ic2 recipes * Revert "Remove redundant canner registration by bartworks" This reverts commit bb032ad728f147b82d67ea68e2df5c1ce5e3e149. * Fixed typo in comment --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
2024-08-27Bartworks cleaning (#2951)Connor-Colenso
* Remove added by bartworks from every single item * Fix germanglish * Works * Clean up a little * Ok, spiralled a little but hopefully worth it... * Spotless * Less "added by" * Clean up tooltips somewhat * more cleanups * Bit more cleaning * Spotless * Reduce random glass crap * Get rid of destructopack (useless) * Magneto work * Further refactor/cleanup * Move Boro tags to materials * Attempt fix * No longer needed * Go away * Rename * Remove dead recipes * Spotless apply for branch bartTooltips for #2951 (#2952) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add warded glass to HV * remove ignored --------- Co-authored-by: Connor Colenso <colen@CONNORSPC> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-27Config/gregtech.cfg (#2939)boubou19
* first pass on config migration * second pass on config migration * removing bad configs * rename config classes and register them * move debug options to its own debug category * migrate pollution * finish migrating general config * removing useless config * finish GregTech.cfg port to GTNHLib * don't accidentally force panic mode in dev env * typo * defaults are now handled by the confg handler * remove dead config * force config save after defaults are being written * stop messing with the GregTech.cfg externally * removing comments * new underground fluid builder and porting default underground fluids to code * move config handlers of gregtech.cfg in their own package * process MachineStats.cfg * yeeted MaterialProperties.cfg * remove unused compat in GTNH * process OverpoweredStuff.cfg * process Other.cfg * ungregify some config variables * remove unused variables * fix Ids.cfg not being populated * delete duplicate printing of MTE IDs in GT5U clients * bump hodgepodge version to get mod phase timers * process Client.cfg * fix bad category naming * registering all the config handlers in gui * bump GTNHLib version * actually only registering client configs * use proper double arrays now * move GT ore mixes to patternbuilders * dead code * fix multifiles config not being handled properly * import class from NHCore * removing reflection * use enums for registration * yeet config for Asteroid dimensions * remove unused since 2015 enum entry * todo * rework oremix enums * imported dimension data in enums * convert old dirty predicate into proper one * hook gagreg onto the OreMixes enum * finally nuke worldgen.ore.mix config category! * hook gagreg small ores onto the SmallOres enum * imported dim values in enum * fix dirty work around in vm predicate * yeet unused classes * hook GT stones to GTStones enum * yeet all the remaining booleans in the worldgen category * port endasteroids category * port general category * deprecated * yeet unused bw compat * finish worldgen config migration * hardcode config into code * remove not generated config entry * remove Unification.cfg * fix build * migrate oreveins away from config * migrate small ores away from config * delete config parser * forgotten * fix EoH recipe crash in dev * fix GT NEI Ore Plugin config and csv paths * shade opencsv * rewrite csv generator * spotless apply
2024-08-27Fix structure error (#2986)HoleFish
* fix * fix
2024-08-27Backend Rework of the Quantum Computer (QC) (#2849)DylanTaylor1
* QC Rework * Increase cooldown rate * Cleanup QC/rack code * sa * Add Cooling Core * Fix Scanner Info --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-08-26Fixed uncraftable LFTR fluid Beryllium Fluoride (#2982)Lorenzo Todisco
2024-08-26Texturework in GT++ (#2945)BlueHero233
* Leaves, Breads and Pizzas re texture * Crop Blocks Added * Fix Advanced Boilers top texture * Adding more controller faces * Remove redundant code * Finish controllers and code readability * spotlessApply to fix violations * Better Tank texture * Various Fixes * Various Fixes * Oopsies * Spotless Apply again... minor adjustments to drinks * Revert public api changes and scanner textures reference couldnt find reason why it was throwing NoSuchFieldError even when crops plus plus was recompiled with correct paths * spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Merge branch 'master' into mergeGTNEIOREboubou19
2024-08-26Added a tooltip line for strong redstone output (#2983)RecursivePineapple
Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-26fix issues caused by mergeboubou19
2024-08-26merge sources and edit mcmod.infoBlueWeabo
2024-08-26Fix breakBlock using wrong block metadata (#2980)NotAPenguin
Fix long standing breakBlock bug
2024-08-26Fix Typo In Dangote Description (#2979)Dr-Nye
Update GregtechMetaTileEntity_Adv_DistillationTower.java Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Multi Autoclave/Lathe Revisions (#2976)Volence
* Revisions: add option for output hatch * Revisions: Format waila better * Revisions: More cleanup on waila and add some to the MultiLathe --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Small adjustments to waterline (#2978)NotAPenguin
* do some tooltip clarifying and disable maintenance properly * Disable hatch locking for all waterline multis
2024-08-26Fix of Simple Stirling Water Pump when it consume container item of certain ↵Elkatra2
fuel items (#2970) fixing bug of Simple Stirling Water Pump Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Fix some misnames and allow toggling batch mode with wire cutters (wh… (#2975)Mary
Fix some misnames and allow toggling batch mode with wire cutters (while shifting) Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Extractor multi (#2966)Mary
* Boilerplate * Removed cursed galacticraft dependency. Sorry mitch :( * spotless * Spotless * Update GT_Loader_MetaTileEntities.java * Update to EMS casing * Finalize multi * Renamed * Small tooltip fix --------- Co-authored-by: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com>
2024-08-26Remove O-Xylene (#2973)Mary
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Give MABS void mode (#2974)Mary
Give MABS batch mode
2024-08-26Normal recipe eu for HSS-E (#2972)Mary
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-25Fix crash when trying to break AE2 cables with a GT wrench (#2958)ceg
* Account for edge case when Platform.rayTrace returns a null value. * Account for edge case when Platform.rayTrace returns a null value. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-25Steam Multi change (#2959)evgengoldwar
* Added craft for Forge Hammer * Renamed Steam Controller ID * Added Dark Steel Block For Steel tier --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-25Fix broken oredict cache if cached early during load time (#2968)Raven Szewczyk
2024-08-25New Multi Autoclave (#2863)Volence
* Create basics of new multi * Fix forming and recipe processing. Fix tiering and display tiers in waila * Add textures, clean up some code, rework bonus calculations * Apply spotless * add amp limit * update deps * Revision: Add 128 mininum casings needed and tooltip * Revision: Change extended class to ExtendedPowerMultiBlockBase * Revisions: remove unecessary call to getBaseMetaTileEntity().sendBlockEvent * Revisions: revised code to break out calculations and show in waila, update calculations to be more inline with other multis * Finished some other changes and formatting, moved things to lang file * Update GT_Loader_MetaTileEntities to use star import * Update src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiAutoclave.java * spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
2024-08-25Rename Dragon Blood bee and items (#2962)Volence
* Change the Dragon Blood and items based around it to be Dragonblood be to further reflect the items it produces * Add lang instance for bee
2024-08-25Fix T8 waterline draining twice the infinity cost as expected (#2963)NotAPenguin
fix t8 water draining twice the infinity as expected
2024-08-24remove crowbar playing breaking sounds when not breaking (#2960)chochem
better no sound than the wrong one
generated by cgit (git 2.46.0) at 2025-03-04 21:05:25 +0000