diff options
Diffstat (limited to 'src/main/java/gregtech')
28 files changed, 8691 insertions, 201 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index b0e48a46bb..a27c5ee43b 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -201,65 +201,7 @@ public class GT_Values { * most of the time I don't know what kind of Data Type the "null" stands for */ public static final FluidStack NF = null; - /** - * MOD ID Strings, since they are very common Parameters. - */ - @Deprecated - public static final String MOD_ID = "gregtech"; - @Deprecated - public static final String MOD_ID_IC2 = "IC2"; - @Deprecated - public static final String MOD_ID_NC = "IC2NuclearControl"; - @Deprecated - public static final String MOD_ID_TC = "Thaumcraft"; - @Deprecated - public static final String MOD_ID_TF = "TwilightForest"; - @Deprecated - public static final String MOD_ID_RC = "Railcraft"; - @Deprecated - public static final String MOD_ID_TE = "ThermalExpansion"; - @Deprecated - public static final String MOD_ID_AE = "appliedenergistics2"; - @Deprecated - public static final String MOD_ID_TFC = "terrafirmacraft"; - @Deprecated - public static final String MOD_ID_PFAA = "PFAAGeologica"; - @Deprecated - public static final String MOD_ID_FR = "Forestry"; - @Deprecated - public static final String MOD_ID_HaC = "harvestcraft"; - @Deprecated - public static final String MOD_ID_APC = "AppleCore"; - @Deprecated - public static final String MOD_ID_MaCr = "magicalcrops"; - @Deprecated - public static final String MOD_ID_GaEn = "ganysend"; - @Deprecated - public static final String MOD_ID_GaSu = "ganyssurface"; - @Deprecated - public static final String MOD_ID_GaNe = "ganysnether"; - @Deprecated - public static final String MOD_ID_BC_SILICON = "BuildCraft|Silicon"; - @Deprecated - public static final String MOD_ID_BC_TRANSPORT = "BuildCraft|Transport"; - @Deprecated - public static final String MOD_ID_BC_FACTORY = "BuildCraft|Factory"; - @Deprecated - public static final String MOD_ID_BC_ENERGY = "BuildCraft|Energy"; - @Deprecated - public static final String MOD_ID_BC_BUILDERS = "BuildCraft|Builders"; - @Deprecated - public static final String MOD_ID_BC_CORE = "BuildCraft|Core"; - @Deprecated - public static final String MOD_ID_GC_CORE = "GalacticraftCore"; - @Deprecated - public static final String MOD_ID_GC_MARS = "GalacticraftMars"; - @Deprecated - public static final String MOD_ID_GC_PLANETS = "GalacticraftPlanets"; - @Deprecated - public static final String MOD_ID_DC = "dreamcraft"; - @Deprecated - public static final String MOD_ID_GTPP = "miscutils"; + /** * File Paths and Resource Paths */ @@ -522,6 +464,63 @@ public class GT_Values { */ public static boolean allow_broken_recipemap = false; /** + * This will set the blacklist for the world accelerator in TE mode. + */ + public static String[] blacklistedTileEntiyClassNamesForWA = new String[] { + "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry", + "advsolar.common.tiles.TileEntityUltimateSolarPanel", "advsolar.common.tiles.TileEntitySolarPanel", + "advsolar.common.tiles.TileEntityQuantumSolarPanel", "advsolar.common.tiles.TileEntityHybridSolarPanel", + "advsolar.common.tiles.TileEntityAdvancedSolarPanel", "com.supsolpans.tiles.TileAdminSolarPanel", + "com.supsolpans.tiles.TilePhotonicSolarPanel", "com.supsolpans.tiles.TileSingularSolarPanel", + "com.supsolpans.tiles.TileSpectralSolarPanel", "emt.tile.solar.air.TileEntityAirSolar", + "emt.tile.solar.air.TileEntityDoubleAirSolar", "emt.tile.solar.air.TileEntityTripleAirSolar", + "emt.tile.solar.air.TileEntityQuadrupleAirSolar", "emt.tile.solar.air.TileEntityQuintupleAirSolar", + "emt.tile.solar.air.TileEntitySextupleAirSolar", "emt.tile.solar.air.TileEntitySeptupleAirSolar", + "emt.tile.solar.air.TileEntityOctupleAirSolar", "emt.tile.solar.compressed.TileEntityCompressedSolar", + "emt.tile.solar.compressed.TileEntityDoubleCompressedSolar", + "emt.tile.solar.compressed.TileEntityTripleCompressedSolar", + "emt.tile.solar.compressed.TileEntityQuadrupleAirSolar", + "emt.tile.solar.compressed.TileEntityQuintupleAirSolar", "emt.tile.solar.compressed.TileEntitySextupleAirSolar", + "emt.tile.solar.compressed.TileEntitySeptupleAirSolar", "emt.tile.solar.compressed.TileEntityOctupleAirSolar", + "emt.tile.solar.dark.TileEntityDarkSolar", "emt.tile.solar.dark.TileEntityDoubleDarkSolar", + "emt.tile.solar.dark.TileEntityTripleDarkSolar", "emt.tile.solar.dark.TileEntityQuadrupleAirSolar", + "emt.tile.solar.dark.TileEntityQuintupleAirSolar", "emt.tile.solar.dark.TileEntitySextupleAirSolar", + "emt.tile.solar.dark.TileEntitySeptupleAirSolar", "emt.tile.solar.dark.TileEntityOctupleAirSolar", + "emt.tile.solar.earth.TileEntityDoubleEarthSolar", "emt.tile.solar.earth.TileEntityEarthSolar", + "emt.tile.solar.earth.TileEntityTripleEarthSolar", "emt.tile.solar.earth.TileEntityQuadrupleAirSolar", + "emt.tile.solar.earth.TileEntityQuintupleAirSolar", "emt.tile.solar.earth.TileEntitySextupleAirSolar", + "emt.tile.solar.earth.TileEntitySeptupleAirSolar", "emt.tile.solar.earth.TileEntityOctupleAirSolar", + "emt.tile.solar.fire.TileEntityDoubleFireSolar", "emt.tile.solar.fire.TileEntityFireSolar", + "emt.tile.solar.fire.TileEntityTripleFireSolar", "emt.tile.solar.fire.TileEntityQuadrupleAirSolar", + "emt.tile.solar.fire.TileEntityQuintupleAirSolar", "emt.tile.solar.fire.TileEntitySextupleAirSolar", + "emt.tile.solar.fire.TileEntitySeptupleAirSolar", "emt.tile.solar.fire.TileEntityOctupleAirSolar", + "emt.tile.solar.order.TileEntityDoubleOrderSolar", "emt.tile.solar.order.TileEntityOrderSolar", + "emt.tile.solar.order.TileEntityTripleOrderSolar", "emt.tile.solar.order.TileEntityQuadrupleAirSolar", + "emt.tile.solar.order.TileEntityQuintupleAirSolar", "emt.tile.solar.order.TileEntitySextupleAirSolar", + "emt.tile.solar.order.TileEntitySeptupleAirSolar", "emt.tile.solar.order.TileEntityOctupleAirSolar", + "emt.tile.solar.water.TileEntityDoubleWaterSolar", "emt.tile.solar.water.TileEntityTripleWaterSolar", + "emt.tile.solar.water.TileEntityWaterSolar", "emt.tile.solar.water.TileEntityQuadrupleAirSolar", + "emt.tile.solar.water.TileEntityQuintupleAirSolar", "emt.tile.solar.water.TileEntitySextupleAirSolar", + "emt.tile.solar.water.TileEntitySeptupleAirSolar", "emt.tile.solar.water.TileEntityOctupleAirSolar", + "com.lulan.compactkineticgenerators.tileentity.TileCkgE", + "com.lulan.compactkineticgenerators.tileentity.TileCkgH", + "com.lulan.compactkineticgenerators.tileentity.TileCkgL", + "com.lulan.compactkineticgenerators.tileentity.TileCkgM", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaE", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaH", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaL", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaM", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmE", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmH", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmL", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmM", "com.supsolpans.tiles.TileSpectralSolarPanel", + "com.supsolpans.tiles.TileSingularSolarPanel", "com.supsolpans.tiles.TileAdminSolarPanel", + "com.supsolpans.tiles.TilePhotonicSolarPanel", "gtPlusPlus.core.tileentities.general.TileEntityFishTrap", + "gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest", + "net.bdew.gendustry.machines.apiary.TileApiary", "goodgenerator.blocks.tileEntity.EssentiaHatch", + "magicbees.tileentity.TileEntityApimancersDrainerCommon", + "magicbees.tileentity.TileEntityApimancersDrainerGT" }; + /** * This will set the percentage how much ReinforcedGlass is Allowed in Cleanroom Walls. */ public static float cleanroomGlass = 5.0f; diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 4ab1261289..77fc88bd30 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -917,7 +917,7 @@ public enum ItemList implements IItemContainer { Automation_ChestBuffer_LuV, Automation_ChestBuffer_ZPM, Automation_ChestBuffer_UV, - Automation_ChestBuffer_MAX, + Automation_ChestBuffer_UHV, Automation_SuperBuffer_ULV, Automation_SuperBuffer_LV, @@ -972,7 +972,7 @@ public enum ItemList implements IItemContainer { Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, - Hatch_Dynamo_MAX, + Hatch_Dynamo_UHV, Hatch_Energy_ULV, Hatch_Energy_LV, @@ -983,7 +983,7 @@ public enum ItemList implements IItemContainer { Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, - Hatch_Energy_MAX, + Hatch_Energy_UHV, Wireless_Hatch_Energy_ULV, Wireless_Hatch_Energy_LV, @@ -1026,7 +1026,7 @@ public enum ItemList implements IItemContainer { Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, - Hatch_Input_MAX, + Hatch_Input_UHV, Hatch_Input_Multi_2x2_EV, Hatch_Input_Multi_2x2_IV, @@ -1060,7 +1060,7 @@ public enum ItemList implements IItemContainer { Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, - Hatch_Output_MAX, + Hatch_Output_UHV, Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, @@ -1097,7 +1097,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_1by1_LuV, Battery_Buffer_1by1_ZPM, Battery_Buffer_1by1_UV, - Battery_Buffer_1by1_MAX, + Battery_Buffer_1by1_UHV, Battery_Buffer_2by2_ULV, Battery_Buffer_2by2_LV, @@ -1108,7 +1108,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_2by2_LuV, Battery_Buffer_2by2_ZPM, Battery_Buffer_2by2_UV, - Battery_Buffer_2by2_MAX, + Battery_Buffer_2by2_UHV, Battery_Buffer_3by3_ULV, Battery_Buffer_3by3_LV, @@ -1119,7 +1119,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_3by3_LuV, Battery_Buffer_3by3_ZPM, Battery_Buffer_3by3_UV, - Battery_Buffer_3by3_MAX, + Battery_Buffer_3by3_UHV, Battery_Buffer_4by4_ULV, Battery_Buffer_4by4_LV, @@ -1130,7 +1130,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_4by4_LuV, Battery_Buffer_4by4_ZPM, Battery_Buffer_4by4_UV, - Battery_Buffer_4by4_MAX, + Battery_Buffer_4by4_UHV, Locker_ULV, Locker_LV, @@ -1545,9 +1545,9 @@ public enum ItemList implements IItemContainer { Casing_Fusion, Casing_Fusion2, + Generator_Plasma_EV, Generator_Plasma_IV, Generator_Plasma_LuV, - Generator_Plasma_ZPMV, MagicEnergyConverter_LV, MagicEnergyConverter_MV, @@ -1749,7 +1749,7 @@ public enum ItemList implements IItemContainer { Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, - Battery_Charger_4by4_MAX, + Battery_Charger_4by4_UHV, MicroTransmitter_HV, MicroTransmitter_EV, @@ -2075,7 +2075,450 @@ public enum ItemList implements IItemContainer { GlassQuarkContainment, BlockQuarkPipe, BlockQuarkReleaseChamber, - BlockQuarkContainmentCasing; + BlockQuarkContainmentCasing, + AcceleratorLV, + AcceleratorMV, + AcceleratorHV, + AcceleratorEV, + AcceleratorIV, + AcceleratorLuV, + AcceleratorZPM, + AcceleratorUV, + Hatch_Dynamo_UEV, + Hatch_Dynamo_UIV, + Hatch_Dynamo_UMV, + Hatch_Dynamo_UXV, + Hatch_Energy_UEV, + Hatch_Energy_UIV, + Hatch_Energy_UMV, + Hatch_Energy_UXV, + Hatch_Input_UEV, + Hatch_Input_UIV, + Hatch_Input_UMV, + Hatch_Input_UXV, + Hatch_Input_MAX, + Hatch_Output_UEV, + Hatch_Output_UIV, + Hatch_Output_UMV, + Hatch_Output_UXV, + Hatch_Output_MAX, + Battery_TurboCharger_4by4_ULV, + Battery_TurboCharger_4by4_LV, + Battery_TurboCharger_4by4_MV, + Battery_TurboCharger_4by4_HV, + Battery_TurboCharger_4by4_EV, + Battery_TurboCharger_4by4_IV, + Battery_TurboCharger_4by4_LuV, + Battery_TurboCharger_4by4_ZPM, + Battery_TurboCharger_4by4_UV, + Battery_TurboCharger_4by4_UHV, + Battery_Charger_4by4_UEV, + Battery_Charger_4by4_UIV, + Battery_Charger_4by4_UMV, + Battery_Charger_4by4_UXV, + Battery_Buffer_1by1_UEV, + Battery_Buffer_1by1_UIV, + Battery_Buffer_1by1_UMV, + Battery_Buffer_1by1_UXV, + Battery_Buffer_1by1_MAXV, + Battery_Buffer_2by2_UEV, + Battery_Buffer_2by2_UIV, + Battery_Buffer_2by2_UMV, + Battery_Buffer_2by2_UXV, + Battery_Buffer_2by2_MAXV, + Battery_Buffer_3by3_UEV, + Battery_Buffer_3by3_UIV, + Battery_Buffer_3by3_UMV, + Battery_Buffer_3by3_UXV, + Battery_Buffer_3by3_MAXV, + Battery_Buffer_4by4_UEV, + Battery_Buffer_4by4_UIV, + Battery_Buffer_4by4_UMV, + Battery_Buffer_4by4_UXV, + Battery_Buffer_4by4_MAXV, + Hull_UEV, + Hull_UIV, + Hull_UMV, + Hull_UXV, + Hull_MAXV, + // todo: move them from gt.blockcasingsNH in NHCore to here + Casing_UEV, + Casing_UIV, + Casing_UMV, + Casing_UXV, + Casing_MAXV, + // + Transformer_UEV_UHV, + Transformer_UIV_UEV, + Transformer_UMV_UIV, + Transformer_UXV_UMV, + Transformer_MAX_UXV, + WetTransformer_LV_ULV, + WetTransformer_MV_LV, + WetTransformer_HV_MV, + WetTransformer_EV_HV, + WetTransformer_IV_EV, + WetTransformer_LuV_IV, + WetTransformer_ZPM_LuV, + WetTransformer_UV_ZPM, + WetTransformer_UHV_UV, + WetTransformer_UEV_UHV, + WetTransformer_UIV_UEV, + WetTransformer_UMV_UIV, + WetTransformer_UXV_UMV, + WetTransformer_MAX_UXV, + Transformer_HA_UEV_UHV, + Transformer_HA_UIV_UEV, + Transformer_HA_UMV_UIV, + Transformer_HA_UXV_UMV, + Transformer_HA_MAX_UXV, + BatteryHull_EV, + BatteryHull_IV, + BatteryHull_LuV, + BatteryHull_ZPM, + BatteryHull_UV, + BatteryHull_UHV, + BatteryHull_UEV, + BatteryHull_UIV, + BatteryHull_UMV, + BatteryHull_UxV, + BatteryHull_EV_Full, + BatteryHull_IV_Full, + BatteryHull_LuV_Full, + BatteryHull_ZPM_Full, + BatteryHull_UV_Full, + BatteryHull_UHV_Full, + BatteryHull_UEV_Full, + BatteryHull_UIV_Full, + BatteryHull_UMV_Full, + BatteryHull_UxV_Full, + + Generator_Plasma_ZPMV, + Generator_Plasma_UV, + Generator_Plasma_UHV, + Generator_Plasma_UEV, + Generator_Plasma_UIV, + Generator_Plasma_UMV, + AlloySmelterLuV, + AlloySmelterZPM, + AlloySmelterUV, + AlloySmelterUHV, + AlloySmelterUEV, + AlloySmelterUIV, + AlloySmelterUMV, + AmplifabricatorLuV, + AmplifabricatorZPM, + AmplifabricatorUV, + AmplifabricatorUHV, + AmplifabricatorUEV, + AmplifabricatorUIV, + AmplifabricatorUMV, + ArcFurnaceLuV, + ArcFurnaceZPM, + ArcFurnaceUV, + ArcFurnaceUHV, + ArcFurnaceUEV, + ArcFurnaceUIV, + ArcFurnaceUMV, + AssemblingMachineLuV, + AssemblingMachineZPM, + AssemblingMachineUV, + AssemblingMachineUHV, + AssemblingMachineUEV, + AssemblingMachineUIV, + AssemblingMachineUMV, + AutoclaveLuV, + AutoclaveZPM, + AutoclaveUV, + AutoclaveUHV, + AutoclaveUEV, + AutoclaveUIV, + AutoclaveUMV, + BendingMachineLuV, + BendingMachineZPM, + BendingMachineUV, + BendingMachineUHV, + BendingMachineUEV, + BendingMachineUIV, + BendingMachineUMV, + BreweryLuV, + BreweryZPM, + BreweryUV, + BreweryUHV, + BreweryUEV, + BreweryUIV, + BreweryUMV, + CanningMachineLuV, + CanningMachineZPM, + CanningMachineUV, + CanningMachineUHV, + CanningMachineUEV, + CanningMachineUIV, + CanningMachineUMV, + CentrifugeLuV, + CentrifugeZPM, + CentrifugeUV, + CentrifugeUHV, + CentrifugeUEV, + CentrifugeUIV, + CentrifugeUMV, + ChemicalBathLuV, + ChemicalBathZPM, + ChemicalBathUV, + ChemicalBathUHV, + ChemicalBathUEV, + ChemicalBathUIV, + ChemicalBathUMV, + ChemicalReactorLuV, + ChemicalReactorZPM, + ChemicalReactorUV, + ChemicalReactorUHV, + ChemicalReactorUEV, + ChemicalReactorUIV, + ChemicalReactorUMV, + CircuitAssemblerUHV, + CircuitAssemblerUEV, + CircuitAssemblerUIV, + CircuitAssemblerUMV, + CircuitAssemblerUXV, + CircuitAssemblerMAX, + CompressorLuV, + CompressorZPM, + CompressorUV, + CompressorUHV, + CompressorUEV, + CompressorUIV, + CompressorUMV, + CuttingMachineLuV, + CuttingMachineZPM, + CuttingMachineUV, + CuttingMachineUHV, + CuttingMachineUEV, + CuttingMachineUIV, + CuttingMachineUMV, + DistilleryLuV, + DistilleryZPM, + DistilleryUV, + DistilleryUHV, + DistilleryUEV, + DistilleryUIV, + DistilleryUMV, + ElectricFurnaceLuV, + ElectricFurnaceZPM, + ElectricFurnaceUV, + ElectricFurnaceUHV, + ElectricFurnaceUEV, + ElectricFurnaceUIV, + ElectricFurnaceUMV, + ElectricOvenLuV, + ElectricOvenZPM, + ElectricOvenUV, + ElectricOvenUHV, + ElectricOvenUEV, + ElectricOvenUIV, + ElectricOvenUMV, + ElectrolyzerLuV, + ElectrolyzerZPM, + ElectrolyzerUV, + ElectrolyzerUHV, + ElectrolyzerUEV, + ElectrolyzerUIV, + ElectrolyzerUMV, + ElectromagneticSeparatorLuV, + ElectromagneticSeparatorZPM, + ElectromagneticSeparatorUV, + ElectromagneticSeparatorUHV, + ElectromagneticSeparatorUEV, + ElectromagneticSeparatorUIV, + ElectromagneticSeparatorUMV, + ExtractorLuV, + ExtractorZPM, + ExtractorUV, + ExtractorUHV, + ExtractorUEV, + ExtractorUIV, + ExtractorUMV, + ExtruderLuV, + ExtruderZPM, + ExtruderUV, + ExtruderUHV, + ExtruderUEV, + ExtruderUIV, + ExtruderUMV, + FermenterLuV, + FermenterZPM, + FermenterUV, + FermenterUHV, + FermenterUEV, + FermenterUIV, + FermenterUMV, + FluidCannerLuV, + FluidCannerZPM, + FluidCannerUV, + FluidCannerUHV, + FluidCannerUEV, + FluidCannerUIV, + FluidCannerUMV, + FluidExtractorLuV, + FluidExtractorZPM, + FluidExtractorUV, + FluidExtractorUHV, + FluidExtractorUEV, + FluidExtractorUIV, + FluidExtractorUMV, + FluidHeaterLuV, + FluidHeaterZPM, + FluidHeaterUV, + FluidHeaterUHV, + FluidHeaterUEV, + FluidHeaterUIV, + FluidHeaterUMV, + FluidSolidifierLuV, + FluidSolidifierZPM, + FluidSolidifierUV, + FluidSolidifierUHV, + FluidSolidifierUEV, + FluidSolidifierUIV, + FluidSolidifierUMV, + FormingPressLuV, + FormingPressZPM, + FormingPressUV, + FormingPressUHV, + FormingPressUEV, + FormingPressUIV, + FormingPressUMV, + ForgeHammerLuV, + ForgeHammerZPM, + ForgeHammerUV, + ForgeHammerUHV, + ForgeHammerUEV, + ForgeHammerUIV, + ForgeHammerUMV, + LatheLuV, + LatheZPM, + LatheUV, + LatheUHV, + LatheUEV, + LatheUIV, + LatheUMV, + PrecisionLaserEngraverLuV, + PrecisionLaserEngraverZPM, + PrecisionLaserEngraverUV, + PrecisionLaserEngraverUHV, + PrecisionLaserEngraverUEV, + PrecisionLaserEngraverUIV, + PrecisionLaserEngraverUMV, + MaceratorLuV, + MaceratorZPM, + MaceratorUV, + MaceratorUHV, + MaceratorUEV, + MaceratorUIV, + MaceratorUMV, + MassFabricatorLuV, + MassFabricatorZPM, + MassFabricatorUV, + MassFabricatorUHV, + MassFabricatorUEV, + MassFabricatorUIV, + MassFabricatorUMV, + MicrowaveLuV, + MicrowaveZPM, + MicrowaveUV, + MicrowaveUHV, + MicrowaveUEV, + MicrowaveUIV, + MicrowaveUMV, + MixerLuV, + MixerZPM, + MixerUV, + MixerUHV, + MixerUEV, + MixerUIV, + MixerUMV, + OreWashingPlantLuV, + OreWashingPlantZPM, + OreWashingPlantUV, + OreWashingPlantUHV, + OreWashingPlantUEV, + OreWashingPlantUIV, + OreWashingPlantUMV, + PlasmaArcFurnaceLuV, + PlasmaArcFurnaceZPM, + PlasmaArcFurnaceUV, + PlasmaArcFurnaceUHV, + PlasmaArcFurnaceUEV, + PlasmaArcFurnaceUIV, + PlasmaArcFurnaceUMV, + PolarizerLuV, + PolarizerZPM, + PolarizerUV, + PolarizerUHV, + PolarizerUEV, + PolarizerUIV, + PolarizerUMV, + RockBreakerLuV, + RockBreakerZPM, + RockBreakerUV, + RockBreakerUHV, + RockBreakerUEV, + RockBreakerUIV, + RockBreakerUMV, + RecyclerLuV, + RecyclerZPM, + RecyclerUV, + RecyclerUHV, + RecyclerUEV, + RecyclerUIV, + RecyclerUMV, + ReplicatorLuV, + ReplicatorZPM, + ReplicatorUV, + ReplicatorUHV, + ReplicatorUEV, + ReplicatorUIV, + ReplicatorUMV, + ScannerLuV, + ScannerZPM, + ScannerUV, + ScannerUHV, + ScannerUEV, + ScannerUIV, + ScannerUMV, + SiftingMachineLuV, + SiftingMachineZPM, + SiftingMachineUV, + SiftingMachineUHV, + SiftingMachineUEV, + SiftingMachineUIV, + SiftingMachineUMV, + SlicingMachineLuV, + SlicingMachineZPM, + SlicingMachineUV, + SlicingMachineUHV, + SlicingMachineUEV, + SlicingMachineUIV, + SlicingMachineUMV, + ThermalCentrifugeLuV, + ThermalCentrifugeZPM, + ThermalCentrifugeUV, + ThermalCentrifugeUHV, + ThermalCentrifugeUEV, + ThermalCentrifugeUIV, + ThermalCentrifugeUMV, + WiremillLuV, + WiremillZPM, + WiremillUV, + WiremillUHV, + WiremillUEV, + WiremillUIV, + WiremillUMV, + PumpLuV, + PumpZPM, + Automation_ChestBuffer_UEV, + Automation_ChestBuffer_UIV, + Automation_ChestBuffer_UMV, + Automation_ChestBuffer_UXV,; public static final ItemList[] DYE_ONLY_ITEMS = { Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, @@ -2091,16 +2534,16 @@ public enum ItemList implements IItemContainer { MACHINE_HULLS = { Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX }, HATCHES_DYNAMO = { Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, - Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX }, + Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_UHV }, HATCHES_ENERGY = { Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, - Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX }, + Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_UHV }, HATCHES_INPUT = { Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, - Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX }, + Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_UHV }, HATCHES_INPUT_BUS = { Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX }, HATCHES_OUTPUT = { Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, - Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX }, + Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_UHV }, HATCHES_OUTPUT_BUS = { Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX }, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index a81d0f902d..6772f4dc12 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -517,6 +517,8 @@ public enum MetaTileEntityIDs { COMBUSTION_GENERATOR_LV(1110), COMBUSTION_GENERATOR_MV(1111), COMBUSTION_GENERATOR_HV(1112), + DieselGeneratorEV(1113), + DieselGeneratorIV(1114), GAS_TURBINE_LV(1115), GAS_TURBINE_MV(1116), GAS_TURBINE_HV(1117), @@ -591,9 +593,9 @@ public enum MetaTileEntityIDs { FUSION_CONTROLLER_MKI(1193), FUSION_CONTROLLER_MKII(1194), FUSION_CONTROLLER_MKIII(1195), - PLASMA_GENERATOR_IV(1196), - PLASMA_GENERATOR_LuV(1197), - PLASMA_GENERATOR_ZPM(1198), + PLASMA_GENERATOR_EV(1196), + PLASMA_GENERATOR_IV(1197), + PLASMA_GENERATOR_LuV(1198), PROCESSING_ARRAY_CONTROLLER(1199), ADVANCED_SEISMIC_PROSPECTOR_LV(2102), ADVANCED_SEISMIC_PROSPECTOR_MV(2103), @@ -611,6 +613,7 @@ public enum MetaTileEntityIDs { INPUT_HATCH_ME(2717), INPUT_BUS_ME(2718), INDUSTRIAL_LASER_ENGRAVER_CONTROLLER(3004), + DraconicEvolutionFusionCrafterController(5001), CHEST_BUFFER_ULV(9230), CHEST_BUFFER_LV(9231), CHEST_BUFFER_MV(9232), @@ -697,12 +700,910 @@ public enum MetaTileEntityIDs { PURIFICATION_UNIT_DEGASIFIER(9412), HATCH_DEGASIFIER_CONTROL(9413), PURIFICATION_UNIT_PARTICLE_EXTRACTOR(9414), + PLASMA_GENERATOR_ZPM(10752), + PLASMA_GENERATOR_UV(10753), + ALLOY_SMELTER_LuV(10760), + ALLOY_SMELTER_ZPM(10761), + ALLOY_SMELTER_UV(10762), + ALLOY_SMELTER_UHV(10763), + ALLOY_SMELTER_UEV(10764), + ALLOY_SMELTER_UIV(10765), + ALLOY_SMELTER_UMV(10766), + MATTER_AMPLIFIER_LuV(10770), + MATTER_AMPLIFIER_ZPM(10771), + MATTER_AMPLIFIER_UV(10772), + MATTER_AMPLIFIER_UHV(10773), + MATTER_AMPLIFIER_UEV(10774), + MATTER_AMPLIFIER_UIV(10775), + MATTER_AMPLIFIER_UMV(10776), + ASSEMBLING_MACHINE_LuV(10780), + ASSEMBLING_MACHINE_ZPM(10781), + ASSEMBLING_MACHINE_UV(10782), + ASSEMBLING_MACHINE_UHV(10783), + ASSEMBLING_MACHINE_UEV(10784), + ASSEMBLING_MACHINE_UIV(10785), + ASSEMBLING_MACHINE_UMV(10786), + AUTOCLAVE_LuV(10790), + AUTOCLAVE_ZPM(10791), + AUTOCLAVE_UV(10792), + AUTOCLAVE_UHV(10793), + AUTOCLAVE_UEV(10794), + AUTOCLAVE_UIV(10795), + AUTOCLAVE_UMV(10796), + BENDING_MACHINE_LuV(10800), + BENDING_MACHINE_ZPM(10801), + BENDING_MACHINE_UV(10802), + BENDING_MACHINE_UHV(10803), + BENDING_MACHINE_UEV(10804), + BENDING_MACHINE_UIV(10805), + BENDING_MACHINE_UMV(10806), + COMPRESSOR_LuV(10810), + COMPRESSOR_ZPM(10811), + COMPRESSOR_UV(10812), + COMPRESSOR_UHV(10813), + COMPRESSOR_UEV(10814), + COMPRESSOR_UIV(10815), + COMPRESSOR_UMV(10816), + CUTTING_MACHINE_LuV(10820), + CUTTING_MACHINE_ZPM(10821), + CUTTING_MACHINE_UV(10822), + CUTTING_MACHINE_UHV(10823), + CUTTING_MACHINE_UEV(10824), + CUTTING_MACHINE_UIV(10825), + CUTTING_MACHINE_UMV(10826), + DISTILLERY_LuV(10830), + DISTILLERY_ZPM(10831), + DISTILLERY_UV(10832), + DISTILLERY_UHV(10833), + DISTILLERY_UEV(10834), + DISTILLERY_UIV(10835), + DISTILLERY_UMV(10836), + ELECTRIC_FURNACE_LuV(10840), + ELECTRIC_FURNACE_ZPM(10841), + ELECTRIC_FURNACE_UV(10842), + ELECTRIC_FURNACE_UHV(10843),< |