aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2022-03-26Fix secondary description not written to language file (#987)MuXiu1997
* Fix secondary description not written to language file * Extract ISecondaryDescribable interface * Recover isDisplaySecondaryDescription in MetaTileEntity
2022-03-18fix set locked fluid not working via drag n drop (#979)Glease
2022-03-18make miner output to correct slots (#985)Glease
* make miner output to correct slots * fix git derp
2022-03-14Add flow rate of oil rigs in the tricorder info (#981)Jakub
* Add info to tricorder * Add number formatting
2022-03-14pin comb type id instead of depending on array ordinal (#980)Glease
* pin comb type id instead of depending on array ordinal * fix up _NULL related problems * fix out of bound * make it private * add some more test
2022-03-14save config late (#982)Glease
2022-03-13fallback to error texture if icon is null (#978)Glease
2022-03-12reverse linesMartin Robertz
(cherry picked from commit ac75144b6aedae4214d3103c075345a1bb563869)
2022-03-12change Biomass brewing recipe to 1000 mb (#976)Martin Robertz
* change Biomass brewing recipe to 1000 mb make distilled water recipe much quicker (cherry picked from commit 64d599e1bd37174df4ae5555f0492e058d40fb61) * fix biomass recipe (cherry picked from commit af0cbc4b4f207fd21428f656572d0fa5a1d013e2) * set input and aoutput stack to 1000L * change back to 1000L (cherry picked from commit 63d5b7b3bbf3d3e80485454a3c87eef65dbb28e6) * remove duplication entry change recipe stack(water) (cherry picked from commit cf86138953199b8dbc9a87451ce0be9c44bf1056) * Revert "set input and aoutput stack to 1000L" This reverts commit 500a250ade0d4eab963b96646a01c497cb252abb. (cherry picked from commit c5142567a319f8379bf716d098e97b7d809783c7)
2022-03-08Add blueprint support to Cleanroom (#973)Jakub
* Add blueprint support to Cleanroom * Fix minimum height in hologram * Just Interface
2022-03-05Fix disable machine mode on cover (#968)Jakub
2022-03-03remove hacky circuit oredict code (#955)Yang Xizhi
2022-03-02add locks to the node graph so paths can block power transfer #25 (#950)Martin Robertz
Co-authored-by: bot <Krampus.sack.never@gmail.com>
2022-03-02Add Circuit from controller inventory slot to stored inputs (#960)Jakub
* Add controller inventory slot to stored inputs * Prevent adding circuit twice
2022-03-01Update tooltip of EBF (#958)Jakub
2022-02-27fix Schematic recipe give steel backMartin Robertz
(cherry picked from commit bc7e44b70cf7a79f46ce4528cef4854c0c7c26a1)
2022-02-27fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9345Martin Robertz
(cherry picked from commit 37b07f0731a49d3ac54b702619d8ef0aead2a04e)
2022-02-26fix redstone output for buffers and filters (#947)repo-alt
closes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9442
2022-02-26Fix magic absorber consume enchantments from item without generate EU and ↵Gates_ice
move item to output slots. (#946)
2022-02-26now input and output hatch are shown on the right side (#954)Martin Robertz
2022-02-25Fix Disassemblers giving wildcard meta variant of stacks (#948)miozune
2022-02-23Base work adding 3 new tiers of coils. (#885)Alkalus
* Base work adding 4 new tiers of coils. * Remove OPV tier. Remove nonsensical coil tier tags. (Awak = UIV, really? No thanks) Add proper texture for Hypogen, Infinity and Eternal coils. * Revert avaratia dep via import by Alk. If someone can implement cosmic rendering here then great but that is well beyond me. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-02-22disable rendering facade texture intended for second pass (#944)Glease
2022-02-21Mining behaviour rework (#936)Johnson
* Mining machines drilling addon. Every machine that uses mining pipes must contain a field with this object and use any interaction with the pipe and drilling solid blocks through it. Includes all checks for this. Allows you to reuse the code and ensure the same behavior of the processes of descending and retracting the pipe and mining blocks. * Mining machines drilling addon - singleblock Miner implementation. Total refactoring of Miner tile entity. * Some mining addon fixes * Fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9733 * Removed some over engineering thoughts * Checks in the mineBlock method. And we can not descent the pipe while outputs are blocked * code review fixes https://github.com/GTNewHorizons/GT5-Unofficial/pull/936 * code review fixes https://github.com/GTNewHorizons/GT5-Unofficial/pull/936 Co-authored-by: karpov.evgeniy <karpov-em@dartit.ru>
2022-02-20key (#942)iouter
2022-02-16Fix typo (#939)miozune
2022-02-12cleanup(ore particles): static analysis auto code cleanup and format (#935)Léa Gris
Normalise indent chars, layout, Remove redundant casts, use diamond operators. Optimize and sort imports Sort member variables by attributes Remove redundant switch case static final text constants simplify conditions replace repeated inline code with iteration add missing @SideOnly(Side.CLIENT) prevents accidental server crashes
2022-02-11Dedicated server crashes in PathFinder calling Renderer (#933)repo-alt
2022-02-10Fix Ore Particles (#926)glowredman
* Fix ore particles * simplify getIcon methods * Fix spacing, fix accidental renaming of args
2022-02-09Do not reference class on dedicated server (#929)Glease
Rendered erroneously is bad, but crashing outright is even worse.
2022-02-09Fix optical circuit ore dict. (#930)Colen
2022-02-07Large Boiler Whitelist and NEI Large Boiler Tab Update (#910)Steelux
* Whitelist for Advanced Boilers - Added a whitelist system to check allowed fuels for the Titanium and Tungstensteel Boilers (thanks glow for the code); - Removed fuel value checks for the advanced boilers, none are needed because the whitelist check does it all; - Changed the boiler tooltip to clarify that the advanced boilers won't work if there is a fuel in the input bus that is not allowed to be burned. * NEI Large Boiler Tab Updated - Changed the burn times to reflect the speed at which the boilers now consume fuels; - Changed the TItanium and Tungstensteel Boiler info to display "Not Allowed" on the fuels that aren't accepted by them. * Re-added Previous Constructor as a Default Case - Implemented the previous addRecipe constructor without the boolean, applying to all non-solid fuels, with a default value; - Changed the boiler code to make the advanced Boilers ignore the fluid recipes (they're only supposed to burn the allowed solid fuels); - Small NEI clarifications. * Unnecessary Burn Time Calculation - Removed the burn time calculation on the NEI handler for the fuels that can't run in the advanced boilers. * Shortened Tungstensteel Boiler Line - Made text shorter to not overflow past the NEI display. * Properly implement solid fuel whitelist for Large Titanium/Tungsten Boilers Co-authored-by: glowredman <fredcraft00@gmail.com>
2022-02-04Texture Shenanigans (#915)Jason Mitchell
* Texture Shenanigans - Get rid of all the TODOs and run everything through the new Texture API in a backwards compatible way. * allow bw runclient to run * Add obf name Co-authored-by: bombcar <github@bombcar.com>
2022-02-04Translation related fixes (#920)Glease
* Translation related fixes * Rename trans to transItem
2022-02-04Revert trans changes for GT_Generic_Item and descendants (#919)YannickMG
2022-02-03Basic Machine NEI Power Tiers (#914)YannickMG
* Add IntelliJ .shelf folder to .gitignore * Fixing GT_GuiTooltip bug I introduced * Deprecated superfluous String trans methods. * Add Power class to compute and describe power usage * trans -> GT_Utility.trans Removed absent param from Javadoc * Add Power to BasicMachine and use it for power calculations * Steam BasicMachine rework Have Bronze and Steel tier override Power with appropriate SteamPower Make Bronze machines explicitly tier 1 Make Steel machines explicitly tier 2 Defined recipe list and bricked status for each machine Unified checkRecipe uses machine's recipe list and Power * Raised NEI dependency to 2.2.5 * Defining NEI transfer rect in individual UIs Using a new interface called from GT_RectHandler * Code cleanup & minor refactor * Add power field to NEI Default Handler Add method to create Power object from the recipe map * Display power tier in NEI handler name * User Power to draw NEI Handler description * Enable filtering handler recipes using Power * Repurposing aBricked parameter into aHighPressure To fix my previous faulty method of setting mTier * Must call getCache to get recipes properly. * Better communicate NEI Overclock info
2022-02-01Add input bus like sorting to chest and super buffers (#900)Johann Bernhardt
* Add input bus like sorting to chest and super buffers * Remove unused import
2022-01-30Waila handling was all in one place, distribute it now that it's in GT5u ↵Jason Mitchell
proper. (#907)
2022-01-28Texture tooltips update (#903)Colen
* New circuits * Fix last tier ore dict * Colorfull tier tooltips (#898) * Make Repellator stop slimes spawning (#896) * Add special tooltip handling, requested by Colen Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com> * Fixed github shenanigans with new tier colours. * Update A LOT of textures (mostly minor) * Remove extraneous comments. * Remove obsolete comments and update materials.java. * Add tooltips for all batteries in base GT. * Remove test case Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com>
2022-01-27Add new xSMDs (#894)GTNH-Colen
* Add new xSMDs and xSMD wraps. * Add new xSMDs and xSMD wraps.
2022-01-27Fix copy pasting error in fluid regulator (#897)Glease
2022-01-27Backport gregicality textures (#893)GTNH-Colen
* Backported gregicality textures for UIV, UMV, UXV and MAX parts and remove OpV tier parts. None of these parts are used for anything currently but at least they aren't just carbon copies of UEV anymore. * Backported gregicality textures for UIV, UMV, UXV and MAX parts and remove OpV tier parts. None of these parts are used for anything currently but at least they aren't just carbon copies of UEV anymore.
2022-01-27Add new circuit tiers (#895)GTNH-Colen
* New circuits * Fix last tier ore dict * Colorfull tier tooltips (#898) * Make Repellator stop slimes spawning (#896) * Add special tooltip handling, requested by Colen Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com> Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com>
2022-01-25fix(glow): missing glow over for single-block miner (#892)Léa Gris
Fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9574
2022-01-24Make the miner actually work and not just retract pipes (#891)repo-alt
2022-01-24Add conditional mode to fluid regulator (#890)Glease
2022-01-23AE2 Cable facade as cover (#887)Glease
* initial work on facade covers * fix colorMultiplier also removed derp * Clean up drop cover texture reset code What was I thinking actually? Send a packet to reset client states? * Fix cover display stack
2022-01-22- fixed threshold GUI for item detector cover on digital chests (#884)repo-alt
- some cleanup
2022-01-18Oil Cracker Buff (#879)Steelux
- Buffed the Oil Cracker to consume less hydrogen than the LCR when hydro-cracking, and to output even more cracked fluid when steam-cracking. These buffs should make it worth to build right away compared to an LCR; - Increased the EU/t reduction from 5% to 10%, but with a limit of 50%, to give more value to early coil upgrades. Since oil setups like this aren't used at late tiers, it's more important to focus on the first tiers of coils; - Reworked the recipe time/energy cost. All recipes are now HV, matching the tier of the multi, but stay at 240 EU/t and run faster; Regarding Anti-Knock Agent: - Buffed the DT recipe to output more Anti-Knock Agent than the equivalent LCR recipe, and also reduced the total energy cost of the recipe. This recipe is part of a cycle between a Mixer and the DT, but the LCR does it it one step with perfect overclocking and without needing the height that the DT requires to do the recipe, which goes against the point of needing to distill to get Anti-Knock Agent.
2022-01-18ECE and Fuel Rebalances (#878)Steelux
* Large Boiler Rebalance - Changed Large Steel Boiler to output 1000 instead of 600 EU/t. - Changed Large Titanium Boiler to output 6000 instead of 800 EU/t. - Changed Large Titanium Boiler to output 6000 instead of 800 EU/t. - Changed Large Tungstensteel Boiler to output 18750 instead of 1000 EU/t. - Changed Titanium and Tungstensteel Boilers to output Superheated Steam instead of regular Steam. - Added an upper bound for the burn value that can be processed by the boilers, in order to prevent an overflow. - Added a lower bound for the burn value that can be processed by the boilers. This is a placeholder limitation intended to prevent the player from using the improved Titanium and Tungstensteel boilers to generate lots of power from easy solid fuels like Charcoal. A better way to implement this would be to make a whitelist of accepted fuels. The one I had in mind for these boilers was the Super Fuels, both the magic and non-magic ones. The last two boilers had terrible numbers for their tier. High numbers would allow for charcoal powergen up to IV or LuV, though, so the better boilers should only accept solid fuels that are difficult to make and need a processing chain. * Fuel Check, Water to Steam and Tooltip Fixes - Changed the Titanium and Tungstensteel Boilers to only consume the Super Fuels. They are checking for their burn values, which are unique - this is a hotfix, this should be implemented as a whitelist that can be changed in the config file, but I do not know how to do this; - Changed the code in the tooltips to differentiate between the two types of boilers without copypasting; - Changed the water consumption when producing Superheated Steam, to maintain the amount of Distilled Water. * Powergen Rebalance 1 - Changed Titanium Boiler from 6000 to 4000 EU/t; - Changed Tungstensteel Boiler from 18750 to 16000 EU/t. * ECE and Fuel Rebalance - Changed Biodiesel fuel value from 256k to 320k EU; - Changed Benzene fuel value from 288k to 360k EU; - Changed Cetane-Boosted Diesel fuel value from 720k to 1M EU; - Changed High Octane Gasoline fuel value from 1.728M to 2.5M EU; - Changed the recipe of Biodiesel to CBD to output 900L instead of 750L per 1000L of Biodiesel, to account for the fuel value change; - Reduced the LOX consumption of the ECE from 320 to 80 L/s. A quad Vacuum Freezer setup, with 3 HV and 1 EV can feed one ECE; - Small changes to the EU/t of the ECE due to it all being coded with ints in a specific format, where doubles caused several rounding errors. The boosted output amount is very similar to how it was before; - Added a condition to the LCE to not burn HOG if it does not have Oxygen to boost it, since it generated power without consuming any fuel due to its consumption being smaller than 1 L/t, and therefore rounded down to 0.
generated by cgit (git 2.46.0) at 2025-03-05 19:17:03 +0000