merge MTEID enums (#2995)

58 files changed, 205 insertions, 423 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 7e7ba6a85b..fe61fd608d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -1,25 +1,25 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_EV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_IV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_LV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_LuV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_MV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_UV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_ZPM;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_EV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_IV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_LV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_LuV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_MV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_UV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_ZPM;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Multi_Crafter;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Tesseract_Generator;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Tesseract_Terminal;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Thermal_Boiler;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_UV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Crop_Harvester_ZPM;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_UV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_ZPM;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Multi_Crafter;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Tesseract_Generator;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Tesseract_Terminal;
+import static gregtech.api.enums.MetaTileEntityIDs.GT4_Thermal_Boiler;
 
 import gregtech.api.GregTech_API;
 import gtPlusPlus.api.objects.Logger;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index acaa6a8edf..7d031dfeff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Boiler_Advanced_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Boiler_Advanced_LV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Boiler_Advanced_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.Boiler_Advanced_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.Boiler_Advanced_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.Boiler_Advanced_MV;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
index 61ba59a91e..4666357f4c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.AlgaeFarm_Controller;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Bus_Catalysts;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ChemicalPlant_Controller;
+import static gregtech.api.enums.MetaTileEntityIDs.AlgaeFarm_Controller;
+import static gregtech.api.enums.MetaTileEntityIDs.Bus_Catalysts;
+import static gregtech.api.enums.MetaTileEntityIDs.ChemicalPlant_Controller;
 
 import gregtech.api.GregTech_API;
 import gtPlusPlus.api.objects.Logger;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
index 7aa52ddaaa..1800ee9440 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Amazon_Warehouse_Controller;
+import static gregtech.api.enums.MetaTileEntityIDs.Amazon_Warehouse_Controller;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
index b4638bc7f0..7ec4897482 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
@@ -1,16 +1,16 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_MAX;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_ULV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_UV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Buffer_Dynamo_ZPM;
 import static gtPlusPlus.core.recipe.common.CI.bitsd;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_EV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_IV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_LV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_LuV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_MAX;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_MV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_ULV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_UV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Buffer_Dynamo_ZPM;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index c3e2f8ea4e..35b5c6719e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -1,21 +1,21 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Air_Intake;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Air_Intake_Extreme;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Input_Cryotheum;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Input_Naquadah;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Input_Pyrotheum;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Input_Steam;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Input_TurbineHousing;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_EV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_IV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_LuV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_MAX;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_MV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_UV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Muffler_Adv_ZPM;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Reservoir;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake_Extreme;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Cryotheum;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Naquadah;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Pyrotheum;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Steam;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_TurbineHousing;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MAX;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_UV;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_ZPM;
+import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Reservoir;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gtPlusPlus.api.objects.Logger;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
index 8c32c035c1..500bc1c57c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.COMET_Cyclotron;
+import static gregtech.api.enums.MetaTileEntityIDs.COMET_Cyclotron;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 0e1dd34e99..94c669c4e9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -1,17 +1,17 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import static gregtech.api.enums.MetaTileEntityIDs.Controller_Vacuum_Furnace;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_ZPM;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_Vacuum_Furnace;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Dehydrator_EV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Dehydrator_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Dehydrator_IV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Dehydrator_LuV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Dehydrator_MV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Dehydrator_ZPM;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 37ecdb9f2f..4b43158f54 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -1,15 +1,15 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_EV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_HV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_IV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_LV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_LuV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_MAX;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_MV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_ULV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_UV;
-import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Energy_Buffer_1by1_ZPM;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_EV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_HV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_IV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_LV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_LuV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_MAX;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_MV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_ULV;
+import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_UV