aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
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-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-26fix issues caused by mergeboubou19
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 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-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-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-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
2024-08-24Make frame boxes no longer TileEntities (#2799)NotAPenguin
* fiddling around with frame boxes * more fiddling * am trying * frames exist * fix frame rendering in inventory * Fix in world frame rendering * Apply cover to dumb frame * continue work on frames * apply covers to correct side and fix crash on load * Test permissions * fix oredict for new frames and create recipes * fix waila names and drops (kind of) * fix drops * mostly all working * remove old comment * fix structurecheck using new frames * create the TE transformer * it didnt work * dont modify tes we dont want to modify (needs future postea update) * it works! * item transformer works too * spotless * add more method overrides from generic gt block? * update postea * fix postea transforming items in reserved frame range that were not frame boxes * fix tesla tower structurecheck + capacitor hatch crash * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Spotless apply for branch dumb-frames for #2799 (#2953) spotlessApply Co-authored-by: GitHub GTNH Actions <> * remove extra null check * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * remove more messy instanceof checks * Spotless apply for branch dumb-frames for #2799 (#2954) spotlessApply Co-authored-by: GitHub GTNH Actions <> * remove unnecessary null check * try fixing facade color * Update src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * small cleanup in framebox gen code * swap material for frame box block * fix description * make getMaterial static and add fix AE cover color * nicer casts + localize tooltip in frame block instead of stealing old localization * draw grid on cover hover * add a null check in getTexture() that hopefully fixes crash in full pack when interacting with frame boxes * also draw grid when hovering with wrench * add chemical element back to tooltip * fix breaking frame not causing structure update --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-08-23Europium bee line (#2818)Volence
* Add europium, neodymium, and rare earth bees. Normalize naming of combs and some bees with their products * fix a few more that were missed, and also apply the same logic to the comb drops * fix redstone bee to iron bee for neodymium * Made requirement for Europium bee mk 1 compact fusion controller and mk 2 for americium bee * Update block requirements to be more efficient for bbreeding * Cleaning up bee and comb names to be closer to what they produce, fix up some typos --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Tooltip fixes (#2919)OmdaCZ
* Fixed tooltips of some machines. * removed properly what I didn't remove before * Undid redundant change. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
2024-08-23Fix MFE issues with multi-amp hatches (#2912)Mary
Fix Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
2024-08-22Add visual distinction for dimensional convergence (#2934)GDCloud
* change screen texture when convergence is active * forgor * remove magic number Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
2024-08-21Cleaning up GT5U's post init (#2932)boubou19
* wrap MTE ids print into a debug option * remove EnsureToBeLoadedLast config * exit early * spotless apply * making collision checks optional by default --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-21Fix full amp recipes (#2930)chochem
* round 1 * RS-AL recipes * round 3 with a bit of cleanup * round 4 --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-20Fix IOF available eut (#2929)chochem
fix IOF available eut
2024-08-19Fix laser engraver recipemap comparator (#2924)NotAPenguin
* Fix laser engraver comparator * debug: use no custom comparator for laser map (do not merge this commit) * Revert "debug: use no custom comparator for laser map (do not merge this commit)" This reverts commit ffc66689f301294f1c4d210a2928ec9a367d4961. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-18Replace all instances of Master/Slave dynamic within Optical and Data ↵GirixK
Bank/Assline Connector hatches (#2918) * Replace all instances of Master/Slave dynamic * Rename to avoid confusion --------- Co-authored-by: GirixK <GirixK@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-17add covers that can hold some items (#2593)Glease
* add chest cover * Spotless apply for branch feature/chestcover for #2593 (#2594) * create window on the left * sa * add slot migration * add texture and T2&3 * add texture and T2&3 * spotless * fix bugs * add chest cover * small fix and spotless Co-Authored-By: GitHub GTNH Actions <> --------- 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: Nxer <43300390+Nxer@users.noreply.github.com> Co-authored-by: Nxer <306803661@qq.com>
2024-08-17Do some recipe cleanup once again (#2897)boubou19
* remove unused config "HardCoreCableLoss" * remove unused config "DisableIC2Cables" * remove unused booleans * Spotless apply for branch sort_recipes for #2897 (#2898) spotlessApply Co-authored-by: GitHub GTNH Actions <> * remove unused config "NerfCombs" * remove unused config "NerfCrops" * remove unused config "ArcSmeltIntoAnnealedWrought" * remove unused boolean * remove unused config "online" * remove unused stuff * remove unused config "HardMachineCasings" * remove unused config "NerfDustCrafting" * exit early * remove unused config "harderstone" * decouple recipes from machine registration for alloy smelter, arc furnace, assembler, autoclave, bending machine, canner, printer, recycler, sifter, slicer, thermal centrifuge, unpackager, wiremill * decouple recipes from machine registration for microwave, polarizer,plasma arc furnace, oven, ore washer, mixer, microwave * decouple recipes from machine registration for forming press, laser engraver, lathe, macerator, matter amplifier * decouple recipes from machine registration for centrifuge, extruder, fermenter, fluid canner, fluid extractor, fluid heater, fluid solidifier, forge hammer * decouple recipes from machine registration for chemical bath, chemical reactor, circuit assembler, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor * spotless apply --------- 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-17Fix OverclockCalculator (#2901)HoleFish
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-16Fix opencomputers cheese of T8 waterline (#2905)NotAPenguin
fix opencomputers cheese
2024-08-16Cleanup (#2904)miozune
* Remove redundant inputSeparation=true call * Remove deprecated MetaTileEntity#isDisplaySecondaryDescription * Always use ModularUI * Remove useModularUI * Remove unused GUI features * Remove IGlobalWirelessEnergy * Remove CommonValues.V & CommonValues.VN * More deprecation cleanup --------- Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-16Move gt machine recipes to postload (#2902)chochem
* move assembler and compresser recipes * move canner+extractor+packager * register MTEs in preload * move to init instead
2024-08-15Electric jukebox (#2827)Raven Szewczyk
* GT music system * Minor fix for some glitches when switching dimensions with P2Ps on both sides * Most features implemented except headphones * Implement wireless headphones * Disable debug mode * Spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-15add forbidden getModItem calls (#2869)boubou19
* add forbidden getModItem calls * remove bartworks gmi * remove goodgenerators gmi * spotless * no more literals in getModItem calls * fix kekztech calls * fix kubatech calls * fix gregtech calls (1/?) * move WA from NHCore to GT5U * MTE enum expanded with bw values * MTE enum expanded with tectech values * fix inversion * fix gregtech calls (2/?) * copied enum from NHCore to GT5U and moved machine hulls * moved plasma gens and alloy smelters * moved machine matter amplifiers, assemblers, scanners, Pump, transformers * moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches * moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches * moved circuit assemblers * moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer * moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine * moved batteries * comment * spotless apply * yeet * imports * bronze blast furnace is no more since a while * sanitize kubatech MTE registration * merge GG's MTE enum into GT5U one * fix gregtech calls (3/4) * fix gt++ calls (1/?) * small cleanup * fix gt++ calls (2/3) * fix gt++ calls (3/3) * temporary test * fix config * Revert "temporary test" This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724. * disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts * spotless apply * dumb dumb * fix dynamic access to CustomItemList * update tests * fix scala test * fix script? * fix script? * actual fix? * there we go! * yeet GT for now, until we move the EOH Controller recipe somewhere else * fix dep
2024-08-15Cleanup (#2803)boubou19
* remove dead code * use proper materials for tiered circuits * remove yet another RA1 call * remove deprecated usage * small step toward Research station assline recipes migration * remove dead code * remove dead code * remove dead code * migrate BW recipes * remove some more RA1 code * remove bad search and replace + spotlessapply * yeet deprecated code and change how sieverts for recipes are computed * fix loading * fix bad replacements * spotless apply
2024-08-14Fix ph sensor not taking decimal numbers (#2889)NotAPenguin
fix ph sensor not taking decimal numbers
2024-08-14Single-block Steam Boiler item handling improvements (#2871)Yannick Marcotte-Gourde
* Refactored GT_MetaTileEntity_Boiler_Bronze::updateFuel * Refactored GT_MetaTileEntity_Boiler_Lava::addUIWidgets * GT_MetaTileEntity_Boiler: Set item filter on fluid & fuel slots * GT_MetaTileEntity_Boiler: Made automation handling more consistent and respect slot filters * Remove deprecated fuel & ash slots from solar boilers * Removed overrides identical to super * Streamline coal boiler combustion logic
2024-08-13Final waterline visuals and small fix (#2864)NotAPenguin
* try to add baryonic matter fluid texture * fix baryonic matter custom fluid * adjust purified water names * do not form waterline multis without positioned hatches to prevent crashes * final baryonic matter texture
2024-08-13Adjust T4 waterline logic to avoid automation cheese (#2886)NotAPenguin
2024-08-14fix volumetric flask config gui on dedicated server (#2880)Glease
2024-08-12Implement dim num agnostic isGenerationAllowed function (#2854)Spacebuilder2020
* Implement dim num agnostic isGenerationAllowed function Replaces references to old function in as many places as possible Only reference that can't be changed right now is `E:\MinecraftProjects\GT5-Unofficial\src\main\java\com\github\bartimaeusnek\crossmod\galacticgreg\VoidMinerUtility.java:189` * Account for unloaded world or null provider by instead doing a dim number check This route should be avoided when possible. * Apply Spotless
2024-08-12Adjust grade 8 water logic (#2873)NotAPenguin
adjust t8 logic
2024-08-11Removed galacticraft dependency for laser render (#2868)Mary
* Removed cursed galacticraft dependency. Sorry mitch :( * spotless * Spotless * Update GT_Loader_MetaTileEntities.java --------- Co-authored-by: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com>
2024-08-11Wormhole Renderer dependancy fix (#2867)BucketBrigade
* Remove Dependancy * Now rendering again * Spotless Apply
2024-08-11Faster dev boot times (120s --> 80s while profiling) (#2866)Jason Mitchell
* Faster dev boot times (120s --> 80s while profiling) * Clean up sloppy hard deps and properly gate them behind isModLoaded() checks. * Include CoreTweaks as runtime only non publishable for faster boot as well
2024-08-11Fix multi bonuses taking too much power (#2804)Volence
Fixed the issue where if bonuses were good enough it would take more than 1 amp + cleaned up now unused text
2024-08-10Removes "right-click to adjust amount" function of regulator covers (#2853)querns
Removes right-click function of regulator covers
2024-08-09Created LHECoolantRegistry from LHE coolant logic (#2756)RecursivePineapple
* Removed coolant logic from LHE & XL LHE * Added LHECoolantRegistry, which replaces the coolant checking logic
2024-08-09Buff later naqfuels and misc changes (#2847)Sampsa
* Buff later naqfuels and misc changes * Buff Mk5 alternate recipe speed
2024-08-09Change Cracking LCR Recipe Tier to HV (#2764)Daniel Mendes
* Change cracking LCR recipe generation -> Changed the CR recipe generation to be singleblock only; -> Added equivalent LCR recipes but at HV tier and halved recipe time. * Spotless apply
2024-08-08Finalize textures for items related to grade 8 purified water (#2848)NotAPenguin
* swap circuits in engraving for distilled water * change quark goop textures and water colors * add structure tooltip to grade 8 multi * display quark catalysts in t8 frontend * add simple uv treatment frontend to show lenses * add final quark catalyst textures and recipes * remove electromagnet from recipe * fix baryonic perfection recipemap and quark colors in scanner output
2024-08-08Added the miniature wormhole generator (#2800)RecursivePineapple
* Added the miniature wormhole generator * Updated structure & tooltip and added hatch hask * Fixed controller promotion not working * Initial work wormhole render + spotless + git strangeness * Fix wildcard imports * Removed redundant code + added more reasonable defaults * fix * sa * Remove debug print statements --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: CookieBrigade <138534411+cookiebrigade@users.noreply.github.com>
2024-08-08Fix solenoid page assignment (#2846)Mary
* Fix solenoid page assignment * Forgot to declare the page itself * Accidentally dropped the override tag
2024-08-08Remove maintenance hatch requirement for late multis (#2844)Serenibyss
2024-08-05Small waterline fixes (#2830)NotAPenguin
* make purified water start with regular instead of distilled water * fix quark name
generated by cgit (git 2.46.0) at 2025-03-05 18:32:43 +0000