aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Materials.java
AgeCommit message (Collapse)Author
2023-01-17Optical Line Items & Fluids added (#1658)TheEpicGamer274
* Optical Line-Water line & Items * Spotless apply * Spotless applies + Optical Board
2023-01-04force compound to be grouped together in chemical formula (#1630)Glease
* force compound to be grouped together in chemical formula Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * patch up glass chemical formula Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * merge two toString Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2023-01-03Add new Weed-EX 9000 (#1615)Jakub
* Add new Weed-EX * Add more pollen * Change material ID * Remove fluid recipes * Remove pollen * Remove cells
2023-01-02Change Tungstensteel to Require TPV Coils (#1628)Steelux
2023-01-01Changed (sg) to * instead (#1620)Ethryan
2022-12-30disable auto recipe (#1611)chochem
2022-12-29Naphthenic acid (#1589)Martin Robertz
* add burn value for NaphthenicAcid 60k in Semi Fluid generator (cherry picked from commit 3fa145932b64025067e807f4ff900f51029d07bd) * add Naphthenic acid recipes and change a few (cherry picked from commit 8b6b6d72dd79b4549dccd3732ccca6e219dd8ce7) * spotless * fix error (cherry picked from commit db7b322cece6cf151f92ab6aa467bc8e4c84bda8) * Chemical balance fixes Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
2022-12-28remove autogenerated SiSG ebf recipe (#1588)Martin Robertz
(cherry picked from commit 4d3052e50b7de739c89c339d37a24297f3bb70fc)
2022-12-14Do some fixes for the PCB Factory (#1549)BlueWeabo
* fixes all over the place * shouldn't have edited that * make easier to understand
2022-12-13Nanite material and circuit board multi for later tiers (#1513)BlueWeabo
* Base work for ModularUI compat * Remove useless interface * Add almost all the widgets * Invert method * Refactor NEI stack placement positions * NEI handlers on ModularUI * Add some more docs * AdvDebugStructureWriter * Fix NEI progressbar not working * PrimitiveBlastFurnace * clean * derp * clean * spotlessApply * Boilers * Buffers * clean * N by N slots containers * Fix boilers not having bucket interaction Put opening UI to individual MetaTEs * Maintenance Hatch * clean * spotlessApply * Add dependency * IndustrialApiary * Adapt to ModularUI change * Base work for covers & fix crash with MP * Fix crash with server * Rewrite base work for covers * Send initial cover data on cover GUI open so that the time of showing incorrect data will be eliminated * Covers part 1 * Rename package: ModularUI -> modularui * Rename class: GT_UIInfo -> GT_UIInfos * Fix build * Covers part2 * Fix missing client check with tile UI & fix title overlap * CoverTabLine * Move cover window creators to inner class * Fix crash with null base TE * Close GUI when tile is broken * Color cover window with tile colorization * add nanites as a material * spotless * start the work on the nanites multi * spotless * Change signature of addUIWidgets * FluidFilter cover, FluidDisplaySlotWidget, BasicTank, BasicGenerator, Output Hatch, MicrowaveEnergyTransmitter, Teleporter, DigitalChest, DigitalTank * Add title tab * Move package: modularui -> modularui/widget * add controller recipe and new casing * add prefix and the casing and controller to the item list * add nano forge controller to its item * add nanites to PreLoad * Programmed circuit + IConfigurationCircuitSupport * clean * add nano forge multi - complete with some recipes * new nanite textures * Apply spotless * fix nanites not registering, remove recipe lock on the nano forge, other small fixed no clue why they didn't want to register in run2. * VolumetricFlask * Remove integrated circuit overlay from recipe input slots * Input Hatch & Quadruple Input Hatch * Multiblock * Deprecate old cover GUI * BasicMachines * Finish BasicMachine & NEI * Expand DTPF NEI to 9 slots * Fix ME input bus on MP * Move AESlotWidget to public class * Move GT_Recipe_Map constructors with mNEIUnificateOutput to setter method * Move SteamTexture.Variant to outer enum * Switch to remote repository * oops * Update MUI * Update MUI * Minor refactor for change amount buttons * the start of a new multi, tooltip WIP * Display items and fluids that exceed usual count * blah * use +=, why didn't I do this * add tier 2 and tier 3. add some more checks * Update MUI * Move ModularUI to Base (#1510) * Move ModularUI to Base * Move most of the ModularUI functionality to `BaseTileEntity` (and `CoverableTileEntity`) * `CommonMetaTileEntity` delegates ato the MetaTileEntity * Added several interfaces (with defaults) to indicate if a tile/metatile override/implement certain behaviors. * Moved `IConfigurationCircuitSupport` interface such that it will work with BaseTileEntity or a MetaTileEntity * Address reviews Co-authored-by: miozune <miozune@gmail.com> * Update MUI * make a single shape rotatable by 90 degrees * Minor changes to NEI * more shapes, more mechanics * Return :facepalm: * IGetTabIconSet override * Some more changes to NEI * Merge texture getter interfaces to new class GUITextureSet * Remove BBF structure picture as it's auto-buildable now * Make unified title tab style of texture angular * Expose some boiler texture getters for addon * Fix crash with cover GUI on pipe * small changes * Lower the number of recipe per page for DTPF & update MUI * Update MUI * Fix crash with middle-clicking slot on circuit selection GUI * Fix circuit selection window not syncing item from base machine * Merge GT_NEI_AssLineHandler into GT_NEI_DefaultHandler * Update MUI * Add in TecTech multi message * Allow changing the way of binding player inventory * Update MUI * Update MUI * Update MUI * Update MUI * Update MUI * Make MUI non-transitive to allow addons to use their own version * Force enable mixin * Format fluid amount tooltip * Add GUITextureSet.STEAM * Add guard against null ModularWindow creation * Add constructors for Muffler Hatch with inventory * Fix output slot on digital chest and tank allowing insertion * Don't log null ModularWindow * add a new material, add some recipes, continue the work on the PCB factory. The first recipe is in! * oops spotless * update bs * rename casings * make material generate plates * add recipes to the pcb factory * nei handling * do some more work on the multi * fixes to recipes. * Update build-and-test.yml * starter work on the PCBFactory GUI. recipe check fully working * finish gui work * spotless thank god drafts don't generate spotless PRs * final touches. tooltip tomorrow * fix typos. and finish PCB multi. * spotless * changes for requests * make consumed amount a constant * fix recipes oopsie * Remove unused textures * Add nanites * fixing recipes * Fix NEI not showing * Make nanites share texture * actually fix recipes and use 2 new lenses * finally circuits work in recipe * Add trans metal block * add default offsets * spotless * make parallels actually work * Downscale nanite texture to 64x64 * improve PCB Factory GUI * finish fixing gui, fix offsets on cooler, apply a new formula for duration * Clean up PCB Factory tooltip * Spotless * Fix typo in Naquadah * make sure the roughness multiplier actually slows down the recipe XD * add a smaller limit to the roughness multipler.... lets not allow for 10x board prodction oops * fix cooler tier 2 using wrong block in its center, fix controller texture on tier 3 * update mui and uodate the button texture * fix one button and prevent null arrays * remove some math. a small rework on recipes * fix and off by 1 * save the change? never heard of it * fix tier 3 not forming * Nano forge tooltip * hopefully fix nano forge. fix neutroni nanite wrong tier in recipe * try 2 to fix structure check * fix nano forge not forming * fix nano forge data stick. we need better error messages * do some fixes. * its 12am, typos.... * never coding at midnight again * try 2 to fix nano forge and pcb factory * fix nano and pcb factory not working. address some reviews * do syncing between client and server. fix recipes asking too much power with multiple upgrades Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Jason Mitchell <mitchej@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Sampsa <sampo.vanninen@aalto.fi>
2022-10-30Add method for getting a GT material from a Forge Fluid instance (#1497)Elisis
* Add Fluid material map, lookup function * spotlessApply (#1498) Co-authored-by: Elisis <gtandemmodding@gmail.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-10-25Recipe fixes 2022/10/25 (#1489)miozune
2022-10-23Replace TSS Coils with Titanium-Platinum Ones (#1211)Steelux
* Replace TSS Coils with Titanium-Platinum Ones - Created a new material, TPV-Alloy, made from Titanium, Platinum and Vanadium (3/3/1); - Replaced the Tungstensteel Coil Block with a TPV one, to make it properly included in EV while adding a Platinum sink in that tier; * Simplified Metal Proportion for TPV * change tpv ebf temp to 3k to be even with TSS (cherry picked from commit 52dda9f666d8e1b2d220a0b2d9e24513ad8a4490) * add TPV mixer recipe (cherry picked from commit 30b6cf62c14165add271a1ecc4a322ab0ce609d1) * add tpv as metal via tag (cherry picked from commit 75dba7283e26b6e2f717a3230d6369e4cbe20c8e) * Spotless apply for branch EV_Coil_Change for #1211 (#1482) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * move TSS and TPV to ev (Mixer recipe) (cherry picked from commit 74dc0da61db49102cc3e073f5c506e8c494c508f) * add info to Nei * Spotless apply for branch EV_Coil_Change for #1211 (#1483) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de>
2022-10-22ore line for some useless ore (#1210)Yang Xizhi
* oreline * ilmenite * update BS+SA * Revert "update BS+SA" This reverts commit 00c0d26b5d4963a42c7cd6721cc9444fac8fd2c2. * add missing import * garnet * Spotless apply for branch ore for #1210 (#1481) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * green vitriol recipe Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de>
2022-09-24rollback(materials): tin ores multipliers (#1406)Léa Gris
Reverts changes from https://github.com/GTNewHorizons/GT5-Unofficial/pull/1150
2022-09-18add recipes to cooldown boron plasma into boron dust (#1389)Glease
2022-09-06Fix overly large sprites being used causing some users FPS lag (#1347)Glease
* fix sprite abuse * Spotless apply for branch fix/sprite-abuse for #1347 (#1348) Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> * convert gaia spirit Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-05feat(API): Implements a featured API for GT_Fluid (#1345)Léa Gris
* feat(API): Implements a featured API for GT_Fluid *** Rationale The current implementation, which is based on the `GT_Fluid` object, does not allow for the evolution of the functionalities, or the variation of the fluid-related implementations in GregTech. *** Objectives This replacement API should free from these constraints, by providing : 1. The separation of responsibilities of the different tasks and steps: - The definition and progressive construction of an `IGT_Fluid`, - Registration of the `IGT_Fluid`, - Configuration of related equipment, such as containers, - Propagation of properties of an `IGT_Fluid` to related services such as Materials 2. The separation of interfaces exposed to the API from their internal implementations to allow: - Evolve the implementations in the most transparent way possible - To have internal GregTech implementations or outsourced implementations coexist in its extensions. *** Specificity of this new API - Provides a new interface to build and interact with fluid related records - Deprecates the old `api/objects/GT_Fluid` object and the `common/GT_Proxy.addFluid` record methods * fix(conversations): addresses @Glease review comments https://github.com/GTNewHorizons/GT5-Unofficial/pull/1345#pullrequestreview-1096261703 * ./gradlew :spotlessApply * fix(review): add review comments from @eigenraven Added missing final qualifiers on methods parameters. https://github.com/GTNewHorizons/GT5-Unofficial/pull/1345#pullrequestreview-1096318523 * fix(review) address remaining review comments from @eigenraven
2022-09-04Fix temperature of Molten Reinforced Glass (#1342)miozune
2022-09-04Fix blaze recycle recipes not being generated (#1343)miozune
2022-09-03Fix reinforced glass (#1337)miozune
2022-09-02fix oxygen dupe (#1334)Glease
2022-09-01Sodium potassium (#1322)Martin Robertz
* Add a new way get Sodium Potassium Add Fluid Sodium to gt * spotless remove old NAk and Helium cell recipes * derp * add liquid sodium texture (cherry picked from commit bd050330f91e0306e156f6a130783e867661338a) * add liquid sodium cells (cherry picked from commit 45f988cf3bbca43abf3f07a0a8e7ba891b8727a3) * move recipe to core mod (cherry picked from commit 7db15cd792136abac6fb88c9a7fa9d05f1f0619e) * add a heater recipe without a input fluid * Revert "move recipe to core mod" This reverts commit 9d5ff875a00e59c6edb52336b7d9c20889d9bd9b. * use fluid heater recipe without input fluid * Spotless apply for branch Sodium-Potassium for #1322 (#1328) * Two slots wiremill (#1324) * add a circuit slot to wiremil * add circuits to wire recipes * add 2 input slots to Wiremil * exchange circuit and material slot * add 2x-16x wires to wiremil * add missing 12x wires * add slot migration code (#1326) * spotlessApply (#1327) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * spotlessApply Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Revert "Spotless apply for branch Sodium-Potassium for #1322 (#1328)" This reverts commit 5bf31ffddfeddd1c4d161d434abb8402939ec9d6. * spotless * make fluid heater working with <1 fluid (cherry picked from commit 8045cf6f03d0ce030b8e7b2fa6c70dca6d9ccc5d) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2022-08-27Fix spotless rebase (#1307)Raven Szewczyk
* Fix broken rebase * Undo Materials formatting, it generates too many lines * Dummy commit * Missed a structurelib update
2022-08-27Update buildscript & apply spotless (#1306)Raven Szewczyk
* Update dependencies * Update buildscript, apply spotless
2022-08-26a proper fix for anyrubber product outputting silicon rubber on macerate (#1302)Glease
* a proper fix for anyrubber product outputting silicon rubber on macerate * remove debug prints
2022-08-21changed diatomite chemical formula (#1283)RIONDY 'POPlol333' Adam
* changed diatomite chemical formula * added the small 8 as requested in the ticket
2022-08-19Meta Generated Items renderer overhaul (#1269)Vladislav Laetansky
* Meta Generated Items renderer overhaul * Adjust naming * Force alpha test * Properly render overlay
2022-08-14Fix wrong ternary operator causing electrolyzer recipes disappear (#1255)miozune
2022-08-12Add correct formula for Superconductor Base materials (#1240)miozune
2022-08-09fix(warnings): remove broad wanings suppression (#1223)Léa Gris
* fix(warnings): remove broad wanings suppression This shell script was applied to remove all instances of `@SuppressWarnings("ALL")`: ```sh grep -lr '@SuppressWarnings([[:space:]]*"ALL"[[:space:]]*)' src/ | xargs -l1 \ sed -n -i.bak '/@SuppressWarnings([[:space:]]*"ALL"[[:space:]]*)/!p' ``` * nuke @SuppressWarnings("all") in GT_NEI_DefaultHandler Case insensitive: ```sh grep -lr '@SuppressWarnings([[:space:]]*"[Aa][Ll][Ll]"[[:space:]]*)' src/ | xargs -l1 \ sed -n -i.bak '/@SuppressWarnings([[:space:]]*"[Aa][Ll][Ll]"[[:space:]]*)/!p' find src -type f -name '*.bak' -delete ``` * fix(warnings): GT_NEI_DefaultHandler * fix(warnings): GT_Mod * fix(warnings): GT_Values * fix(warnings): Materials * fix(warnings): GT_BeeDefinition * fix(warnings): GT_PostLoad * fix(warnings): GT_Worldgenloader * fix(warnings): GT_PreLoad
2022-08-07Botania adjustments (#1224)miozune
2022-08-06Add wiremill recipe for SC UEV Base (#1214)miozune
* Add wiremill recipe for SC UEV Base * Adding UIV and UMV SC (#1213) * fixing sphalerite electrolyze recipe * beginning of UIV/UMV SC * real sc mat * real umv sc craft * fixes sc umv heat temp * Fix ID conflict * Move wiremill recipe Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
2022-08-06Adding UIV and UMV SC (#1213)RIONDY 'POPlol333' Adam
* fixing sphalerite electrolyze recipe * beginning of UIV/UMV SC * real sc mat * real umv sc craft * fixes sc umv heat temp
2022-08-02copper and molten texture change (#1184)Yang Xizhi
2022-07-31no furnace recipe (#1180)chochem
2022-07-31Better Endgame Wireless EU (#1144)Connor-Colenso
* Basis of changes * Adjust voltage tiers to remove OpV * Better textures, move IDs around etc. * Format cleanup * Log level change * Dynamos * More stuff * More OpV purging. * Fixes * Remove wire support. * Textures * IDs * Update hatch/dynamo * New number formatter * Add default method * Add save method on world close * Cleanup old comments/debug * Author * Author * Author * Author * Restructuring of code * Unit tests * More unit tests + cleanup * Fix ID shift + add spares Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-31fix small ore and cass ore (#1150)Yang Xizhi
2022-07-30Botania Materials with custom textures (#1168)Connor-Colenso
* Move materials to new class and remove some old comments. * Move materials to new class and remove some old comments. * New mat textures * RGB Fixes * Change material stats Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-30Add energised tesseract (#1175)Connor-Colenso
* New recipe methods. * Pulverise tesseracts * New pulveriser method * Cleanup code * Smelting/cooling methods * Super coolant * Add hot ingot * Expand DTPF UI * Add energised tesseract * Disable incorrect freezer recipe. * Remove compressor recipe + adjust values of transcendent metal a bit. * Fix missing textures Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-30Transcendent metal (almost) (#1171)Connor-Colenso
* New recipe methods. * Pulverise tesseracts * New pulveriser method * Cleanup code * Smelting/cooling methods * Super coolant * Add hot ingot Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-27Rework Turbine Materials and Useless Space Ores (#1146)Steelux
- Changed the flow calculation system to account for multipliers, which can be customized for every material without changing existing material stats; - Greatly improved materials matching some space ores that aren't used for anything (these ores will get tiered EBF recipes like Oriharukon did); - Changed some other materials that currently aren't used for turbines.
2022-07-26New material + item + texture changes. (#1161)Connor-Colenso
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-23add(api/enums): particle and sound effect enumerations (#1154)Léa Gris
* add(api/enums): particle and sound effect enumerations - Adds new GregTech API enumerations: - `ParticleFX`: Enumerates known EntityFX particles. - `SoundResource`: Enumerates known sounds with, id and ResourceLocation. - Refactors code to use the new enumerations instead of string literals. - Uses `ParticleFX` and `onRandomDisplayTick` to improve or implement new particle effects for these machines: - BBF: Adds random flames in front of the firebox. - Steam machines: Changes pressure-exhaust particles to white vapour, rather than dark smoke. - Magic Energy Absorber: Adds random effect, of absorbed magical purple particles, by the EnderDragon Egg siphon. - Forge Hammer: Adds sparse random sparks, ejected from the main face.
2022-07-19Standardize Anti-Knock Agent recipes (#1143)miozune
* Standardize Anti-Knock Agent recipes * Fix cell amount
2022-07-18generate silicon EBF recipe (#1140)chochem
2022-07-10replace oxide chemical with raosted ore dust (#1120)Yang Xizhi
* replace oxide chemical with raosted ore dust * typo
2022-07-09Standardization of GT5u Chemical Recipes (#1062)Yang Xizhi
* chemical rebalance 1 item unit = how many atom in it 1 fluid unit = 1b * remove some tiny dust * remove crop tiny dust * Na2S * Acetone chain rework and fix COx * electis balance * Fix cell amount * more fix * acid, rubber and epoxy * no * roast thing * pbi * number wise unnerf roast recipe * uranium, indium, titanium lossless cycle * salts * clay * silicon * derp * corret sodium carbonate chemical formula * revert lossless indium * fix * scheelite * silicon line * ore dust * kevlar line * fix * don't change register name * fix * nerf NaOH electrolysis recipe to match water * fix Co-authored-by: Pnc6lx <2458894429@qq.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: miozune <miozune@gmail.com>
2022-07-08Missed a few (#1116)Ethryan
2022-07-08Update Materials.java (#1115)Ethryan
generated by cgit (git 2.46.0) at 2025-03-05 01:20:11 +0000