Bring in experimental branch

1 files changed, 207 insertions, 3 deletions

diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 43c33fc8db..163c451522 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -50,10 +50,10 @@ public class Textures {
 		, DIESEL_GENERATOR_BACK, DIESEL_GENERATOR_FRONT, DIESEL_GENERATOR_SIDE, DIESEL_GENERATOR_BOTTOM, DIESEL_GENERATOR_TOP, DIESEL_GENERATOR_BACK_ACTIVE, DIESEL_GENERATOR_FRONT_ACTIVE, DIESEL_GENERATOR_SIDE_ACTIVE, DIESEL_GENERATOR_BOTTOM_ACTIVE, DIESEL_GENERATOR_TOP_ACTIVE
 		, GAS_TURBINE_BACK, GAS_TURBINE_FRONT, GAS_TURBINE_SIDE, GAS_TURBINE_BOTTOM, GAS_TURBINE_TOP, GAS_TURBINE_BACK_ACTIVE, GAS_TURBINE_FRONT_ACTIVE, GAS_TURBINE_SIDE_ACTIVE, GAS_TURBINE_BOTTOM_ACTIVE, GAS_TURBINE_TOP_ACTIVE
 		, STEAM_TURBINE_BACK, STEAM_TURBINE_FRONT, STEAM_TURBINE_SIDE, STEAM_TURBINE_BOTTOM, STEAM_TURBINE_TOP, STEAM_TURBINE_BACK_ACTIVE, STEAM_TURBINE_FRONT_ACTIVE, STEAM_TURBINE_SIDE_ACTIVE, STEAM_TURBINE_BOTTOM_ACTIVE, STEAM_TURBINE_TOP_ACTIVE
-		, MACHINE_COIL_CUPRONICKEL, MACHINE_COIL_KANTHAL, MACHINE_COIL_NICHROME, MACHINE_COIL_SUPERCONDUCTOR
+		, MACHINE_COIL_CUPRONICKEL, MACHINE_COIL_KANTHAL, MACHINE_COIL_NICHROME, MACHINE_COIL_SUPERCONDUCTOR,BLOCK_BRONZEPREIN,BLOCK_IRREIN,BLOCK_PLASCRETE,BLOCK_TSREIN
 		, OVERLAY_LOCKER, OVERLAY_LOCKER_000, OVERLAY_LOCKER_001, OVERLAY_LOCKER_002, OVERLAY_LOCKER_003, OVERLAY_LOCKER_004, OVERLAY_LOCKER_005, OVERLAY_LOCKER_006, OVERLAY_LOCKER_007, OVERLAY_LOCKER_008, OVERLAY_LOCKER_009, OVERLAY_LOCKER_010, OVERLAY_LOCKER_011, OVERLAY_LOCKER_012, OVERLAY_LOCKER_013
 		, OVERLAY_LENS, OVERLAY_PIPE, OVERLAY_PIPE_IN, OVERLAY_PIPE_OUT, OVERLAY_MUFFLER, OVERLAY_CONTROLLER, OVERLAY_ACTIVITYDETECTOR, OVERLAY_ENERGYDETECTOR, OVERLAY_FLUIDDETECTOR, OVERLAY_ITEMDETECTOR, OVERLAY_FUSION1, OVERLAY_FUSION2, OVERLAY_FUSION3, OVERLAY_SCREEN, OVERLAY_QTANK, OVERLAY_QCHEST, OVERLAY_SHUTTER, OVERLAY_CLOSET, OVERLAY_DUCTTAPE, OVERLAY_MAINTENANCE, OVERLAY_CONVEYOR, OVERLAY_PUMP, OVERLAY_ARM, OVERLAY_DRAIN, OVERLAY_CRAFTING
-		, OVERLAY_ENERGY_IN, OVERLAY_ENERGY_OUT , OVERLAY_ENERGY_IN_MULTI, OVERLAY_ENERGY_OUT_MULTI
+ 		, OVERLAY_ENERGY_IN, OVERLAY_ENERGY_OUT , OVERLAY_ENERGY_IN_MULTI, OVERLAY_ENERGY_OUT_MULTI
 		, OVERLAY_FRONT_LARGE_BOILER, OVERLAY_FRONT_LARGE_BOILER_ACTIVE, OVERLAY_FRONT_VACUUM_FREEZER, OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE, OVERLAY_FRONT_MULTI_SMELTER, OVERLAY_FRONT_MULTI_SMELTER_ACTIVE, OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE, OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE, OVERLAY_FRONT_IMPLOSION_COMPRESSOR, OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE
 		,    OVERLAY_TOP_POTIONBREWER       ,    OVERLAY_TOP_REPLICATOR       ,    OVERLAY_TOP_MASSFAB       ,    OVERLAY_TOP_STEAM_HAMMER       ,    OVERLAY_TOP_STEAM_FURNACE       ,    OVERLAY_TOP_STEAM_ALLOY_SMELTER       ,    OVERLAY_TOP_STEAM_MACERATOR       ,    OVERLAY_TOP_STEAM_COMPRESSOR       ,    OVERLAY_TOP_STEAM_EXTRACTOR       ,    OVERLAY_TOP_DISASSEMBLER       ,    OVERLAY_TOP_BOXINATOR       ,    OVERLAY_TOP_ROCK_BREAKER       ,    OVERLAY_TOP_SCANNER       
 		,  OVERLAY_FRONT_POTIONBREWER       ,  OVERLAY_FRONT_REPLICATOR       ,  OVERLAY_FRONT_MASSFAB       ,  OVERLAY_FRONT_STEAM_HAMMER       ,  OVERLAY_FRONT_STEAM_FURNACE       ,  OVERLAY_FRONT_STEAM_ALLOY_SMELTER       ,  OVERLAY_FRONT_STEAM_MACERATOR       ,  OVERLAY_FRONT_STEAM_COMPRESSOR       ,  OVERLAY_FRONT_STEAM_EXTRACTOR       ,  OVERLAY_FRONT_DISASSEMBLER       ,  OVERLAY_FRONT_BOXINATOR       ,  OVERLAY_FRONT_ROCK_BREAKER       ,  OVERLAY_FRONT_SCANNER       
@@ -65,6 +65,18 @@ public class Textures {
 		,   OVERLAY_SIDE_POTIONBREWER_ACTIVE,   OVERLAY_SIDE_REPLICATOR_ACTIVE,   OVERLAY_SIDE_MASSFAB_ACTIVE,   OVERLAY_SIDE_STEAM_HAMMER_ACTIVE,   OVERLAY_SIDE_STEAM_FURNACE_ACTIVE,   OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE,   OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE,   OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE,   OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE,   OVERLAY_SIDE_DISASSEMBLER_ACTIVE,   OVERLAY_SIDE_BOXINATOR_ACTIVE,   OVERLAY_SIDE_ROCK_BREAKER_ACTIVE,   OVERLAY_SIDE_SCANNER_ACTIVE, OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER,OVERLAY_TELEPORTER_ACTIVE
 		,FUSIONI_1,FUSIONI_2,FUSIONI_3,FUSIONI_4,FUSIONI_5,FUSIONI_6,FUSIONI_7,FUSIONI_8,FUSIONI_9,FUSIONI_10,FUSIONI_11,FUSIONI_12,FUSIONII_1,FUSIONII_2,FUSIONII_3,FUSIONII_4,FUSIONII_5,FUSIONII_6,FUSIONII_7,FUSIONII_8,FUSIONII_9,FUSIONII_10,FUSIONII_11,FUSIONII_12
 		,LARGETURBINE1,LARGETURBINE2,LARGETURBINE3,LARGETURBINE4,LARGETURBINE5,LARGETURBINE6,LARGETURBINE7,LARGETURBINE8,LARGETURBINE9,LARGETURBINE_ACTIVE1,LARGETURBINE_ACTIVE2,LARGETURBINE_ACTIVE3,LARGETURBINE_ACTIVE4,LARGETURBINE_ACTIVE5,LARGETURBINE_ACTIVE6,LARGETURBINE_ACTIVE7,LARGETURBINE_ACTIVE8,LARGETURBINE_ACTIVE9, MACHINE_CASING_TURBINE
+		,BLOCK_ADAMANTIUM,BLOCK_ALUMINIUM,BLOCK_AMERICIUM,BLOCK_ANNEALEDCOPPER,BLOCK_ANTIMONY,BLOCK_ARSENIC,BLOCK_ASTRALSILVER,BLOCK_BATTERYALLOY,BLOCK_BERYLLIUM,BLOCK_BISMUTH,BLOCK_BISMUTHBRONZE,BLOCK_BLACKBRONZE,BLOCK_BLACKSTEEL,BLOCK_BLUEALLOY,BLOCK_BLUESTEEL,BLOCK_BRASS
+		
+		,BLOCK_BRONZE,BLOCK_CAESIUM,BLOCK_CERIUM,BLOCK_CHROME,BLOCK_CHROMIUMDIOXIDE,BLOCK_COBALT,BLOCK_COBALTBRASS,BLOCK_COPPER,BLOCK_CUPRONICKEL,BLOCK_DAMASCUSSTEEL,BLOCK_DARKIRON,BLOCK_DEEPIRON,BLOCK_DESH,BLOCK_DURANIUM,BLOCK_DYSPROSIUM,BLOCK_ELECTRUM
+		,BLOCK_ELECTRUMFLUX,BLOCK_ENDERIUM,BLOCK_ERBIUM,BLOCK_EUROPIUM,BLOCK_FIERYSTEEL,BLOCK_GADOLINIUM,BLOCK_GALLIUM,BLOCK_HOLMIUM,BLOCK_HSLA,BLOCK_INDIUM,BLOCK_INFUSEDGOLD,BLOCK_INVAR,BLOCK_IRIDIUM,BLOCK_IRONMAGNETIC,BLOCK_IRONWOOD,BLOCK_KANTHAL
+		,BLOCK_KNIGHTMETAL,BLOCK_LANTHANUM,BLOCK_LEAD,BLOCK_LUTETIUM,BLOCK_MAGNALIUM,BLOCK_MAGNESIUM,BLOCK_MANGANESE,BLOCK_METEORICIRON,BLOCK_METEORICSTEEL,BLOCK_MIDASIUM,BLOCK_MITHRIL,BLOCK_MOLYBDENUM,BLOCK_NAQUADAH,BLOCK_NAQUADAHALLOY,BLOCK_NAQUADAHENRICHED,BLOCK_NAQUADRIA
+		,BLOCK_NEODYMIUM,BLOCK_NEODYMIUMMAGNETIC,BLOCK_NEUTRONIUM,BLOCK_NICHROME,BLOCK_NICKEL,BLOCK_NIOBIUM,BLOCK_NIOBIUMNITRIDE,BLOCK_NIOBIUMTITANIUM,BLOCK_OSMIRIDIUM,BLOCK_OSMIUM,BLOCK_PALLADIUM,BLOCK_PIGIRON,BLOCK_PLATINUM,BLOCK_PLUTONIUM,BLOCK_PLUTONIUM241,BLOCK_PRASEODYMIUM
+		,BLOCK_PROMETHIUM,BLOCK_REDALLOY,BLOCK_REDSTEEL,BLOCK_ROSEGOLD,BLOCK_RUBIDIUM,BLOCK_SAMARIUM,BLOCK_SCANDIUM,BLOCK_SHADOWIRON,BLOCK_SHADOWSTEEL,BLOCK_SILICON,BLOCK_SILVER,BLOCK_SOLDERINGALLOY,BLOCK_STAINLESSSTEEL,BLOCK_STEEL,BLOCK_STEELMAGNETIC,BLOCK_STERLINGSILVER
+		,BLOCK_SUNNARIUM,BLOCK_TANTALUM,BLOCK_TELLURIUM,BLOCK_TERBIUM,BLOCK_THAUMIUM,BLOCK_THORIUM,BLOCK_THULIUM,BLOCK_TIN,BLOCK_TINALLOY,BLOCK_TITANIUM,BLOCK_TRITANIUM,BLOCK_TUNGSTEN,BLOCK_TUNGSTENSTEEL,BLOCK_ULTIMET,BLOCK_URANIUM,BLOCK_URANIUM235
+		,BLOCK_VANADIUM,BLOCK_VANADIUMGALLIUM,BLOCK_WROUGHTIRON,BLOCK_YTTRBIUM,BLOCK_YTTRIUM,BLOCK_YTTRIUMBARIUMCUPRATE,BLOCK_ZINC,BLOCK_TUNGSTENCARBIDE,BLOCK_VANADIUMSTEEL,BLOCK_HSSG,BLOCK_HSSE,BLOCK_HSSS
+		,BLOCK_AERCRYSTAL,BLOCK_AMBER,BLOCK_AMETHYST,BLOCK_AQUACRYSTAL,BLOCK_BLUETOPAZ,BLOCK_CERTUSQUARTZ,BLOCK_DILITHIUM,BLOCK_ENDEREYE,BLOCK_ENDERPEARL,BLOCK_FOOLSRUBY,BLOCK_FORCE,BLOCK_FORCICIUM,BLOCK_FORCILLIUM,BLOCK_GREENSAPPHIRE,BLOCK_IGNISCRYSTAL,BLOCK_JASPER
+		,BLOCK_LAZURITE,BLOCK_LIGNITE,BLOCK_MONAZITE,BLOCK_NITER,BLOCK_OLIVINE,BLOCK_OPAL,BLOCK_ORDOCRYSTAL,BLOCK_PERDITIOCRYSTAL,BLOCK_PHOSPHORUS,BLOCK_QUARTZITE,BLOCK_REDGARNET,BLOCK_RUBY,BLOCK_SAPPHIRE,BLOCK_SODALITE,BLOCK_TANZANITE,BLOCK_TERRACRYSTAL
+		,BLOCK_TOPAZ,BLOCK_VINTEUM,BLOCK_YELLOWGARNET,BLOCK_NETHERSTAR,BLOCK_CHARCOAL
 		
 		;
 		
@@ -260,9 +272,201 @@ public class Textures {
 	    	FUSIONII_10,
 	    	FUSIONII_11,
 	    	FUSIONII_12,
-	    };
+	    },
 	    
+	    STORAGE_BLOCKS1 = new IIconContainer[]{
+	    	BLOCK_ADAMANTIUM,
+	    	BLOCK_ALUMINIUM,
+	    	BLOCK_AMERICIUM,
+	    	BLOCK_ANNEALEDCOPPER,
+	    	BLOCK_ANTIMONY,
+	    	BLOCK_ARSENIC,
+	    	BLOCK_ASTRALSILVER,
+	    	BLOCK_BATTERYALLOY,
+	    	BLOCK_BERYLLIUM,
+	    	BLOCK_BISMUTH,
+	    	BLOCK_BISMUTHBRONZE,
+	    	BLOCK_BLACKBRONZE,
+	    	BLOCK_BLACKSTEEL,
+	    	BLOCK_BLUEALLOY,
+	    	BLOCK_BLUESTEEL,
+	    	BLOCK_BRASS				
+	    }, 
 	    
+	    STORAGE_BLOCKS2 = new IIconContainer[]{
+	    	BLOCK_BRONZE,
+	    	BLOCK_CAESIUM,
+	    	BLOCK_CERIUM,
+	    	BLOCK_CHROME,
+	    	BLOCK_CHROMIUMDIOXIDE,
+	    	BLOCK_COBALT,
+	    	BLOCK_COBALTBRASS,
+	    	BLOCK_COPPER,
+	    	BLOCK_CUPRONICKEL,
+	    	BLOCK_DAMASCUSSTEEL,
+	    	BLOCK_DARKIRON,
+	    	BLOCK_DEEPIRON,
+	    	BLOCK_DESH,
+	    	BLOCK_DURANIUM,
+	    	BLOCK_DYSPROSIUM,
+	    	BLOCK_ELECTRUM
+		},
+		
+	    STORAGE_BLOCKS3 = new IIconContainer[]{
+	    	BLOCK_ELECTRUMFLUX,
+	    	BLOCK_ENDERIUM,
+	    	BLOCK_ERBIUM,
+	    	BLOCK_EUROPIUM,
+	    	BLOCK_FIERYSTEEL,
+	    	BLOCK_GADOLINIUM,
+	    	BLOCK_GALLIUM,
+	    	BLOCK_HOLMIUM,
+	    	BLOCK_HSLA,
+	    	BLOCK_INDIUM,
+	    	BLOCK_INFUSEDGOLD,
+	    	BLOCK_INVAR,
+	    	BLOCK_IRIDIUM,
+	    	BLOCK_IRONMAGNETIC,
+	    	BLOCK_IRONWOOD,
+	    	BLOCK_KANTHAL
+		},
+		
+	    STORAGE_BLOCKS4 = new IIconContainer[]{
+	    	BLOCK_KNIGHTMETAL,
+	    	BLOCK_LANTHANUM,
+	    	BLOCK_LEAD,
+	    	BLOCK_LUTETIUM,
+	    	BLOCK_MAGNALIUM,
+	    	BLOCK_MAGNESIUM,
+	    	BLOCK_MANGANESE,
+	    	BLOCK_METEORICIRON,
+	    	BLOCK_METEORICSTEEL,
+	    	BLOCK_MIDASIUM,
+	    	BLOCK_MITHRIL,
+	    	BLOCK_MOLYBDENUM,
+	    	BLOCK_NAQUADAH,
+	    	BLOCK_NAQUADAHALLOY,
+	    	BLOCK_NAQUADAHENRICHED,
+	    	BLOCK_NAQUADRIA
+		},
+		
+	    STORAGE_BLOCKS5 = new IIconContainer[]{
+	    	BLOCK_NEODYMIUM,
+	    	BLOCK_NEODYMIUMMAGNETIC,
+	    	BLOCK_NEUTRONIUM,
+	    	BLOCK_NICHROME,
+	    	BLOCK_NICKEL,
+	    	BLOCK_NIOBIUM,
+	    	BLOCK_NIOBIUMNITRIDE,
+	    	BLOCK_NIOBIUMTITANIUM,
+	    	BLOCK_OSMIRIDIUM,
+	    	BLOCK_OSMIUM,
+	    	BLOCK_PALLADIUM,
+	    	BLOCK_PIGIRON,
+	    	BLOCK_PLATINUM,
+	    	BLOCK_PLUTONIUM,
+	    	BLOCK_PLUTONIUM241,
+	    	BLOCK_PRASEODYMIUM
+		},
+		
+	    STORAGE_BLOCKS6 = new IIconContainer[]{
+	    	BLOCK_PROMETHIUM,
+	    	BLOCK_REDALLOY,
+	    	BLOCK_REDSTEEL,
+	    	BLOCK_ROSEGOLD,
+	    	BLOCK_RUBIDIUM,
+	    	BLOCK_SAMARIUM,
+	    	BLOCK_SCANDIUM,
+	    	BLOCK_SHADOWIRON,
+	    	BLOCK_SHADOWSTEEL,
+	    	BLOCK_SILICON,
+	    	BLOCK_SILVER,
+	    	BLOCK_SOLDERINGALLOY,
+	    	BLOCK_STAINLESSSTEEL,
+	    	BLOCK_STEEL,
+	    	BLOCK_STEELMAGNETIC,
+	    	BLOCK_STERLINGSILVER
+		},
+		
+	    STORAGE_BLOCKS7 = new IIconContainer[]{
+	    	BLOCK_SUNNARIUM,
+	    	BLOCK_TANTALUM,
+	    	BLOCK_TELLURIUM,
+	    	BLOCK_TERBIUM,
+	    	BLOCK_THAUMIUM,
+	    	BLOCK_THORIUM,
+	    	BLOCK_THULIUM,
+	    	BLOCK_TIN,
+	    	BLOCK_TINALLOY,
+	    	BLOCK_TITANIUM,
+	    	BLOCK_TRITANIUM,
+	    	BLOCK_TUNGSTEN,
+	    	BLOCK_TUNGSTENSTEEL,
+	    	BLOCK_ULTIMET,
+	    	BLOCK_URANIUM,
+	    	BLOCK_URANIUM235
+		},
+		
+	    STORAGE_BLOCKS8 = new IIconContainer[]{
+	    	BLOCK_VANADIUM,
+	    	BLOCK_VANADIUMGALLIUM,
+	    	BLOCK_WROUGHTIRON,
+	    	BLOCK_YTTRBIUM,
+	    	BLOCK_YTTRIUM,
+	    	BLOCK_YTTRIUMBARIUMCUPRATE,
+	    	BLOCK_ZINC,
+	    	BLOCK_TUNGSTENCARBIDE,
+	    	BLOCK_VANADIUMSTEEL,
+	    	BLOCK_HSSG,
+	    	BLOCK_HSSE,
+	    	BLOCK_HSSS
+		},
+		
+	    STORAGE_BLOCKS9 = new IIconContainer[]{
+	    	BLOCK_AERCRYSTAL,
+	    	BLOCK_AMBER,
+	    	BLOCK_AMETHYST,
+	    	BLOCK_AQUACRYSTAL,
+	    	BLOCK_BLUETOPAZ,
+	    	BLOCK_CERTUSQUARTZ,
+	    	BLOCK_DILITHIUM,
+	    	BLOCK_ENDEREYE,
+	    	BLOCK_ENDERPEARL,
+	    	BLOCK_FOOLSRUBY,
+	    	BLOCK_FORCE,
+	    	BLOCK_FORCICIUM,
+	    	BLOCK_FORCILLIUM,
+	    	BLOCK_GREENSAPPHIRE,
+	    	BLOCK_IGNISCRYSTAL,
+	    	BLOCK_JASPER
+		},
+		
+	    STORAGE_BLOCKS10 = new IIconContainer[]{
+	    	BLOCK_LAZURITE,
+	    	BLOCK_LIGNITE,
+	    	BLOCK_MONAZITE,
+	    	BLOCK_NITER,
+	    	BLOCK_OLIVINE,
+	    	BLOCK_OPAL,
+	    	BLOCK_ORDOCRYSTAL,
+	    	BLOCK_PERDITIOCRYSTAL,
+	    	BLOCK_PHOSPHORUS,
+	    	BLOCK_QUARTZITE,
+	    	BLOCK_REDGARNET,
+	    	BLOCK_RUBY,
+	    	BLOCK_SAPPHIRE,
+	    	BLOCK_SODALITE,
+	    	BLOCK_TANZANITE,
+	    	BLOCK_TERRACRYSTAL
+		},
+		
+	    STORAGE_BLOCKS11 = new IIconContainer[]{
+	    	BLOCK_TOPAZ,
+	    	BLOCK_VINTEUM,
+	    	BLOCK_YELLOWGARNET,
+	    	BLOCK_NETHERSTAR,
+	    	BLOCK_CHARCOAL
+	   };
 	    
 	    public static ITexture[]
 	    ERROR_RENDERING = new ITexture[] {