diff options
| author | Maxim <maxim235@gmx.de> | 2023-04-22 17:38:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 08:38:49 -0700 |
| commit | fdde96ab6fef30064b67e28390008ee4ba455655 (patch) | |
| tree | ee169d0d4a8432433c4ec01eada1e24049a0e47a /src/main/resources/assets | |
| parent | de864236f83dc31c53ca77a6939357a0959bca75 (diff) | |
| download | GT5-Unofficial-fdde96ab6fef30064b67e28390008ee4ba455655.tar.gz GT5-Unofficial-fdde96ab6fef30064b67e28390008ee4ba455655.tar.bz2 GT5-Unofficial-fdde96ab6fef30064b67e28390008ee4ba455655.zip | |
MuTE overhaul and ACR (#1883)
* 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>
Diffstat (limited to 'src/main/resources/assets')
33 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active.png Binary files differnew file mode 100644 index 0000000000..ffd43d8dc2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active_glow.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active_glow.png Binary files differnew file mode 100644 index 0000000000..3bb29bbda6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active_glow.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/base.png Binary files differnew file mode 100644 index 0000000000..84cd5fa9f2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive.png Binary files differnew file mode 100644 index 0000000000..6092ec4c18 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive_glow.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive_glow.png Binary files differnew file mode 100644 index 0000000000..b7955d63ab --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive_glow.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/side.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/side.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/top.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/top.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/active/front.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active.png Binary files differindex 708971d8cf..708971d8cf 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/active/front.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active_glow.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active_glow.png Binary files differnew file mode 100644 index 0000000000..c2866f4570 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active_glow.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/base.png Binary files differindex f125fa6bbc..f125fa6bbc 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/bottom.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/inactive/front.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/inactive.png Binary files differindex c684fbb353..c684fbb353 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/inactive/front.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/inactive.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/conveyor/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/bottom.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/conveyor/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/emitter/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/side.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/emitter/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/fieldGenerator/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/top.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/fieldGenerator/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active.png Binary files differnew file mode 100644 index 0000000000..ffd43d8dc2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active_glow.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active_glow.png Binary files differnew file mode 100644 index 0000000000..3bb29bbda6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active_glow.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/bottom.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive.png Binary files differnew file mode 100644 index 0000000000..6092ec4c18 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive_glow.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive_glow.png Binary files differnew file mode 100644 index 0000000000..b7955d63ab --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive_glow.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/bottom.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/bottom.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/front.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/front.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/front.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/left.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/left.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/left.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/right.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/right.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/right.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/side.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/side.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/top.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/top.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/motor/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/side.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/motor/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/bottom.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/bottom.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/side.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/side.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/top.png Binary files differdeleted file mode 100644 index f125fa6bbc..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/top.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/piston/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/top.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/piston/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/pump/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/bottom.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/pump/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/robotArm/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/side.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/robotArm/base.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/sensor/base.png Binary files differindex e05f5d89c7..e05f5d89c7 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/top.png +++ b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/sensor/base.png |
