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>
|
|
* Make material renderer available for arbitrary item
* pass render pass
|
|
* Add files via upload
* Add files via upload
* Add files via upload
|
|
|
|
|
|
* 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>
|
|
|
|
|
|
* 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>
|
|
|
|
volumetric flasks (#1431)
* Format large cells.
* Add number formatting and fix localisation issue.
* Add number formatting for radioactive cells.
* Add number formatting for coal boiler.
* Add number formatting for GT turbine items.
* Add number formatting for GT credits.
* Add number formatting for breeder cells.
* spotlessApply (#1432)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
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>
|
|
* Update dependencies
* Update buildscript, apply spotless
|
|
* Meta Generated Items renderer overhaul
* Adjust naming
* Force alpha test
* Properly render overlay
|
|
- Changed the flow calculation system to account for multipliers, which can be customized for every material without changing existing material stats;
- Greatly improved materials matching some space ores that aren't used for anything (these ores will get tiered EBF recipes like Oriharukon did);
- Changed some other materials that currently aren't used for turbines.
|
|
* add(api/enums): particle and sound effect enumerations
- Adds new GregTech API enumerations:
- `ParticleFX`: Enumerates known EntityFX particles.
- `SoundResource`: Enumerates known sounds with, id and ResourceLocation.
- Refactors code to use the new enumerations instead of string literals.
- Uses `ParticleFX` and `onRandomDisplayTick` to improve or implement
new particle effects for these machines:
- BBF: Adds random flames in front of the firebox.
- Steam machines: Changes pressure-exhaust particles to white vapour,
rather than dark smoke.
- Magic Energy Absorber: Adds random effect, of absorbed magical purple
particles, by the EnderDragon Egg siphon.
- Forge Hammer: Adds sparse random sparks, ejected from the main face.
|
|
* 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
|
|
* Turbine Rework
- Changed the tooltip of Turbine items to add more data and clarify some values: it now shows all types of optimal flow rates, EU/t values and the new overflow tier;
- Changed the math for the EU/t value above the optimal flow. Before this change, efficiency drops so quickly that EU/t will never raise above that of optimal flow, but with this change, higher EU/t values are possible, with efficiency losses;
* Prevent Explosions by Voiding Fuel on Startup
- Changed all multiblock turbines so that, when switching from disabled to enabled mode, they void all the fuel in the input hatch and only start running afterwards. This prevents them from exploding due to filled input hatches on startup, but punishes the player by wasting the fuel;
* Revert Voiding Change and Throttle Output
- Reverted the input voiding change done in the previous commit, given that the turbines could still explode on world load;
- Changed the fluidIntoPower functions to never output an EU/t value higher than what the dynamo can handle. If the value is higher, set it to the maximum EU/t of the dynamo and consume the same amount of fuel regardless.
* Changed Tooltip Values to Int
- Changed tooltip values to int, for rounding and simplifying purposes.
|
|
* 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
|
|
* Loose Mode Turbine Changes
- Changed Steam loose mode efficiency and optimal flow to improve this mode, especially on the lategame turbines. Efficiency was capped at 75% regardless of the regular value, with this change setting it to always be a percentage of the tight mode efficiency, down to 60% for those lategame turbines, and a maximum of 90% of the tight mode value for the lowest efficiency turbines.
- Also changed the optimal flow calculation to grant a larger optimal flow in loose mode than it was before the change, for all turbines except the highest efficiency ones;
- Improved the tooltip for these turbines, updating to these new values, fixing a typo and showing the EU/t for steam at optimal flow, in both modes.
* Fixed Weird Spacing
* Update GT_MetaGenerated_Tool.java
* Remove Duplicate Formula for Loose Mode
|
|
* Suppress warnings "unmappable character"
* Allow soldering to be inserted into toolbox and used for maintenance
* Clearfy tooltip
* Address reviews
|
|
* sunnarium from glowstone in reactors
* change glowstone dust to 9 items
(cherry picked from commit 24d7318ae8e73dc0082784e0a5872903b074dd2e)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* Translation related fixes
* Rename trans to transItem
|
|
|
|
* Add IntelliJ .shelf folder to .gitignore
* Fixing GT_GuiTooltip bug I introduced
* Deprecated superfluous String trans methods.
* Add Power class to compute and describe power usage
* trans -> GT_Utility.trans
Removed absent param from Javadoc
* Add Power to BasicMachine and use it for power calculations
* Steam BasicMachine rework
Have Bronze and Steel tier override Power with appropriate SteamPower
Make Bronze machines explicitly tier 1
Make Steel machines explicitly tier 2
Defined recipe list and bricked status for each machine
Unified checkRecipe uses machine's recipe list and Power
* Raised NEI dependency to 2.2.5
* Defining NEI transfer rect in individual UIs
Using a new interface called from GT_RectHandler
* Code cleanup & minor refactor
* Add power field to NEI Default Handler
Add method to create Power object from the recipe map
* Display power tier in NEI handler name
* User Power to draw NEI Handler description
* Enable filtering handler recipes using Power
* Repurposing aBricked parameter into aHighPressure
To fix my previous faulty method of setting mTier
* Must call getCache to get recipes properly.
* Better communicate NEI Overclock info
|
|
|
|
I tried to fix the tools
|
|
|
|
|
|
|
|
- Add glow support for all sides and states of iconset machines (same as with basicmachines).
Automated code cleanup with IDEA of:
- Optiimise all imports (remove unused, sort)
- Reorder all modifiers to the canonical preferred order (as stated in the Java Language Specification)
- Add all missing @Override annotations
|
|
Normalize all repository files format
|
|
|
|
|
|
git and diff tools will complain if text file does not end with a newline.
Fixed all text files in the repository with Linux bash shell:
```sh
git ls-files -z |
while IFS= read -rd '' f; do
mime="$(file --brief --mime "$f")";
if [ -z "${mime##text/*}" ]; then
tail -c1 "$f" |
read -r _ || printf '\n' >>"$f";
fi;
done
```
|
|
(cherry picked from commit f21a80dcdd61f004b6cc78639c4448a120b76cdd)
|
|
|
|
GT6 under LGPL.
|
|
|
|
|
|
* Added all Ores to Voidminer in DeepDark
+ removed Infinity Ore
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* renormalize line endings
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
+re-added unused, Deprecated
constructors
+re-added unused vars
+treat empty string as null for GT_Tool_*.isMinableBlock
+allowed to mine any block that doesnt require a tool with GT tools at Hand mining speed
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
|
|
|
|
|
|
|
|
|