aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2022-02-27fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9345Martin Robertz
(cherry picked from commit 37b07f0731a49d3ac54b702619d8ef0aead2a04e)
2022-02-26remove hand crafting Neutron Reflector recipes (#956)Martin Robertz
(cherry picked from commit 758a3c4b3c9e46376c24f30f23a97f374396b9ca)
2022-02-26both use circuit 4Martin Robertz
2022-02-26fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9133Martin Robertz
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-25remove autogenerated jade electolyse recipesMartin Robertz
2022-02-25fix jasper fumularMartin Robertz
2022-02-25fix RailCraft Tanks beyond Steel Need Material Recovery Options #9808 (#951)Martin Robertz
* fix RailCraft Tanks beyond Steel Need Material Recovery Options #9808 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9808 (cherry picked from commit 923d1fa1b9aded23074809f61173acb57a8f503b) * fix recipes (cherry picked from commit 28c4b21e8094140ac0aac0f36b42f342a5a19a8c) * add fluid extractor recycling recipes as well * fix wrong recipes (cherry picked from commit 712a0ec37bb282a728c177886525b8663f5ec60c) * fix wrong recipes again (cherry picked from commit 18e053085112ecf94c2db44ce636c7692ae3d50c)
2022-02-25change mushroom stew stacksize (#952)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-23Minor bugfix/cleanup (#941)pariator
* Fixes slime spawn handling variances After testing, I was able to see 2 separate problems. 1: event.getResult() was occasionally returning ALLOW for some of the world spawned slimes. Slime spawn denial is done regardless of the ALLOW/DENY flag. This does not impact slimes spawned via eggs or powered spawners or slimes spawning after a slime is killed which apparently return DEFAULT for getResult(). 2: Slimes don't seem to properly handle a getResult() value of DENY. The checkSpawn event is not cancellable. To fix this, the entity is also destroyed by setting isDead to true. This does occasionally cause slimes to appear on the minimap briefly before disappearing. Lastly, with a forge update this could be handled much better by using the EntitySlime.spawnReason enum. That is not present in the current forge version, so I would consider this a temporary workaround and this method could/should be reworked if/when forge is updated. * Make repellators stop slimes. While testing, this was used to name the slimes as they were being generated. It turns out to also make the slimes behave properly in addition to the other changes. * Minor Cleanup Moved the slime handling out of the rest of the method and takes an approach of setting it to DEFAULT of it is ALLOW and then also adding a custom name tag if it doesn't have one. If it does have a custom name tag and ALLOW, then the slime spawn will be allowed. * Moved the setCustomNameTag method This method is still required to properly stop ALL slime spawns but it should only alter the customNameTag when a slime is intended to be stopped from spawning. * Fixed likely exception Check for instance of EntitySlime before casting it. This method is only required to stop slimes from spawning so is only being called against slimes. Co-authored-by: Randy Braunm <randy@unseencolor.com>
2022-02-23UEV Superconductors and slight rejig of other superconductors (#943)Colen
2022-02-23fix Add Jasper Dust Electrolyzer Recipe [Suggestion] #9801Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9801
2022-02-23fix Add Amber Electrolyzer Recipe #9802Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9802
2022-02-23fix Add Jade Electrolyzer Recipe #9803Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9803
2022-02-23fix Graphite Dust missing C chemical formula #9804Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9804
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-20Add default behavior for looking up NEI catalysts (#940)miozune
2022-02-16Fix typo (#939)miozune
2022-02-14Server side metaitems localization (#938)repo-alt
fixes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8778
2022-02-13fix Alloy smelting synthetic rubber bars into their plates #9717 (#934)Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9717
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-12Fix separatorl. (#932)Colen
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-10Fixes slime spawn handling variances Issue 7298 (#905)pariator
* Fixes slime spawn handling variances After testing, I was able to see 2 separate problems. 1: event.getResult() was occasionally returning ALLOW for some of the world spawned slimes. Slime spawn denial is done regardless of the ALLOW/DENY flag. This does not impact slimes spawned via eggs or powered spawners or slimes spawning after a slime is killed which apparently return DEFAULT for getResult(). 2: Slimes don't seem to properly handle a getResult() value of DENY. The checkSpawn event is not cancellable. To fix this, the entity is also destroyed by setting isDead to true. This does occasionally cause slimes to appear on the minimap briefly before disappearing. Lastly, with a forge update this could be handled much better by using the EntitySlime.spawnReason enum. That is not present in the current forge version, so I would consider this a temporary workaround and this method could/should be reworked if/when forge is updated. * Make repellators stop slimes. While testing, this was used to name the slimes as they were being generated. It turns out to also make the slimes behave properly in addition to the other changes. * Minor Cleanup Moved the slime handling out of the rest of the method and takes an approach of setting it to DEFAULT of it is ALLOW and then also adding a custom name tag if it doesn't have one. If it does have a custom name tag and ALLOW, then the slime spawn will be allowed.
2022-02-09change SMR recipes (#931)Glease
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-08Add CPU wafer craft from Americium and europium wafers (#927)LewisSaber
* Add CPU wafer craft from Americium and europium wafers * Change crafttime of CPU wafers * Change Ram recipes to encourage use of better wafers * Change SoC wafer recipe to encourage use of better wafer * Buff Americium CPu recipe output * Change AsoC wafer recipe time to encourage use of better wafers * Change NPIC time * fix what dream requested im too stupid sometimes help me
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-06Provide a runtime solution for number rendering. (#922)Daniel
* Provide a runtime solution for number rendering. This should adapt based on locale selected by user instead of the system locale. Also fixes 'nbsp' issue in some locales like pl_PL. * Add missing imports * Add missing imports
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-04Add 2 more transmute recipes (#921)Pao
2022-02-04Translation related fixes (#920)Glease
* Translation related fixes * Rename trans to transItem
2022-02-04GT_RectHandler now relies on an interface (#916)YannickMG
and not specific class names
2022-02-04Paperbark tweak (#917)miozune
2022-02-04Revert trans changes for GT_Generic_Item and descendants (#919)YannickMG
2022-02-04Changed DT Water Distillation Recipe (#918)Steelux
* Changed DT Water Distillation Recipe - Changed input and output values to match, and rounded them up to a round number. * Changed Values to 1000L - Changed input and output to 1 bucket, about 4 times what they were before, and doubled both the duration and EU/t cost. * Changed EU/t to Allow Some Loss in MV
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-02Pulverize Cobweb to String (#913)Steelux
- Added a recipe to pulverize Cobweb to String, at a 1:1 ration until HV Macerator, where there's a 50% chance to get one more.
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-02-01Reserve meta IDs for glowredman (#912)glowredman
2022-02-01Reserve MTE IDs for glee8e (#911)Glease
2022-01-31Fix incorrect sorted recipe list cachingGlease