| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Co-authored-by: Caedis <Caedis@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: BucketBrigade <138534411+CookieBrigade@users.noreply.github.com>
|
|
|
|
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
|
|
* fix wrong offset
* improve item insertion window
* finish upgrade material functionality
* add tooltip to material button
* add rhugnor gear
* half serious upgrade costs (will definitely change)
* fix stocking hatch not working for fuel supply
* add information window
* add heat formula info
* add autobuild hint dot info
* add phonon related items and fluids
* first iteration of glitchy material renderer
* tweak renderer overlay opacity
* add new material
* add phononic seed crystal and six-phased copper block
* add recipes for phonon transfer medium chain
* add solenoid block replacement
* add creon
* decouple smelting module structure
* spotless weirdness
* add most casing recipes and late loading method (for the special singularities)
* add new singularity recipes
* more recipes
* add glow
* generate more dragonblood parts
* add upgrade costs
* fix upgrade tree window scrollable weirdness
* forgor glow texture
* add last upgrade text + a random comma
* re-add phonon medium abs recipe
* add six-phased copper nanite recipe
* fix button overlay being off by 1 pixel
* fix merge mishaps
* forgot to adjust debug buttons
* fix stocking bus fuel insertion and fuel int overflow
* add graviton shard ejection
* minor structure oopsie
* ejection button registration
* ejection button tooltip
* add graviton shard item
* eject the right item + save ejection status to nbt
* fix input bus amount npe
* change rendering block offset
* adapt eoh rendering to allow changing the star's size
* initial rendering changes (make the blue star render)
* change seed crystal recipes
* another small seed crystal change
* adjust item renderer
* add tooltips
* circuit oredict fix
* tooltips, upgrade names, some experimental ui changes and small fixes
* author
* make star bigger
* fix recipes
* remove unnecessary tooltips
* spotless
* recipe adjustments
* make magneto resonatic block craftable
* change magneto resonatic gem autoclave times + spotless
* add structurecheck button to modules
* more recipe adjustments
* fix extra material crash
* more recipe adjustments
* lower eternal singularity amounts
* display recipetimes <1 sec properly
* try to fix hasShiftDown crash
* adjust plasma module recipes
* swap placeholder names
* implement rings disappearing/reappearing for renderer
* utility for structure strings
* buff plasma module parallel
* fix itemlist
* Spotless apply for branch godforge for #2950 (#3013)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* fiddling around with frame boxes
* more fiddling
* am trying
* frames exist
* fix frame rendering in inventory
* Fix in world frame rendering
* Apply cover to dumb frame
* continue work on frames
* apply covers to correct side and fix crash on load
* Test permissions
* fix oredict for new frames and create recipes
* fix waila names and drops (kind of)
* fix drops
* mostly all working
* remove old comment
* fix structurecheck using new frames
* create the TE transformer
* it didnt work
* dont modify tes we dont want to modify (needs future postea update)
* it works!
* item transformer works too
* spotless
* add more method overrides from generic gt block?
* update postea
* fix postea transforming items in reserved frame range that were not frame boxes
* fix tesla tower structurecheck + capacitor hatch crash
* Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
* Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
* Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
* Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
* Spotless apply for branch dumb-frames for #2799 (#2953)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* remove extra null check
* Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
* remove more messy instanceof checks
* Spotless apply for branch dumb-frames for #2799 (#2954)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* remove unnecessary null check
* try fixing facade color
* Update src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
* small cleanup in framebox gen code
* swap material for frame box block
* fix description
* make getMaterial static and add fix AE cover color
* nicer casts + localize tooltip in frame block instead of stealing old localization
* draw grid on cover hover
* add a null check in getTexture() that hopefully fixes crash in full pack when interacting with frame boxes
* also draw grid when hovering with wrench
* add chemical element back to tooltip
* fix breaking frame not causing structure update
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Added the miniature wormhole generator
* Updated structure & tooltip and added hatch hask
* Fixed controller promotion not working
* Initial work wormhole render + spotless + git strangeness
* Fix wildcard imports
* Removed redundant code + added more reasonable defaults
* fix
* sa
* Remove debug print statements
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: CookieBrigade <138534411+cookiebrigade@users.noreply.github.com>
|
|
* Laser engraver boilerplate and structure
* Made a rough, untextured laser renderer
* Laser renderer is kind of functional
* Laser renderer follows curve
* Laser turns on/off when recipe is running
* Sampsa laser
* Color changing boilerplate
* Registered all gt lenses
* Fixed default renderer to white
* NBT reading functional
* Stole SE code to try and get TE working. It does not
* Laser renderer finally functioning with more than 1 laser!
* Moved tick count to TileLaser so lasers don't tick each other
* Implemented laser source hatch
* Structure update + spotless
* Switched to the GT_Values tier list
* Update tooltip and message player about rendering toggle
* Allow fluid input/output
* Attempting to give proper name to laser plate
* Fixed laser plate name
* New laser plate texture
* New casing just dropped
* Allow UMV glass to use any laser source
* Switched laser to a simple line renderer instead of a model
* Fixed hatch texture I missed earlier
* Spotless
* Controller textures
* render: New laser renderer
- Use GL quad rendering instead of line rendering to fix scaling
- Set lightmap coords (Emit bloom glow with shaders)
- Set opacity to 1.0
- Slight cleanup
* Got rid of the old laser model
* Tweaked some numbers on the renderer
* Spotless
* cleanup
* I give up on rotation, I've spent too much time trying to get this to work
* Got block item working I think
* Fixed tooltip for laser and multicanner
* Support bartworks lenses
* Finishing touches
* Removed unneeded assignment
* Allow UXV lasers to do all recipes
* Forgot to call super for nbt data...
* Replace magic numbers
* oops, spotless
* Another magic voltage number
* Rotations and mirror flips
Now with spotless
* fixed west/east
* ok but actually fixed now, mixed up west/east with north/south
* Updated laser source snapping to account for rotation being allowed
* Cleanup rotation axis and remove unecessary nbt
* Re-added nbt but actually load it properly now
* Fix NEI displaying lots of hatches
---------
Co-authored-by: LekKit <50500857+LekKit@users.noreply.github.com>
Co-authored-by: BucketBrigade <apple12a1@hotmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* Merge MultiTileEntityBlockRegistryInternal into MultiTileEntityBlock
* Add a hard dep on NEID for meta extension
* Use in world block meta for MuTE ID
* Use one block per MuTE Registry
* Add WeakTargetRef
* Migrate `controller` reference for parts over to a non non cachable WeakTargetRef
* Migrate controller WeakReference usage to WeakTargetRef
|
|
|
|
* remove arrows
* remove arrow classes
* remove arrow usages in ItemList
* less bullshit
* sa
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* Add IAllSidedTexturedTileEntity to reduce memory overhead for ore textures
(cherry picked from commit 274918800a3bf728e1db88e2d22b14cb6eb1a2e5)
* Cache texture for ore, since it doesn't change during the game obviously
(cherry picked from commit 45a2fe43f2cdb33fa7c0b05a4b8e4531fd2706a6)
* Reduce allocations for inventory ores rendering
(cherry picked from commit 5ed6526436e9b3a0586f37eac460f707636a102d)
---------
Co-authored-by: SKProCH <skproch@yandex.ru>
|
|
* Maybe thread safe
* While we're at it, let's reduce allocations by a few orders of magnitude. ~1gb -> 1mb in testing for similar time periods.
* use return value of add() again
* That's apparently not available on the server side
* Spotless apply for branch maybe-thread-safe for #2523 (#2524)
spotlessApply
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Add Drone Centre
* Apply texture and model
* Update en_US.lang
* Remove import.*
* Switch to block render
* Balance range and break chance
* Add recipe
* Spotless
* Update lang
* Fix recipe
* Rewrite connection system and UI
* Remove debuff party
* Spotless
* Fix server class not found
* A stupid enough recipe
* Another bad recipe
* Update tooltip & i18n
* Close it!
* Spotless
* Disable draggable
* prohibited remote control when centre is offline
* Rename
* Rename; Change specifiers
* Update texture
* spotless
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* Fix large fluid cell Rendering 🤦
* Convert if-else chain to switch 🧹
* Remove unnecessary z offset 🧹
|
|
* Rework item renderers
API breaking changes (minor):
Subclasses of GT_GeneratedItem_Renderer may need updating
Subclasses of GT_GeneratedMaterial_Renderer may need updating
Subclasses of GT_DataStick_Renderer may need updating
* Improve Universium shader compatibility
still looks wrong, but won't screw up stuff rendered after it
|
|
* guard clause technique on GT_ItemIterator
* removing oredict for ars magica 2 items
* removing oredict for mystcraft items
* convert big if ladder into a swtich statement
* enhanced switch
* clean non GTNH compat and identify other compats
* spotlessApply (#2310)
Co-authored-by: GitHub GTNH Actions <>
* more guard clauses
* reordering condition
* removing dead code
* removing optional block
* deprecating mIC2Classic
* spotless apply
* deprecate modloaded variables
* spotlessApply
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
|
|
* 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.
|
|
|
|
|
|
|
|
* ForgeDirection
Also refactor the clusterfuck that was `getCoordinateScan`
Co-authored by: Jason Mitchell <mitchej@gmail.com>
* Fix rendering of Frame Boxes
Frame boxes needed their own implementation of getTexture with int connexion mask,
which is returning an error texture for the MetaTileEntity, because pipes (FrameBox
**is** a pipe) do use this method to return different textures based on connexion
status.
---------
Co-authored-by: Léa Gris <lea.gris@noiraude.net>
|
|
* complex controller start
* Added methods to get input fluids and items
* Added logic to complex parallel mute
* Added ACR and fixed many, many, many, many bugs
* Added void protection setting to checkRecipe
* do not init nbt, if mteID and mteRegistry are the same
* Improved GUI design
* Force structure check when pressing power switch
* ACR Textures
* Added T1 structure
* Added perfect OC
* Added WAILA
* fix mutes resetting their nbt
* Fix ACR GUI
* fix npe
* Added void protection for MuTEs
* Fixed ACR starting recipe while another one is ongoing
* nbt saving
* maybe fix structure breaking
* Fix complex machine disabling on startup
* correctly update input tanks
* move casings over
* Changed logic of casings to change mode and facing in one go by sneaking
* Fixed the casing target not resetting
* Added side only annotations
* don't leave it empty
* Added power logic and tiered blocks to ACR
* Change facing to wrench side if casing mode is currently none
* lasers anyone?
* Added ACR item chaining
* Remove unncessary item lists
* Use HashSet for process whitelists
* Optimize list capacities
* Fix potential recipe voiding bug
* Rename methods for consistancy
* Fix NPE
* Duct tape fix structure check
* allow MuTEs to connect to cables
* Added separate tank inventories for input separation (#1887)
* Fixed unregistering tank function
* Fixed input busses not being automatable
* Added fluid chaining
* Fixed saving of input tanks
* Forbid inventory registering with empty name
* Display all input tanks in controller GUI
* Fixed fluid hatch GUI height
* Reset casing lists when checking the structure
* Make inventory GUI size consistant
* Make use of the tooltip cache
* rename thing clean up
* Forgot to put tooltip into map
* Added tooltip to ACR
* Reset whitelists when one whitelist window was opened
* Refined scanner string
* Fixed progress times
* Fixed MuTE not consuming fluids
* Properly register controller inventories
* switch to ForgeDirection
* switch to new Renderer
* Added missing contains check on registerInventory
* Fixed output tanks not registering
* Fixed upgrade tank loading
* fix machines not having active/inactive textures
* fix overlays not loading correctly
* Don't register controller directly
* Remove magic strings all
* fix active not setting to inactive
* allow glow
* item renderer
* fix glow
* MuTE improved hatch GUI and fluid output locking (#1889)
* Allow output hatches to be fluid locked
* Reworked hatch GUI
* Check target before trying to open GUI
* Make ACR GUI easier to look at
* fix covers not rendering on mutes
* fix covers not displaying above the item/fluid in/out
* new folder texture structure
* Reduce network traffic caused by covers
* Fixed WAILA fluid locking display
* Don't save everything to the itemstack NBT
* Added possibility to save NBT of MuTE to its itemstack
* fix textures, but make sacrifices
* mah textures
* Removed the need for all textures to be present
* Added glow texture for active coke oven
* Removed unncesssary upgrade casing textures
* shorten nbt tags
---------
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
|
|
* allow data stick (contains assline recipe)render like ae2 patten
* spotless
* data stick renderer and spotlessApply
* Remove recursive boolean in data stick renderer,maybe have side effect
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* 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
|
|
|
|
|
|
* Make material renderer available for arbitrary item
* pass render pass
|
|
* Add Hodgepodge compat
* cleanup
* Fix for fluid inside large cell
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* 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>
|
|
* 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
|
|
|
|
* fix sprite abuse
* Spotless apply for branch fix/sprite-abuse for #1347 (#1348)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
* convert gaia spirit
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Update dependencies
* Update buildscript, apply spotless
|
|
|
|
|
|
* Bind atlas according to sprite number
* Don't modulate color when rendering fluids
|
