aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/render
AgeCommit message (Collapse)Author
2023-04-23Forge direction (#1895)Jason Mitchell
* ForgeDirection Also refactor the clusterfuck that was `getCoordinateScan` Co-authored by: Jason Mitchell <mitchej@gmail.com> * Fix rendering of Frame Boxes Frame boxes needed their own implementation of getTexture with int connexion mask, which is returning an error texture for the MetaTileEntity, because pipes (FrameBox **is** a pipe) do use this method to return different textures based on connexion status. --------- Co-authored-by: Léa Gris <lea.gris@noiraude.net>
2023-04-22MuTE overhaul and ACR (#1883)Maxim
* complex controller start * Added methods to get input fluids and items * Added logic to complex parallel mute * Added ACR and fixed many, many, many, many bugs * Added void protection setting to checkRecipe * do not init nbt, if mteID and mteRegistry are the same * Improved GUI design * Force structure check when pressing power switch * ACR Textures * Added T1 structure * Added perfect OC * Added WAILA * fix mutes resetting their nbt * Fix ACR GUI * fix npe * Added void protection for MuTEs * Fixed ACR starting recipe while another one is ongoing * nbt saving * maybe fix structure breaking * Fix complex machine disabling on startup * correctly update input tanks * move casings over * Changed logic of casings to change mode and facing in one go by sneaking * Fixed the casing target not resetting * Added side only annotations * don't leave it empty * Added power logic and tiered blocks to ACR * Change facing to wrench side if casing mode is currently none * lasers anyone? * Added ACR item chaining * Remove unncessary item lists * Use HashSet for process whitelists * Optimize list capacities * Fix potential recipe voiding bug * Rename methods for consistancy * Fix NPE * Duct tape fix structure check * allow MuTEs to connect to cables * Added separate tank inventories for input separation (#1887) * Fixed unregistering tank function * Fixed input busses not being automatable * Added fluid chaining * Fixed saving of input tanks * Forbid inventory registering with empty name * Display all input tanks in controller GUI * Fixed fluid hatch GUI height * Reset casing lists when checking the structure * Make inventory GUI size consistant * Make use of the tooltip cache * rename thing clean up * Forgot to put tooltip into map * Added tooltip to ACR * Reset whitelists when one whitelist window was opened * Refined scanner string * Fixed progress times * Fixed MuTE not consuming fluids * Properly register controller inventories * switch to ForgeDirection * switch to new Renderer * Added missing contains check on registerInventory * Fixed output tanks not registering * Fixed upgrade tank loading * fix machines not having active/inactive textures * fix overlays not loading correctly * Don't register controller directly * Remove magic strings all * fix active not setting to inactive * allow glow * item renderer * fix glow * MuTE improved hatch GUI and fluid output locking (#1889) * Allow output hatches to be fluid locked * Reworked hatch GUI * Check target before trying to open GUI * Make ACR GUI easier to look at * fix covers not rendering on mutes * fix covers not displaying above the item/fluid in/out * new folder texture structure * Reduce network traffic caused by covers * Fixed WAILA fluid locking display * Don't save everything to the itemstack NBT * Added possibility to save NBT of MuTE to its itemstack * fix textures, but make sacrifices * mah textures * Removed the need for all textures to be present * Added glow texture for active coke oven * Removed unncesssary upgrade casing textures * shorten nbt tags --------- Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-19Prevent NPE with large fluid cell renderer (#1898)miozune
2023-04-17allow data stick (contains assline recipe)render like ae2 pattern (#1890)xkball
* allow data stick (contains assline recipe)render like ae2 patten * spotless * data stick renderer and spotlessApply * Remove recursive boolean in data stick renderer,maybe have side effect --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-04-10Update spotless config to 0.2.2Raven Szewczyk
2023-04-01Jabel, Generic injection and mostly automatic code cleanup (#1829)Raven Szewczyk
* Enable Jabel&Generic injection, fix type error caused by this * add missing <> * Infer generic types automatically * Parametrize cast types * Use enhanced for loops * Unnecessary boxing * Unnecessary unboxing * Use Objects.equals * Explicit type can be replaced with `<>` * Collapse identical catch blocks * Add SafeVarargs where applicable * Anonymous type can be replaced with lambda * Use List.sort directly * Lambda can be a method reference * Statement lambda can be an expression lambda * Use string switches * Instanceof pattern matching * Text block can be used * Migrate to enhanced switch * Java style array declarations * Unnecessary toString() * More unnecessary String conversions * Unnecessary modifiers * Unnecessary semicolons * Fix duplicate conditions * Extract common code from if branches * Replace switches with ifs for 1-2 cases * Inner class may be static * Minor performance issues * Replace string appending in loops with string builders * Fix IntelliJ using the wrong empty list method * Use Long.compare * Generic arguments: getSubItems * Generic arguments: getSubBlocks * Raw types warnings * Fix remaining missing generics * Too weak variable type leads to unnecessary cast * Redundant type casts * Redundant array length check * Redundant vararg arrays * Manual min/max implementations * A couple missed inspections * Goodbye explosion power ternary ladder * Apply spotless * Get rid of the other two big ternary ladders * Binary search explosion power * Don't overcomplicate things
2023-04-01update spotless formatting (#1827)boubou19
2023-02-21Fix some issues with custom material renderers (#1755)miozune
2023-02-19Make material renderer available for arbitrary item (#1753)miozune
* Make material renderer available for arbitrary item * pass render pass
2023-02-17Add Hodgepodge compat (#1752)miozune
* Add Hodgepodge compat * cleanup * Fix for fluid inside large cell
2023-02-16Apply post-decompilation cleanup patches from the new RFG version (#1744)Raven Szewczyk
2023-02-01Fix fluid display renderer not having "L" for >= 10k amount (#1709)miozune
2023-02-01Fix crash with rendering GT_MetaGenerated_Item_99 item (#1710)miozune
2023-01-30[ci skip] spotlessApply with the new settingsJason Mitchell
2023-01-30saMartin Robertz
2023-01-30fix merge conflictMartin Robertz
2023-01-30Rendering materials (#1592)Connor-Colenso
* Inf renderer working + fuzzy halo on cosmic neutronium. * Helper method * Cosmic nt nearly done * Glitch renderer * Working! * Add comment * Cosmic Nt finished * Cosmic render appears * Universium Renderer nearly done * New material universium * Dep * Dep * Universium * Some more changes * Spotless apply for branch RenderingMaterials for #1592 (#1593) * Fix Battery Buffer accepting more than 1 items per slot (#1590) * Unify sodium persulfate amount (#1591) Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent. See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context * spotlessApply Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Better textures for universium maybe? * Fixed cosmic Nt * Remove glitch renderer (not used) * Rename universium renderer * Rename universium renderer * Change Colour to Color (begrudgingly) * Gray infinity halo * Remove halo * Fix off axis rotation on dropped universium and some new textures * More universium stuff * Cell render works * Inf render * Working inf * Universium done but no fluid outside of cells rendering * Fluid rendering * Comment * Spotless apply for branch RenderingMaterials for #1592 (#1634) * Fix Battery Buffer accepting more than 1 items per slot (#1590) * Unify sodium persulfate amount (#1591) Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent. See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context * fix it (#1597) * Fix tooltip for required input hatches (#1599) * Allow resource packs to override individual progressbar textures (#1596) * Allow resource packs to override individual progressbar textures * spell: every + singular * Fix potential crash on server with FallbackableSteamTexture * Add colored voltage tier display for Waila (#1598) * Add colored voltage tier display for Waila * Adapt to new methods * fix oredict name (#1600) Fix wrong oredict for blizz comb * fix it (#1601) * adds molds and recipe generation (#1603) * Delete water from recipe (#1604) * Added Shortcut because simply dull (#1594) * Added Shortcut because simply dull * I always forget to remove a dep * Increase Recipe Time To fit the original recipe chain * spotless :( * Upped the recipe to ZPM and increased educt/product side by 16 * make sugar maceration recipe shorter (#1586) * make sugar maceration recipe shorter (cherry picked from commit 55d85dc6ab315da3eb31e41667317e127a2059fe) * spotlessApply (#1587) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> * fix reed to sugar recipe Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add light, medium and heavy oil to get lube (#1584) * Add light, medium and heavy oil to get lube Add distillation recipe to get lube out of oil add control circuit * spotlessApply (#1585) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> * fix misstype Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * remove autogenerated SiSG ebf recipe (#1588) (cherry picked from commit 4d3052e50b7de739c89c339d37a24297f3bb70fc) * Remove void break from fluid tanks and chests (#1602) * Remove void break from fluid tanks Previously, sneaking while breaking a fluid tank would void the contents of the tank, leading to potential loss of valuable resources. However, this behavior is not consistent with other blocks, such as chests and furnaces, which retain their contents when broken while sneaking. This commit removes the sneak breaking voiding behavior for fluid tanks, bringing them in line with other blocks and reducing the risk of unintended loss for players. * run spotless * fix stray check for voidBreak Signed-off-by: NexusNull <p.wellershaus@googlemail.com> * remove override Signed-off-by: NexusNull <p.wellershaus@googlemail.com> * remove void tooltip Signed-off-by: NexusNull <p.wellershaus@googlemail.com> Signed-off-by: NexusNull <p.wellershaus@googlemail.com> * fix (#1605) * Fix inconsistency in naming (#1606) * Add a way to remove a furnace recipe using the output instead of input (#1609) * add method * change method to remove all recipes with said output * Naphthenic acid (#1589) * 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> * Fix plasma turbine EU output (#1607) * Revert "Turbine efficiency helper (#1562)" This reverts commit 3c852a0143cbfa864da59bdd0b2edab1fa4bf146. * Restore efficiency helper * Spotless Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> * disable auto recipe (#1611) * possible fix (#1614) https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12139 (cherry picked from commit 64f7433f2fab2eff618bb25997c303516fdab3f8) * Add Failsafe for getCasingTextureForId to prevent null page. (#1612) * Improve NEI customizability (#1583) * Move descriptions to recipemap * Move tooltips to recipemap * Move overlays to recipemap * Use shared code for generating grid positions * 2 fluid inputs for freezer recipes * Add deprecation javadoc * Fix (#1616) Allows players to use any rubber instead of just one. As other tiers have that. * Heating element change (#1618) * Changed (sg) to * instead (#1620) * add transcendant metal pipe and multiple pipe (#1619) * fix drills not generating and using less material (#1623) * fix LV steam valve (#1624) * TungSteel to TPV (#1622) * fix waila displaying wrong generated eu/t (#1621) Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Add a Overclock Calculator for multis and the like to use (#1617) * add calculator and unit tests * use math.ceil * math.ceil everywhere * add some more unit tests and add onetick discount possibility * add an exception when trying to get the consumption before calculating * spotless oops * convert PCB Factory to use the OC calculator * fix tests trying for wrong values * fix copy paste error * address reviews * this should be there too. * add callhook for pre block destroy (#1625) * add callhook for pre block destroy Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * spotless Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Change Tungstensteel to Require TPV Coils (#1628) * Fix Blue Steel and Bismuth Bronze mixing (#1629) * blue steel * bismuth bronze * Add new Weed-EX 9000 (#1615) * Add new Weed-EX * Add more pollen * Change material ID * Remove fluid recipes * Remove pollen * Remove cells * Balance adjustment for the LCR Nitrobenzene recipe. (#1631) * nitrobenzene balance * SA * zpm instead * force compound to be grouped together in chemical formula (#1630) * 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> * Allow overriding more progressbar textures & Add document for resource packs (#1632) * spotlessApply Signed-off-by: NexusNull <p.wellershaus@googlemail.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com> Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com> 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: NexusNull <p.wellershaus@googlemail.com> Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com> Co-authored-by: Ethryan <dborrfors@gmail.com> Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Comment * Glee8e * Spotless * fix Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Weird error * Spotless * Material ID * Universium fluid working * Fix some inf renderer issues * Remove try catch * Cosmic neutronium fixes, but no fluid rendering yet. * Working * Spotless... * Fake frame --------- Signed-off-by: NexusNull <p.wellershaus@googlemail.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com> Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com> Co-authored-by: Ethryan <dborrfors@gmail.com> Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
2023-01-30add back turbine wallsharing (#1699)Glease
* add back turbine wallsharing Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * use new texture from @Jimbno Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * remove unnecessary structure checks it turns out you cannot build 2 functional large turbine at these locations anyway, so why not? Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * spotless Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * update bs * use the original grey for empty texture these are slightly darker, and looks better Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --------- Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-12-20Uv lock (#1564)Léa Gris
* fix(GT_TextureBuilder): State check belongs to the build method. * fix(texture): lock orientation of large turbine controller Large turbine controllers displays the rotor's center of a 3-by-3 connected textures displayed on surrounding casings. To keep the rotor's center seamlessly aligned with the connected textures from the casings, it need to UV lock its orientation. Addresses issue: https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11953 * fix(GT_TextureBuilder): correctly check worldCoord's state
2022-11-17added new capes, credit to @Jimbno (#1519)boubou19
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-08-27Update buildscript & apply spotless (#1306)Raven Szewczyk
* Update dependencies * Update buildscript, apply spotless
2022-08-26remove debug print; keep disabled for nowJason Mitchell
2022-08-26WIP Texture supportJason Mitchell
2022-08-20Don't modulate color when rendering fluid (#1277)Vladislav Laetansky
* Bind atlas according to sprite number * Don't modulate color when rendering fluids
2022-08-20Don't disable blending before overlay rendering (#1275)Vladislav Laetansky
* Don't disable blending before overlay rendering * Yeet unnecessary color reset
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-15Overriding GUI colors with .mcmeta (#1261)Albi
* Implemented gui textcolor override with .mcmeta files * cleanup * Added shared class to reduce code duplication * Moved #drawLine back to GT_NEI_DefaultHandler
2022-08-14do not cache result of GuiColors if the object is not short-lived (#1254)Glease
2022-08-12Added means of customizing GUI colors for resource packs (#1203)Albi
* Added means of customizing GUI colors through lang file * Color values are now stored in json file instead of the lang file * Made json only load upon resource reload and ensured server compatibility Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-08-10do not return IAlignment if MTE is not IAlignmentProvider (#1234)Glease
2022-07-22MultiTileEntityJason Mitchell
2022-05-22fixes GTNewHorizons/GT-New-Horizons-Modpack#10115 (#1052)Pavel Belous
2022-04-18Multitileentity precursor (#963)Jason Mitchell
* Refactors * Refactor CoverableTileEntity a bit more, pull out a CommonMetaTileEntity * Add an IDebugableTileEntity interface instead of checking various subclasses * Move more redstone related things to CoverableTileEntity * Add IGTENet * Final and dead code removal * Address a few comments, fix a few comments, remove some more dead code, and add some more finals. * fix bad rebase
2022-03-13fallback to error texture if icon is null (#978)Glease
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-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-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-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
2021-11-30Bug fix pass in UO and PollutionGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-23added configs to disabled dirt particles and pollution fog renderingboubou_19
2021-09-20prevent GT cape rendering from overriding vanilla capes with no capes.boubou_19
See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8558
2021-08-12Added liquid rendering inside Large Fluid PipeTimeConqueror
2021-08-12Item Renderers: improved readabilityTimeConqueror
2021-07-30Fix class loading problemGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-07-30re-enable flipping, but add an option to render them not flippedGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-07-30draw flipped textures & flipping markersGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-07-30feat(texture API): integrate ExtendedFacing rotationLéa Gris
Add ExtendedFacing rotation to the texture API. Rotatable ExtendedFacing textures can be created with: ```java TextureFactory.builder().addIcon(IICon).extFacing().build(); ``` Improve and unify internal implementation of standard oriented and glow textures.
2021-07-10Extended GUI fluid manipulation support to GT_MetaTileEntity_BasicTankGlease
generated by cgit (git 2.46.0) at 2025-03-06 10:04:32 +0000