aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces
AgeCommit message (Collapse)Author
2023-01-30Add sifter chance outputs (#1707)GDCloud
2023-01-30Revert "Add chance to sifter method (#1705)" (#1706)BlueWeabo
This reverts commit a132001f964faee20cc035693987c10cb19a02d4.
2023-01-30Add chance to sifter method (#1705)GDCloud
2023-01-28Optical Circuit line recipes (#1665)GDCloud
* Optical Board recipes * Spotless * Tweak chromatic glass amount * Expand Forming press input slots * sa * Glowstone nanites recipe * Add new forming press support * Spotless * Tiered expansion of PLE/Forming press slots --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-01-28Sifter method (#1697)TheEpicGamer274
* Optical Line-Water line & Items * Spotless apply * Spotless applies + Optical Board * Sifter Method for fluid to fluid
2023-01-25EOH materials + Allow materials to pick their processing tier (#1671)Connor-Colenso
* Begin addition of tiered material manipulation * Dwarf matter * Add hardcoded EU tiers for wider usage. * New material images etc * Nugget processing tiers * Move iron nugget to wrought iron smelting to the correct place * Add white dwarf shapes * Add white dwarf shapes * Additional retiering options for EU consumption on material part generation * White dwarf matter complete * Tier neutronium processing at ZPM * Spotless * More adjustments * Renaming files * Add new overlays for magneto material and more name adjustments * Add no recipes subtag * Spotless + name adjustment * Undo isCustom to maintain potential public variable references in addons. * Undo isCustom to maintain potential public variable references in addons. * Fix fluid registry corruption. * Add rotor EU override * Add rotor EU override * Make neutronium mass more reasonable * Add proper time adjustments to rotor (probably an old oversight) * Adjust enums to use VP rather than recalculate * Fix typos on EU usage * spotlessApply (#1672) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Change setProcessingMaterialTierEU to accept long. * Small fix * Add space and time materials * Add new forge hammer support * Update tooltip * Expand laser engraver slots. * spotlessApply (#1673) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Reserve texture page. * Modernise GT circuit usage * Add oversight in assembler frame recipe * Add missing MHDCSM overlay textures * Remove small and tiny MHDCSM dusts * Fix error in ingot texture * Fix NO_RECIPES not applying to frame boxes * Restore missing ingot * Add rod handles for materials * Fix frame box auto generating with NO_RECIPEs tag * recipe * Spotless * Add MOD_ID_GTPP as modid * spotlessApply (#1675) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Remove smelting spacetime from furnace (why does this exist?) * Recipes + new storage blocks for materials * Bedrockium LuV -> EV * SpaceTime UMV -> UIV * TranscendentMetal UIV -> UEV * MagnetoThingy and dward mats UXV -> UMV * update buildscript * yeet magic number that could be * spotlessApply * Make the nanite tier 3, colen request * Up nanite tier * Comment * Change name * Change name 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: adam riondy <adampoplol@gmail.com> Co-authored-by: boubou19 <miisterunknown@gmail.com>
2023-01-20MTE Inventory updates (#1496)Jason Mitchell
* MTE Inventory updates * Separate Input/Output inventory * Use a LinkedHashMap to ensure inventory orders are deterministic * Input/Output work on either Input/Output inventories * MTE Inventory * Add GT_Packet_MultiTileEntity * More dyanmic packet with packetFeatures * Add IMTE_HasModes for MultiBlockPart * Help with MTE Inventory (#1613) * convert inventory to use ItemStackHandler * Update MUI * inventories * move Iteminventory to its own method Co-authored-by: miozune <miozune@gmail.com> * Update MUI * Update MUI * Add IMultiBlockPart * Mte fluid inventory (#1639) * first work on fluid inventory * make gui work with numbers not dividable by 4 * use math.min * add outputfluids saving * actually working * Update MUI Co-authored-by: miozune <miozune@gmail.com> * Ticking Covers! * Parts now register covers with the controller * Controllers now tick covers on parts * Break cover ticking out into `tickCoverAtSide` Fix some inventory methods on MultiBlockController * Filter on tickable covers * Improve GUIs for MTEs (#1650) * working controller GUI * locked inventory selection work * input and output locking of inventories Co-authored-by: miozune <miozune@gmail.com> * spotless * CoverInfo refactor (#1654) * Add `CoverInfo` and deprecate the old fields to hold cover information * Disable MTE registration * Fix NPE - Return EMPTY_INFO for SIDE_UNKNOWN Temporarily add back old NBT saving in case of a revert so covers aren't lost. * Actually save the old NBT data, instead of empty Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com>
2023-01-02add callhook for pre block destroy (#1625)Glease
* 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>
2022-12-23add NEI handler for ic2 fuel rods (#1580)Glease
* add NEI handler for ic2 fuel rods Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * fix typo Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * rename variable to cover up the original intention Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
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-12-14ensure machine controller incompatible with redstone receiver (#1547)Glease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
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-11-25Rewrite GUIs with ModularUI (#1381)miozune
* 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 * Change signature of addUIWidgets * FluidFilter cover, FluidDisplaySlotWidget, BasicTank, BasicGenerator, Output Hatch, MicrowaveEnergyTransmitter, Teleporter, DigitalChest, DigitalTank * Add title tab * Move package: modularui -> modularui/widget * Programmed circuit + IConfigurationCircuitSupport * clean * 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 * Display items and fluids that exceed usual count * blah * use +=, why didn't I do this * 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 * Minor changes to NEI * 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 * 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 default implementation for IHasWorldObjectAndCoords#openGUI * Make openGTTileEntityUI accept MultiTE & cleanup Co-authored-by: Jason Mitchell <mitchej@gmail.com>
2022-10-22Added check to API if the block should drop its inventory on break (#1479)Maxim
* Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument
2022-10-17me output hatch (#1473)Yang Xizhi
* me input hacth * sa
2022-10-17add PR screwdriver compat to GT screwdriver (#1475)Glease
* add PR screwdriver compat to GT screwdriver * Spotless apply for branch feature/pr-screwdriver for #1475 (#1476) Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * make it optional Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-10-13Interface IAlleleBeeAcceleratableEffect moved to Forestry (#1462)Jakub
* Bump Forestry * Interface IAlleleBeeAcceleratableEffect moved to Forestry
2022-10-12Add interface to implement Bee effects that can be accelerated (#1460)Jakub
* Add IAlleleBeeAcceleratableEffect * Still feeling the rainbow * Use float * NBT * No more gendustry * Production modifier is counted from 0 now * Extract bee cycles length * spotless
2022-10-02minor_typo(javadoc): Documentation typos in IGT_RegisteredFluid's JavaDoc ↵Léa Gris
(#1428)
2022-10-01refactor(fluid_api): fluent interface (#1407)Léa Gris
* refactor(fluid_api): fluent interface Improves the initial construction model into a fluent interface. See: https://java-design-patterns.com/patterns/fluentinterface/ This change provides the built and saved states of a GT_Fluid, with their own interface, so that: object state validations are performed at build time, rather than causing an `IllegalStateException` to be thrown at runtime, with the previous implementation. This also allows the IDE to display and check the applicable methods for the GT_Fluid object's state, as it moves through the call chain. * hotfix off-by-one in FluidState.fromValue * minor: deduplicate buildAndRegister action * fix(withIconsFrom): needs dependency management Cracked fluid Icons were copied too early from non-cracked fluid within the `IGT_FluidBuilder`'s implementation. At this stage, the source Fluid has not registered its own icons yet, so the Cracked fluid got null Icons (fallback to Error checkerboard). This commit delegates the copy of the source fluid's Icons, to the `run` Icons texture's registration task; ensuring the source Fluid runs its own Icons textures registration before copying them, as a light-weight dependency management.
2022-09-18migrate to new survival autoplace api (#1382)Glease
* migrate to new survival autoplace api * reduce type of blocks autoplace will use this does not prevent those blocks from not being accepted into the structures though * implement getBlocksToPlace * fix survivalConstruct code for assline and DT i hate variable size multi :( * fix AIOBE * allow disabling machine block updates on a per-thread basis * make a sensible guess at what texture to use on server side * spotless * implement hologram support for bbf * spotless
2022-09-11Fix global wireless EU bugging by transferring to world NBT system (#1371)Connor-Colenso
* Transfer to NBT * Half working, write only. * Fix load data * Works, thanks Kuba. * spotlessApply (#1372) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Fix NPE in unit tests * Spotless * Move clear map * Spotless and import cleanup * Suppressions and warning corrections * Warnings, warnings, warnings smh. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: kuba6000 <kuba.123123.6000@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-08fix(API): GT_Fluid (#1349)Léa Gris
* fix(API): GT_Fluid - Fix: Use registeredFluid instead of GT_Fluid to configure Materials and containers to prevent crashes when retrieving fluids referrences from those. - Impr: Adjust fluid luminosity computation to better fit with Tungsten as maximum - Impr: Remove transparency from the fluid.molten.autogenerated.png texture to prevent molten materials to appear dilluted. * ./gradlew :spotlessApply * rev(comment): address review comment from @Glease rev: https://github.com/GTNewHorizons/GT5-Unofficial/pull/1349#pullrequestreview-1098651647 fix: Logic to handle working with own registered fluids and already registered fluids. imp: Some IGT_Fluid methods requires the fluid to be registered, throws an IllegalStateException on use at an unregistered fluid. imp: Normalizes @inheritDoc no additionnal text allowed
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-02Add Drag-And-Drop support for digital tank (#1333)miozune
* Add Drag-And-Drop support for digital tank * lockedFluidName is null in old save
2022-09-01Super Tank Fluid Locking Fix (#1332)くぁーりぃ
* fix bugs * spotless * add null check
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-31Two slots wiremill (#1324)Martin Robertz
* 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>
2022-08-27Update buildscript & apply spotless (#1306)Raven Szewczyk
* Update dependencies * Update buildscript, apply spotless
2022-08-26WIP Texture supportJason Mitchell
2022-08-23Refactored built-in integrated circuit support (#1284)repo-alt
* Refactored built-in integrated circuit support Added built-in integrated circuit to input buses * fix spacing
2022-08-19more autoplace utility/fixes (#1245)Glease
* allow building multiple anyOf structure elements in same batch * port utility from gt++ * add shouldSkip to hatchClass and hatchIds * minor improvement to DT structure code * pass in trigger stack * add makeshift translation for item hint * fix lcr not having autoplace
2022-08-18no more magical texture index (#1249)Glease
* no more magical texture index * add a reverse map for fxxk sake
2022-08-16Fix Wireless EU not transferring 2A/operation (#1265)Connor-Colenso
* Useless import * Lower case for methods * Double transfer rate for machines using two hatches. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-08-12More wireless fixes/updates (#1206)Connor-Colenso
* Fix possible out-of-bounds error. * Bye bye OpV * Bye bye OpV * Some textures while I'm here * Test * Maybe * New command * Fix forge minecraft shenanigans interfering with saving data. * Localisation of achievements * Add save intervals for energy map. * Refactor as to not use dumb bloat * New interface for wireless hatches * Remove prefix * Big refactor and code cleanup. Also fixes bug with energy not getting added sometimes * Fix typo causing ore dict issues * New interface * Clean up commands a little * Add some colouring and clean up a little. * Update desc * Add more catches for command misuse and colours * Jenkins Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-08-10loosen the generic restrictions on hatch elements (#1236)Glease
It honestly never occurred to me that SOMEONE would not derive from GT_MetaTileEntity_EnhancedMultiblockBase
2022-08-09autoplace integration (#1117)Glease
2022-08-05Wireless Fixes (#1195)Connor-Colenso
* Fix possible out-of-bounds error. * Bye bye OpV * Bye bye OpV * Some textures while I'm here * Test * Maybe * New command * Fix forge minecraft shenanigans interfering with saving data. * Localisation of achievements * Add save intervals for energy map. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-07-31Fix clicking FluidDisplay not working with digital tank overflow mode (#1149)miozune
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-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-23don't allow pollution machine in cleanroom (#1147)Yang Xizhi
2022-07-18feat(tile): onRandomDisplayTick (#1138)Léa Gris
Adds onRandomDisplayTick method to the IGregTechTileEntity interface that can proxy randomDisplayTick from block. This allows to delegate block particles to the tile, with a client-side-only processing. Includes reference implementation for the Bronze Boiler
2022-07-05DTPF Laser (#1100)Connor-Colenso
* DTPF Laser * exotic * Structure forms with TT laser, recipe broken. WIP. * Format amps in PA correctly. * Fix incorrect colouring on text. * New DTPF controller textures. * Update spacetime material. * Update DTPF texture * Update DTPF NEI page * Add spacetime wires * Tons of fixes/adjustments. * Localise achievements. * Typos * More fixes + move plasmas to mixer. * Spacetime adjustment * Spacetime blocks. * Spacetime wires. * Localise coils * Adjust DTPF fuels * Adjust DTPF fuels. * Stuff * Fix optimiser * DTPF * Depreciated Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
2022-07-02Par, var, begone! (#1104)YannickMG
* Renamed parameters of ItemBlock subclasses * Renamed damageDropped and getDamageValue method parameters of Block subclasses * Removed trivially superfluous overrides of Block::quantityDropped, Block::isOpaqueCube and Block::renderAsNormalBlock * Removed trivially superfluous overrides of Block::getItemDropped * Cleaned up a few more block subclass method parameters * Cleaned up obsolete Javadoc * par1 -> block in ItemBlock Constructors * Renamed arguments to drawGuiContainerForegroundLayer * Cleaned up redundant casts * Renamed arguments to drawGuiContainerBackgroundLayer * Renamed arguments to Slot subclass constructors * Renamed arguments to World subclass GT_DummyWorld * Renamed parameters of updateProgressBar * Renamed the rest of the par* parameters outside of GT_MinableOreGenerator which should be deleted * Renamed most var1-var10 and a few more in generally non-dead code * Renamed last varSomething variables * Removed 3 fully dead classes used nowhere in the codebase, with obsolete unused code
2022-06-24Kevlar (#1018)Martin Robertz
* add first recipes for Kevlar Line * merge conflict * add more materials and recipes for kevlar line * fix butanol naming (cherry picked from commit 808c91e2904314f67085c8cce2d579d6ac711bbb) * fix more Kevlar recipes (cherry picked from commit 3688dda0a8d4cd79edd76072d04a59fe4e8b3ca4) * fix more recipes (cherry picked from commit a527b22bd815629372c8dca98e579628b1128d46) * add more Kevlar stuff * add more materials for Kevlar Line * add more Materials and recipes for Kevlar (cherry picked from commit 448083f5c1789cd78cc1dc049c859c3bec4c2485) * Merge branch 'Kevlar' into dev # Conflicts: # src/main/java/gregtech/api/enums/Materials.java * add second maven from ic2 * overseen * add more kevlar materials and recipes * fix naming * fix metal block 9 was not set * fix materials and names (cherry picked from commit 3119d83ba53f43de6163de3f01edd6081f318cd6) * Fix Acetylen Material (cherry picked from commit d379365de519c503a78f68ce5ab2a3de02ff7852) * fix recipes (cherry picked from commit 2e2033773e1aa92224932fc93aaadaeacb83e8ba) * remove Calcium Hydroxide Formula * add ALF3 * make Nitrochlorobenzene backwards compatible fix a lot of recipes (cherry picked from commit ca2a59db88f036649f6d8ff4b5e5565c9da400c9) * add more Kevlar materials fix recipes remove Nitrobenzene 3 and 4 * remove 2 Buten 1,4 Diol fix recipes (cherry picked from commit 811549dc9f4f73e77752d5faef2b6d7243e6e625) * add spinnert Item, Woven and fiber kevlar add more materials add more recipes * fix derp (cherry picked from commit dc1e24753c39c70ad262f7bc2ce70d839a655942) * fix materials id derp (cherry picked from commit c7ba51ad846ae466054fb5e002fa8c634e3dfcad) * fix recipes (cherry picked from commit f8e6e32acaee563d3683b79980459bc464c6e716) * fix more recipe add Kevlar material add fiber and woven kevlar recipes (cherry picked from commit cc99809ea80f616ffe5c22e0d3f189a7b5cd7bdb) * add Spinneret recipe (cherry picked from commit 4db8497380b39edda8a00964613eae3a72cebbcb) * add Bromine add Liquid Kevlar Texture fix recipe add more Kevlar Materials (cherry picked from commit e2f96cb825f5ededaff3989b7e087b51b57a913c) * Fix recipes (cherry picked from commit e4f8d0d33f81f94124b733cbeb975ca0b4a33da2) * fix recipes (cherry picked from commit 7c6b7cdd0fd0720f58993faeaa81dd95d1b3757c) * Add more Kevlar recipes add more Materials (cherry picked from commit 9c35ca47e917fb2ac082ba5077e65001a7ab074a) * add more Materials (cherry picked from commit 12c598fe8784198c996eda3d5e072b829cf33ab8) * fix Kevlar recipes add more recipes * finish kevlar line (cherry picked from commit 39567610956ac02d3001f68851ddeb7e5d63aed7) * fix a few more recipes (cherry picked from commit e28283321ce1670d6684a47c0fd3fd263da8a6cb) * fix recipe (cherry picked from commit df89c96bc826b321f81c1c3af521469decdcff22) * try to add back single block distillation recipes * stupid me :) (cherry picked from commit 7fc6c375605d85b7cc791aa9818174a1cb2f7f59) * fix distillation recipes (cherry picked from commit e2351c4390b632b9e361a19ba03225c82766e455) * fix more recipes (cherry picked from commit 0fefb881e80659d41308dec85c59a114862aaf40) * remove not working texture (cherry picked from commit f70cdbf7e0138ed6cc867153693db527f04a78f8) * fix more recipes (cherry picked from commit 6c45aa36d4176af8f41e64a8758e31618ac56ab9) * rename chemicals (cherry picked from commit 4aa52352319b72bca6ec27ea65aba42bd293bb39) * fix recipes (cherry picked from commit 0885006add9ce78614a4a45cc8ae1d46a5b466d8) * remove unused Kevlar Materials (cherry picked from commit 69525c04a6505ef06e1f7cc6166aaba808b0ba26) * add more Kevlar changes (cherry picked from commit a16f12fe71fa65ce7706b049b5e94602cb676b37) * change Kevlar line a bit (cherry picked from commit b06cdb634125465e073adf1e09f1821b8794d243) * add Rhodium as compat metal (cherry picked from commit cfde983db03efec6d83367cbd5c13887eef6aa67) * fix texture set (cherry picked from commit 7f2f5508acb3613505522db98eef948c8e269892) * add more Kevlar recipes disable Rhodium GT dummy (cherry picked from commit 9389fe086e9d8a4bef92115a9eef8816fdf51c43) * fix recipes (cherry picked from commit 7dd26f59af45619c3cf2045edfb6c38198358cb0) * fix more recipes (cherry picked from commit b407abebd0ce1d5351b770a729d75fb3fc7a0e87) * fix more recipes (cherry picked from commit f2c24ea7fe4a2dfb9a95129d9a0c4b03b70f34d5) * fix kevlar recipes (cherry picked from commit fb9f937b7f31ab9f3f958a0a53772c82f0d55b64) * add chemical Formular (cherry picked from commit 5116ee58132bb1723c318e8f2c20b52f97da3b9d) * fix recipe (cherry picked from commit ce10e89e059946f7020219f2a79397862272d2ab) * fix circuit (cherry picked from commit 0ee7d4535dab0bb1a20665160f11bdf01efd411d) * fix most of the Kevelar recipes retier them remove potassium Nitrate its still Saltpeter (cherry picked from commit 49e1eec47c4c86044ce748d96dc5a11d1db68877) * add back Potassium Nitrate for compt reasons (cherry picked from commit eee82dc1783d40fe4b68d87ee0da646cc4ea5262) * fix more Kevlar recipes (cherry picked from commit aaaf2969da671cf923f7213f71e9c8eb89091e87) * fix name in Kevlar line (cherry picked from commit e7a883254d2c89f289453cdcd67be5dc1fc1c53a) * Lowered EU cost on Wood Tar - Lowered EU/t on the Wood Tar DT recipe from 256 to 224 EU/t (value suggested by Dream). The old value is just a bit too high for an HV Semifluid Generator to power the DT with the Creosote output, which forced lower tier generators and spam. * Removed DT Recipes and Added Alternatives - Removed circuits in DT recipes for the HV Oil and Benzene processing; - Added IV recipes to obtain the new chemicals for the Kevlar line (the Dimethylbenzene isomer and Naphthenic Acid), without changing the setup of players that were previously processing those for their early-mid game purposes. * Revert "Removed DT Recipes and Added Alternatives" This reverts commit 165ad2e4d196b5966af0fe282658f1bea3d579a9. * Revert "Lowered EU cost on Wood Tar" This reverts commit 420d0d5cd530d3e29164c3a9c384d4187a46495a. * fix Copper oxide use old Material Shift ids add melting Point (cherry picked from commit 488d6598513307bb4221bbb50904a32e5a0bd069) * Update GT_Loader_Item_Block_And_Fluid.java * MAchine REcipe code too large Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux8 <steelux7@gmail.com>
2022-06-24Silicon change (#953)Martin Robertz
* remove autogenerated recipes (electrolyzer) * change Silicon to Raw Silicon add Silicone SG and EG for Solar Panels and circuits add new materials fro Silicon Line * add more materials and recipes fro Silicon line * add more materials for silicon line add more recipes * re arranged materials and add it to material builder change gases (cherry picked from commit 2706242d1d41221eaf2311d7f05a3f6c1358feb0) * derp (cherry picked from commit 208fc734f474eda26364e8e3c345969b0f57032d) * change famular add recipes that use all Quartz variants (SiO2) Add ebf Si recipes with all quartz variants change tep to 2273k (2000°C) (cherry picked from commit 0a9fc9f8aeddd19918e2ccb4d2d41bbbaf9c3b18) * Add new Blocks doe Sieg and Sisg move cryolite to metal blocks change Boule recipes to use new SI variants (cherry picked from commit 26074610edaf62c891953a2005948ef1716a3bcd) * Add new Blocks doe Sieg and Sisg move cryolite to metal blocks change Boule recipes to use new SI variants (cherry picked from commit aa0d37acc501ff6151cd46a759386e424a41a573) * rename sisg and sieg (cherry picked from commit 55f81a2418bf76cbed4d8e6b1db37ce22d0a8729) * re enable electrolyzer autogenerated recipes * add Formular to Quartz (cherry picked from commit 57057fb4f3892911e4ef7f5bd7c3be09edecebd5) * add centrifuge recipes to brick dust add Quartz dust to BBF recipes (Ferrosilite) change Lava recipe output dust instead of small dust Add Quartz dust to Chalcopyrite EBF recipes (cherry picked from commit dfe920ebba18bc7d330a8c9ae5dc00b01c2f7bb6) * add new materials for Silicon line add fluid to Hexachlorodisilane add mor si line recipes * Committer: Martin Robertz fix broken recipes set output fluids and items to 6 * add a way to electrolyze Dichlorosilan (cherry picked from commit ff82a5d04e0a182ebd13efd1b24de74fcddeba2a) * add ebf to Sieg and Sisg fix some si line recipes (cherry picked from commit 79b5ecbcedfa0fe0f056a1369ed9f127ae26e9b8) * add electrolyser recipe for Hexachlorodilisilan fix recipe (cherry picked from commit e6b012f77760707ef5fdbfb656f7b08fdc06cd8b) * change chemical Famular from Trichlorsilane fix recipes and add cell varaint recipes (cherry picked from commit 8207edcbb82523646c20af3c9d6ba6a1d61a366f) * add a few cell recipes fix recipe (cherry picked from commit 36dac62eacbfe55baae4a6a8ceb2d79637214335) * add Poly and Mono to SI name change back Boule recipes made out of SIsg (cherry picked from commit 83cafb97df22319f1b3191bc9eeb38bbddec8623) * add Gallium Arsenide Crystal for Boule recipes (cherry picked from commit 436fbe52230bf12cd3f02b7b7f3376c8d2dba882) * add 4 output slots to cutting machines (hv and up) add Silicon dust to Wafer recipes (recycling) (cherry picked from commit 7a5bb72fcc9337a6841e7c7f0e487eee3d8b363b) * remove fluids from Boule cutting process add diamond sawblade to recipe (not consumed) (cherry picked from commit 1b5f14da1352eacb78bdd8466c4de7e42ccbfb8a) * fix SI typo fix Cutter4 slots can be used (cherry picked from commit a258cfd7747a0ed5ed164a5e8c7a0ecd0f67ca76) * change recipe change fluid position in chemical rector multi * resolve conflicts * fix fluid stack visual bug in chemical reactor if fluids >3 (cherry picked from commit 6e509b36d3a5a702f0354e6d683ecc5aa095c7cf) * fix recipes * change recipe times (cherry picked from commit 86302a7476a5985e862f8ae0242f77444a41ed37) * fix LCR not showing item and fluids overriden thanks to miozune * Update Materials.java * Fix SI recipes (cherry picked from commit 4c6ff96ead83e53b7fe4cab79ba8f07a13ae2476) * fix mire SI recipes (cherry picked from commit dc3aac372e5bdbc08b7de49f55325a260ed0a21f) * fix recipes SI (cherry picked from commit e077a6976e6614f547aa3ce4215208a85aef3dca) * buff this recipes a bit. (cherry picked from commit 334c6e5eb8224525116fd2a9fe340feef38c6579) * fix typo (cherry picked from commit d0eae40c64f44ab6d207891ff8a8ae30f5988cd8) * remove SIeg (cherry picked from commit 59f870d04234454bd73131aadfecff0cfdac2266) * remove Sieg recipes (cherry picked from commit 80c501f210ff30726c37a74f1cfec4844138273f) * remove SIeg Block * remove SIeg * fix Tooltip Grammar for Gallium Arsenide Crystal #10221 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10221 * fix [Conflicted Recipe] Monocrystalline Silicon Boule cannot be made in LV EBF #10308 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10308 (cherry picked from commit 7acd07346add055cb729205de1a50ae8381e3d47) * fix Silicon Processing Line Feedback #10228 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10228 (cherry picked from commit bc71c9ccb0aac338aedb2a282d0859d7c4fd07d2) * Make the circuits used in silicon boules smelting more consistent (#1079) (cherry picked from commit b1e994efce0bedb5ae10c5f6468b07a0cac9068a) Co-authored-by: repo-alt <wvk17@yandex.ru>
2022-06-23Plasma forge fixes (#1086)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. * Update/fix plasma forge recipes. * Increase max hatch count. * Increase max hatch count and fix mixing energy hatches. Plus quick check for processing time. * Fix spacetime recipe. * Update spacetime textures and add new item textures. * Remove manual spacetime fluid addition. * Add custom fluid texture override ability. * Update infinity and spacetime to use new custom fluid override texture. * Depreciate old recipe adding methods. * Refactor GT NEI handler. * Remove unnecessary import. * Remove debug comment. * Clean up auto generated fluid code. * Fix NPE and add a few comments. * Refactor GT NEI handler. * Update NEI GUIs. * More NEI fixes. * Update LCR NEI GUI. * Update error message. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-06-19Add Plasma Forge (Endgame multi) (#1076)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-04-24add quadruple input hatch (#1016)Yang Xizhi
* add quadruple input hatch * pull all fluid slot thing to GT_Container
generated by cgit (git 2.46.0) at 2025-03-05 03:02:24 +0000