merge MTEID enums (#2995)

1 files changed, 206 insertions, 0 deletions

diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
index e51be375d1..6206e7daab 100644
--- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
+++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
@@ -516,6 +516,137 @@ public enum MetaTileEntityIDs {
     QUADRUPLE_INPUT_HATCHES_UMV(717),
     QUADRUPLE_INPUT_HATCHES_UXV(718),
     QUADRUPLE_INPUT_HATCHES_MAX(719),
+    Nuclear_Salt_Processing_Plant(749),
+    ThoriumReactor(751),
+    TreeFarmer_Structural(752),
+    Boiler_Advanced_LV(753),
+    Boiler_Advanced_MV(754),
+    Boiler_Advanced_HV(755),
+    Pollution_Detector(756),
+    Pollution_Cleaner_LV(758),
+    Pollution_Cleaner_MV(759),
+    Pollution_Cleaner_HV(760),
+    Pollution_Cleaner_EV(761),
+    Pollution_Cleaner_IV(762),
+    Pollution_Cleaner_LuV(763),
+    Pollution_Cleaner_ZPM(764),
+    Pollution_Cleaner_UV(765),
+    Pollution_Cleaner_MAX(766),
+    SimpleDustWasher_ULV(767),
+    Energy_Buffer_1by1_ULV(770),
+    Energy_Buffer_1by1_LV(771),
+    Energy_Buffer_1by1_MV(772),
+    Energy_Buffer_1by1_HV(773),
+    Energy_Buffer_1by1_EV(774),
+    Energy_Buffer_1by1_IV(775),
+    Energy_Buffer_1by1_LuV(776),
+    Energy_Buffer_1by1_ZPM(777),
+    Energy_Buffer_1by1_UV(778),
+    Energy_Buffer_1by1_MAX(779),
+    Industrial_Centrifuge(790),
+    Industrial_CokeOven(791),
+    Industrial_PlatePress(792),
+    Rocket_Engine_EV(793),
+    Rocket_Engine_IV(794),
+    Rocket_Engine_LuV(795),
+    Industrial_Electrolyzer(796),
+    Industrial_MacerationStack(797),
+    Industrial_WireFactory(798),
+    Industrial_MassFab(799),
+    Industrial_AlloyBlastSmelter(810),
+    Industrial_Mixer(811),
+    PowerSubStation(812),
+    GT_Dehydrator_EV(813),
+    GT_Dehydrator_IV(814),
+    GT_Dehydrator_LuV(815),
+    GT_Dehydrator_ZPM(816),
+    GT_FluidTank_ULV(817),
+    GT_FluidTank_LV(818),
+    GT_FluidTank_MV(819),
+    GT_FluidTank_HV(820),
+    COMET_Cyclotron(828),
+    Industrial_FishingPond(829),
+    Geothermal_Engine_EV(830),
+    Geothermal_Engine_IV(831),
+    Geothermal_Engine_LuV(832),
+    GT4_Tesseract_Generator(833),
+    GT4_Tesseract_Terminal(834),
+    Industrial_FuelRefinery(835),
+    Industrial_TreeFarm(836),
+    Generator_SemiFluid_LV(837),
+    Generator_SemiFluid_MV(838),
+    Generator_SemiFluid_HV(839),
+    Industrial_Sifter(840),
+    Industrial_ThermalCentrifuge(849),
+    Industrial_WashPlant(850),
+    Industrial_Extruder(859),
+    Industrial_MultiMachine(860),
+    Hatch_Air_Intake(861),
+    Industrial_Arc_Furnace(862),
+    Industrial_Solar_Tower(863),
+    Solar_Tower_Reflector(864),
+    Large_Steam_Turbine(865),
+    Large_HPSteam_Turbine(866),
+    RTG(869),
+    GT4_Thermal_Boiler(875),
+    GT4_Multi_Crafter(876),
+    Transformer_HA_LV_ULV(877),
+    Transformer_HA_MV_LV(878),
+    Transformer_HA_HV_MV(879),
+    Transformer_HA_EV_HV(880),
+    Transformer_HA_IV_EV(881),
+    Transformer_HA_LuV_IV(882),
+    Transformer_HA_ZPM_LuV(883),
+    Transformer_HA_UV_ZPM(884),
+    Transformer_HA_MAX_UV(885),
+    Hatch_Input_Battery_MV(886),
+    Hatch_Input_Battery_EV(887),
+    Hatch_Output_Battery_MV(888),
+    Hatch_Output_Battery_EV(889),
+    Charger_LV(890),
+    Charger_MV(891),
+    Charger_HV(892),
+    Charger_EV(893),
+    Charger_IV(894),
+    Charger_LuV(895),
+    Charger_ZPM(896),
+    Charger_UV(897),
+    Charger_UHV(898),
+    Hatch_Buffer_Dynamo_ULV(899),
+    Hatch_Buffer_Dynamo_LV(900),
+    Hatch_Buffer_Dynamo_MV(901),
+    Hatch_Buffer_Dynamo_HV(902),
+    Hatch_Buffer_Dynamo_EV(903),
+    Hatch_Buffer_Dynamo_IV(904),
+    Hatch_Buffer_Dynamo_LuV(905),
+    Hatch_Buffer_Dynamo_ZPM(906),
+    Hatch_Buffer_Dynamo_UV(907),
+    Hatch_Buffer_Dynamo_MAX(908),
+    Industrial_Cryogenic_Freezer(910),
+    GT_Dehydrator_MV(911),
+    GT_Dehydrator_HV(912),
+    Amazon_Warehouse_Controller(942),
+    Super_Chest_LV(946),
+    Super_Chest_MV(947),
+    Super_Chest_HV(948),
+    Super_Chest_EV(949),
+    Super_Chest_IV(950),
+    Pollution_Creator(951),
+    Thaumcraft_Researcher(956),
+    Machine_Adv_BlastFurnace(963),
+    Machine_Adv_ImplosionCompressor(964),
+    FusionComputer_UV2(965),
+    Hatch_Input_Cryotheum(967),
+    Hatch_Input_Pyrotheum(968),
+    Hatch_Input_Naquadah(969),
+    FusionComputer_UV3(975),
+    Industrial_CuttingFactoryController(992),
+    Generator_SemiFluid_EV(993),
+    Generator_SemiFluid_IV(994),
+    Controller_Vacuum_Furnace(995),
+    Controller_RocketEngine(996),
+    AlgaeFarm_Controller(997),
+    ChemicalPlant_Controller(998),
     EBF_CONTROLLER(1000),
     IMPLOSION_COMPRESSOR_CONTROLLER(1001),
     VACUUM_FREEZER_CONTROLLER(1002),
@@ -1638,7 +1769,82 @@ public enum MetaTileEntityIDs {
     WIRELESS_LASER_UXV8(16026),
     WIRELESS_LASER_UXV9(16027),
     FuelRefineFactory(16999),
+    Hatch_Muffler_Adv_LV(30001),
+    Hatch_Muffler_Adv_MV(30002),
+    Hatch_Muffler_Adv_HV(30003),
+    Hatch_Muffler_Adv_EV(30004),
+    Hatch_Muffler_Adv_IV(30005),
+    Hatch_Muffler_Adv_LuV(30006),
+    Hatch_Muffler_Adv_ZPM(30007),
+    Hatch_Muffler_Adv_UV(30008),
+    Hatch_Muffler_Adv_MAX(30009),
+    Hatch_Turbine_Rotor(30010),
     PipeIncoloy903(30995),
+    Infinite_Item_Chest(31010),
+    SimpleDustWasher_MV(31017),
+    SimpleDustWasher_EV(31018),
+    SimpleDustWasher_LuV(31019),
+    SimpleDustWasher_UV(31020),
+    Machine_Adv_DistillationTower(31021),
+    Industrial_AlloySmelter(31023),
+    Hatch_Input_TurbineHousing(31025),
+    Controller_LargeSemifluidGenerator(31026),
+    Controller_IsaMill(31027),
+    Controller_Flotation_Cell(31028),
+    Bus_Milling_Balls(31029),
+    Bus_Catalysts(31030),
+    ReactorProcessingUnit_IV(31031),
+    ReactorProcessingUnit_ZPM(31032),
+    ColdTrap_IV(31033),
+    ColdTrap_ZPM(31034),
+    Controller_Sparge_Tower(31035),
+    Hatch_Input_Steam(31040),
+    Controller_SteamMaceratorMulti(31041),
+    Hatch_Input_Bus_Steam(31046),
+    Hatch_Output_Bus_Steam(31047),
+    Controller_ElementalDuplicator(31050),
+    Hatch_Input_Elemental_Duplicator(31051),
+    Controller_IndustrialRockBreaker(31065),
+    GT_Chisel_LV(31066),
+    GT_Chisel_MV(31067),
+    GT_Chisel_HV(31068),
+    Controller_IndustrialAutoChisel(31069),
+    Hatch_Air_Intake_Extreme(31070),
+    Hatch_Reservoir(31071),
+    Controller_MolecularTransformer(31072),
+    Large_Gas_Turbine(31073),
+    Large_Plasma_Turbine(31074),
+    Controller_IndustrialForgeHammer(31075),
+    Large_SCSteam_Turbine(31076),
+    Controller_IndustrialFluidHeater(31077),
+    Controller_SteamCompressorMulti(31078),
+    XL_HeatExchanger(31079),
+    Controller_SteamCentrifugeMulti(31080),
+    Controller_SteamWasherMulti(31082),
+    Controller_SteamForgeHammer(31083),
+    Controller_SteamMixerMulti(31084),
+    GT4_Electric_Auto_Workbench_LV(31091),
+    GT4_Electric_Auto_Workbench_MV(31092),
+    GT4_Electric_Auto_Workbench_HV(31093),
+    GT4_Electric_Auto_Workbench_EV(31094),
+    GT4_Electric_Auto_Workbench_IV(31095),
+    GT4_Electric_Auto_Workbench_LuV(31096),
+    GT4_Electric_Auto_Workbench_ZPM(31097),
+    GT4_Electric_Auto_Workbench_UV(31098),
+    GT4_Crop_Harvester_LV(31111),
+    GT4_Crop_Harvester_MV(31112),
+    GT4_Crop_Harvester_HV(31113),
+    GT4_Crop_Harvester_EV(31114),
+    GT4_Crop_Harvester_IV(31115),
+    GT4_Crop_Harvester_LuV(31116),
+    GT4_Crop_Harvester_ZPM(31117),
+    GT4_Crop_Harvester_UV(31118),
+    Mega_AlloyBlastSmelter(31150),
+    QuantumForceTransformer(31151),
+    SimpleDustWasher_LV(31790),
+    SimpleDustWasher_HV(31791),
+    SimpleDustWasher_IV(31792),
+    SimpleDustWasher_ZPM(31793),
     UniversalChemicalFuelEngine(32001),
     LargeEssentiaGenerator(32002),
     NeutronAcceleratorULV(32003),