$ Hopefully fixed a bug where TAE would return the wrong casing IDs.

% Cleaned up and re-organised GregtechItemList.java.

1 files changed, 385 insertions, 244 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 10175d414d..6e29c51724 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -15,37 +15,9 @@ import net.minecraftforge.fluids.Fluid;
  */
 public enum GregtechItemList implements GregtechItemContainer {
 
-	Energy_Buffer_CREATIVE,
-
-	//Energy Buffers
-	Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX,
-
-	//Cobble Generators
-	Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX,
-
-	//The max Steam condenser
-	Condensor_MAX,
-
-	//Player owned Safes
-	GT_Safe_ULV, GT_Safe_LV, GT_Safe_MV, GT_Safe_HV, GT_Safe_EV, GT_Safe_IV, GT_Safe_LuV, GT_Safe_ZPM, GT_Safe_UV, GT_Safe_MAX,
-
-	//Rocket Engines
-	Rocket_Engine_EV, Rocket_Engine_IV, Rocket_Engine_LuV,
-
-	//IronBlastFurnace Machine_Bronze_BlastFurnace
-	Machine_Iron_BlastFurnace, Casing_IronPlatedBricks,
-
-	//Machine Casings
-	Casing_Shielding,
-
-	//Large Centrifuge
-	Industrial_Centrifuge, Casing_Centrifuge1,
-
-	//Coke Oven
-	Industrial_CokeOven, Casing_CokeOven, Casing_CokeOven_Coil1, Casing_CokeOven_Coil2,
-
-	//Bending Maching // Plate Press // Press
-	Casing_MaterialPress, Industrial_PlatePress,
+	/**
+	 * Items
+	 */
 
 	//Gregtech Machine Parts
 	Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX,
@@ -56,7 +28,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX,
 	Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX,
 	Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX,
-	
+
 	//ULV Components
 	Electric_Motor_ULV,
 	Electric_Pump_ULV,
@@ -72,293 +44,462 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Old_Circuit_Advanced, Old_Circuit_Data, Old_Circuit_Elite,
 	Old_Circuit_Master, Old_Tool_DataOrb, Old_Circuit_Ultimate, Old_Tool_DataStick,
 	Circuit_IV, Circuit_LuV, Circuit_ZPM,
+	
 	//Circuit Parts
 	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM,
 	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
 	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
 	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM,
 
-	//Unused Machine Casings
-	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7,
-	//Unused Machine Coils
-	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_BlastSmelter, Casing_BlastSmelter,
+	//Old Style Circuits
+	Old_Circuit_Board_Basic, Old_Circuit_Board_Advanced, Old_Circuit_Board_Elite,
+	Old_Circuit_Parts_Crystal_Chip_Elite, Old_Circuit_Parts_Crystal_Chip_Master, Old_Circuit_Parts_Advanced,
+	Old_Circuit_Parts_Wiring_Basic, Old_Circuit_Parts_Wiring_Advanced, Old_Circuit_Parts_Wiring_Elite,
+	Old_Empty_Board_Basic, Old_Empty_Board_Elite, 
+
+	//Batteries
+	Battery_RE_EV_Sodium, 
+	Battery_RE_EV_Cadmium, 
+	Battery_RE_EV_Lithium,
 
 	//Shapes for Extruder
 	Shape_Extruder_WindmillShaft,
 	Shape_Extruder_SmallGear,
 
-	//Batteries
-	Battery_RE_EV_Sodium, Battery_RE_EV_Cadmium, Battery_RE_EV_Lithium,
+	//Cooked Raisin Toast for ImQ009
+	Food_Baked_Raisin_Bread,
 
-	//Industrial Electrolyzer
-	Casing_Electrolyzer, Industrial_Electrolyzer,
 
-	//Industrial Maceration Stack
-	Casing_WireFactory, Industrial_MacerationStack,
+	//Fluid Cells to regulate flows.
+	Fluid_Cell_1L, Fluid_Cell_16L, 
+	Fluid_Cell_36L, Fluid_Cell_144L,
 
-	//Industrial Wire Factory
-	Industrial_WireFactory,
+	//Debug
+	TESTITEM, 
 
-	Industrial_MassFab,
+	//RTG Fuels
+	Pellet_RTG_PU238, Pellet_RTG_SR90,
+	Pellet_RTG_PO210, Pellet_RTG_AM241, 
 
-	//Solar Generators
-	GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV,
-	GT_Solar_HV, GT_Solar_EV, GT_Solar_IV,
-	GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX,
+	//Computer Cube
+	Gregtech_Computer_Cube, 
 
+	//Custom Batteries (Unused)
+	Battery_Gem_1, Battery_Gem_2, Battery_Gem_3, 
+	
+	
 
+	//----------------------------------------------------------------------------
+	
+	
+	
+	/**
+	 * MultiBlocks
+	 */
 
-	//Cooked Raisin Toast for ImQ009
-	Food_Baked_Raisin_Bread,
+	//IronBlastFurnace Machine_Bronze_BlastFurnace
+	Machine_Iron_BlastFurnace, 
+	Casing_IronPlatedBricks,
+
+	//Large Centrifuge
+	Industrial_Centrifuge, 
+	Casing_Centrifuge1,
+
+	//Coke Oven
+	Industrial_CokeOven,
+	Casing_CokeOven,
+	Casing_CokeOven_Coil1,
+	Casing_CokeOven_Coil2,
+
+	//Bending Maching // Plate Press // Press
+	Industrial_PlatePress,
+	Casing_MaterialPress,
+
+	//Matter Fab
+	Industrial_MassFab,
+	Casing_MatterGen, 
+	Casing_MatterFab,
 
-	//For making alloys
+	//ABS
 	Industrial_AlloyBlastSmelter,
+	Casing_Coil_BlastSmelter, 
+	Casing_BlastSmelter,	
 
-	//Block that enables uplink to a superconductor network
-	SuperConductorInputNode,
+	//Industrial Electrolyzer
+	Industrial_Electrolyzer,
+	Casing_Electrolyzer,
 
-	//The two tiers of reactor casings
-	Casing_Reactor_I, Casing_Reactor_II,
+	//Industrial Maceration Stack
+	Industrial_MacerationStack,
+	Casing_MacerationStack, 	
+
+	//Industrial Wire Factory
+	Industrial_WireFactory,
+	Casing_WireFactory,
 
 	//Power sub-station for mass storage. 3 hatches for input and output, whatever voltages you desire.
 	PowerSubStation,
+	Casing_Vanadium_Redox,
+	Casing_Vanadium_Redox_IV,
+	Casing_Vanadium_Redox_LuV,
+	Casing_Vanadium_Redox_ZPM,
+	Casing_Vanadium_Redox_UV,
+	Casing_Vanadium_Redox_MAX,
+	Casing_Power_SubStation, 
 
-	//Chemical Dehydrators for nuclear fuels
-	 GT_Dehydrator_MV, GT_Dehydrator_HV, GT_Dehydrator_EV, GT_Dehydrator_IV, GT_Dehydrator_LuV, GT_Dehydrator_ZPM,
-
-	//Fluid Storage Tanks
-	GT_FluidTank_ULV, GT_FluidTank_LV, GT_FluidTank_MV, GT_FluidTank_HV, GT_FluidTank_EV,
-	GT_FluidTank_IV, GT_FluidTank_LuV, GT_FluidTank_ZPM, GT_FluidTank_UV, GT_FluidTank_MAX,
 
-	//Fluid Cells to regulate flows.
-	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L,
+	//LFTR
+	ThoriumReactor,
+	Casing_Reactor_I, 
+	Casing_Reactor_II,
 
 	//Multitank
-	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior,
+	Industrial_MultiTank, 
+	Industrial_MultiTankDense, 
+	Casing_MultitankExterior,
 
-	//Gt4 Workbenches
-	GT4_Workbench_Bronze, GT4_Workbench_Advanced,
 
-	//Geothermal Engines
-	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV,
-
-	//Tesseracts
-	GT4_Tesseract_Generator, GT4_Tesseract_Terminal,
-
-	//Casings Tier 2 [17-32]
-	//Structural Glass
-	Casing_ThermalCentrifuge,
-	
 	//Fission Fuel Refinery
+	Industrial_FuelRefinery,
 	Casing_Refinery_External,
 	Casing_Refinery_Structural,
 	Casing_Refinery_Internal,
-	
-	//Unknown
-	Casing_WashPlant,
-	
+
+
 	//Industrial Sifter
+	Industrial_Sifter, 
 	Casing_Sifter,
 	Casing_SifterGrate,
-	
-	//Power Substation
-	Casing_Vanadium_Redox,
-    Casing_Vanadium_Redox_IV,
-	Casing_Vanadium_Redox_LuV,
-	Casing_Vanadium_Redox_ZPM,
-	Casing_Vanadium_Redox_UV,
-	Casing_Vanadium_Redox_MAX,
 
-	Casing_Power_SubStation, 
-	
+
+	//Large Thermal Centrifuge
+	Industrial_ThermalCentrifuge,
+	Casing_ThermalCentrifuge,
+
+
 	//Cyclotron
+	COMET_Cyclotron, 
 	Casing_Cyclotron_Coil,
 	Casing_Cyclotron_External,
-	
+
 	//Thermal Boiler
+	GT4_Thermal_Boiler,
 	Casing_ThermalContainment, 
-	
-	
-	Casing_Autocrafter,
-	Casing_CuttingFactoryFrame, 
-	Casing_TeslaTower, 
+
+
+	//Tree Farm
+	Industrial_TreeFarm, 
+	TreeFarmer_Structural,
 	Casing_PLACEHOLDER_TreeFarmer,
 
-	//LFTR
-	ThoriumReactor,
 
-	//Nuclear Fuel Processor
-	Industrial_FuelRefinery,
+	//Fish Pond
+	Industrial_FishingPond,
+	Casing_FishPond,  
+
+
+	//GT4 autoCrafter
+	GT4_Multi_Crafter, 
+	Casing_Autocrafter,
+
 
-	//Tree Farm
-	Industrial_TreeFarm, TreeFarmer_Structural,
-	
-	//Sifter
-	Industrial_Sifter, 
-	
-	//Advanced Boilers
-	Boiler_Advanced_LV, Boiler_Advanced_MV, Boiler_Advanced_HV, 
-	
-	//Fancy Pollution Devices
-	Pollution_Detector, 
-	Pollution_Cleaner_ULV, Pollution_Cleaner_LV, Pollution_Cleaner_MV, Pollution_Cleaner_HV, Pollution_Cleaner_EV,
-	Pollution_Cleaner_IV, Pollution_Cleaner_LuV, Pollution_Cleaner_ZPM, Pollution_Cleaner_UV, Pollution_Cleaner_MAX, 
-	
-	//Debug machine
-	Pollution_Creator, 
-	
-	//Basically is an automatic Cauldron
-	SimpleDustWasher, 
-	
-	//Old Style Circuits
-	Old_Circuit_Board_Basic, Old_Circuit_Board_Advanced, Old_Circuit_Board_Elite,
-	Old_Circuit_Parts_Crystal_Chip_Elite, Old_Circuit_Parts_Crystal_Chip_Master, Old_Circuit_Parts_Advanced,
-	Old_Circuit_Parts_Wiring_Basic, Old_Circuit_Parts_Wiring_Advanced, Old_Circuit_Parts_Wiring_Elite,
-	Old_Empty_Board_Basic, Old_Empty_Board_Elite, 
-	
-	
-	//Debug
-	TESTITEM, 
-	
-	//Tick Accelerators from GTNH	
-	AcceleratorLV, AcceleratorMV, AcceleratorHV, AcceleratorEV,
-	AcceleratorIV, AcceleratorLuV, AcceleratorZPM, AcceleratorUV, 
-	
-	//GT RTG
-	RTG,
-	Pellet_RTG_PU238, Pellet_RTG_SR90, Pellet_RTG_PO210, Pellet_RTG_AM241, 
-	
-	//Computer Cube
-	Gregtech_Computer_Cube, 
-	
-	//Cyclotron
-	COMET_Cyclotron, 
-	
-	//GT4 Multiblocks
-	GT4_Thermal_Boiler, GT4_Multi_Crafter, 
-	
-	//GT4 Shelves
-	GT4_Shelf, GT4_Shelf_Iron, GT4_Shelf_FileCabinet, GT4_Shelf_Desk, GT4_Shelf_Compartment, 
-	GT4_Shelf_Large,
-	
-	
-	//Hi Amp Transformers
-	Transformer_HA_LV_ULV, Transformer_HA_MV_LV, Transformer_HA_HV_MV,
-	Transformer_HA_EV_HV, Transformer_HA_IV_EV, Transformer_HA_LuV_IV,
-	Transformer_HA_ZPM_LuV, Transformer_HA_UV_ZPM, Transformer_HA_MAX_UV, 
-	
-	//Large Thermal Centrifuge
-	Industrial_ThermalCentrifuge,
-	
 	//industrial Ore-Washer
-	Industrial_WashPlant, 
-	
-	//Semi-Fluid generators
-	Generator_SemiFluid_LV, Generator_SemiFluid_MV, Generator_SemiFluid_HV, 
-	
-	//Advanced Mixer 4x4
-	Machine_Advanced_LV_Mixer, Machine_Advanced_MV_Mixer, Machine_Advanced_HV_Mixer, 
-	Machine_Advanced_EV_Mixer, Machine_Advanced_IV_Mixer, Machine_Advanced_LuV_Mixer, 
-	Machine_Advanced_ZPM_Mixer, Machine_Advanced_UV_Mixer,
-	
-	//Custom hatches
-	Hatch_Input_Battery_MV, Hatch_Input_Battery_EV, 
-	Hatch_Output_Battery_MV, Hatch_Output_Battery_EV, 
-	
-	//Wireless Chargers
-	Charger_LV,	Charger_MV, Charger_HV,
-	Charger_EV,	Charger_IV,	Charger_LuV, 
-	Charger_ZPM, Charger_UV, Charger_MAX, 
-	
+	Industrial_WashPlant, 	
+	Casing_WashPlant,
+
+
 	//Generator Array
 	Generator_Array_Controller, 
-	
+
+
 	//Cutting Factory Controller
 	Industrial_CuttingFactoryController, 
-	
-	//Tiny Fusion
-	Miniature_Fusion, 
-	
-	//Component Makers
-	Machine_LV_Component_Maker, Machine_MV_Component_Maker, Machine_HV_Component_Maker, 
-	Machine_EV_Component_Maker, Machine_IV_Component_Maker, 
-	
+	Casing_CuttingFactoryFrame, 
+
+
 	//Tesla Tower
-	TelsaTower, 
-	
-	Battery_Gem_1, Battery_Gem_2, Battery_Gem_3, 
-	
-	//Super Tier Chests
-	Super_Chest_LV, Super_Chest_MV, Super_Chest_HV, Super_Chest_EV, Super_Chest_IV, 
-	
-	//Fish Pond
-	Casing_FishPond, Industrial_FishingPond, 
-	
-	//Chunkloader
-	GT_Chunkloader_HV, GT_Chunkloader_EV, GT_Chunkloader_IV, 
-	
+	TelsaTower,
+	Casing_TeslaTower, 
+
+
 	//Large Extruder
-	Industrial_Extruder, Casing_Extruder, 
-	
+	Industrial_Extruder, 
+	Casing_Extruder, 
+
+
 	//Multi-Machine
-	Industrial_MultiMachine, Casing_Multi_Use, 
-	
+	Industrial_MultiMachine, 
+	Casing_Multi_Use, 
+
+
 	//Bedrock Mining Platforms
-	BedrockMiner_MKI, BedrockMiner_MKII, BedrockMiner_MKIII, Casing_BedrockMiner, 
-	
+	BedrockMiner_MKI, 
+	BedrockMiner_MKII, 
+	BedrockMiner_MKIII, 
+	Casing_BedrockMiner, 
+
+
+	//Large Packager
+	Amazon_Warehouse_Controller, 
+	Casing_AmazonWarehouse, 
+
+
+	//Advanced GT vanilla Multis
+	Machine_Adv_BlastFurnace, 
+	Casing_Adv_BlastFurnace,
+	Machine_Adv_ImplosionCompressor, 
+
+
+	//Advanced Vacuum Freezer
+	Industrial_Cryogenic_Freezer, 
+	Casing_AdvancedVacuum,	
+
+
+	//FusionTek MK IV	
+	FusionComputer_UV2, 
+	Casing_Fusion_External, 
+	Casing_Fusion_Internal, 
+
+
+	//large mixer
+	Industrial_Mixer, 
+
+
+	//Naq Reactor
+	Casing_Naq_Reactor_A,
+	Casing_Naq_Reactor_B,
+	Casing_Naq_Reactor_C,
+	Controller_Naq_Reactor, 
+	Casing_Containment,	
+
+
+
+	//----------------------------------------------------------------------------
+
+	/**
+	 * Custom hatches/Busses
+	 */
+
 	//Buffer Dynamos
 	Hatch_Buffer_Dynamo_ULV, Hatch_Buffer_Dynamo_LV, Hatch_Buffer_Dynamo_MV, Hatch_Buffer_Dynamo_HV, Hatch_Buffer_Dynamo_EV, 
 	Hatch_Buffer_Dynamo_IV, Hatch_Buffer_Dynamo_LuV, Hatch_Buffer_Dynamo_ZPM, Hatch_Buffer_Dynamo_UV, Hatch_Buffer_Dynamo_MAX, 
-	
-	
-	//Large Packager
-	Amazon_Warehouse_Controller, Casing_AmazonWarehouse, 
-	
-	 
-	
-	
+
+	//Air Intake hatch
 	Hatch_Air_Intake,
-	
-	
+
+	//Custom Fluid Hatches
+	Hatch_Input_Cryotheum,
+	Hatch_Input_Pyrotheum,	
+	Hatch_Input_Naquadah, 
+
+
+	//Battery hatches for PSS
+	Hatch_Input_Battery_MV, 
+	Hatch_Input_Battery_EV, 
+	Hatch_Output_Battery_MV, 
+	Hatch_Output_Battery_EV, 
+
+
+
+	//----------------------------------------------------------------------------
+
+
+
+
+
+	/**
+	 * Single Block Tile Entities
+	 */
+
 	//ULV Generators
 	Generator_Diesel_ULV, Generator_Gas_Turbine_ULV, Generator_Steam_Turbine_ULV, 
-	
-	
-	//Advanced GT vanilla Multis
-	Machine_Adv_BlastFurnace, Casing_Adv_BlastFurnace,
-	Machine_Adv_ImplosionCompressor, 
-	//Advanced Vacuum Freezer
-	Industrial_Cryogenic_Freezer, Casing_AdvancedVacuum,
-	
-	//FusionTek MK IV
-	FusionComputer_UV2, Casing_Fusion_External, Casing_Fusion_Internal, 
-	
+
 	//Crate Box
 	CrateStorage, 
-	
+
+	//Auto TC Research Creator
 	Thaumcraft_Researcher, 
-	
+
+	//Threaded Buffers
 	Automation_Threaded_SuperBuffer_ULV, Automation_Threaded_SuperBuffer_LV, Automation_Threaded_SuperBuffer_MV, Automation_Threaded_SuperBuffer_HV, Automation_Threaded_SuperBuffer_EV,
 	Automation_Threaded_SuperBuffer_IV, Automation_Threaded_SuperBuffer_LuV, Automation_Threaded_SuperBuffer_ZPM, Automation_Threaded_SuperBuffer_UV, Automation_Threaded_SuperBuffer_MAX, 
-	
+
+	//infinite Items
 	Infinite_Item_Chest, 
+
+
+	//Gt4 Workbenches
+	GT4_Workbench_Bronze,
+	GT4_Workbench_Advanced,
+
+
+	//Geothermal Engines
+	Geothermal_Engine_EV, 
+	Geothermal_Engine_IV, 
+	Geothermal_Engine_LuV,
+
+
+	//Tesseracts
+	GT4_Tesseract_Generator,
+	GT4_Tesseract_Terminal,
+
+
+	//Advanced Boilers
+	Boiler_Advanced_LV, 
+	Boiler_Advanced_MV, 
+	Boiler_Advanced_HV, 
+
+
+	//Fancy Pollution Devices
+	Pollution_Detector, 
+	Pollution_Cleaner_ULV, Pollution_Cleaner_LV,
+	Pollution_Cleaner_MV, Pollution_Cleaner_HV,
+	Pollution_Cleaner_EV, Pollution_Cleaner_IV, 
+	Pollution_Cleaner_LuV, Pollution_Cleaner_ZPM, 
+	Pollution_Cleaner_UV, Pollution_Cleaner_MAX, 
+
+
+	//Debug machine
+	Pollution_Creator, 
+
+
+	//Basically is an automatic Cauldron
+	SimpleDustWasher, 
+
+
+
+	//Super Tier Chests
+	Super_Chest_LV, Super_Chest_MV, Super_Chest_HV, Super_Chest_EV, Super_Chest_IV, 
+
+	//Chunkloader
+	GT_Chunkloader_HV, GT_Chunkloader_EV, GT_Chunkloader_IV, 
+
+
+	//Wireless Chargers
+	Charger_LV,	Charger_MV, Charger_HV,
+	Charger_EV,	Charger_IV,	Charger_LuV, 
+	Charger_ZPM, Charger_UV, Charger_MAX, 
+
+
+	//Tiny Fusion
+	Miniature_Fusion, 
+
+
+	//Component Makers
+	Machine_LV_Component_Maker, 
+	Machine_MV_Component_Maker, 
+	Machine_HV_Component_Maker, 
+	Machine_EV_Component_Maker, 
+	Machine_IV_Component_Maker,  
+
+
+	//Solar Generators
+	GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV,
+	GT_Solar_HV, GT_Solar_EV, GT_Solar_IV,
+	GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX,
+
+
+	//512v Creative Buffer
+	Energy_Buffer_CREATIVE,
+	//Energy Buffers
+	Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV,
+	Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV,
+	Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV,
+	Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM,
+	Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX,
+
+
+	//Cobble Generators
+	Cobble_Generator_ULV, Cobble_Generator_LV,
+	Cobble_Generator_MV, Cobble_Generator_HV,
+	Cobble_Generator_EV, Cobble_Generator_IV,
+	Cobble_Generator_LuV, Cobble_Generator_ZPM,
+	Cobble_Generator_UV, Cobble_Generator_MAX,
+
+
+	//The max Steam condenser
+	Condensor_MAX,
+
+
+	//Player owned Safes
+	GT_Safe_ULV, GT_Safe_LV, 
+	GT_Safe_MV, GT_Safe_HV, 
+	GT_Safe_EV, GT_Safe_IV, 
+	GT_Safe_LuV, GT_Safe_ZPM, 
+	GT_Safe_UV, GT_Safe_MAX,
+
+
+	//Rocket Engines
+	Rocket_Engine_EV, 
+	Rocket_Engine_IV, 
+	Rocket_Engine_LuV,
+
+
+	//GT4 Shelves
+	GT4_Shelf, GT4_Shelf_Iron, 
+	GT4_Shelf_FileCabinet, GT4_Shelf_Desk, 
+	GT4_Shelf_Compartment, GT4_Shelf_Large,
+
+
+	//Hi Amp Transformers
+	Transformer_HA_LV_ULV, Transformer_HA_MV_LV, Transformer_HA_HV_MV,
+	Transformer_HA_EV_HV, Transformer_HA_IV_EV, Transformer_HA_LuV_IV,
+	Transformer_HA_ZPM_LuV, Transformer_HA_UV_ZPM, Transformer_HA_MAX_UV, 
+
+
+	//Semi-Fluid generators
+	Generator_SemiFluid_LV, 
+	Generator_SemiFluid_MV, 
+	Generator_SemiFluid_HV, 
+
+
+	//Advanced Mixer 4x4
+	Machine_Advanced_LV_Mixer, Machine_Advanced_MV_Mixer, Machine_Advanced_HV_Mixer, 
+	Machine_Advanced_EV_Mixer, Machine_Advanced_IV_Mixer, Machine_Advanced_LuV_Mixer, 
+	Machine_Advanced_ZPM_Mixer, Machine_Advanced_UV_Mixer,
+
+
+	//Block that enables uplink to a superconductor network
+	SuperConductorInputNode,
+
+
+	//Chemical Dehydrators for nuclear fuels
+	GT_Dehydrator_MV, GT_Dehydrator_HV, 
+	GT_Dehydrator_EV, GT_Dehydrator_IV, 
+	GT_Dehydrator_LuV, GT_Dehydrator_ZPM,
+
+
+	//Fluid Storage Tanks
+	GT_FluidTank_ULV, GT_FluidTank_LV, 
+	GT_FluidTank_MV, GT_FluidTank_HV, 
+	GT_FluidTank_EV, GT_FluidTank_IV, 
+	GT_FluidTank_LuV, GT_FluidTank_ZPM, 
+	GT_FluidTank_UV, GT_FluidTank_MAX,
+
+	//Tick Accelerators from GTNH	
+	AcceleratorLV, AcceleratorMV, 
+	AcceleratorHV, AcceleratorEV,
+	AcceleratorIV, AcceleratorLuV, 
+	AcceleratorZPM, AcceleratorUV, 
+
+	//GT RTG
+	RTG,
 	
-	Industrial_Mixer, 
 	
-	Hatch_Input_Cryotheum,
-	Hatch_Input_Pyrotheum,	
-	Hatch_Input_Naquadah, 
+	//----------------------------------------------------------------------------
 	
+
+	/**
+	 * Covers
+	 */
+
+	//Fluid Void Covers
 	Cover_Overflow_ULV, Cover_Overflow_LV, Cover_Overflow_MV, Cover_Overflow_HV, Cover_Overflow_EV, Cover_Overflow_IV, 
 	
-	//Naq Reactor
-	Casing_Naq_Reactor_A,
-	Casing_Naq_Reactor_B,
-	Casing_Naq_Reactor_C,
-	Controller_Naq_Reactor,
-	
-	
 	
+
+	//----------------------------------------------------------------------------
+
 	;
 
 	public static final GregtechItemList[]
@@ -423,7 +564,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 		}
 		return GT_Utility.areUnificationsEqual((ItemStack)aStack, aWildcard?this.getWildcard(1):this.get(1), aIgnoreNBT);
 	}
-	
+
 	public static Block getBlockFromStack(Object aStack) {
 		if (GT_Utility.isStackInvalid(aStack))
 			return Blocks.air;