From fdde96ab6fef30064b67e28390008ee4ba455655 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sat, 22 Apr 2023 17:38:49 +0200 Subject: 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 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../blocks/multitileentity/advChemicalReactor/active.png | Bin 0 -> 255 bytes .../multitileentity/advChemicalReactor/active_glow.png | Bin 0 -> 255 bytes .../blocks/multitileentity/advChemicalReactor/base.png | Bin 0 -> 333 bytes .../multitileentity/advChemicalReactor/inactive.png | Bin 0 -> 254 bytes .../multitileentity/advChemicalReactor/inactive_glow.png | Bin 0 -> 256 bytes .../blocks/multitileentity/base/cokeOven/bottom.png | Bin 453 -> 0 bytes .../blocks/multitileentity/base/cokeOven/side.png | Bin 453 -> 0 bytes .../textures/blocks/multitileentity/base/cokeOven/top.png | Bin 453 -> 0 bytes .../blocks/multitileentity/base/metalwall/bottom.png | Bin 443 -> 0 bytes .../blocks/multitileentity/base/metalwall/side.png | Bin 443 -> 0 bytes .../blocks/multitileentity/base/metalwall/top.png | Bin 443 -> 0 bytes .../textures/blocks/multitileentity/cokeOven/active.png | Bin 0 -> 379 bytes .../blocks/multitileentity/cokeOven/active_glow.png | Bin 0 -> 306 bytes .../textures/blocks/multitileentity/cokeOven/base.png | Bin 0 -> 453 bytes .../textures/blocks/multitileentity/cokeOven/inactive.png | Bin 0 -> 209 bytes .../textures/blocks/multitileentity/conveyor/base.png | Bin 0 -> 443 bytes .../textures/blocks/multitileentity/emitter/base.png | Bin 0 -> 443 bytes .../blocks/multitileentity/fieldGenerator/base.png | Bin 0 -> 443 bytes .../textures/blocks/multitileentity/macerator/active.png | Bin 0 -> 255 bytes .../blocks/multitileentity/macerator/active_glow.png | Bin 0 -> 255 bytes .../textures/blocks/multitileentity/macerator/base.png | Bin 0 -> 443 bytes .../blocks/multitileentity/macerator/inactive.png | Bin 0 -> 254 bytes .../blocks/multitileentity/macerator/inactive_glow.png | Bin 0 -> 256 bytes .../blocks/multitileentity/machines/cokeOven/bottom.png | Bin 453 -> 0 bytes .../blocks/multitileentity/machines/cokeOven/front.png | Bin 453 -> 0 bytes .../blocks/multitileentity/machines/cokeOven/left.png | Bin 453 -> 0 bytes .../machines/cokeOven/overlay/active/front.png | Bin 379 -> 0 bytes .../machines/cokeOven/overlay/inactive/front.png | Bin 209 -> 0 bytes .../blocks/multitileentity/machines/cokeOven/right.png | Bin 453 -> 0 bytes .../blocks/multitileentity/machines/cokeOven/side.png | Bin 453 -> 0 bytes .../blocks/multitileentity/machines/cokeOven/top.png | Bin 453 -> 0 bytes .../blocks/multitileentity/machines/metalwall/bottom.png | Bin 443 -> 0 bytes .../blocks/multitileentity/machines/metalwall/side.png | Bin 443 -> 0 bytes .../blocks/multitileentity/machines/metalwall/top.png | Bin 443 -> 0 bytes .../textures/blocks/multitileentity/motor/base.png | Bin 0 -> 443 bytes .../multitileentity/multiblockparts/cokeOven/bottom.png | Bin 453 -> 0 bytes .../multitileentity/multiblockparts/cokeOven/side.png | Bin 453 -> 0 bytes .../multitileentity/multiblockparts/cokeOven/top.png | Bin 453 -> 0 bytes .../multitileentity/multiblockparts/metalwall/bottom.png | Bin 443 -> 0 bytes .../multitileentity/multiblockparts/metalwall/side.png | Bin 443 -> 0 bytes .../multitileentity/multiblockparts/metalwall/top.png | Bin 443 -> 0 bytes .../textures/blocks/multitileentity/piston/base.png | Bin 0 -> 443 bytes .../textures/blocks/multitileentity/pump/base.png | Bin 0 -> 443 bytes .../textures/blocks/multitileentity/robotArm/base.png | Bin 0 -> 443 bytes .../textures/blocks/multitileentity/sensor/base.png | Bin 0 -> 443 bytes 45 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active_glow.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive_glow.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/bottom.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/side.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/top.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/bottom.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/side.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active_glow.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/inactive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/conveyor/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/emitter/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/fieldGenerator/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active_glow.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive_glow.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/bottom.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/front.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/left.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/active/front.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/inactive/front.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/right.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/side.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/top.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/bottom.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/side.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/motor/base.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/bottom.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/side.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/top.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/bottom.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/side.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/top.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/piston/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/pump/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/robotArm/base.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multitileentity/sensor/base.png (limited to 'src/main/resources/assets') 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 new file mode 100644 index 0000000000..ffd43d8dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active.png differ 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 new file mode 100644 index 0000000000..3bb29bbda6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/active_glow.png differ 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 new file mode 100644 index 0000000000..84cd5fa9f2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/base.png differ 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 new file mode 100644 index 0000000000..6092ec4c18 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive.png differ 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 new file mode 100644 index 0000000000..b7955d63ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/advChemicalReactor/inactive_glow.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/bottom.png deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/bottom.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/side.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/cokeOven/top.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/bottom.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/bottom.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/side.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/side.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/top.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/base/metalwall/top.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active.png new file mode 100644 index 0000000000..708971d8cf Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active.png differ 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 new file mode 100644 index 0000000000..c2866f4570 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/active_glow.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/base.png new file mode 100644 index 0000000000..f125fa6bbc Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/base.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/inactive.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/inactive.png new file mode 100644 index 0000000000..c684fbb353 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/cokeOven/inactive.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/conveyor/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/conveyor/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/conveyor/base.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/emitter/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/emitter/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/emitter/base.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/fieldGenerator/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/fieldGenerator/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/fieldGenerator/base.png differ 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 new file mode 100644 index 0000000000..ffd43d8dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active.png differ 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 new file mode 100644 index 0000000000..3bb29bbda6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/active_glow.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/base.png differ 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 new file mode 100644 index 0000000000..6092ec4c18 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive.png differ 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 new file mode 100644 index 0000000000..b7955d63ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/macerator/inactive_glow.png differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/bottom.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/front.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/left.png and /dev/null differ 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/machines/cokeOven/overlay/active/front.png deleted file mode 100644 index 708971d8cf..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/active/front.png and /dev/null differ 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/machines/cokeOven/overlay/inactive/front.png deleted file mode 100644 index c684fbb353..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/overlay/inactive/front.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/right.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/side.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/cokeOven/top.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/bottom.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/bottom.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/side.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/side.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/top.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/machines/metalwall/top.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/motor/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/motor/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/motor/base.png differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/bottom.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/side.png and /dev/null differ 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 deleted file mode 100644 index f125fa6bbc..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/cokeOven/top.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/bottom.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/bottom.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/bottom.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/side.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/side.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/side.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/top.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/top.png deleted file mode 100644 index e05f5d89c7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/multiblockparts/metalwall/top.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/piston/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/piston/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/piston/base.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/pump/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/pump/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/pump/base.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/robotArm/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/robotArm/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/robotArm/base.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/multitileentity/sensor/base.png b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/sensor/base.png new file mode 100644 index 0000000000..e05f5d89c7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multitileentity/sensor/base.png differ -- cgit