aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2024-08-04Circuit material overhaul (#2814)chochem
* first push to use new Materials for circuits * dont deprecate or redefine ultimate * sa * move it * second round * dont deprecate or redefine advanced * part 3 * part 4 * part 5 * part 6 * mini fix
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-08-03Waterline rework (#2577)NotAPenguin
* Add barebones PurificationPlant class * Make simple 3x3 structure to form purification plant * Add base purification unit class and dummy sifter unit MTE * Make sifter unit form * Fix accidental wildcard import * Implement basic linking of units to controller using data stick * Make linking more robust, save bidirectional links, add scanner output * add linking range, error message and unregister old controller when re-linking * Add link status of purification units to waila body * Disable maintenance issues on purification plant units * spotless * Check structure of linked purification units in main controller * Remove all star imports * Small refactor to avoid updating status from main controller * spotless * Attempt to document current code * Convert some comments to javadoc * Implement basic processing cycle, sync it with linked purification units * Make water purification plant drain power * Calculate power drain from active units and remove controller power drain * spotless * Add very barebones recipemap * Fix recipemap name in lang file * spotless * Fix purification unit recipemap name * spotless * more sane amount of max fluid outputs * add some item outputs to sifter unit * Very simple recipe processing, may be buggy * spotless * Implement recipe failure * Implement void protection for purification units * spotless * buff item output odds slightly * Add WIP grade 1 structure * spotless * Store base success chance in recipe metadata and display it in NEI * Fill sifter plant with water * Add comment * Allow construction sifter unit in survival * Implement water boost * Fix water boost allowing output chance to go over 100% * Implement failed recipes outputting lower tier water * Fix typo * Fix deformed purification unit still drawing power * Slightly refactor recipe check so base class can read result * Create empty ModularUI container for purification plant * The great gui struggle part 1 * More gui struggles, we have a button now * Adjust button text and size * gui wars: the rise of the sync * gui wars: a new hope * fix the sync * is pengu old enough to know exceeder? * Fix being able to link the same unit multiple times * Sync status string to client * Sign sifter with my name * Show status somewhat properly * Adjust sifter base chance and structure * Fully implement sifter unit * More tooltip refactoring * Add structure info to sifter tooltip. * nitpicking tooltips * Adding sound to Purification Plant Main Unit. * fix star imports * Add basic coagulator unit, add recipemap for it * Write coagulator tooltip * comma nitpicking * more tooltip work * small refactor to purification plant controller * start work on custom recipemap frontend * Fully implement coagulator * Update structure requirements in tooltips * Move controller text in structure tooltips to be consistent * fix NPE on world load * Add base ph adjustment unit MTE * Add info to main controller and energy hatch check * Fixing tooltip of Main Controller & Energy/Exotic Hatch check. * Create full pH adjustment structure * disallow any voiding on purification unit * Small custom RecipeMap frontend for ph adjustment * Generate random initial pH value * Implement inserting NaOH and HCl to adjust pH * Add easter egg * Implement pH sensor hatch * Properly consume HCl and round pH value to 2 digits * Write ph adjustment unit tooltip * Tooltip nitpicking * Try to fix some structurelib hints * More trying to fix hints * Add industrial strength concrete casing block * Add water loop sound to the game * Document random initial pH in tooltip * Add glass material base * Fix spotless formatting in Textures docs because I cannot take it anymore * Add glass texture * Try adding transparent glass * Transparent glass working * Create pH resistant glass and update pH structure to use it * Create full structure for main purification plant * Create custom water purification casing block * Properly balance ferrous wastewater reprocessing and reduce input by a factor 10 * Add pH factor to NEI tooltip and fix coagulator structure * Structure tooltip for Purification Plant base * Add GT_Block_Glass2 and properly set maxMeta * Add Tinted Industrial Glass blocks * Fix BlockCasing9 not showing custom tooltip * Register tinted glass as EV glass * Add sterile water plant casing and revert tooltip change * Mention required water in sifter tooltip * Add more textures and casings * Add more textures, sounds and add structure info for pH adjustment * Rename sifter unit to clarifier * Rename coagulation unit to flocculation unit * Add activated carbon line * Fix unintended activated carbon recipe * Add activated carbon filter * Add polyaluminium chloride + solution * Add new custom textures by @BlueHero233 * Wip recipe page with new background for flocculation * Fix flocculation background image mostly * Finally aligned the slots * angery mumbles * Finish flocculation recipe page * All the recipe pages! * Add new reworked textures * Fix ph adjustment being t3 instead of t4 * Fix invisible casing * apply chembalance to polyaluminium chloride properly * Fix ferrous wastewater -> flocculation waste liquid * Move flocculation to grade 3 * create ozonation unit with placeholder blocks * add new blocks for ozonation with placeholder textures * Add water to ozonation structure * Create ozone gas material * Add ozone recipe * Add textures for ozone unit * Add sound loop for ozonation * fix * implement ozonation mechanics * Finalize ozonation tooltip * Create dummy plasma heater multi * Update textures for plasma heater * Add grade 5 recipemap * Add hatches to plasma heater multi * Add basic plasma heating unit variables * Implement plasma heating unit mechanics * Add plasma heater tooltip * Add structure info to plasma heater tooltip * fix ozonation tooltip, add frontend * Fix positioning on ozonation tooltip and fix plasma heater crash * Add UV treatment MTE and structure without textures * Revert accidental addition of debug dependencies * Add initial version of uv unit textures * update naquadria casing, add water color gradient * Some minor cleanup and added docs * Create lens housing bus * Add lens bus to UV treatment unit * Add lens indicator hatch * Merge GT_MetaGeneratedItem_03.java * Add lens indicator hatch * Add the lens cycle, uv treatment recipe map and fix eut of flocculation recipe * Implement lens swapping mechanic * Clean up first lens swap * Fix uv recipemap lang and move lens cycle to recipe * Write uv treatment tooltip * Add sounds for uv and plasma steps * Create empty degasifier class * Create temporary debug structure for degasifier * set temp casing index for degasifier * create degasifier control hatch * create slightly less temporary but still temporary structure for degasifier * Start impl of degasifier * fix fluid consumption and nbt loading of degasifier * Degasifier implementation should work now * Rename and reformat some things and start work on degasser tooltiop * give last bit much lower chance of being on to avoid cheesing * Finish degasifier tooltip * Integrate some deleno lore * hopefully fix all moved casing meta ids after merge * Create finalized degasser structure * Integrate more deleno lore * Add even more lore * Create placeholder particle catalysts and fetch particle items from gt++ * Fix wrong casing and recipemap localization * Create parallel config menu * refactor purification recipecheck slightly * implement parallel amount on water i/o and power * add tooltip info about parallel config * fix text * update block names in structure tooltips * create structure tooltip for degasser * create textureless quark catalyst items * add the purple glass * fix lore typos * fix some casing indices * remove concrete floor from water plant and reword tooltip * fix main plant structure and add placeholder structure for t8 step * fix structurecheck for main plant and add random catalyst generation for t8 * implement basic mechanics for particle extractor (wip) * Create plasma heater frontend * implement final mechanics and bugfixes for particle extractor * add recipes for re-aligning quark catalysts * add simple recipes for catalyst alignment * initial replacement of purified water in engraver recipes * add purified water to all wafer cutting recipes * fix purified water amounts * buff quark cyclotron recipe again * extract t8 unit casings into their own icons * Write initial tooltip for t8 module * add purified water to mask recipes * Add recipe comparator to show low tier purified water recipes first * add min casing check to waterline multis * buff ozone production * update t8 structure * make purified water optional again for naq wafers * Fix blockrenderer for purification plant * fix nei previews * fix nei * really fix nei this time * add t8 lore * fix hatch recipe locking blocking automation on some steps * try to solve weirdness with grade 3 recipe * fix issues with recipecheck * fix missing null check * make ph sensor use a strict inequality check * fix min casings on t5 * significantly nerf purified water usage for beamline masks * disable void protection for waterline * small adjustments to t6 unit * more small adjustments to t6 unit to prevent easy automation cheese * fix degasser redstone output and missing return statement * remove water QFT catalyst recipes --------- Co-authored-by: Tianyou Mei <meitianyou94@gmail.com> Co-authored-by: OlliedeLeeuw <ollie.riemersma@xs4all.nl> Co-authored-by: Ollie_de_Leeuw <154506304+OlliedeLeeuw@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-03Swap Tiering of XL Gas and SH Steam and Lower Ichorium Turbine Multipliers ↵Daniel Mendes
(#2806) * Reduce multipliers in Ichorium rotors -> Reduce multipliers for steam and gas from 30 to 6. * Swap costs and tiering between XL Gas and SH Steam - Changed the tiering of material inputs for the recipes of the two turbines, so they swap tiers (Gas becomes LuV, SH Steam becomes IV). * Fix tiered LuV material in some GT++ recipes - Change Chrome to Rhodium-Plated Palladium in the tiered material list used in some GT++ recipes. * Spotless apply for branch XLGT_Changes for #2806 (#2807) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-08-03EOH fix & change (#2792)HoleFish
* fix & addition * less magic number * spotless? * comment changes * hoho
2024-08-03Fix RA2 porting mistake (#2813)Pxx500
fix
2024-08-02Fix gtpp hv-iv material progression (#2812)chochem
* use new tier materials * remove outdated comments * fix material progression * sa * remove more outdated commented code * use gt api * materials.uv is broken
2024-08-02Switch to using the vanilla fortune logic for raw ores. (#2810)Ethryan
* Switch to using the vanilla fortune logic for raw ores. * change long to int * switch random generator
2024-08-02fix another ra2 issue (#2811)chochem
no chances in ingot maceration
2024-08-02Use oredict instead circuit enum for Magneto Star Matter material component ↵Nxer
(#2809) use oredict instead circuit enum for Magneto Star Matter material component Allow ANY CIRCUIT as input for Magneto Star Matter material recipe in Electric Implosion Compressor.
2024-08-01MFE buffs (#2805)Mary
* MFE buffs * Change electromagnet text formatting for consistency * Formatting changes as suggested * Structure change
2024-08-01Hot salt ehe support (#2727)Reflex18
* Support for hot solar salt in EHE This provides support for the hot salt from the solar tower in the EHE. The numbers are based off of the heat exchanger which is that hot salt is five times as dease as hot coolant. * Spotlessapply
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