Texturework in GT++ (#2945)

* Leaves, Breads and Pizzas re texture

* Crop Blocks Added

* Fix Advanced Boilers top texture

* Adding more controller faces

* Remove redundant code

* Finish controllers and code readability

* spotlessApply to fix violations

* Better Tank texture

* Various Fixes

* Various Fixes

* Oopsies

* Spotless Apply again...
minor adjustments to drinks

* Revert public api changes and scanner textures reference
couldnt find reason why it was throwing NoSuchFieldError even when crops plus plus was recompiled with correct paths

* spotless

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 23 insertions, 64 deletions

diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index eac8634632..d00c5dccb9 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -645,12 +645,12 @@ public class Textures {
         OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE,
         OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW,
 
-        OVERLAY_TOP_POTIONBREWER,
-        OVERLAY_TOP_POTIONBREWER_GLOW,
-        OVERLAY_TOP_REPLICATOR,
-        OVERLAY_TOP_REPLICATOR_GLOW,
         OVERLAY_TOP_MASSFAB,
         OVERLAY_TOP_MASSFAB_GLOW,
+        OVERLAY_TOP_SCANNER,
+        OVERLAY_TOP_SCANNER_ACTIVE,
+        OVERLAY_TOP_SCANNER_GLOW,
+        OVERLAY_TOP_SCANNER_ACTIVE_GLOW,
         OVERLAY_TOP_STEAM_HAMMER,
         OVERLAY_TOP_STEAM_HAMMER_GLOW,
         OVERLAY_TOP_STEAM_FURNACE,
@@ -667,21 +667,17 @@ public class Textures {
         OVERLAY_TOP_STEAM_EXTRACTOR_GLOW,
         OVERLAY_TOP_DISASSEMBLER,
         OVERLAY_TOP_DISASSEMBLER_GLOW,
-        OVERLAY_TOP_BOXINATOR,
-        OVERLAY_TOP_BOXINATOR_GLOW,
         OVERLAY_TOP_ROCK_BREAKER,
         OVERLAY_TOP_ROCK_BREAKER_GLOW,
-        OVERLAY_TOP_SCANNER,
-        OVERLAY_TOP_SCANNER_GLOW,
         OVERLAY_TOP_INDUSTRIAL_APIARY,
         OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW,
 
-        OVERLAY_FRONT_POTIONBREWER,
-        OVERLAY_FRONT_POTIONBREWER_GLOW,
-        OVERLAY_FRONT_REPLICATOR,
-        OVERLAY_FRONT_REPLICATOR_GLOW,
         OVERLAY_FRONT_MASSFAB,
         OVERLAY_FRONT_MASSFAB_GLOW,
+        OVERLAY_FRONT_SCANNER,
+        OVERLAY_FRONT_SCANNER_ACTIVE,
+        OVERLAY_FRONT_SCANNER_ACTIVE_GLOW,
+        OVERLAY_FRONT_SCANNER_GLOW,
         OVERLAY_FRONT_STEAM_HAMMER,
         OVERLAY_FRONT_STEAM_HAMMER_GLOW,
         OVERLAY_FRONT_STEAM_HAMMER_ACTIVE,
@@ -690,6 +686,8 @@ public class Textures {
         OVERLAY_FRONT_STEAM_FURNACE_GLOW,
         OVERLAY_FRONT_STEAM_ALLOY_SMELTER,
         OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW,
+        OVERLAY_FRONT_NUCLEAR_REACTOR,
+        OVERLAY_FRONT_NUCLEAR_REACTOR_ACTIVE,
 
         OVERLAY_FRONT_STEAM_MACERATOR,
         OVERLAY_FRONT_STEAM_MACERATOR_GLOW,
@@ -711,21 +709,17 @@ public class Textures {
         OVERLAY_FRONT_DISASSEMBLER_GLOW,
         OVERLAY_FRONT_DISASSEMBLER_ACTIVE,
         OVERLAY_FRONT_DISASSEMBLER_ACTIVE_GLOW,
-        OVERLAY_FRONT_BOXINATOR,
-        OVERLAY_FRONT_BOXINATOR_GLOW,
         OVERLAY_FRONT_ROCK_BREAKER,
         OVERLAY_FRONT_ROCK_BREAKER_GLOW,
-        OVERLAY_FRONT_SCANNER,
-        OVERLAY_FRONT_SCANNER_GLOW,
         OVERLAY_FRONT_INDUSTRIAL_APIARY,
         OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW,
 
-        OVERLAY_BOTTOM_POTIONBREWER,
-        OVERLAY_BOTTOM_POTIONBREWER_GLOW,
-        OVERLAY_BOTTOM_REPLICATOR,
-        OVERLAY_BOTTOM_REPLICATOR_GLOW,
         OVERLAY_BOTTOM_MASSFAB,
         OVERLAY_BOTTOM_MASSFAB_GLOW,
+        OVERLAY_BOTTOM_SCANNER,
+        OVERLAY_BOTTOM_SCANNER_ACTIVE,
+        OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW,
+        OVERLAY_BOTTOM_SCANNER_GLOW,
         OVERLAY_BOTTOM_STEAM_HAMMER,
         OVERLAY_BOTTOM_STEAM_HAMMER_GLOW,
         OVERLAY_BOTTOM_STEAM_FURNACE,
@@ -741,21 +735,18 @@ public class Textures {
         OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW,
         OVERLAY_BOTTOM_DISASSEMBLER,
         OVERLAY_BOTTOM_DISASSEMBLER_GLOW,
-        OVERLAY_BOTTOM_BOXINATOR,
-        OVERLAY_BOTTOM_BOXINATOR_GLOW,
         OVERLAY_BOTTOM_ROCK_BREAKER,
         OVERLAY_BOTTOM_ROCK_BREAKER_GLOW,
-        OVERLAY_BOTTOM_SCANNER,
-        OVERLAY_BOTTOM_SCANNER_GLOW,
         OVERLAY_BOTTOM_INDUSTRIAL_APIARY,
         OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW,
 
-        OVERLAY_SIDE_POTIONBREWER,
-        OVERLAY_SIDE_POTIONBREWER_GLOW,
-        OVERLAY_SIDE_REPLICATOR,
-        OVERLAY_SIDE_REPLICATOR_GLOW,
+        OVERLAY_SIDE_FLUIDTANK,
         OVERLAY_SIDE_MASSFAB,
         OVERLAY_SIDE_MASSFAB_GLOW,
+        OVERLAY_SIDE_SCANNER,
+        OVERLAY_SIDE_SCANNER_ACTIVE,
+        OVERLAY_SIDE_SCANNER_ACTIVE_GLOW,
+        OVERLAY_SIDE_SCANNER_GLOW,
         OVERLAY_SIDE_STEAM_HAMMER,
         OVERLAY_SIDE_STEAM_HAMMER_GLOW,
         OVERLAY_SIDE_STEAM_FURNACE,
@@ -770,20 +761,13 @@ public class Textures {
         OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW,
         OVERLAY_SIDE_DISASSEMBLER,
         OVERLAY_SIDE_DISASSEMBLER_GLOW,
-        OVERLAY_SIDE_BOXINATOR,
-        OVERLAY_SIDE_BOXINATOR_GLOW,
         OVERLAY_SIDE_ROCK_BREAKER,
         OVERLAY_SIDE_ROCK_BREAKER_GLOW,
-        OVERLAY_SIDE_SCANNER,
-        OVERLAY_SIDE_SCANNER_GLOW,
         OVERLAY_SIDE_INDUSTRIAL_APIARY,
         OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW,
         OVERLAY_SIDE_JUKEBOX,
 
-        OVERLAY_TOP_POTIONBREWER_ACTIVE,
-        OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW,
-        OVERLAY_TOP_REPLICATOR_ACTIVE,
-        OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW,
+        OVERLAY_TOP_FLUIDTANK,
         OVERLAY_TOP_MASSFAB_ACTIVE,
         OVERLAY_TOP_MASSFAB_ACTIVE_GLOW,
 
@@ -802,19 +786,11 @@ public class Textures {
         OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_TOP_DISASSEMBLER_ACTIVE,
         OVERLAY_TOP_DISASSEMBLER_ACTIVE_GLOW,
-        OVERLAY_TOP_BOXINATOR_ACTIVE,
-        OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW,
         OVERLAY_TOP_ROCK_BREAKER_ACTIVE,
         OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW,
-        OVERLAY_TOP_SCANNER_ACTIVE,
-        OVERLAY_TOP_SCANNER_ACTIVE_GLOW,
         OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE,
         OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW,
 
-        OVERLAY_FRONT_POTIONBREWER_ACTIVE,
-        OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW,
-        OVERLAY_FRONT_REPLICATOR_ACTIVE,
-        OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_FRONT_MASSFAB_ACTIVE,
         OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_FURNACE_ACTIVE,
@@ -826,19 +802,11 @@ public class Textures {
         OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE,
         OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW,
-        OVERLAY_FRONT_BOXINATOR_ACTIVE,
-        OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW,
         OVERLAY_FRONT_ROCK_BREAKER_ACTIVE,
         OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW,
-        OVERLAY_FRONT_SCANNER_ACTIVE,
-        OVERLAY_FRONT_SCANNER_ACTIVE_GLOW,
         OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE,
         OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW,
 
-        OVERLAY_BOTTOM_POTIONBREWER_ACTIVE,
-        OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW,
-        OVERLAY_BOTTOM_REPLICATOR_ACTIVE,
-        OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_MASSFAB_ACTIVE,
         OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW,
         OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE,
@@ -856,19 +824,11 @@ public class Textures {
         OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE,
         OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE_GLOW,
-        OVERLAY_BOTTOM_BOXINATOR_ACTIVE,
-        OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE,
         OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW,
-        OVERLAY_BOTTOM_SCANNER_ACTIVE,
-        OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE,
         OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW,
 
-        OVERLAY_SIDE_POTIONBREWER_ACTIVE,
-        OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW,
-        OVERLAY_SIDE_REPLICATOR_ACTIVE,
-        OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_SIDE_MASSFAB_ACTIVE,
         OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW,
         OVERLAY_SIDE_STEAM_HAMMER_ACTIVE,
@@ -886,12 +846,8 @@ public class Textures {
         OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_SIDE_DISASSEMBLER_ACTIVE,
         OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW,
-        OVERLAY_SIDE_BOXINATOR_ACTIVE,
-        OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW,
         OVERLAY_SIDE_ROCK_BREAKER_ACTIVE,
         OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW,
-        OVERLAY_SIDE_SCANNER_ACTIVE,
-        OVERLAY_SIDE_SCANNER_ACTIVE_GLOW,
         OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE,
         OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW,
 
@@ -1005,6 +961,9 @@ public class Textures {
         LARGETURBINE_TU_ACTIVE9,
 
         MACHINE_CASING_TURBINE,
+        MACHINE_CASING_TURBINE_STAINLESSSTEEL,
+        MACHINE_CASING_TURBINE_TITANIUM,
+        MACHINE_CASING_TURBINE_TUNGSTENSTEEL,
         MACHINE_CASING_ADVANCEDGAS,
         BLOCK_ADAMANTIUM,
         BLOCK_ALUMINIUM,