aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2023-05-24Adjust overrides to allow opening machine GUI (#2019)Maxim
2023-05-22Nerf Sunnarium Bee, Add Endstone to Endstone Bee (#2014)Runakai1
* Nerf Sunnarium Bee, Add Endstone to Endstone Bee Previous sunnarium: glowstone 40% sunnarium 20% now: glowstone 30% sunnarium 5% Added 4 End Stone to comb centrifuging of End stone bee * spotlessApply (#2015) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-20Singleblock machine internal fluid tank scaling standardization (#1999)Pxx500
* chemical reactors * Other machines * More machines and chemical reactors pt2 * standard * fix * Update GT_Loader_MetaTileEntities_Recipes.java * expand fluid scaling --------- Co-authored-by: kuba6000 <kuba.123123.6000@gmail.com>
2023-05-20Fix typo in SteamPower (#2012)miozune
2023-05-19Yet another round of ra2 conversions (#2006)chochem
* lathe and saplings * toolhead oreproc recipes * fluid solidification * reverse macerating * autoclave combs * implosion compressor * assembler recipes * assembling line * slicer recipes * minor fixes * attempted cell to fluid fix * minor fix 2
2023-05-19Don't allow steel steam machines to do MV recipe (#2007)miozune
2023-05-18a few small fixes (#2003)chochem
* fix snow queen bee drop * fix ismodloaded errors
2023-05-17More RA2 conversion for automatic gt recipes (#2000)chochem
* fully convert all wiremill recipes and clean up unnecessary duplicate code * fully convert all polarizer recipes * fully convert all canner recipes * RA2 for oredict plank recipes * RA2 for oredict stoneCobble recipes * convert some assembler recipes to RA2 * fix * fix2 * remove recipes that were never in the game
2023-05-17Various GT fixes (#2002)chochem
* TE items cant be required * remove from itemlist * TE does not exist * this never worked anyway but also unecessary * these are broken. have a working replacement already * give valid id to fix rockbreaker fake recipes * fix texture and text * no NC its fake anyway
2023-05-16PA doesn't take a muffler -> fix blockrenderer and hologram projector (#1996)Fiyorin ᵘʷᵘ
Co-authored-by: Fiyorin <david@bitmail.cc>
2023-05-15cleanroom -> botania glass (#1993)Quetz4l
* added support for botania glass in clean room. No more than 50% in structure. * bs
2023-05-14glasses for structure (#1986)Quetz4l
* glasses for structure * new Api for glasses * changed glass requirements * fix api desc * sa
2023-05-14Nerf Phosphorus Bee, Buff Fluid bees (#1985)Runakai1
2023-05-13Next round of Ra2 conversions (#1982)chochem
* process log RA2 * process crop RA2 * process nuggets ra2 * process gear ra2 * process pipe ra2 * unhide leninade
2023-05-12Add Eternity material + Timepiece (#1973)GDCloud
* add eternity * textures * timepiece * disable ebf + freezing
2023-05-11Add cell item for some fluids (#1974)miozune
2023-05-10Fix ME Output Hatch not outputting other fluids if one gets stuck (#1971)miozune
2023-05-10Slight adjustment for TPM NEI (#1972)miozune
2023-05-08Migrate to FluidSlotWidget from FluidDisplaySlotWidget (#1963)miozune
2023-05-07deprecate all the recipes adders (#1961)boubou19
* deprecate all the recipes adders * spotlessApply (#1962) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-06Exploring some various ForgeDirection fixes (#1950)Jason Mitchell
* Fix mFacing NPEs * Default facing fixes (#1945) * QuickFixes incomplete facing fixes * fix Neither UP nor DOWN conditions as offsetY == 0 is not valid test * fix neither up nor down again * Still not fixed: use ForgeDirection.flag for clarty killed more ordinal siding. * get ride of offset testing --------- Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Jason Mitchell <mitchej@gmail.com> * bit logic fix * Fix single block machine facings * Predict the machine facing direction clientside before the server packet arrives * Fix isFacingValid logic --------- Co-authored-by: Léa Gris <lea.gris@noiraude.net> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Raven Szewczyk <git@eigenraven.me>
2023-05-03Adds 1 manual slot to Stocking Input Bus for lenses/molds (#1946)kstvr32
* Adds 1 manual slot to Stocking Input Bus for lenses/molds * Replace SlotGroup with SlotWidget Co-authored-by: miozune <miozune@gmail.com> * cleaned up code --------- Co-authored-by: miozune <miozune@gmail.com>
2023-05-01bs+saMartin Robertz
2023-05-01Add tooltip in code (#1940)Jakub
2023-04-29Revert #1816 and #1825 (#1931)NexusNull
* revert redstone fix * remove strong redstone checkbox from Liquid Meter
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-21Recipes ra2 (#1872)boubou19
* Recipes RA2 fixes * Use \uXXXX for non-ASCII characters * Misc cleanup (#1888) * migrate away from addThermalCentrifugeRecipe * split recipes of GT_Block_Stones_Abstract * migrate away from addForgeHammerRecipe * migrate away from addChemicalBathRecipe * remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing * Remove underground biomes ore classes, as it's not present in NH * migrate away from addFluidCannerRecipe * migrate away from addFluidExtractionRecipe * migrate away from addChemicalRecipe * migrate away from addMultiblockChemicalRecipe * deprecate addChemicalRecipeForBasicMachineOnly * migrate away from addCentrifugeRecipe * spotlessApply * fixing wrong merge conflict solving * Add Tengam materials (#1891) * Add Tengam materials * Change new recipes to consume 15/16 Amp * Remove now redundant `break` statements * fix comb chances? * fix centrifuge code not working --------- Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-04-21Stellar catalyst + catalyst fixes + new materials class (#1893)GDCloud
* add catalyst * pu plasma recipe * increase plasma mixer input slots * noOptimize + mixer recipe + voltage fix * noOptimize + PLE recipe * TPM recipe * spotlessApply (#1894) Co-authored-by: GitHub GTNH Actions <> * add two more plasma recipes * replace neptunium & fermium plasma * spotless * fix stellar plasma amount * new materials class --------- 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-15Misc structure and tooltip fixes (#1884)chochem
* DT structure fix * fix oil cracker description * fix dt tooltip * fix cleanroom tooltip * sa
2023-04-15fix (#1882)BlueWeabo
2023-04-13Space Project fixes (#1881)Maxim
* Added more null checks * Added command to unlock project upgrade
2023-04-12Fixed recipe lock not setting difference correctly (#1879)Maxim
2023-04-12make lightning rod more cumbersome to use (#1875)Glease
* make lightning rod more cumbersome to use * forget to push this * spotless be like
2023-04-10Renamed space coolant to super coolant (#1873)Maxim
2023-04-10Update spotless config to 0.2.2Raven Szewczyk
2023-04-10Added tooltip line which displays the machine color, if any (#1868)Maxim
* Added tooltip line which displays the machine color, if any * Added chat formatting color to dyes enum * Minor cleanup
2023-04-09Add missing Override (#1864)Батьків Нестор-Євген Васильович
2023-04-09Allow spray cans to color a chain of blocks when sneaking (#1863)Maxim
* Allow spray cans to color a chain of blocks when sneaking * Added new chain feature to tooltip
2023-04-09Enable input separation button in EBF GUI (#1862)Maxim
* Enable input separation button in EBF GUI * Check for old key, instead of not the new one Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> * Remove unused override --------- Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
2023-04-09Fix metal machine block support on break (#1859)Dakota Jones
2023-04-08Kill Disassembler 🔪 (#1855)Connor-Colenso
* Kill disassembler * Kill disassembler * Change arc furnace to fulfil Dreams request. --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-04-08Added method to add instance specific information to an MTE tooltip (#1857)Maxim
2023-04-08Add isMachineBlock support to metal blocks (#1849)Dakota Jones
2023-04-07Player activity logger fixes (#1842)Raven Szewczyk
- Fix potential race condition when adding entries to the list - Make the thread a daemon thread and give it a name for thread dumps Grepped for usages of mBufferedPlayerActivity, no gt addon seems to use it so the type change should be fine.
2023-04-06Monthly disassembler fix (#1840)miozune
2023-04-05Add hazmat protection to GT++ armors (#1839)miozune
2023-04-04Modid work (#1833)boubou19
* add all mods founds in NHCore * depracte old strings * add ars magica 2 * more enum work * use a switch * spotless * more mod id rework * more mod id rework * more mod id rework * should be last * spotless * rename to make more sense * add path attribute * add getResourcePath to enum * spotless