diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-08-15 16:48:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 16:48:03 +0200 |
| commit | 361adcefd72d3f58040b18cc7ae92b65ec017522 (patch) | |
| tree | 8a93908c1fc4f0cf4e2395b02715f2cbd9fd805f /src/main/java/gregtech/api | |
| parent | 0f990a7cfd78c3ede4db09a893e1e6edff164a2a (diff) | |
| download | GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.gz GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.bz2 GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.zip | |
add forbidden getModItem calls (#2869)
* add forbidden getModItem calls
* remove bartworks gmi
* remove goodgenerators gmi
* spotless
* no more literals in getModItem calls
* fix kekztech calls
* fix kubatech calls
* fix gregtech calls (1/?)
* move WA from NHCore to GT5U
* MTE enum expanded with bw values
* MTE enum expanded with tectech values
* fix inversion
* fix gregtech calls (2/?)
* copied enum from NHCore to GT5U and moved machine hulls
* moved plasma gens and alloy smelters
* moved machine matter amplifiers, assemblers, scanners, Pump, transformers
* moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches
* moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches
* moved circuit assemblers
* moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer
* moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine
* moved batteries
* comment
* spotless apply
* yeet * imports
* bronze blast furnace is no more since a while
* sanitize kubatech MTE registration
* merge GG's MTE enum into GT5U one
* fix gregtech calls (3/4)
* fix gt++ calls (1/?)
* small cleanup
* fix gt++ calls (2/3)
* fix gt++ calls (3/3)
* temporary test
* fix config
* Revert "temporary test"
This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724.
* disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts
* spotless apply
* dumb dumb
* fix dynamic access to CustomItemList
* update tests
* fix scala test
* fix script?
* fix script?
* actual fix?
* there we go!
* yeet GT for now, until we move the EOH Controller recipe somewhere else
* fix dep
Diffstat (limited to 'src/main/java/gregtech/api')
6 files changed, 1550 insertions, 82 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), + ELECTRIC_FURNACE_UEV(10844), + ELECTRIC_FURNACE_UIV(10845), + ELECTRIC_FURNACE_UMV(10846), + ELECTROLYZER_LuV(10850), + ELECTROLYZER_ZPM(10851), + ELECTROLYZER_UV(10852), + ELECTROLYZER_UHV(10853), + ELECTROLYZER_UEV(10854), + ELECTROLYZER_UIV(10855), + ELECTROLYZER_UMV(10856), + ELECTROMAGNETIC_SEPARATOR_LuV(10860), + ELECTROMAGNETIC_SEPARATOR_ZPM(10861), + ELECTROMAGNETIC_SEPARATOR_UV(10862), + ELECTROMAGNETIC_SEPARATOR_UHV(10863), + ELECTROMAGNETIC_SEPARATOR_UEV(10864), + ELECTROMAGNETIC_SEPARATOR_UIV(10865), + ELECTROMAGNETIC_SEPARATOR_UMV(10866), + EXTRACTOR_LuV(10870), + EXTRACTOR_ZPM(10871), + EXTRACTOR_UV(10872), + EXTRACTOR_UHV(10873), + EXTRACTOR_UEV(10874), + EXTRACTOR_UIV(10875), + EXTRACTOR_UMV(10876), + EXTRUDER_LuV(10880), + EXTRUDER_ZPM(10881), + EXTRUDER_UV(10882), + EXTRUDER_UHV(10883), + EXTRUDER_UEV(10884), + EXTRUDER_UIV(10885), + EXTRUDER_UMV(10886), + FLUID_SOLIDIFIER_LuV(10890), + FLUID_SOLIDIFIER_ZPM(10891), + FLUID_SOLIDIFIER_UV(10892), + FLUID_SOLIDIFIER_UHV(10893), + FLUID_SOLIDIFIER_UEV(10894), + FLUID_SOLIDIFIER_UIV(10895), + FLUID_SOLIDIFIER_UMV(10896), + FORMING_PRESS_LuV(10900), + FORMING_PRESS_ZPM(10901), + FORMING_PRESS_UV(10902), + FORMING_PRESS_UHV(10903), + FORMING_PRESS_UEV(10904), + FORMING_PRESS_UIV(10905), + FORMING_PRESS_UMV(10906), + FORGE_HAMMER_LuV(10910), + FORGE_HAMMER_ZPM(10911), + FORGE_HAMMER_UV(10912), + FORGE_HAMMER_UHV(10913), + FORGE_HAMMER_UEV(10914), + FORGE_HAMMER_UIV(10915), + FORGE_HAMMER_UMV(10916), + LATHE_LuV(10920), + LATHE_ZPM(10921), + LATHE_UV(10922), + LATHE_UHV(10923), + LATHE_UEV(10924), + LATHE_UIV(10925), + LATHE_UMV(10926), + PRECISION_LASER_ENGRAVER_LuV(10930), + PRECISION_LASER_ENGRAVER_ZPM(10931), + PRECISION_LASER_ENGRAVER_UV(10932), + PRECISION_LASER_ENGRAVER_UHV(10933), + PRECISION_LASER_ENGRAVER_UEV(10934), + PRECISION_LASER_ENGRAVER_UIV(10935), + PRECISION_LASER_ENGRAVER_UMV(10936), + MACERATOR_LuV(10940), + MACERATOR_ZPM(10941), + MACERATOR_UV(10942), + MACERATOR_UHV(10943), + MACERATOR_UEV(10944), + MACERATOR_UIV(10945), + MACERATOR_UMV(10946), + MATTER_FABRICATOR_LuV(10950), + MATTER_FABRICATOR_ZPM(10951), + MATTER_FABRICATOR_UV(10952), + MATTER_FABRICATOR_UHV(10953), + MATTER_FABRICATOR_UEV(10954), + MATTER_FABRICATOR_UIV(10955), + MATTER_FABRICATOR_UMV(10956), + MICROWAVE_LuV(10960), + MICROWAVE_ZPM(10961), + MICROWAVE_UV(10962), + MICROWAVE_UHV(10963), + MICROWAVE_UEV(10964), + MICROWAVE_UIV(10965), + MICROWAVE_UMV(10966), + ORE_WASHING_PLANT_LuV(10970), + ORE_WASHING_PLANT_ZPM(10971), + ORE_WASHING_PLANT_UV(10972), + ORE_WASHING_PLANT_UHV(10973), + ORE_WASHING_PLANT_UEV(10974), + ORE_WASHING_PLANT_UIV(10975), + ORE_WASHING_PLANT_UMV(10976), + POLARIZER_LuV(10980), + POLARIZER_ZPM(10981), + POLARIZER_UV(10982), + POLARIZER_UHV(10983), + POLARIZER_UEV(10984), + POLARIZER_UIV(10985), + POLARIZER_UMV(10986), + RECYCLER_LuV(10990), + RECYCLER_ZPM(10991), + RECYCLER_UV(10992), + RECYCLER_UHV(10993), + RECYCLER_UEV(10994), + RECYCLER_UIV(10995), + RECYCLER_UMV(10996), + MATTER_REPLICATOR_LuV(11000), + MATTER_REPLICATOR_ZPM(11001), + MATTER_REPLICATOR_UV(11002), + MATTER_REPLICATOR_UHV(11003), + MATTER_REPLICATOR_UEV(11004), + MATTER_REPLICATOR_UIV(11005), + MATTER_REPLICATOR_UMV(11006), + SCANNER_LuV(11010), + SCANNER_ZPM(11011), + SCANNER_UV(11012), + SCANNER_UHV(11013), + SCANNER_UEV(11014), + SCANNER_UIV(11015), + SCANNER_UMV(11016), + SIFTING_MACHINE_LuV(11020), + SIFTING_MACHINE_ZPM(11021), + SIFTING_MACHINE_UV(11022), + SIFTING_MACHINE_UHV(11023), + SIFTING_MACHINE_UEV(11024), + SIFTING_MACHINE_UIV(11025), + SIFTING_MACHINE_UMV(11026), + SLICING_MACHINE_LuV(11028), + SLICING_MACHINE_ZPM(11029), + SLICING_MACHINE_UV(11030), + SLICING_MACHINE_UHV(11033), + SLICING_MACHINE_UEV(11034), + SLICING_MACHINE_UIV(11035), + SLICING_MACHINE_UMV(11036), + THERMAL_CENTRIFUGE_LuV(11040), + THERMAL_CENTRIFUGE_ZPM(11041), + THERMAL_CENTRIFUGE_UV(11042), + THERMAL_CENTRIFUGE_UHV(11043), + THERMAL_CENTRIFUGE_UEV(11044), + THERMAL_CENTRIFUGE_UIV(11045), + THERMAL_CENTRIFUGE_UMV(11046), + WIREMILL_LuV(11050), + WIREMILL_ZPM(11051), + WIREMILL_UV(11052), + WIREMILL_UHV(11053), + WIREMILL_UEV(11054), + WIREMILL_UIV(11055), + WIREMILL_UMV(11056), + PUMP_LuV(11060), + PUMP_ZPM(11061), + ARC_FURNACE_LuV(11070), + ARC_FURNACE_ZPM(11071), + ARC_FURNACE_UV(11072), + ARC_FURNACE_UHV(11073), + ARC_FURNACE_UEV(11074), + ARC_FURNACE_UIV(11075), + ARC_FURNACE_UMV(11076), + CENTRIFUGE_LuV(11080), + CENTRIFUGE_ZPM(11081), + CENTRIFUGE_UV(11082), + CENTRIFUGE_UHV(11083), + CENTRIFUGE_UEV(11084), + CENTRIFUGE_UIV(11085), + CENTRIFUGE_UMV(11086), + PLASMA_ARC_FURNACE_LuV(11090), + PLASMA_ARC_FURNACE_ZPM(11091), + PLASMA_ARC_FURNACE_UV(11092), + PLASMA_ARC_FURNACE_UHV(11093), + PLASMA_ARC_FURNACE_UEV(11094), + PLASMA_ARC_FURNACE_UIV(11095), + PLASMA_ARC_FURNACE_UMV(11096), + WORLD_ACCELERATOR_LV(11100), + WORLD_ACCELERATOR_MV(11101), + WORLD_ACCELERATOR_HV(11102), + WORLD_ACCELERATOR_EV(11103), + WORLD_ACCELERATOR_IV(11104), + WORLD_ACCELERATOR_LuV(11105), + WORLD_ACCELERATOR_ZPM(11106), + WORLD_ACCELERATOR_UV(11107), + BREWERY_LuV(11120), + BREWERY_ZPM(11121), + BREWERY_UV(11122), + BREWERY_UHV(11123), + BREWERY_UEV(11124), + BREWERY_UIV(11125), + BREWERY_UMV(11126), + CANNING_MACHINE_LuV(11130), + CANNING_MACHINE_ZPM(11131), + CANNING_MACHINE_UV(11132), + CANNING_MACHINE_UHV(11133), + CANNING_MACHINE_UEV(11134), + CANNING_MACHINE_UIV(11135), + CANNING_MACHINE_UMV(11136), + CHEMICAL_BATH_LuV(11140), + CHEMICAL_BATH_ZPM(11141), + CHEMICAL_BATH_UV(11142), + CHEMICAL_BATH_UHV(11143), + CHEMICAL_BATH_UEV(11144), + CHEMICAL_BATH_UIV(11145), + CHEMICAL_BATH_UMV(11146), + CHEMICAL_REACTOR_LuV(11150), + CHEMICAL_REACTOR_ZPM(11151), + CHEMICAL_REACTOR_UV(11152), + CHEMICAL_REACTOR_UHV(11153), + CHEMICAL_REACTOR_UEV(11154), + CHEMICAL_REACTOR_UIV(11155), + CHEMICAL_REACTOR_UMV(11156), + FERMENTER_LuV(11170), + FERMENTER_ZPM(11171), + FERMENTER_UV(11172), + FERMENTER_UHV(11173), + FERMENTER_UEV(11174), + FERMENTER_UIV(11175), + FERMENTER_UMV(11176), + FLUID_CANNER_LuV(11180), + FLUID_CANNER_ZPM(11181), + FLUID_CANNER_UV(11182), + FLUID_CANNER_UHV(11183), + FLUID_CANNER_UEV(11184), + FLUID_CANNER_UIV(11185), + FLUID_CANNER_UMV(11186), + FLUID_EXTRACTOR_LuV(11190), + FLUID_EXTRACTOR_ZPM(11191), + FLUID_EXTRACTOR_UV(11192), + FLUID_EXTRACTOR_UHV(11193), + FLUID_EXTRACTOR_UEV(11194), + FLUID_EXTRACTOR_UIV(11195), + FLUID_EXTRACTOR_UMV(11196), + FLUID_HEATER_LuV(11200), + FLUID_HEATER_ZPM(11201), + FLUID_HEATER_UV(11202), + FLUID_HEATER_UHV(11203), + FLUID_HEATER_UEV(11204), + FLUID_HEATER_UIV(11205), + FLUID_HEATER_UMV(11206), + MIXER_LuV(11210), + MIXER_ZPM(11211), + MIXER_UV(11212), + MIXER_UHV(11213), + MIXER_UEV(11214), + MIXER_UIV(11215), + MIXER_UMV(11216), + TRANSFORMER_UEV_UHV(11220), + TRANSFORMER_UIV_UEV(11221), + TRANSFORMER_UMV_UIV(11222), + TRANSFORMER_UXV_UMV(11223), + TRANSFORMER_MAX_UXV(11224), + HULL_UEV(11230), + HULL_UIV(11231), + HULL_UMV(11232), + HULL_UXV(11233), + HULL_MAX(11234), + BATTERY_BUFFER_4_BY_4_UEV(11240), + BATTERY_BUFFER_4_BY_4_UIV(11241), + BATTERY_BUFFER_4_BY_4_UMV(11242), + BATTERY_BUFFER_4_BY_4_UXV(11243), + BATTERY_BUFFER_4_BY_4_MAX(11245), + BATTERY_BUFFER_3_BY_3_UEV(11250), + BATTERY_BUFFER_3_BY_3_UIV(11251), + BATTERY_BUFFER_3_BY_3_UMV(11252), + BATTERY_BUFFER_3_BY_3_UXV(11253), + BATTERY_BUFFER_3_BY_3_MAX(11255), + BATTERY_BUFFER_2_BY_2_UEV(11260), + BATTERY_BUFFER_2_BY_2_UIV(11261), + BATTERY_BUFFER_2_BY_2_UMV(11262), + BATTERY_BUFFER_2_BY_2_UXV(11263), + BATTERY_BUFFER_2_BY_2_MAX(11265), + BATTERY_BUFFER_1_BY_1_UEV(11270), + BATTERY_BUFFER_1_BY_1_UIV(11271), + BATTERY_BUFFER_1_BY_1_UMV(11272), + BATTERY_BUFFER_1_BY_1_UXV(11273), + BATTERY_BUFFER_1_BY_1_MAX(11275), + BATTERY_CHARGER_4_4_UEV(11280), + BATTERY_CHARGER_4_4_UIV(11281), + BATTERY_CHARGER_4_4_UMV(11282), + BATTERY_CHARGER_4_4_UXV(11283), + DYNAMO_HATCH_UEV(11290), + DYNAMO_HATCH_UIV(11291), + DYNAMO_HATCH_UMV(11292), + DYNAMO_HATCH_UXV(11293), + ENERGY_HATCH_UEV(11300), + ENERGY_HATCH_UIV(11301), + ENERGY_HATCH_UMV(11302), + ENERGY_HATCH_UXV(11303), + HIGH_AMP_TRANSFORMER_UIV_UEV(11910), + HIGH_AMP_TRANSFORMER_UMV_UIV(11911), + HIGH_AMP_TRANSFORMER_UXV_UMV(11912), + HIGH_AMP_TRANSFORMER_MAX_UXV(11913), + HIGH_AMP_TRANSFORMER_UEV_UHV(11989), + WET_TRANSFORMER_LV_ULV(12000), + WET_TRANSFORMER_MV_LV(12001), + WET_TRANSFORMER_HV_MV(12002), + WET_TRANSFORMER_EV_HV(12003), + WET_TRANSFORMER_IV_EV(12004), + WET_TRANSFORMER_LuV_IV(12005), + WET_TRANSFORMER_ZPM_LuV(12006), + WET_TRANSFORMER_UV_ZPM(12007), + WET_TRANSFORMER_UHV_UV(12008), + WET_TRANSFORMER_UEV_UHV(12009), + WET_TRANSFORMER_UIV_UEV(12010), + WET_TRANSFORMER_UMV_UIV(12011), + WET_TRANSFORMER_UXV_UMV(12012), + WET_TRANSFORMER_MAX_UXV(12013), + AIR_FILTER_CONTROLLER_T1(12020), + AIR_FILTER_CONTROLLER_T2(12021), + AIR_FILTER_CONTROLLER_T3(12022), + TURBO_CHARGER_ULV(12040), + TURBO_CHARGER_LV(12041), + TURBO_CHARGER_MV(12042), + TURBO_CHARGER_HV(12043), + TURBO_CHARGER_EV(12044), + TURBO_CHARGER_IV(12045), + TURBO_CHARGER_LuV(12046), + TURBO_CHARGER_ZPM(12047), + TURBO_CHARGER_UV(12048), + TURBO_CHARGER_UHV(12049), + CHEST_BUFFER_UEV(12060), + CHEST_BUFFER_UIV(12061), + CHEST_BUFFER_UMV(12062), + NAME_REMOVER(12070), + ROCK_BREAKER_LuV(12080), + ROCK_BREAKER_ZPM(12081), + ROCK_BREAKER_UV(12082), + ROCK_BREAKER_UHV(12083), + ROCK_BREAKER_UEV(12084), + ROCK_BREAKER_UIV(12085), + ROCK_BREAKER_UMV(12086), + CIRCUIT_ASSEMBLER_UHV(12090), + CIRCUIT_ASSEMBLER_UEV(12091), + CIRCUIT_ASSEMBLER_UIV(12092), + CIRCUIT_ASSEMBLER_UMV(12093), + CIRCUIT_ASSEMBLER_UXV(12094), + CIRCUIT_ASSEMBLER_MAX(12096), + INPUT_HATCH_UEV(12097), + INPUT_HATCH_UIV(12098), + INPUT_HATCH_UMV(12099), + INPUT_HATCH_UXV(12100), + INPUT_HATCH_MAX(12102), + OUTPUT_HATCH_UEV(12103), + OUTPUT_HATCH_UIV(12104), + OUTPUT_HATCH_UMV(12105), + OUTPUT_HATCH_UXV(12106), + OUTPUT_HATCH_MAX(12108), + LESU(12600), + EnergyDistributor_ULV(12601), + EnergyDistributor_LV(12602), + EnergyDistributor_MV(12603), + EnergyDistributor_HV(12604), + EnergyDistributor_EV(12605), + EnergyDistributor_IV(12606), + EnergyDistributor_LuV(12607), + EnergyDistributor_ZPM(12608), + EnergyDistributor_UV(12609), + EnergyDistributor_UHV(12610), + EnergyDistributor_UEV(12611), + EnergyDistributor_UIV(12612), + EnergyDistributor_UMV(12613), + EnergyDistributor_UXV(12614), + EnergyDistributor_MAX(12615), + Diode2A_ULV(12617), + Diode2A_LV(12618), + Diode2A_MV(12619), + Diode2A_HV(12620), + Diode2A_EV(12621), + Diode2A_IV(12622), + Diode2A_LuV(12623), + Diode2A_ZPM(12624), + Diode2A_UV(12625), + Diode2A_UHV(12626), + Diode2A_UEV(12627), + Diode2A_UIV(12628), + Diode2A_UMV(12629), + Diode2A_UXV(12630), + Diode2A_MAX(12631), + Diode4A_ULV(12633), + Diode4A_LV(12634), + Diode4A_MV(12635), + Diode4A_HV(12636), + Diode4A_EV(12637), + Diode4A_IV(12638), + Diode4A_LuV(12639), + Diode4A_ZPM(12640), + Diode4A_UV(12641), + Diode4A_UHV(12642), + Diode4A_UEV(12643), + Diode4A_UIV(12644), + Diode4A_UMV(12645), + Diode4A_UXV(12646), + Diode4A_MAX(12647), + Diode8A_ULV(12649), + Diode8A_LV(12650), + Diode8A_MV(12651), + Diode8A_HV(12652), + Diode8A_EV(12653), + Diode8A_IV(12654), + Diode8A_LuV(12655), + Diode8A_ZPM(12656), + Diode8A_UV(12657), + Diode8A_UHV(12658), + Diode8A_UEV(12659), + Diode8A_UIV(12660), + Diode8A_UMV(12661), + Diode8A_UXV(12662), + Diode8A_MAX(12663), + Diode12A_ULV(12665), + Diode12A_LV(12666), + Diode12A_MV(12667), + Diode12A_HV(12668), + Diode12A_EV(12669), + Diode12A_IV(12670), + Diode12A_LuV(12671), + Diode12A_ZPM(12672), + Diode12A_UV(12673), + Diode12A_UHV(12674), + Diode12A_UEV(12675), + Diode12A_UIV(12676), + Diode12A_UMV(12677), + Diode12A_UXV(12678), + Diode12A_MAX(12679), + Diode16A_ULV(12681), + Diode16A_LV(12682), + Diode16A_MV(12683), + Diode16A_HV(12684), + Diode16A_EV(12685), + Diode16A_IV(12686), + Diode16A_LuV(12687), + Diode16A_ZPM(12688), + Diode16A_UV(12689), + Diode16A_UHV(12690), + Diode16A_UEV(12691), + Diode16A_UIV(12692), + Diode16A_UMV(12693), + Diode16A_UXV(12694), + Diode16A_MAX(12695), + ManualTrafo(12697), + Windmill(12698), + BioLab_HV(12699), + BioLab_EV(12700), + BioLab_IV(12701), + BioLab_LuV(12702), + BioLab_ZPM(12703), + BioLab_UV(12704), + BioLab_UHV(12705), + BioLab_UEV(12706), + BioLab_UIV(12707), + BioLab_UMV(12708), + BioLab_UXV(12709), + BioLab_MAX(12710), + BioVat(12712), + RadioHatch_HV(12713), + RadioHatch_EV(12714), + RadioHatch_IV(12715), + RadioHatch_LuV(12716), + RadioHatch_ZPM(12717), + RadioHatch_UV(12718), + RadioHatch_UHV(12719), + RadioHatch_UEV(12720), + RadioHatch_UIV(12721), + RadioHatch_UMV(12722), + RadioHatch_UXV(12723), + RadioHatch_MAX(12724), + AcidGeneratorMV(12726), + AcidGeneratorHV(12727), + AcidGeneratorEV(12728), + DeepEarthHeatingPump(12729), + MegaBlastFurnace(12730), + MegaVacuumFreezer(12731), + MultiNqGenerator(12732), + ThoriumHighTemperatureReactor(12733), + ElectricImplosionCompressor(12734), + CircuitAssemblyLine(12735), + CompressedFluidHatch(12736), + GiantOutputHatch(12737), + MegaDistillationTower(12738), + VoidMinerIII(12739), + VoidMinerII(12740), + VoidMinerI(12741), + LowPowerLaserPipe(12742), + LowPowerLaserConverter32A_EV(12743), + LowPowerLaserConverter32A_IV(12744), + LowPowerLaserConverter32A_LuV(12745), + LowPowerLaserConverter32A_ZPM(12746), + LowPowerLaserConverter64A_EV(12747), + LowPowerLaserConverter64A_IV(12748), + LowPowerLaserConverter64A_LuV(12749), + LowPowerLaserConverter64A_ZPM(12750), + LowPowerLaserConverter96A_EV(12751), + LowPowerLaserConverter96A_IV(12752), + LowPowerLaserConverter96A_LuV(12753), + LowPowerLaserConverter96A_ZPM(12754), + LowPowerLaserConverter128A_EV(12755), + LowPowerLaserConverter128A_IV(12756), + LowPowerLaserConverter128A_LuV(12757), + LowPowerLaserConverter128A_ZPM(12758), + LowPowerLaserTargetHatch32A_EV(12759), + LowPowerLaserTargetHatch32A_IV(12760), + LowPowerLaserTargetHatch32A_LuV(12761), + LowPowerLaserTargetHatch32A_ZPM(12762), + LowPowerLaserTargetHatch64A_EV(12763), + LowPowerLaserTargetHatch64A_IV(12764), + LowPowerLaserTargetHatch64A_LuV(12765), + LowPowerLaserTargetHatch64A_ZPM(12766), + LowPowerLaserTargetHatch96A_EV(12767), + LowPowerLaserTargetHatch96A_IV(12768), + LowPowerLaserTargetHatch96A_LuV(12769), + LowPowerLaserTargetHatch96A_ZPM(12770), + LowPowerLaserTargetHatch128A_EV(12771), + LowPowerLaserTargetHatch128A_IV(12772), + LowPowerLaserTargetHatch128A_LuV(12773), + LowPowerLaserTargetHatch128A_ZPM(12774), + LowPowerLaserSourceHatch32A_EV(12775), + LowPowerLaserSourceHatch32A_IV(12776), + LowPowerLaserSourceHatch32A_LuV(12777), + LowPowerLaserSourceHatch32A_ZPM(12778), + LowPowerLaserSourceHatch64A_EV(12779), + LowPowerLaserSourceHatch64A_IV(12780), + LowPowerLaserSourceHatch64A_LuV(12781), + LowPowerLaserSourceHatch64A_ZPM(12782), + LowPowerLaserSourceHatch96A_EV(12783), + LowPowerLaserSourceHatch96A_IV(12784), + LowPowerLaserSourceHatch96A_LuV(12785), + LowPowerLaserSourceHatch96A_ZPM(12786), + LowPowerLaserSourceHatch128A_EV(12787), + LowPowerLaserSourceHatch128A_IV(12788), + LowPowerLaserSourceHatch128A_LuV(12789), + LowPowerLaserSourceHatch128A_ZPM(12790), + HighTemperatureGasCooledReactor(12791), + ExtremeIndustrialGreenhouseController(12792), + AcidGeneratorLV(12793), + HumongousInputHatch(12799), + CreativeScanner(12800), sofc1(13101), sofc2(13102), tfft(13104), lsc(13106), tfftHatch(13109), WORMHOLE_GENERATOR_CONTROLLER(13115), + MegaChemicalReactor(13366), + MegaOilCracker(13367), + ExtremeEntityCrusherController(14201), + ExtremeIndustrialApiaryController(14202), + EV4AWirelessEnergyHatch(15065), + EV16AWirelessEnergyHatch(15066), + EV64AWirelessEnergyHatch(15067), + IV4AWirelessEnergyHatch(15068), + IV16AWirelessEnergyHatch(15069), + IV64AWirelessEnergyHatch(15070), + LuV4AWirelessEnergyHatch(15071), + LuV16AWirelessEnergyHatch(15072), + LuV64AWirelessEnergyHatch(15073), + ZPM4AWirelessEnergyHatch(15074), + ZPM16AWirelessEnergyHatch(15075), + ZPM64AWirelessEnergyHatch(15076), + UV4AWirelessEnergyHatch(15077), + UV16AWirelessEnergyHatch(15078), + UV64AWirelessEnergyHatch(15079), + UHV4AWirelessEnergyHatch(15080), + UHV16AWirelessEnergyHatch(15081), + UHV64AWirelessEnergyHatch(15082), + UEV4AWirelessEnergyHatch(15083), + UEV16AWirelessEnergyHatch(15084), + UEV64AWirelessEnergyHatch(15085), + UIV4AWirelessEnergyHatch(15086), + UIV16AWirelessEnergyHatch(15087), + UIV64AWirelessEnergyHatch(15088), + UMV4AWirelessEnergyHatch(15089), + UMV16AWirelessEnergyHatch(15090), + UMV64AWirelessEnergyHatch(15091), + UXV4AWirelessEnergyHatch(15092), + UXV16AWirelessEnergyHatch(15093), + UXV64AWirelessEnergyHatch(15094), + MAX4AWirelessEnergyHatch(15095), + MAX16AWirelessEnergyHatch(15096), + MAX64AWirelessEnergyHatch(15097), + IV4AEnergyHatch(15100), + LuV4AEnergyHatch(15101), + ZPM4AEnergyHatch(15102), + UV4AEnergyHatch(15103), + UHV4AEnergyHatch(15104), + UEV4AEnergyHatch(15105), + UIV4AEnergyHatch(15106), + UMV4AEnergyHatch(15107), + UXV4AEnergyHatch(15108), + EV4AEnergyHatch(15109), + IV16AEnergyHatch(15110), + LuV16AEnergyHatch(15111), + ZPM16AEnergyHatch(15112), + UV16AEnergyHatch(15113), + UHV16AEnergyHatch(15114), + UEV16AEnergyHatch(15115), + UIV16AEnergyHatch(15116), + UMV16AEnergyHatch(15117), + UXV16AEnergyHatch(15118), + EV16AEnergyHatch(15119), + IV64AEnergyHatch(15120), + LuV64AEnergyHatch(15121), + ZPM64AEnergyHatch(15122), + UV64AEnergyHatch(15123), + UHV64AEnergyHatch(15124), + UEV64AEnergyHatch(15125), + UIV64AEnergyHatch(15126), + UMV64AEnergyHatch(15127), + UXV64AEnergyHatch(15128), + EV64AEnergyHatch(15129), + IV256AtLaserTargetHatch(15130), + LuV256AtLaserTargetHatch(15131), + ZPM256AtLaserTargetHatch(15132), + UV256AtLaserTargetHatch(15133), + UHV256AtLaserTargetHatch(15134), + UEV256AtLaserTargetHatch(15135), + UIV256AtLaserTargetHatch(15136), + UMV256AtLaserTargetHatch(15137), + UXV256AtLaserTargetHatch(15138), + IV1024AtLaserTargetHatch(15140), + LuV1024AtLaserTargetHatch(15141), + ZPM1024AtLaserTargetHatch(15142), + UV1024AtLaserTargetHatch(15143), + UHV1024AtLaserTargetHatch(15144), + UEV1024AtLaserTargetHatch(15145), + UIV1024AtLaserTargetHatch(15146), + UMV1024AtLaserTargetHatch(15147), + UXV1024AtLaserTargetHatch(15148), + IV4096AtLaserTargetHatch(15150), + LuV4096AtLaserTargetHatch(15151), + ZPM4096AtLaserTargetHatch(15152), + UV4096AtLaserTargetHatch(15153), + UHV4096AtLaserTargetHatch(15154), + UEV4096AtLaserTargetHatch(15155), + UIV4096AtLaserTargetHatch(15156), + UMV4096AtLaserTargetHatch(15157), + UXV4096AtLaserTargetHatch(15158), + IV16384AtLaserTargetHatch(15160), + LuV16384AtLaserTargetHatch(15161), + ZPM16384AtLaserTargetHatch(15162), + UV16384AtLaserTargetHatch(15163), + UHV16384AtLaserTargetHatch(15164), + UEV16384AtLaserTargetHatch(15165), + UIV16384AtLaserTargetHatch(15166), + UMV16384AtLaserTargetHatch(15167), + UXV16384AtLaserTargetHatch(15168), + IV65536AtLaserTargetHatch(15170), + LuV65536AtLaserTargetHatch(15171), + ZPM65536AtLaserTargetHatch(15172), + UV65536AtLaserTargetHatch(15173), + UHV65536AtLaserTargetHatch(15174), + UEV65536AtLaserTargetHatch(15175), + UIV65536AtLaserTargetHatch(15176), + UMV65536AtLaserTargetHatch(15177), + UXV65536AtLaserTargetHatch(15178), + IV262144AtLaserTargetHatch(15180), + LuV262144AtLaserTargetHatch(15181), + ZPM262144AtLaserTargetHatch(15182), + UV262144AtLaserTargetHatch(15183), + UHV262144AtLaserTargetHatch(15184), + UEV262144AtLaserTargetHatch(15185), + UIV262144AtLaserTargetHatch(15186), + UMV262144AtLaserTargetHatch(15187), + UXV262144AtLaserTargetHatch(15188), + IV1048576AtLaserTargetHatch(15190), + LuV1048576AtLaserTargetHatch(15191), + ZPM1048576AtLaserTargetHatch(15192), + UV1048576AtLaserTargetHatch(15193), + UHV1048576AtLaserTargetHatch(15194), + UEV1048576AtLaserTargetHatch(15195), + UIV1048576AtLaserTargetHatch(15196), + UMV1048576AtLaserTargetHatch(15197), + UXV1048576AtLaserTargetHatch(15198), + LegendaryLaserTargetHatch(15199), + IV4ADynamoHatch(15200), + LuV4ADynamoHatch(15201), + ZPM4ADynamoHatch(15202), + UV4ADynamoHatch(15203), + UHV4ADynamoHatch(15204), + UEV4ADynamoHatch(15205), + UIV4ADynamoHatch(15206), + UMV4ADynamoHatch(15207), + UXV4ADynamoHatch(15208), + EV4ADynamoHatch(15209), + IV16ADynamoHatch(15210), + LuV16ADynamoHatch(15211), + ZPM16ADynamoHatch(15212), + UV16ADynamoHatch(15213), + UHV16ADynamoHatch(15214), + UEV16ADynamoHatch(15215), + UIV16ADynamoHatch(15216), + UMV16ADynamoHatch(15217), + UXV16ADynamoHatch(15218), + EV16ADynamoHatch(15219), + IV64ADynamoHatch(15220), + LuV64ADynamoHatch(15221), + ZPM64ADynamoHatch(15222), + UV64ADynamoHatch(15223), + UHV64ADynamoHatch(15224), + UEV64ADynamoHatch(15225), + UIV64ADynamoHatch(15226), + UMV64ADynamoHatch(15227), + UXV64ADynamoHatch(15228), + EV64ADynamoHatch(15229), + IV256AtLaserSourceHatch(15230), + LuV256AtLaserSourceHatch(15231), + ZPM256AtLaserSourceHatch(15232), + UV256AtLaserSourceHatch(15233), + UHV256AtLaserSourceHatch(15234), + UEV256AtLaserSourceHatch(15235), + UIV256AtLaserSourceHatch(15236), + UMV256AtLaserSourceHatch(15237), + UXV256AtLaserSourceHatch(15238), + IV1024AtLaserSourceHatch(15240), + LuV1024AtLaserSourceHatch(15241), + ZPM1024AtLaserSourceHatch(15242), + UV1024AtLaserSourceHatch(15243), + UHV1024AtLaserSourceHatch(15244), + UEV1024AtLaserSourceHatch(15245), + UIV1024AtLaserSourceHatch(15246), + UMV1024AtLaserSourceHatch(15247), + UXV1024AtLaserSourceHatch(15248), + IV4096AtLaserSourceHatch(15250), + LuV4096AtLaserSourceHatch(15251), + ZPM4096AtLaserSourceHatch(15252), + UV4096AtLaserSourceHatch(15253), + UHV4096AtLaserSourceHatch(15254), + UEV4096AtLaserSourceHatch(15255), + UIV4096AtLaserSourceHatch(15256), + UMV4096AtLaserSourceHatch(15257), + UXV4096AtLaserSourceHatch(15258), + IV16384AtLaserSourceHatch(15260), + LuV16384AtLaserSourceHatch(15261), + ZPM16384AtLaserSourceHatch(15262), + UV16384AtLaserSourceHatch(15263), + UHV16384AtLaserSourceHatch(15264), + UEV16384AtLaserSourceHatch(15265), + UIV16384AtLaserSourceHatch(15266), + UMV16384AtLaserSourceHatch(15267), + UXV16384AtLaserSourceHatch(15268), + IV65536AtLaserSourceHatch(15270), + LuV65536AtLaserSourceHatch(15271), + ZPM65536AtLaserSourceHatch(15272), + UV65536AtLaserSourceHatch(15273), + UHV65536AtLaserSourceHatch(15274), + UEV65536AtLaserSourceHatch(15275), + UIV65536AtLaserSourceHatch(15276), + UMV65536AtLaserSourceHatch(15277), + UXV65536AtLaserSourceHatch(15278), + IV262144AtLaserSourceHatch(15280), + LuV262144AtLaserSourceHatch(15281), + ZPM262144AtLaserSourceHatch(15282), + UV262144AtLaserSourceHatch(15283), + UHV262144AtLaserSourceHatch(15284), + UEV262144AtLaserSourceHatch(15285), + UIV262144AtLaserSourceHatch(15286), + UMV262144AtLaserSourceHatch(15287), + UXV262144AtLaserSourceHatch(15288), + IV1048576AtLaserSourceHatch(15290), + LuV1048576AtLaserSourceHatch(15291), + ZPM1048576AtLaserSourceHatch(15292), + UV1048576AtLaserSourceHatch(15293), + UHV1048576AtLaserSourceHatch(15294), + UEV1048576AtLaserSourceHatch(15295), + UIV1048576AtLaserSourceHatch(15296), + UMV1048576AtLaserSourceHatch(15297), + UXV1048576AtLaserSourceHatch(15298), + LegendaryLaserSourceHatch(15299), + ActiveTransformer(15300), + NetworkSwitchWithQoS(15310), + QuantumComputer(15311), + MicrowaveGrinder(15312), + DataBank(15313), + TeslaTower(15314), + Researchstation(15331), + EnergyInfuser(15350), + EyeofHarmony(15410), + ForgeoftheGods(15411), + HelioflarePowerForge(15412), + HeliofluxMeltingCore(15413), + HeliothermalPlasmaFabricator(15414), + HeliofusionExoticizer(15415), + Parametrizer(15420), + ParametrizerX(15421), + ParametrizertXt(15422), + UncertaintyResolver(15430), + UncertaintyResolverX(15431), + OpticalSlaveConnector(15440), + OpticalMasterConnector(15441), + AssemblylineSlaveConnector(15442), + DataBankMasterConnector(15443), + CloudComputationServerHatch(15444), + CloudComputationClientHatch(15445), + WirelessAssemblylineSlaveConnector(15446), + WirelessDataBankMasterConnector(15447), + ComputerRack(15450), + ObjectHolder(15451), + CapacitorHatch(15452), + LaserVacuumPipe(15465), + LaserVacuumMirror(15466), + OpticalFiberCable(15470), + LaserVacuumPipeCasing(15472), + OpticalFiberCableCasing(15473), + Ownerdetector(15480), + InsaneBuckConverter(15485), + LudicrousBuckConverter(15486), + ZPMVoltageBuckConverter(15487), + UltimatePowerBuckConverter(15488), + HighlyUltimateBuckConverter(15489), + ExtremelyUltimateBuckConverter(15490), + InsanelyUltimateBuckConverter(15491), + MegaUltimateBuckConverter(15492), + ExtendedMegaUltimateBuckConverter(15493), + DebugPollutionGenerator(15495), + DebugDataHatch(15496), + AutoTapingMaintenanceHatch(15497), + DebugPowerGenerator(15498), + DebugStructureWriter(15499), + UXV256AWirelessEnergyHatch(15500), + UXV1024AWirelessEnergyHatch(15501), + UXV4096AWirelessEnergyHatch(15502), + UXV16384AWirelessEnergyHatch(15503), + UXV65536AWirelessEnergyHatch(15504), + UXV262144AWirelessEnergyHatch(15505), + UXV1048576AWirelessEnergyHatch(15506), + UncertaintyResolution(15510), + BasicTeslaTransceiver1by1(16000), + AdvancedTeslaTransceiver1by1(16001), + EpycTeslaTransceiver1by1(16002), + UltimatePowerTeslaTransceiver1by1(16003), + InsaneTeslaTransceiver1by1(16004), + BasicTeslaTransceiver2by2(16005), + AdvancedTeslaTransceiver2by2(16006), + EpycTeslaTransceiver2by2(16007), + UltimatePowerTeslaTransceiver2by2(16008), + InsaneTeslaTransceiver2by2(16009), + BasicTeslaTransceiver3by3(16010), + AdvancedTeslaTransceiver3by3(16011), + EpycTeslaTransceiver3by3(16012), + UltimatePowerTeslaTransceiver3by3(16013), + InsaneTeslaTransceiver3by3(16014), + BasicTeslaTransceiver4by4(16015), + AdvancedTeslaTransceiver4by4(16016), + EpycTeslaTransceiver4by4(16017), + UltimatePowerTeslaTransceiver4by4(16018), + InsaneTeslaTransceiver4by4(16019), LASER_SOURCE_UMV8(16020), LASER_SOURCE_UXV8(16021), LASER_SOURCE_UXV9(16022), @@ -710,7 +1611,37 @@ public enum MetaTileEntityIDs { LASER_TARGET_UXV8(16024), LASER_TARGET_UXV9(16025), WIRELESS_LASER_UXV8(16026), - WIRELESS_LASER_UXV9(16027); + WIRELESS_LASER_UXV9(16027), + FuelRefineFactory(16999), + PipeIncoloy903(30995), + UniversalChemicalFuelEngine(32001), + LargeEssentiaGenerator(32002), + NeutronAcceleratorULV(32003), + NeutronAcceleratorLV(32004), + NeutronAcceleratorMV(32005), + NeutronAcceleratorHV(32006), + NeutronAcceleratorEV(32007), + NeutronAcceleratorIV(32008), + NeutronAcceleratorLuV(32009), + NeutronAcceleratorZPM(32010), + NeutronAcceleratorUV(32011), + NeutronSensor(32012), + NeutronActivator(32013), + YottaFluidTank(32014), + YottaHatch(32015), + SupercriticalFluidTurbine(32016), + ExtremeHeatExchanger(32017), + PreciseAssembler(32018), + LargeFusionComputer1(32019), + LargeFusionComputer2(32020), + LargeFusionComputer3(32021), + LargeFusionComputer4(32022), + LargeFusionComputer5(32023), + LargeEssentiaSmeltery(32024), + CoolantTower(32025), + ComponentAssemblyLine(32026), + WireLumiium(32737), + WireSignalium(32749),; public final int ID; diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index 05d5da27ae..28ed17d299 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -72,6 +72,7 @@ public enum Mods { Forestry(Names.FORESTRY), ForgeMicroblocks(Names.FORGE_MICROBLOCKS), ForgeRelocation(Names.FORGE_RELOCATION), + GGFab(Names.G_G_FAB), GTNHIntergalactic(Names.G_T_N_H_INTERGALACTIC), GTNHLanthanides(Names.G_T_N_H_LANTHANIDES), GTPlusPlus(Names.G_T_PLUS_PLUS), @@ -256,6 +257,7 @@ public enum Mods { public static final String FORESTRY = "Forestry"; public static final String FORGE_MICROBLOCKS = "ForgeMicroblock"; public static final String FORGE_RELOCATION = "ForgeRelocation"; + public static final String G_G_FAB = "ggfab"; public static final String G_T_N_H_INTERGALACTIC = "gtnhintergalactic"; public static final String G_T_N_H_LANTHANIDES = "gtnhlanth"; public static final String G_T_PLUS_PLUS = "miscutils"; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java new file mode 100644 index 0000000000..f865a5ea8a --- /dev/null +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java @@ -0,0 +1,93 @@ +package gregtech.api.metatileentity.implementations; + +import static gregtech.api.enums.GT_Values.V; + +import net.minecraft.util.EnumChatFormatting; + +import org.apache.commons.lang3.ArrayUtils; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer { + + public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier, + String aDescription) { + super(aID, aName, aNameRegional, aTier, aDescription); + } + + public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescriptionArray, mTextures); + } + + @Override + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + ITexture[][][] rTextures = new ITexture[12][17][]; + for (byte b = -1; b < 16; b++) { + rTextures[0][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; + rTextures[1][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; + rTextures[2][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; + rTextures[3][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_POWER[mTier + 1] }; + rTextures[4][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_POWER[mTier + 1] }; + rTextures[5][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_POWER[mTier + 1] }; + rTextures[6][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; + rTextures[7][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; + rTextures[8][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; + rTextures[9][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier + 1] }; + rTextures[10][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier + 1] }; + rTextures[11][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier + 1] }; + } + return rTextures; + } + + @Override + public String[] getDescription() { + return ArrayUtils.addAll( + mDescriptionArray, + "Accepts 16A and outputs 64A", + EnumChatFormatting.BLUE + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.BLUE + + ": Interdimensional"); + } + + @Override + public long getMinimumStoredEU() { + return V[mTier + 1]; + } + + @Override + public long maxEUStore() { + return 512L + V[mTier + 1] * 128L; + } + + @Override + public long maxAmperesOut() { + return getBaseMetaTileEntity().isAllowedToWork() ? 64 : 16; + } + + @Override + public long maxAmperesIn() { + return getBaseMetaTileEntity().isAllowedToWork() ? 16 : 64; + } +} diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index a2f053922c..ff60504e8d 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -1,7 +1,6 @@ package gregtech.api.recipe; import static gregtech.api.enums.Mods.GTNHIntergalactic; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.NEICustomDiagrams; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; @@ -85,6 +84,7 @@ import gregtech.nei.formatter.FuelSpecialValueFormatter; import gregtech.nei.formatter.FusionSpecialValueFormatter; import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter; import gregtech.nei.formatter.SimpleSpecialValueFormatter; +import gtPlusPlus.core.item.ModItems; import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; import mods.railcraft.common.items.RailcraftToolItems; @@ -673,8 +673,8 @@ public final class RecipeMaps { .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount / 2)) .setDuration(aDuration * 2 / 3); } - ItemStack cactusCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); - ItemStack sugarCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); + ItemStack cactusCoke = new ItemStack(ModItems.itemCactusCoke, aCoalAmount * 2); + ItemStack sugarCoke = new ItemStack(ModItems.itemSugarCoke, aCoalAmount * 2); coll.derive() .setInputs(aInput1, aInput2, cactusCoke) .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) |