aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common
AgeCommit message (Collapse)Author
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-03readd eff numbers. (#3036)chochem
Co-authored-by: Martin Robertz <dream-master@gmx.net>
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-01Fix of the bronze variant of Steam Centrifuge (#3011)Elkatra2
Bronze Steam Centrifuge don't use anymore other multis instead of only steam multi
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-28Rework inventory logic of crop manager (#2990)Caedis
rework inventory logic of crop manager
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-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-26Fix Typo In Dangote Description (#2979)Dr-Nye
Update GregtechMetaTileEntity_Adv_DistillationTower.java Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Give MABS void mode (#2974)Mary
Give MABS batch mode
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-23Add Structure Update button (#2941)HoleFish
* trigger * structure update button --------- 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-23Added Steam mixer (#2915)evgengoldwar
* Added Steam Mixer * Added Steam Mixer * Change logic and tooltip steam multi * Change mixer tooltip * Apply spotless * Fixed updateTexture for InputHatch * Added controller recipe for Steam Mixer --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Bug with hatches in Steam multis (#2923)evgengoldwar
* Fixed hatches bug * Apply spotless
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-18fix industrial macerator check hatch method with dual input hatch (#2916)Nxer
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-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-11Fix QFT recipes (#2862)NotAPenguin
* fix qft chances in recipes * fix qft frontend * remove cry about it catch
2024-08-10Fix arc furnace tooltip (#2855)chochem
fix arc furnace tooltip
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-09Plasma Line buffs, EHE nerfs, Unstable Naquadah rebalance (#2842)Sampsa
* Plasma Line buffs and EHE changes * Change efficiency to 1.0 (still has +50% boost from Steam buff) * One too many zeros * SC Steam -> 100 EU, 100L of Normal Steam, Base efficiency to 1.2 * Rebalance Extremely Unstable Naquadah to match SpNt (Nerf turbines)
2024-08-08Fixed minor bugs with Steam Washer (#2839)evgengoldwar
* Fix Steam Washer structure * Change tick update * Add check structure * Add check autofill water in structure * Improved the method of filling the structure with water * Apply spotless * Fix structure bug * Apply spotless * let NEI show different recipe map --------- Co-authored-by: Nxer <306803661@qq.com>
2024-08-08Remove maintenance hatch requirement for late multis (#2844)Serenibyss
2024-08-07Fix structure bugs in Industrial Macerator (#2841)Nxer
2024-08-05Fix LFTR Running, Stocking and Maintenance Hatches (#2835)Daniel Mendes
* Fix LFTR EU output and stocking hatch exploit - Change value used in processingLogic from the outdated mSpecialValue to the new metadata; - Change input fluids reference to actually drain fluids when using stocking hatches. * Change maintenance hatch checks - Removed requirement for the useless maintenance hatches, since the multi doesn't have maintenance problems * Finish tooltip change * Spotless apply
2024-08-05Adding some stuff I removed long ago (#2702)Ryan Nasers
* Adding back in stuff I removed * Fixing connections * Idk what this was * Spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-05Fix distillation towers voiding with ME output hatches (#2823)Sampsa
* Fix distillation towers voiding with ME output hatches * Now for Mega DT too! * You learn something every day
2024-08-04Reworked Maceration Stack (#2752)evgengoldwar
* Fix macerator structure * Fix checkHatch * Spotless Apply
2024-08-04Cryofreezer buff (#2795)Volence
* changed the eu bonus, speed bonus, parallel bonus, and cryo use to be akin to the volcanus * Changed cryo freezer recipe to be IV based * actually change it to use half the cryotheum * revert certain buffs as requested * changed check for pyro/cryo from 5 every half second to 10 every full second, got rid of grace check
2024-08-04change gelid cryotheum temperature (#2816)Pxx500
* change temp * delete unused code
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-29Remove old integer methods in OC calculator and parallel helper (#2779)HoleFish
remove old integer method
2024-07-28Fix steam consumption and improve tooltip of steam water pump (#2780)chochem
fix oversight and improve tooltip
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-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 free energy generation from LFTR (Thorium Reactor) during warm-up (#2743)ChangHwan Lee / 이창환
Update GregtechMTE_NuclearReactor.java
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-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-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 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-18Fix steam multi (#2657)evgengoldwar
* Fix Bug * Fix Bug * Fix bug * Fix direction bug * Fix vertical rotated washer * Fix static variables
2024-07-15Amazon warehouse is now an unpackager too (#2723)ddoubleo
* Amazon warehouse is now an unpackager too * Fixed unpackager recipes not showing up in NEI for the Warehouse. Edited the tooltip * sa (cherry picked from commit e42861816ba516bd3da1f28d068a1e800e6098ee) --------- Co-authored-by: bdoubleo <user@MacBook-Pro-user.local> Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-14Rework Mega Alloy Blast Smelter bonuses (#2673)GDCloud
* redo mabs bonuses * split bonus calculations
2024-06-30Remove malus for steel variant of steam multiblocks (#2697)chochem
remove malus for steel variant
generated by cgit (git 2.34.1) at 2026-04-08 03:11:40 +0000