aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2024-09-07Followup for the great renaming & cleanup IMC for NEI (#3083)miozune
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-07Remove a bunch more reflection (#3074)Alexdoru
Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-07Fluid solidifer multiblock balance and cleanup (#3094)TheEpicGamer274
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-07Fix overlapped IDs for sounds and add two new sounds (#3093)Volence
Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-06Multiblock machine for Fluid Solidifier (#2808)OmdaCZ
Co-authored-by: Mary Hopson <doyoumined@gmail.com> Co-authored-by: GDCloud <gdcloudstrike@gmail.com> Co-authored-by: Dream Master <dream-master@gmx.net> Co-authored-by: Caedis <Caedis@users.noreply.github.com> Co-authored-by: NotAPenguin <michiel.vandeginste@gmail.com>
2024-09-06Halkonite/Superdense Plate fixes (#3081)Maya
2024-09-05Fix up tooltips, crib acceptance, and normalize the lathe to use all item ↵Volence
pipe casings (#3057) Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-05Enhance GPL for several multis (#3071)HoleFish
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-05UEV+ Material Diversity (#3045)NotAPenguin
2024-09-05Move superdense plates to MI3 (#3068)Mary
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-05Fix conflicting lang key for spray can (#3063)miozune
2024-09-05Add superdense plates (#3050)Mary
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-04Delete/modify some reflection + more renaming (#3037)Alexdoru
2024-09-04Rework Indium comb Processing (#3051)StaffiX
Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-04Add support to disable pattern optimization in CRIBs (#3043)kstvr32
* add button to disable optimizing patterns in CRIBs * spotless --------- Co-authored-by: kstvr32 <kstvr32@gmail.com> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-04Fix Overflows with Burn Times and adjust burn-time when the super efficiency ↵Spacebuilder2020
increase logic reaches max efficiency (#3044) * Fix Burn Times and adjust burntime when superEffIncrease reaches max eff. * Apply Spotless * implement suggestion Co-authored-by: Alexander Anishin <oneeyemaker@gmail.com> --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Alexander Anishin <oneeyemaker@gmail.com>
2024-09-04Fixes #17207 (#3041)joegnis
Changed methods in OverclockCalculator: - setEUtDiscount - setSpeedBoost - setHeatDiscountMultiplier Most of other changes are directly related to them. Adds a unit test. Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-09-03fix nei (#3035)NotAPenguin
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-03replace Loader.isModLoaded() calls with Mods enum cached call (#3031)Alexdoru
* replace Loader.isModLoaded() calls with Mods enum cached call * prevent Loader.isModLoaded calls * Revert "prevent Loader.isModLoaded calls" This reverts commit 9df23fd8db9dfe70a16be10e1d8688ee629da054. * no Loader.isModLoaded calls in gagreg --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-03Improve unification for blocks (#3023)chochem
* prio gt blocks for unification * clean up unnecessary loop * remove superfluous enderio check --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-03Laser Engraver fixes (#3024)Mary
* Better renderer adder, fixes plate not appearing in NEI preview * Lower minimum casing * New casing texture --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-09-03fix string references to classes in callConstructor calls (#3021)NotAPenguin
2024-09-02The Great Renaming (#3014)NotAPenguin
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
2024-09-02change loops on METATILEENTITIES to all start at 1 for consistency (#3017)Alexdoru
2024-09-01Godforge continuation (#2950)GDCloud
* fix wrong offset * improve item insertion window * finish upgrade material functionality * add tooltip to material button * add rhugnor gear * half serious upgrade costs (will definitely change) * fix stocking hatch not working for fuel supply * add information window * add heat formula info * add autobuild hint dot info * add phonon related items and fluids * first iteration of glitchy material renderer * tweak renderer overlay opacity * add new material * add phononic seed crystal and six-phased copper block * add recipes for phonon transfer medium chain * add solenoid block replacement * add creon * decouple smelting module structure * spotless weirdness * add most casing recipes and late loading method (for the special singularities) * add new singularity recipes * more recipes * add glow * generate more dragonblood parts * add upgrade costs * fix upgrade tree window scrollable weirdness * forgor glow texture * add last upgrade text + a random comma * re-add phonon medium abs recipe * add six-phased copper nanite recipe * fix button overlay being off by 1 pixel * fix merge mishaps * forgot to adjust debug buttons * fix stocking bus fuel insertion and fuel int overflow * add graviton shard ejection * minor structure oopsie * ejection button registration * ejection button tooltip * add graviton shard item * eject the right item + save ejection status to nbt * fix input bus amount npe * change rendering block offset * adapt eoh rendering to allow changing the star's size * initial rendering changes (make the blue star render) * change seed crystal recipes * another small seed crystal change * adjust item renderer * add tooltips * circuit oredict fix * tooltips, upgrade names, some experimental ui changes and small fixes * author * make star bigger * fix recipes * remove unnecessary tooltips * spotless * recipe adjustments * make magneto resonatic block craftable * change magneto resonatic gem autoclave times + spotless * add structurecheck button to modules * more recipe adjustments * fix extra material crash * more recipe adjustments * lower eternal singularity amounts * display recipetimes <1 sec properly * try to fix hasShiftDown crash * adjust plasma module recipes * swap placeholder names * implement rings disappearing/reappearing for renderer * utility for structure strings * buff plasma module parallel * fix itemlist * Spotless apply for branch godforge for #2950 (#3013) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-01Add bee in courtesy to DaddyDiddy (#2507)Nico Spiske
* [major] new effect, comb, flower, mutation condition * [minor] imports * Update GT_BeeDefinition.java * [minor] fancier processing * [patch] bs * Update ItemComb.java * Update SifterRecipes.java * [minor] nuked machine booster effect * Added back the effect but now with tick throttling. Right now it is set so the effect only gets triggered every 30 seconds. * SA & BS * [minor] add dynamic authority * rename comb type and bee reduce speed to super speed * update bs + sa * changed to fastest because super speed was 2x blinding (wired naming) --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-31Fix some more gmi calls (#3009)boubou19
* strenghten fobidden gmi checks * yeet some hidden gt++ gmi * yeet last gt gmi call * forbidden isModLoaded calls * add other GTNH-I MTE IDs * Spotless apply for branch fix/gmi_calls for #3009 (#3010) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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-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-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-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-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-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>
generated by cgit (git 2.46.0) at 2025-03-09 01:21:15 +0000