From 1e017f854f0cf56882efb49f78527282db13f92f Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 29 Aug 2024 18:02:21 +0200 Subject: merge MTEID enums (#2995) --- .../java/gregtech/api/enums/MetaTileEntityIDs.java | 206 +++++++++++++++++++ .../registration/gregtech/Gregtech4Content.java | 40 ++-- .../gregtech/GregtechAdvancedBoilers.java | 6 +- .../gregtech/GregtechAlgaeContent.java | 6 +- .../gregtech/GregtechAmazonWarehouse.java | 2 +- .../gregtech/GregtechBufferDynamos.java | 20 +- .../gregtech/GregtechCustomHatches.java | 32 +-- .../registration/gregtech/GregtechCyclotron.java | 2 +- .../registration/gregtech/GregtechDehydrator.java | 14 +- .../gregtech/GregtechEnergyBuffer.java | 20 +- .../GregtechFactoryGradeReplacementMultis.java | 12 +- .../GregtechGeothermalThermalGenerator.java | 6 +- .../gregtech/GregtechHiAmpTransformer.java | 18 +- .../gregtech/GregtechIndustrialAlloySmelter.java | 2 +- .../gregtech/GregtechIndustrialArcFurnace.java | 2 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 4 +- .../gregtech/GregtechIndustrialCentrifuge.java | 2 +- .../gregtech/GregtechIndustrialChisel.java | 8 +- .../gregtech/GregtechIndustrialCokeOven.java | 2 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 2 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 2 +- .../GregtechIndustrialElementDuplicator.java | 4 +- .../gregtech/GregtechIndustrialExtruder.java | 2 +- .../gregtech/GregtechIndustrialFishPond.java | 2 +- .../gregtech/GregtechIndustrialFluidHeater.java | 2 +- .../gregtech/GregtechIndustrialForgeHammer.java | 2 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 2 +- .../gregtech/GregtechIndustrialMacerator.java | 2 +- .../gregtech/GregtechIndustrialMassFabricator.java | 2 +- .../gregtech/GregtechIndustrialMixer.java | 2 +- .../gregtech/GregtechIndustrialMultiMachine.java | 2 +- .../gregtech/GregtechIndustrialPlatePress.java | 2 +- .../gregtech/GregtechIndustrialRockBreaker.java | 2 +- .../gregtech/GregtechIndustrialSifter.java | 2 +- .../GregtechIndustrialThermalCentrifuge.java | 2 +- .../gregtech/GregtechIndustrialTreeFarm.java | 2 +- .../gregtech/GregtechIndustrialWashPlant.java | 2 +- .../gregtech/GregtechIndustrialWiremill.java | 2 +- .../registration/gregtech/GregtechIsaMill.java | 6 +- .../registration/gregtech/GregtechLFTR.java | 12 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 14 +- .../gregtech/GregtechMolecularTransformer.java | 2 +- .../GregtechNuclearSaltProcessingPlant.java | 2 +- .../gregtech/GregtechPollutionDevices.java | 22 +-- .../gregtech/GregtechPowerSubStation.java | 10 +- .../gregtech/GregtechQuantumForceTransformer.java | 2 +- .../registration/gregtech/GregtechRTG.java | 2 +- .../gregtech/GregtechRocketFuelGenerator.java | 8 +- .../gregtech/GregtechSemiFluidgenerators.java | 12 +- .../gregtech/GregtechSimpleWasher.java | 18 +- .../registration/gregtech/GregtechSolarTower.java | 4 +- .../registration/gregtech/GregtechSteamMultis.java | 16 +- .../registration/gregtech/GregtechSuperChests.java | 10 +- .../gregtech/GregtechThaumcraftDevices.java | 2 +- .../gregtech/GregtechThreadedBuffers.java | 2 +- .../gregtech/GregtechTieredFluidTanks.java | 8 +- .../gregtech/GregtechTreeFarmerTE.java | 2 +- .../gregtech/GregtechWirelessChargers.java | 18 +- .../registration/gregtech/MetaTileEntityIDs.java | 218 --------------------- 59 files changed, 411 insertions(+), 423 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java (limited to 'src/main') 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), 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; +import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_ZPM; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java index c0a12d3b25..deaefb3e9d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java @@ -1,11 +1,11 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.FusionComputer_UV2; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.FusionComputer_UV3; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Cryogenic_Freezer; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Machine_Adv_BlastFurnace; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Machine_Adv_DistillationTower; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Machine_Adv_ImplosionCompressor; +import static gregtech.api.enums.MetaTileEntityIDs.FusionComputer_UV2; +import static gregtech.api.enums.MetaTileEntityIDs.FusionComputer_UV3; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Cryogenic_Freezer; +import static gregtech.api.enums.MetaTileEntityIDs.Machine_Adv_BlastFurnace; +import static gregtech.api.enums.MetaTileEntityIDs.Machine_Adv_DistillationTower; +import static gregtech.api.enums.MetaTileEntityIDs.Machine_Adv_ImplosionCompressor; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index 7d422c3e1f..ed577a1551 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -1,8 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Geothermal_Engine_EV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Geothermal_Engine_IV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Geothermal_Engine_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Geothermal_Engine_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Geothermal_Engine_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Geothermal_Engine_LuV; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java index 171323de4a..8c452cbca4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java @@ -1,14 +1,14 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_EV_HV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_HV_MV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_IV_EV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_LV_ULV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_LuV_IV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_MAX_UV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_MV_LV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_UV_ZPM; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Transformer_HA_ZPM_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_EV_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_HV_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_IV_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_LV_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_LuV_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_MAX_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_MV_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_UV_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_ZPM_LuV; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java index d03e7fc4a2..e40a2ad86b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_AlloySmelter; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloySmelter; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java index 0bfa0173c8..85ea33917a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Arc_Furnace; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Arc_Furnace; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 0c9a9b126b..498b504eb1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_AlloyBlastSmelter; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Mega_AlloyBlastSmelter; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloyBlastSmelter; +import static gregtech.api.enums.MetaTileEntityIDs.Mega_AlloyBlastSmelter; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index 91021db42e..4dab825902 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Centrifuge; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Centrifuge; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java index fe7ef347db..23bd4565fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java @@ -1,9 +1,9 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_IndustrialAutoChisel; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Chisel_HV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Chisel_LV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT_Chisel_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialAutoChisel; +import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_HV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_LV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_AutoChisel; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index 4ebb921892..de8b253534 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_CokeOven; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CokeOven; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index d39222177c..69a449c70b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_CuttingFactoryController; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CuttingFactoryController; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index c9137c4a47..0493662f85 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Electrolyzer; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Electrolyzer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java index fdc47955fb..c3f86d8e2e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_ElementalDuplicator; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Input_Elemental_Duplicator; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_ElementalDuplicator; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Elemental_Duplicator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index b5283d7043..ad9d267b3b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Extruder; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Extruder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java index 73c7fade6b..0bba25461e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_FishingPond; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FishingPond; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java index d1e144e91a..23bb34e16e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_IndustrialFluidHeater; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialFluidHeater; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java index a3c6264e6e..f55e5e2a97 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_IndustrialForgeHammer; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialForgeHammer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index ab2c0e43ef..e7b3d700ad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_FuelRefinery; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FuelRefinery; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index cc597210e9..f9cb57f504 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_MacerationStack; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MacerationStack; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index ec9e3ccc97..9bf1a3746f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -1,9 +1,9 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MassFab; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.multiblockMassFabricatorRecipes; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_MassFab; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index 2fb3b797ea..7da9e59425 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Mixer; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Mixer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index 4538af20ff..ae9dae1773 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_MultiMachine; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MultiMachine; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index 49e52a850e..96446b4380 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_PlatePress; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_PlatePress; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java index d9af5c906e..5523103d18 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_IndustrialRockBreaker; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialRockBreaker; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialRockBreaker; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index a8b4bbfed9..12ff0a281e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_Sifter; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Sifter; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index fe47a48ff2..74b2d26e35 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_ThermalCentrifuge; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_ThermalCentrifuge; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index b70f933eaa..6327c424ce 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_TreeFarm; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_TreeFarm; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index 5fa5929eb9..20804a9138 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_WashPlant; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WashPlant; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 448e4020ea..51bb20a6f6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Industrial_WireFactory; +import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WireFactory; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java index 2b0df93b3a..1fae804b7d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java @@ -1,8 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Bus_Milling_Balls; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_Flotation_Cell; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_IsaMill; +import static gregtech.api.enums.MetaTileEntityIDs.Bus_Milling_Balls; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_Flotation_Cell; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_IsaMill; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index 5dffac3776..f4d6eae1b8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -1,11 +1,11 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ColdTrap_IV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ColdTrap_ZPM; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_Sparge_Tower; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ReactorProcessingUnit_IV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ReactorProcessingUnit_ZPM; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ThoriumReactor; +import static gregtech.api.enums.MetaTileEntityIDs.ColdTrap_IV; +import static gregtech.api.enums.MetaTileEntityIDs.ColdTrap_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_Sparge_Tower; +import static gregtech.api.enums.MetaTileEntityIDs.ReactorProcessingUnit_IV; +import static gregtech.api.enums.MetaTileEntityIDs.ReactorProcessingUnit_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.ThoriumReactor; import gregtech.api.enums.SoundResource; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index f757d30f62..a367ac009c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java @@ -1,12 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Hatch_Turbine_Rotor; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Large_Gas_Turbine; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Large_HPSteam_Turbine; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Large_Plasma_Turbine; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Large_SCSteam_Turbine; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Large_Steam_Turbine; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.XL_HeatExchanger; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Turbine_Rotor; +import static gregtech.api.enums.MetaTileEntityIDs.Large_Gas_Turbine; +import static gregtech.api.enums.MetaTileEntityIDs.Large_HPSteam_Turbine; +import static gregtech.api.enums.MetaTileEntityIDs.Large_Plasma_Turbine; +import static gregtech.api.enums.MetaTileEntityIDs.Large_SCSteam_Turbine; +import static gregtech.api.enums.MetaTileEntityIDs.Large_Steam_Turbine; +import static gregtech.api.enums.MetaTileEntityIDs.XL_HeatExchanger; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java index 9140ef3441..f7014c4cbb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_MolecularTransformer; +import static gregtech.api.enums.MetaTileEntityIDs.Controller_MolecularTransformer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java index d663a3c7fb..c4aee9bd19 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Nuclear_Salt_Processing_Plant; +import static gregtech.api.enums.MetaTileEntityIDs.Nuclear_Salt_Processing_Plant; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index f8e33b8449..5f902c05d9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -1,16 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_EV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_HV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_IV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_LV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_LuV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_MAX; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_MV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_UV; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Cleaner_ZPM; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Creator; -import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Pollution_Detector; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Cleaner_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Creator; +import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Detector; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index 75897ba7d1..ed02264afe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -1,10 +1,10 @@ package g