| Age | Commit message (Collapse) | Author |
|---|
|
bus/hatch (#2339)
* Periodically update active state of ME hatches
* Use HV casing textures for ME hatches
* Add new textures for stocking input bus/hatch and me output bus/hatch
---------
Co-authored-by: Pelotrio <45769595+Pelotrio@users.noreply.github.com>
|
|
Panels (#2289)
* Adds several UI elements to multiblock drills
* Adds metrics transmitter cover and associated sensor card
* Fixes item icons and item name
* Adds tooltips for adv. sensor card and metrics panel, fixes card/overlay icons, adds recipe for metrics cover
* Refactor cover tab sync to send much smaller ISerializable payloads
* Remove unused variable
* Additional master merge cleanup
* Adds interface for custom metrics export, adds oil drill support
* Adds support for metrics covers retaining attached machine name for tooltip, metrics
* * Adds discrete coordinates to Metrics Cover data
* Adds machine to advanced sensor card tooltip
* Adds cycle time and minimum energy hatch tier to multiblock ore drill tooltips
* Moves many tooltip strings to i10n
* Remove old GT_DisabledWhileActiveButton.java file that crept in during a messy merge
* Spotless
* Improve oil and ore drill metrics, more i18n
* Addresses PR review concerns, adds more situations for self-destructing sensor cards
* Remediates further PR concerns
|
|
* crafting input textures
* texture v2
* texture v3
* texture
* various fixes
* lazy pattern update
* fix dtpf
* fix removing pattern
* spotless
* fix lag in recipe checks
* fix
* increase tier so they look pretty
|
|
* Improve Long Distance Pipe WAILA status
Also addiotional information to the NEI item tooltip
* Long Distance Pipeline texture improvements
The side textures of the pipeline start/end blocks are now aligned with
the axis through the input output face (most visible with the Item
Pipeline). This is based on the Buffer texture code.
In addition, the input and output face textures have received the
typical blue/orange coding found on multiblock hatches and busses.
|
|
* remove redundant suppressions
* prettify commented code
* improve comments
The integer comment contradicted the code, so I deleted it.
* delete commented-out code
* update bitwise int flip from XOR to the dedicated tilda operator
The flip was a 32-bit XOR, which is an int-flip.
That XOR was replaced with an equivalent tilda operator.
* convert a field to inline
This field was used only once, so put it straight to where it is used.
* remove fluid fix since no-one uses Forge version 1355 or earlier
* unwrap switches where fitting
In some places, we suppress IntelliJ's inspection
RedundantLabeledSwitchRuleCodeBlock - we don't want to unwrap some of
the suggested cases because we want to keep the consistency in a
switch statement for the sake of readability.
* fuse "collect" into Stream API
* fix javadocs
* remove unnecessary public modifiers from an interface
Members of an interface are public by default.
* move common parts outside of if
* suppress OverrideOnly warning in a javadoc
* remove unused lock
* suppress warnings about unchecked casts
These warnings require non-trivial fixes that are yet to arrive.
For now, let's suppress them to reduce the warning-bloat.
* remove outdated comment
* remove final modifier from private methods
Because they are private, it is hard to accidentally overwrite them.
Therefore, the final modifier is redundant in this case.
* refactor getIcon
The first 'if' doesn't cover only tMeta == 9 && mConnectedMachineTextures,
therefore the second if can be unrolled.
The last switch is redundant because all tMeta values are covered by
switches, but let's keep SOLID_STEEL as a fallback just in case.
* explain what the casings are and why block casings are split
* suppress switch-to-if suggestion
* remove unnecessary null check
The null is handled in doGenerateItem()
* address redundant local variables
* rename variables in onTick
* suppress warning about accessing static member via instance
* rephrase exception
* rephrase javadoc
* address field-can-be-final warnings
* remove empty methods
* enum cannot inherit, so protected is redundant
* remove redundant throws
* update imports to be not wildcard
* remove unnecessary try-catch
* update for loop
* remove redundant code in order to use the diamond operator
* update instanceof to use pattern variables
* replace blank lines with <p> in javadocs
* fix dangling javadocs
* suppress warning about unreachable methods in javadocs
* remove redundant operation
* add the descriptions of parameters in javadocs
Also fix javadocs along the way.
* relax returned type in javadoc
That was done in order to make the docs reflect the code more often.
Otherwise, people may forget to change the returned type again with
another change.
* make long conversion explicit
Integer multiplication can give a wrong result if one of the parts is
not explicitly cast to long. Let's cast one of the parts where
applicable.
* remove unary plus
* simplify unary minus
* use addAll instead of forEach,add
It was suggested by IntelliJ to replace the iteration with a bulk operation
to improve performance.
* replace .asList with .singletonList for consistency
* simplify toArray calls
Explanation from IntelliJ:
There are two styles to convert a collection to an array:
* A pre-sized array, for example, c.toArray(new String[c.size()])
* An empty array, for example, c.toArray(new String[0])
In older Java versions, using a pre-sized array was recommended, as the
reflection call necessary to create an array of proper size was quite slow.
However, since late updates of OpenJDK 6, this call was intrinsified, making
the performance of the empty array version the same, and sometimes even better,
compared to the pre-sized version. Also, passing a pre-sized array is dangerous
for a concurrent or synchronized collection as a data race is possible between
the size and toArray calls. This may result in extra nulls at the end of the
array if the collection was concurrently shrunk during the operation.
* split StringBuilder append
Explanation by IntelliJ:
Reports String concatenation used as the argument to appends.
Such calls may profitably be turned into chained append calls on the existing
StringBuilder saving the cost of an extra StringBuilder allocation. This
inspection ignores compile-time evaluated String concatenations,
in which case the conversion would only worsen performance.
* annotate overriding methods with @Nonnull where needed
The method that was overridden has @Nonnull so the method that is overriding
should also have @Nonnull.
* remove set adding itself to itself
* remove null check because findField either works or blows up
cpw.mods.fml.relauncher.ReflectionHelper::findField either returns a non-null
value or throws a RuntimeException, so no need to check of null.
* remove slot comparison with tInventory.length
slot max value is 127 when tInventory.length is set to 256, which results in
that the condition is always true and unnecessary.
* remove aOutput2 null check
As GT_Values.NI is null, there is no need to check aOutput2 for null again
* suppress the suggestion to delete tMeta < 13
mConnectedMachineTextures can change, so tMeta range is not guaranteed
* remove aCoverVariable % 3 < 2
the if above already limits the result of % 3 to "2", so the condition
"less than 2" is always false.
* unwrap "if" because bonus is unchanged
Unwrap if because even if the bonus is a variable, it hasn't been changed for
the past 8 years and is unlikely to be changed in the future.
* reformat javadoc
* improve ignoring an exception
Make them either more clear or concise
* fixup fix typo
* update deprecated calls of newInstance()
* remove testing BaseMetaTileEntity
GregTech_API.constructBaseMetaTileEntity() checks the creation by itself,
logging and throwing a runtime error if failed.
* unwrap hatch-fill for do_SolarSalt
To reach this branch, do_coolant needs to be false and we need to still be in
the function, which means that do_SolarSalt was set to true in the previous
top-tier "if".
* remove always-false input-bus checks of MTE PlasmaForge
size() is non-negative, and the values it is compared to are final and 0.
* length and size are non-negative
Therefore, there's no need to check their negativity
* aOutput is guaranteed to be positive
* tThereWasARecipe is always false when reached in its first occurrence
* convert an assert into if
Only tStack 2 is checked for null because if it isn't null then
tStack1 also isn't null based on the "if" above.
Also IntelliJ was sure that tStack is not null for some reason.
On a side note, assertions work only either with a specified flag
or in debug runs. Therefore, it is dangerous to rely on them.
* simplify stone-gravel-cobble if
tBlock != Blocks.stone because of the if at the start of the method.
for the last else-if, tBlock == Blocks.gravel because of the check slightly
above the change.
* interDimensional is always true because of the first if
* convert an example to javadoc
* remove always-false statements
* replace referential string equality with equals
If we compare strings by "==", we compare references to them, which is not
what we usually want. I wasn't sure if String Pool works here, so I played
it save with equals().
* use Automatic Resource Management for AutoCloseable ByteBufOutputStream
* add todo to swap from sleep to event bus
* null is checked by instanceof
* merge switch branches
* add a TODO to use clamp()
* new String declaration is redundant
* use getOrDefault for a map
* replace StringBuilder with concatenation where fitting
Using a StringBuilder to concatenate two string will not make the program
faster or more understandable, so I swapped it to concatenation.
* remove unnecessary continue
* flip if
* remove redundant returns
* unwrap ifs
It's checked at the top "if" that aType == IItemRenderer.ItemRenderType.INVENTORY,
so all aType.equals(IItemRenderer.ItemRenderType.INVENTORY below are always true.
* remove checking all GT VERSIONs except the API one
* remove version check from GT_Mod and delete respective VERSION fields
Aside from GregTech_API.VERSION, these fields are not used anywhere
in the project, so only GregTech_API.VERSION was kept.
The idea and the usage check were done by miozune.
|
|
Non-final enum fields make a global mutable state, which should be used only
when necessary. Let's make the enum fields final where possible.
|
|
* add eternity
* textures
* timepiece
* disable ebf + freezing
|
|
|
|
* 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
|
|
|
|
* New texture
* Blade
* Change molten space and time names.
* Update fluid names
* Bump dep of AE2
* Bump dep of AE2
* spotlessApply (#1733)
Co-authored-by: GitHub GTNH Actions <>
* New fluid solidifer method
* Space
* Spotless
* New recipes for new white dwarf matter shapes.
* Universium block
* Universium nanites
* Spotless
* Add some fine wires
---------
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>
|
|
|
|
* 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>
|
|
* 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>
|
|
* 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>
|
|
|
|
|
|
* 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>
|
|
|
|
* Add solenoid coils for cyclotron.
* Fix?
* Push
* Spotless apply for branch cyclotron_coils for #1494 (#1495)
* Change stack size (#1484)
* Replace TSS Coils with Titanium-Platinum Ones (#1211)
* Replace TSS Coils with Titanium-Platinum Ones
- Created a new material, TPV-Alloy, made from Titanium, Platinum and Vanadium (3/3/1);
- Replaced the Tungstensteel Coil Block with a TPV one, to make it properly included in EV while adding a Platinum sink in that tier;
* Simplified Metal Proportion for TPV
* change tpv ebf temp to 3k to be even with TSS
(cherry picked from commit 52dda9f666d8e1b2d220a0b2d9e24513ad8a4490)
* add TPV mixer recipe
(cherry picked from commit 30b6cf62c14165add271a1ecc4a322ab0ce609d1)
* add tpv as metal via tag
(cherry picked from commit 75dba7283e26b6e2f717a3230d6369e4cbe20c8e)
* Spotless apply for branch EV_Coil_Change for #1211 (#1482)
* Remove convert gendustry bees code (#1187)
* Remove convert gendustry bees code
* fix derp. run BS update
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* Added check to API if the block should drop its inventory on break (#1479)
* Added check to API if the block should drop its inventory on break
* Apply spotless
* Changed should drop flag to take index argument
* spotlessApply
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* move TSS and TPV to ev (Mixer recipe)
(cherry picked from commit 74dc0da61db49102cc3e073f5c506e8c494c508f)
* add info to Nei
* Spotless apply for branch EV_Coil_Change for #1211 (#1483)
* Remove convert gendustry bees code (#1187)
* Remove convert gendustry bees code
* fix derp. run BS update
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* Added check to API if the block should drop its inventory on break (#1479)
* Added check to API if the block should drop its inventory on break
* Apply spotless
* Changed should drop flag to take index argument
* spotlessApply
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
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: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
* Recipe fixes 2022/10/25 (#1489)
* Fix quad input hatch voiding (#1487)
fixes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11728
* Add constructor for Energy Hatch with inventory (#1488)
* Force Industrial Apiary to suck 4 amps (#1492)
* Fixed annoying cover message bug (#1490)
* Fixed annoying cover message bug
* Spotless
* make the cleanroom to accept 2 doors so alastor is happy (#1493)
* spotlessApply
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@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: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: johnch18 <42650497+johnch18@users.noreply.github.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Random magic numbers
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: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: johnch18 <42650497+johnch18@users.noreply.github.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
|
|
* me input hacth
* sa
|
|
* Pocket Multitool
* :spotlessApply
* Revert ":spotlessApply"
This reverts commit f1421c537c25627bb3d56ddca4fa610d90b16b07.
* :spotlessApply again
|
|
|
|
|
|
* Added advanced debug structure writer
* Applied spotless
* Removed testing variables
* Added client only to rendering
* Added one client side annotation too much
* Included requested changes
* Applied spotless
* Introduced variables for tooltip keys
|
|
* Update dependencies
* Update buildscript, apply spotless
|
|
|
|
|
|
types (#1271)
* ME input bus, gives the multiblock direct access to the 16 selected item types
* Reworked GUI to match the normal interface
* Don't need to duplicate shadow slots
Sync can (better) be done in `endRecipeProcessing`, in case some multi doesn't call `updateSlots` or does it at the wrong time
* Clarify name, to distinguish from the (future) Buffering and Crafting buses
* Make the GUI 4x4 again
* Make the 4x4 GUI actually work
* Make ghost item show item amount
* Remove unimplemented code remnants
Co-authored-by: Sampsa <sampo.vanninen@aalto.fi>
|
|
* no more magical texture index
* add a reverse map for fxxk sake
|
|
* Fix possible out-of-bounds error.
* Bye bye OpV
* Bye bye OpV
* Some textures while I'm here
* Test
* Maybe
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* 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>
|
|
* Industrial Apiary
* Make Forestry not required.
* Add support for gendustry upgrades and lower energy demand
* Add item validation to input slots and fix battery + special slots
* Automation upgrade support and bug fixes
* Better canWork check and flower detection
* GUI work
* Better detection of modifier update
* Add button to cancel process
* Add textures
* Tooltip changes
* Add convert crafting
* Make top and sides glow
* Bug fix
* New textures
* Add bee effects
* Make all tooltips translatable
* Implement GT Apiary Upgrades
* Prevent inserting too many upgrades
* Just require gendustry instead of checking it everywhere
* Add blacklist (bug fix) and use hashsets instead of arrays
* Cache beemember to do effects
* Make blacklist automatic
* Add acceleration upgrades for all tiers (LV -> UV)
* Lock the machine to maxspeed by default
* Correct required energy in info tooltip
* Use isUpgrade method instead of manually checking
* Lower amperage to 4
* Save locked speed to nbt
|
|
* Add Advanced Gas Turbine and Limit Original LGT
- Added an Advanced LGT, made out of HSS-S, that only accepts gas fuels with a fuel value above 800k per bucket;
- Capped the EU/t output of the regular LGT at 8192 EU/t, regardless of dynamo (it will never explode);
* Changed Texture Ordering, Byte to Int and Texture Order
- Reverted the change to existing texture placements in the array to not break already existing multis;
- Changed the output value type of getTextureCasingIndex to int, to support the intended texture.
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* 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>
|
|
* 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 |
