Age | Commit message (Collapse) | Author |
|
* 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
|
|
* 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
|
|
|
|
* add everything
* fixes
* migrate plasma forge recipes
* syntax update
* make chances array length differ a fatal error
* time constants + long eut overload
* migrate extruder recipes
* migrate electromagnetic separator recipes
* migrate wiremill recipes
* migrate forming press recipes
* migrate bender recipes
* add doc to clarify the three itemInputs
* migrate alloy smelter recipes
* migrate arc furnace recipes
* added ModIDs enum
* sort ModIDs
* migrate autoclave recipes
* migrated some assembler recipes
* split a bit more assembler recipes
* migrate canner recipes
* migrate brewing recipes
* ic2 mod check in canner recipes
* use some loops to reduce the amount of recipes to migrate
* add requested helper methods
* migrate vacuum freezer recipes
* migrate thermal centrifuge recipes
* format smelter recipes only, doesn't go through normal GT recipe
* migrated slicer recipes
* migrated sifter recipes
* Use proper enum now
* remove more constants
* cleaning cutting recipes before migration
* remove tons of dead commented recipes
* migrate pyrolyse recipes
* use ModIDs enum more
* migrate printer recipes
* add a less confusing way to specify value of specialItem
* migrate pulverizer recipes
* less confusing special item specification
* even more ModIDs enum usage
* fix auto * import confusing Minecraft enum value with Minecraft client object
* migrated blast furnace recipes
* migrated Centrifuge recipes
* migrated assembler recipes
* migrated implosion compressor recipes
* migrated extractor recipes
* migrated mixer recipes
* remove useless code
* mgrate universal chemical recipes
* refactor chemical recipes
* migrate single block only chem reactor recipes
* migrate chem reactor recipes
* reworked circuit assembler recipes before migrating them
* migrated circuit assembler recipes
* fix merge conflict for assembler recipes
* remove leftover of the merge conflicts
* fix weird translation glitch
* example of assembly line recipe using RA2
* bugfixes for assline
* remove specialValue usage in blast furnace recipes
* fix more bugs
* add nooptimize to where it make sense
* add recipe descriptions
* Materials.Superconductor -> Materials.SuperconductorUHV
* remove useless Object creations
* remove explicit long casts
* migrate assemblyline recipes
* migrate chemical bath recipes
* migrate compressor recipes
* move smelting recipe where it belongs
* migrated cutting machine recipes
* migrated fermenter recipes (unhide alcohol)
* remove explicit long casts
* migrate fluid canner recipes
* migrate fluid heater recipes
* migrated fusion recipes
* migrated lathe recipes
* migrated laser engraver recipes
* migrated packager recipes
* migrated forge hammer recipes
* migrated TPM recipes
* exit early and reduced indents
* migrated fluid extractor recipes
* migrated fluid solidifier recipes
* migrated electrolyzer recipes
* migrated crop processing recipes
* migrated default polymerization recipes
* migrate distillery recipes
* migrate matter amplifier recipes
* add metadata identifier for fusion ignition threshold
* migrate fuel recipes
* update bs
(cherry picked from commit c2d931c9b6caa0376e9d50591894cd849021104d)
* spotless
(cherry picked from commit 1060f5357fb95e28bfae1f052025f55dabc21a0f)
* guard against null itemstacks
* wrong translation
* fix empty arrays being accessed
* add 0 duration and 0 EU/t for fuel recipes
* fix typo in matter amplifier recipes
* spotless apply
---------
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* Added activity sound
* Added acitivity sound to DTPF
* Added missing annotation
* Missed one
|
|
This reverts commit 4159f36223a936528f43eaa4439281478a4314c2.
|
|
This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc.
|
|
|
|
|
|
* updateBuildScript
* Fix basic machine ignoring fluid capacity when fluid output is empty
|
|
* a more direct and permanent solution to dummy world issue
* spotless
|
|
* implement save & load for single recipe lock
* fix fat finger
* fix NPE
* disable machine if old locked recipe is gone
* address reviews
* spotless
|
|
* Added methods to allow multiblocks to play sounds
* Implemented first few sounds
* Added sound to PA
* Introduced static variables for sound indexes
|
|
* Added more buttons to multiblock GUI
* Migrated PA to new GUI
* Migrated Nano Forge to new GUI
* Migrated PCB Factory to new GUI
* Reband void protection to void excess to match GTPP logic
* Adjust fusion reactor GUI size
* Added statics for new NBT keys
* Added getters for button status
* Rename methods to reflect that they are about void excess, not the opposite
* Added button textures
|
|
|
|
|
|
* Added optional special value to Power and getter for power into IMTE
* Added FusionPower to properly display available fusion recipes and OC
* spotlessApply (#1743)
Co-authored-by: GitHub GTNH Actions <>
* Moved compare flag to recipe map
* Missed a new constructor
* Added user request
* Addressed reviews
* Typo
* Update src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
Co-authored-by: miozune <miozune@gmail.com>
* Removed wrong bracket from git online commit
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
|
|
* Update buildscript, add all recently added gradle.properties entries
* Dependency version bumps and cleanup
* Bump eternal singularity version
* Update buildscript
* Make AE2 a required dependency
* Switch version to class generation from token replacement
|
|
* Remove warning suppression
* New helper default method
* Initial work on TPM
* Bump dep for structure lib and modular UI
* Structure works + recipe map
* Working
* Tooltip and NEI work
* Change controller texture
* spotlessApply (#1719)
* Fix wrong order
* Add override
* Spotless
* Big opps lol
* Comment
* Spotless
---------
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>
|
|
|
|
* Fix missing machine recipes due to load order.
* Fix missing compressor recipe
* Add new compressor recipe adder method
* Line
* Narrow crafting restrictions on pipes
* Crafting working, assembler not
* Nonuple working
* Spotless
* Both assembler recipes exist
* Pipe recipes finally working as they should.
* Spotless
* Working still
* T-2 materials
* Tier -> TierEU and a few corrections on recipes using full amps.
* Fix comment
* spotlessApply (#1703)
Co-authored-by: GitHub GTNH Actions <>
* Spotless
* Remove comment
* T-2
---------
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>
|
|
|
|
(#1693)
* Fix total EU implementation
* Wrong hatches
|
|
|
|
|
|
* 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>
|
|
|
|
* 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>
|
|
* Added getter if machine is rain proof
* Extract rain checker to prevent needless computation
* Minor refactoring
|
|
|
|
* Added connection type and getter
* Added getter for total eu
* Replace old getters
|
|
|
|
* Added getter for working amperes of a hatch
* Replaced max input amp getter with call to working amp getter
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
(#1632)
|
|
* 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>
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
|
|
|
|
* Add colored voltage tier display for Waila
* Adapt to new methods
|
|
* Allow resource packs to override individual progressbar textures
* spell: every + singular
* Fix potential crash on server with FallbackableSteamTexture
|
|
|
|
|
|
* add some more waila display
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* rename some translation keys
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* rename misleading variable names
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
* disable shift click in maintance hatch
* spotlessApply (#1572)
Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
|
|
|
|
* why am I so bad at spotting bugs
* fixes fixes fixes, who needs to reset multipliers
* remove the comment
* fix oc oops
* fix the roughnessMultiplier
* fix accidental energy discount
* remove the useless hatch boolean
* fix units
|
|
* another attempt at lag fixing
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* fix tests
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* fix tests 2/2
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* address review
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* get rid of GT_Test
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|