aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-08-03 01:50:09 +0100
committerGitHub <noreply@github.com>2022-08-03 07:50:09 +0700
commit33910a2881b3aed51179b789fc927c19f28883b5 (patch)
tree3e9c4c7dc1bdb0f85720c2a06a440bd25e453947 /src/main/java/gregtech/api
parentd14ddda2c70cdcb3a9b2227f5891375d8298026e (diff)
downloadGT5-Unofficial-33910a2881b3aed51179b789fc927c19f28883b5.tar.gz
GT5-Unofficial-33910a2881b3aed51179b789fc927c19f28883b5.tar.bz2
GT5-Unofficial-33910a2881b3aed51179b789fc927c19f28883b5.zip
More OpV purge (#1188)
* Fix possible out-of-bounds error. * Bye bye OpV * Bye bye OpV * Some textures while I'm here * Test * Maybe Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java6
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java8
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java1299
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java35
4 files changed, 670 insertions, 678 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 725f41868d..ea27be01ad 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -87,7 +87,9 @@ public class GT_Values {
512L, 2048L, 8192L,
32_768L, 131_072L, 524_288L,
2_097_152L, 8_388_608L, 33_554_432L,
- 134_217_728L, 536_870_912L, Integer.MAX_VALUE - 7};
+ 134_217_728L, 536_870_912L, Integer.MAX_VALUE - 7,
+ // Error tier to prevent out of bounds errors. Not really a real tier (for now).
+ 8_589_934_592L};
// Why -7? Mystery of the universe. Something may break if you change this so please do not without extensive testing.
//TODO:Adding that in coremod!!!
//TODO:tier 14,15 wires and transformers only (not even cables !!!)
@@ -154,7 +156,7 @@ public class GT_Values {
"Ultimate Mega Voltage", // 12
"Ultimate Extended Mega Voltage", // 13
"Maximum Voltage", // 14
- "Error Voltage" // 15
+ "Error Voltage, report this" // 15
};
public static final String[] TIER_COLORS =
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 6996a139c4..0df54f85b6 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -398,7 +398,6 @@ public enum ItemList implements IItemContainer {
Electric_Motor_UIV,
Electric_Motor_UMV,
Electric_Motor_UXV,
- Electric_Motor_OpV,
Electric_Motor_MAX,
Electric_Pump_LV,
@@ -414,7 +413,6 @@ public enum ItemList implements IItemContainer {
Electric_Pump_UIV,
Electric_Pump_UMV,
Electric_Pump_UXV,
- Electric_Pump_OpV,
Electric_Pump_MAX,
Tesseract,
@@ -448,7 +446,6 @@ public enum ItemList implements IItemContainer {
Conveyor_Module_UIV,
Conveyor_Module_UMV,
Conveyor_Module_UXV,
- Conveyor_Module_OpV,
Conveyor_Module_MAX,
Electric_Piston_LV,
@@ -464,7 +461,6 @@ public enum ItemList implements IItemContainer {
Electric_Piston_UIV,
Electric_Piston_UMV,
Electric_Piston_UXV,
- Electric_Piston_OpV,
Electric_Piston_MAX,
Robot_Arm_LV,
@@ -480,7 +476,6 @@ public enum ItemList implements IItemContainer {
Robot_Arm_UIV,
Robot_Arm_UMV,
Robot_Arm_UXV,
- Robot_Arm_OpV,
Robot_Arm_MAX,
Emitter_LV,
@@ -496,7 +491,6 @@ public enum ItemList implements IItemContainer {
Emitter_UIV,
Emitter_UMV,
Emitter_UXV,
- Emitter_OpV,
Emitter_MAX,
Sensor_LV,
@@ -512,7 +506,6 @@ public enum ItemList implements IItemContainer {
Sensor_UIV,
Sensor_UMV,
Sensor_UXV,
- Sensor_OpV,
Sensor_MAX,
Field_Generator_LV,
@@ -528,7 +521,6 @@ public enum ItemList implements IItemContainer {
Field_Generator_UIV,
Field_Generator_UMV,
Field_Generator_UXV,
- Field_Generator_OpV,
Field_Generator_MAX,
Battery_Hull_LV,
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 26cd952a8d..cacbc42b25 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -21,7 +21,6 @@ public class Textures {
MACHINE_UMV_SIDE,
MACHINE_UXV_SIDE,
- MACHINE_OPV_SIDE,
MACHINE_MAXV_SIDE,
MACHINE_UEV_TOP,
@@ -30,7 +29,6 @@ public class Textures {
MACHINE_UMV_TOP,
MACHINE_UXV_TOP,
- MACHINE_OPV_TOP,
MACHINE_MAXV_TOP,
MACHINE_UEV_BOTTOM,
@@ -39,7 +37,6 @@ public class Textures {
MACHINE_UMV_BOTTOM,
MACHINE_UXV_BOTTOM,
- MACHINE_OPV_BOTTOM,
MACHINE_MAXV_BOTTOM,
OVERLAY_SCHEST,
@@ -1274,583 +1271,581 @@ public class Textures {
* 1 - 16 = Colors
*/
public static final ITexture[][] HARDENEDFOAMS = {
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.CONSTRUCTION_FOAM.mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[0].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[1].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[2].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[3].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[4].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[5].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[6].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[7].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[8].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[9].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[10].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[11].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[12].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[13].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[14].mRGBa)},
- new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[15].mRGBa)}
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.CONSTRUCTION_FOAM.mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[0].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[1].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[2].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[3].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[4].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[5].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[6].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[7].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[8].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[9].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[10].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[11].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[12].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[13].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[14].mRGBa)},
+ new ITexture[]{TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[15].mRGBa)}
};
/**
* Machine Casings by Tier
* 0 = 8V, 1 = LV, 2 = MV, 3 = HV, 4 = EV, 5 = IV, 6 = IV, 7 = IV, 8 = IV, 9 = IV
*/
public static final IIconContainer[]
- MACHINECASINGS_SIDE = {
- MACHINE_8V_SIDE,
- MACHINE_LV_SIDE,
- MACHINE_MV_SIDE,
- MACHINE_HV_SIDE,
- MACHINE_EV_SIDE,
- MACHINE_IV_SIDE,
- MACHINE_LuV_SIDE,
- MACHINE_ZPM_SIDE,
- MACHINE_UV_SIDE,
- MACHINE_MAX_SIDE,
- MACHINE_UEV_SIDE,
- MACHINE_UIV_SIDE,
- MACHINE_UMV_SIDE,
- MACHINE_UXV_SIDE,
- MACHINE_OPV_SIDE,
- MACHINE_MAXV_SIDE,
+ MACHINECASINGS_SIDE = {
+ MACHINE_8V_SIDE,
+ MACHINE_LV_SIDE,
+ MACHINE_MV_SIDE,
+ MACHINE_HV_SIDE,
+ MACHINE_EV_SIDE,
+ MACHINE_IV_SIDE,
+ MACHINE_LuV_SIDE,
+ MACHINE_ZPM_SIDE,
+ MACHINE_UV_SIDE,
+ MACHINE_MAX_SIDE,
+ MACHINE_UEV_SIDE,
+ MACHINE_UIV_SIDE,
+ MACHINE_UMV_SIDE,
+ MACHINE_UXV_SIDE,
+ MACHINE_MAXV_SIDE,
},
- MACHINECASINGS_TOP = {
- MACHINE_8V_TOP,
- MACHINE_LV_TOP,
- MACHINE_MV_TOP,
- MACHINE_HV_TOP,
- MACHINE_EV_TOP,
- MACHINE_IV_TOP,
- MACHINE_LuV_TOP,
- MACHINE_ZPM_TOP,
- MACHINE_UV_TOP,
- MACHINE_MAX_TOP,
- MACHINE_UEV_TOP,
- MACHINE_UIV_TOP,
- MACHINE_UMV_TOP,
- MACHINE_UXV_TOP,
- MACHINE_OPV_TOP,
- MACHINE_MAXV_TOP,
- },
- MACHINECASINGS_BOTTOM = {
- MACHINE_8V_BOTTOM,
- MACHINE_LV_BOTTOM,
- MACHINE_MV_BOTTOM,
- MACHINE_HV_BOTTOM,
- MACHINE_EV_BOTTOM,
- MACHINE_IV_BOTTOM,
- MACHINE_LuV_BOTTOM,
- MACHINE_ZPM_BOTTOM,
- MACHINE_UV_BOTTOM,
- MACHINE_MAX_BOTTOM,
- MACHINE_UEV_BOTTOM,
- MACHINE_UIV_BOTTOM,
- MACHINE_UMV_BOTTOM,
- MACHINE_UXV_BOTTOM,
- MACHINE_OPV_BOTTOM,
- MACHINE_MAXV_BOTTOM,
- },
- GRANITES = {
- GRANITE_BLACK_STONE,
- GRANITE_BLACK_COBBLE,
- GRANITE_BLACK_COBBLE_MOSSY,
- GRANITE_BLACK_BRICKS,
- GRANITE_BLACK_BRICKS_CRACKED,
- GRANITE_BLACK_BRICKS_MOSSY,
- GRANITE_BLACK_BRICKS_CHISELED,
- GRANITE_BLACK_SMOOTH,
- GRANITE_RED_STONE,
- GRANITE_RED_COBBLE,
- GRANITE_RED_COBBLE_MOSSY,
- GRANITE_RED_BRICKS,
- GRANITE_RED_BRICKS_CRACKED,
- GRANITE_RED_BRICKS_MOSSY,
- GRANITE_RED_BRICKS_CHISELED,
- GRANITE_RED_SMOOTH,
- },
- CONCRETES = {
- CONCRETE_DARK_STONE,
- CONCRETE_DARK_COBBLE,
- CONCRETE_DARK_COBBLE_MOSSY,
- CONCRETE_DARK_BRICKS,
- CONCRETE_DARK_BRICKS_CRACKED,
- CONCRETE_DARK_BRICKS_MOSSY,
- CONCRETE_DARK_BRICKS_CHISELED,
- CONCRETE_DARK_SMOOTH,
- CONCRETE_LIGHT_STONE,
- CONCRETE_LIGHT_COBBLE,
- CONCRETE_LIGHT_COBBLE_MOSSY,
- CONCRETE_LIGHT_BRICKS,
- CONCRETE_LIGHT_BRICKS_CRACKED,
- CONCRETE_LIGHT_BRICKS_MOSSY,
- CONCRETE_LIGHT_BRICKS_CHISELED,
- CONCRETE_LIGHT_SMOOTH,
- },
- STONES = {
- MARBLE_STONE,
- MARBLE_COBBLE,
- MARBLE_COBBLE_MOSSY,
- MARBLE_BRICKS,
- MARBLE_BRICKS_CRACKED,
- MARBLE_BRICKS_MOSSY,
- MARBLE_BRICKS_CHISELED,
- MARBLE_SMOOTH,
- BASALT_STONE,
- BASALT_COBBLE,
- BASALT_COBBLE_MOSSY,
- BASALT_BRICKS,
- BASALT_BRICKS_CRACKED,
- BASALT_BRICKS_MOSSY,
- BASALT_BRICKS_CHISELED,
- BASALT_SMOOTH,
- },
- TURBINE = {
- LARGETURBINE_ST1,
- LARGETURBINE_ST2,
- LARGETURBINE_ST3,
- LARGETURBINE_ST4,
- LARGETURBINE_ST5,
- LARGETURBINE_ST6,
- LARGETURBINE_ST7,
- LARGETURBINE_ST8,
- LARGETURBINE_ST9
- },
- TURBINE_ACTIVE = {
- LARGETURBINE_ST_ACTIVE1,
- LARGETURBINE_ST_ACTIVE2,
- LARGETURBINE_ST_ACTIVE3,
- LARGETURBINE_ST_ACTIVE4,
- LARGETURBINE_ST_ACTIVE5,
- LARGETURBINE_ST_ACTIVE6,
- LARGETURBINE_ST_ACTIVE7,
- LARGETURBINE_ST_ACTIVE8,
- LARGETURBINE_ST_ACTIVE9
- },
- TURBINE_EMPTY = {
- LARGETURBINE_ST_EMPTY1,
- LARGETURBINE_ST_EMPTY2,
- LARGETURBINE_ST_EMPTY3,
- LARGETURBINE_ST_EMPTY4,
- LARGETURBINE_ST_EMPTY5,
- LARGETURBINE_ST_EMPTY6,
- LARGETURBINE_ST_EMPTY7,
- LARGETURBINE_ST_EMPTY8,
- LARGETURBINE_ST_EMPTY9
- },
- TURBINE1 = {
- LARGETURBINE_SS1,
- LARGETURBINE_SS2,
- LARGETURBINE_SS3,
- LARGETURBINE_SS4,
- LARGETURBINE_SS5,
- LARGETURBINE_SS6,
- LARGETURBINE_SS7,
- LARGETURBINE_SS8,
- LARGETURBINE_SS9
- },
- TURBINE_ACTIVE1 = {
- LARGETURBINE_SS_ACTIVE1,
- LARGETURBINE_SS_ACTIVE2,
- LARGETURBINE_SS_ACTIVE3,
- LARGETURBINE_SS_ACTIVE4,
- LARGETURBINE_SS_ACTIVE5,
- LARGETURBINE_SS_ACTIVE6,
- LARGETURBINE_SS_ACTIVE7,
- LARGETURBINE_SS_ACTIVE8,
- LARGETURBINE_SS_ACTIVE9
- },
- TURBINE_EMPTY1 = {
- LARGETURBINE_SS_EMPTY1,
- LARGETURBINE_SS_EMPTY2,
- LARGETURBINE_SS_EMPTY3,
- LARGETURBINE_SS_EMPTY4,
- LARGETURBINE_SS_EMPTY5,
- LARGETURBINE_SS_EMPTY6,
- LARGETURBINE_SS_EMPTY7,
- LARGETURBINE_SS_EMPTY8,
- LARGETURBINE_SS_EMPTY9
- },
- TURBINE2 = {
- LARGETURBINE_TI1,
- LARGETURBINE_TI2,
- LARGETURBINE_TI3,
- LARGETURBINE_TI4,
- LARGETURBINE_TI5,
- LARGETURBINE_TI6,
- LARGETURBINE_TI7,
- LARGETURBINE_TI8,
- LARGETURBINE_TI9
- },
- TURBINE_ACTIVE2 = {
- LARGETURBINE_TI_ACTIVE1,
- LARGETURBINE_TI_ACTIVE2,
- LARGETURBINE_TI_ACTIVE3,
- LARGETURBINE_TI_ACTIVE4,
- LARGETURBINE_TI_ACTIVE5,
- LARGETURBINE_TI_ACTIVE6,
- LARGETURBINE_TI_ACTIVE7,
- LARGETURBINE_TI_ACTIVE8,
- LARGETURBINE_TI_ACTIVE9
- },
- TURBINE_EMPTY2 = {
- LARGETURBINE_TI_EMPTY1,
- LARGETURBINE_TI_EMPTY2,
- LARGETURBINE_TI_EMPTY3,
- LARGETURBINE_TI_EMPTY4,
- LARGETURBINE_TI_EMPTY5,
- LARGETURBINE_TI_EMPTY6,
- LARGETURBINE_TI_EMPTY7,
- LARGETURBINE_TI_EMPTY8,
- LARGETURBINE_TI_EMPTY9
- },
- TURBINE3 = {
- LARGETURBINE_TU1,
- LARGETURBINE_TU2,
- LARGETURBINE_TU3,
- LARGETURBINE_TU4,
- LARGETURBINE_TU5,
- LARGETURBINE_TU6,
- LARGETURBINE_TU7,
- LARGETURBINE_TU8,
- LARGETURBINE_TU9
- },
- TURBINE_ACTIVE3 = {
- LARGETURBINE_TU_ACTIVE1,
- LARGETURBINE_TU_ACTIVE2,
- LARGETURBINE_TU_ACTIVE3,
- LARGETURBINE_TU_ACTIVE4,
- LARGETURBINE_TU_ACTIVE5,
- LARGETURBINE_TU_ACTIVE6,
- LARGETURBINE_TU_ACTIVE7,
- LARGETURBINE_TU_ACTIVE8,
- LARGETURBINE_TU_ACTIVE9
- },
- TURBINE_EMPTY3 = {
- LARGETURBINE_TU_EMPTY1,
- LARGETURBINE_TU_EMPTY2,
- LARGETURBINE_TU_EMPTY3,
- LARGETURBINE_TU_EMPTY4,
- LARGETURBINE_TU_EMPTY5,
- LARGETURBINE_TU_EMPTY6,
- LARGETURBINE_TU_EMPTY7,
- LARGETURBINE_TU_EMPTY8,
- LARGETURBINE_TU_EMPTY9
- },
- TURBINEADVGAS = {
- LARGETURBINE_ADVGAS1,
- LARGETURBINE_ADVGAS2,
- LARGETURBINE_ADVGAS3,
- LARGETURBINE_ADVGAS4,
- LARGETURBINE_ADVGAS5,
- LARGETURBINE_ADVGAS6,
- LARGETURBINE_ADVGAS7,
- LARGETURBINE_ADVGAS8,
- LARGETURBINE_ADVGAS9
- },
- TURBINE_ADVGASACTIVE = {
- LARGETURBINE_ADVGAS_ACTIVE1,
- LARGETURBINE_ADVGAS_ACTIVE2,
- LARGETURBINE_ADVGAS_ACTIVE3,
- LARGETURBINE_ADVGAS_ACTIVE4,
- LARGETURBINE_ADVGAS_ACTIVE5,
- LARGETURBINE_ADVGAS_ACTIVE6,
- LARGETURBINE_ADVGAS_ACTIVE7,
- LARGETURBINE_ADVGAS_ACTIVE8,
- LARGETURBINE_ADVGAS_ACTIVE9
- },
- TURBINE_ADVGASEMPTY = {
- LARGETURBINE_ADVGAS_EMPTY1,
- LARGETURBINE_ADVGAS_EMPTY2,
- LARGETURBINE_ADVGAS_EMPTY3,
- LARGETURBINE_ADVGAS_EMPTY4,
- LARGETURBINE_ADVGAS_EMPTY5,
- LARGETURBINE_ADVGAS_EMPTY6,
- LARGETURBINE_ADVGAS_EMPTY7,
- LARGETURBINE_ADVGAS_EMPTY8,
- LARGETURBINE_ADVGAS_EMPTY9
- },
- CONNECTED_HULLS = {
- CONCRETE_DARK_STONE,
- FUSIONI_1,
- FUSIONI_2,
- FUSIONI_3,
- FUSIONI_4,
- FUSIONI_5,
- FUSIONI_6,
- FUSIONI_7,
- FUSIONI_8,
- FUSIONI_9,
- FUSIONI_10,
- FUSIONI_11,
- FUSIONI_12,
- FUSIONII_1,
- FUSIONII_2,
- FUSIONII_3,
- FUSIONII_4,
- FUSIONII_5,
- FUSIONII_6,
- FUSIONII_7,
- FUSIONII_8,
- FUSIONII_9,
- FUSIONII_10,
- FUSIONII_11,
- FUSIONII_12,
- },
- STORAGE_BLOCKS1 = {
- BLOCK_ADAMANTIUM,
- BLOCK_ALUMINIUM,
- BLOCK_AMERICIUM,
- BLOCK_ANNEALEDCOPPER,
- BLOCK_ANTIMONY,
- BLOCK_ARSENIC,
- BLOCK_ASTRALSILVER,
- BLOCK_BATTERYALLOY,
- BLOCK_BERYLLIUM,
- BLOCK_BISMUTH,
- BLOCK_BISMUTHBRONZE,
- BLOCK_BLACKBRONZE,
- BLOCK_BLACKSTEEL,
- BLOCK_BLUEALLOY,
- BLOCK_BLUESTEEL,
- BLOCK_BRASS
- },
- STORAGE_BLOCKS2 = {
- BLOCK_BRONZE,
- BLOCK_CAESIUM,
- BLOCK_CERIUM,
- BLOCK_CHROME,
- BLOCK_CHROMIUMDIOXIDE,
- BLOCK_COBALT,
- BLOCK_COBALTBRASS,
- BLOCK_COPPER,
- BLOCK_CUPRONICKEL,
- BLOCK_DAMASCUSSTEEL,
- BLOCK_DARKIRON,
- BLOCK_DEEPIRON,
- BLOCK_DESH,
- BLOCK_DURANIUM,
- BLOCK_DYSPROSIUM,
- BLOCK_ELECTRUM
- },
- STORAGE_BLOCKS3 = {
- BLOCK_ELECTRUMFLUX,
- BLOCK_ENDERIUM,
- BLOCK_ERBIUM,
- BLOCK_EUROPIUM,
- BLOCK_FIERYSTEEL,
- BLOCK_GADOLINIUM,
- BLOCK_GALLIUM,
- BLOCK_HOLMIUM,
- BLOCK_HSLA,
- BLOCK_INDIUM,
- BLOCK_INFUSEDGOLD,
- BLOCK_INVAR,
- BLOCK_IRIDIUM,
- BLOCK_IRONMAGNETIC,
- BLOCK_IRONWOOD,
- BLOCK_KANTHAL
- },
- STORAGE_BLOCKS4 = {
- BLOCK_KNIGHTMETAL,
- BLOCK_LANTHANUM,
- BLOCK_LEAD,
- BLOCK_LUTETIUM,
- BLOCK_MAGNALIUM,
- BLOCK_MAGNESIUM,
- BLOCK_MANGANESE,
- BLOCK_METEORICIRON,
- BLOCK_METEORICSTEEL,
- BLOCK_TRINIUM,
- BLOCK_MITHRIL,
- BLOCK_MOLYBDENUM,
- BLOCK_NAQUADAH,
- BLOCK_NAQUADAHALLOY,
- BLOCK_NAQUADAHENRICHED,
- BLOCK_NAQUADRIA
- },
- STORAGE_BLOCKS5 = {
- BLOCK_NEODYMIUM,
- BLOCK_NEODYMIUMMAGNETIC,
- BLOCK_NEUTRONIUM,
- BLOCK_NICHROME,
- BLOCK_NICKEL,
- BLOCK_NIOBIUM,
- BLOCK_NIOBIUMNITRIDE,
- BLOCK_NIOBIUMTITANIUM,
- BLOCK_OSMIRIDIUM,
- BLOCK_OSMIUM,
- BLOCK_PALLADIUM,
- BLOCK_PIGIRON,
- BLOCK_PLATINUM,
- BLOCK_PLUTONIUM,
- BLOCK_PLUTONIUM241,
- BLOCK_PRASEODYMIUM
- },
- STORAGE_BLOCKS6 = {
- BLOCK_PROMETHIUM,
- BLOCK_REDALLOY,
- BLOCK_REDSTEEL,
- BLOCK_ROSEGOLD,
- BLOCK_RUBIDIUM,
- BLOCK_SAMARIUM,
- BLOCK_SCANDIUM,
- BLOCK_SHADOWIRON,
- BLOCK_SHADOWSTEEL,
- BLOCK_SILICON,
- BLOCK_SILVER,
- BLOCK_SOLDERINGALLOY,
- BLOCK_STAINLESSSTEEL,
- BLOCK_STEEL,
- BLOCK_STEELMAGNETIC,
- BLOCK_STERLINGSILVER
- },
- STORAGE_BLOCKS7 = {
- BLOCK_SUNNARIUM,
- BLOCK_TANTALUM,
- BLOCK_TELLURIUM,
- BLOCK_TERBIUM,
- BLOCK_THAUMIUM,
- BLOCK_THORIUM,
- BLOCK_THULIUM,
- BLOCK_TIN,
- BLOCK_TINALLOY,
- BLOCK_TITANIUM,
- BLOCK_TRITANIUM,
- BLOCK_TUNGSTEN,
- BLOCK_TUNGSTENSTEEL,
- BLOCK_ULTIMET,
- BLOCK_URANIUM,
- BLOCK_URANIUM235
- },
- STORAGE_BLOCKS8 = {
- BLOCK_VANADIUM,
- BLOCK_VANADIUMGALLIUM,
- BLOCK_WROUGHTIRON,
- BLOCK_YTTRBIUM,
- BLOCK_YTTRIUM,
- BLOCK_YTTRIUMBARIUMCUPRATE,
- BLOCK_ZINC,
- BLOCK_TUNGSTENCARBIDE,
- BLOCK_VANADIUMSTEEL,
- BLOCK_HSSG,
- BLOCK_HSSE,
- BLOCK_HSSS,
- BLOCK_STEELEAF,
- BLOCK_ICHORIUM,
- BLOCK_FIRESTONE,
- BLOCK_SHADOW
- },
- STORAGE_BLOCKS9 = {
- BLOCK_AERCRYSTAL,
- BLOCK_AMBER,
- BLOCK_AMETHYST,
- BLOCK_AQUACRYSTAL,
- BLOCK_BLUETOPAZ,
- BLOCK_CERTUSQUARTZ,
- BLOCK_DILITHIUM,
- BLOCK_ENDEREYE,
- BLOCK_ENDERPEARL,
- BLOCK_FOOLSRUBY,
- BLOCK_FORCE,
- BLOCK_FORCICIUM,
- BLOCK_FORCILLIUM,
- BLOCK_GREENSAPPHIRE,
- BLOCK_IGNISCRYSTAL,
- BLOCK_JASPER
- },
- STORAGE_BLOCKS10 = {
- BLOCK_LAZURITE,
- BLOCK_LIGNITE,
- BLOCK_MONAZITE,
- BLOCK_NITER,
- BLOCK_OLIVINE,
- BLOCK_OPAL,
- BLOCK_ORDOCRYSTAL,
- BLOCK_PERDITIOCRYSTAL,
- BLOCK_PHOSPHORUS,
- BLOCK_QUARTZITE,
- BLOCK_REDGARNET,
- BLOCK_RUBY,
- BLOCK_SAPPHIRE,
- BLOCK_SODALITE,
- BLOCK_TANZANITE,
- BLOCK_TERRACRYSTAL
- },
- STORAGE_BLOCKS11 = {
- BLOCK_TOPAZ,
- BLOCK_VINTEUM,
- BLOCK_YELLOWGARNET,
- BLOCK_NETHERSTAR,
- BLOCK_CHARCOAL,
- BLOCK_BLAZE,
- },
- STORAGE_BLOCKS12 = {
- BLOCK_CRYOLITE,
- BLOCK_SILICONSG,
- BLOCK_NICKELALUMINIUM,
- BLOCK_SPACETIME
- };
-
- public static final ITexture[] HIDDEN_TEXTURE = {
- TextureFactory.builder().addIcon(HIDDEN_FACE).stdOrient().build()
+ MACHINECASINGS_TOP = {
+ MACHINE_8V_TOP,
+ MACHINE_LV_TOP,
+ MACHINE_MV_TOP,
+ MACHINE_HV_TOP,
+ MACHINE_EV_TOP,
+ MACHINE_IV_TOP,
+ MACHINE_LuV_TOP,
+ MACHINE_ZPM_TOP,
+ MACHINE_UV_TOP,
+ MACHINE_MAX_TOP,
+ MACHINE_UEV_TOP,
+ MACHINE_UIV_TOP,
+ MACHINE_UMV_TOP,
+ MACHINE_UXV_TOP,
+ MACHINE_MAXV_TOP,
+ },
+ MACHINECASINGS_BOTTOM = {
+ MACHINE_8V_BOTTOM,
+ MACHINE_LV_BOTTOM,
+ MACHINE_MV_BOTTOM,
+ MACHINE_HV_BOTTOM,
+ MACHINE_EV_BOTTOM,
+ MACHINE_IV_BOTTOM,
+ MACHINE_LuV_BOTTOM,
+ MACHINE_ZPM_BOTTOM,
+ MACHINE_UV_BOTTOM,
+ MACHINE_MAX_BOTTOM,
+ MACHINE_UEV_BOTTOM,
+ MACHINE_UIV_BOTTOM,
+ MACHINE_UMV_BOTTOM,
+ MACHINE_UXV_BOTTOM,
+ MACHINE_MAXV_BOTTOM,
+
+ },
+ GRANITES = {
+ GRANITE_BLACK_STONE,
+ GRANITE_BLACK_COBBLE,
+ GRANITE_BLACK_COBBLE_MOSSY,
+ GRANITE_BLACK_BRICKS,
+ GRANITE_BLACK_BRICKS_CRACKED,
+ GRANITE_BLACK_BRICKS_MOSSY,
+ GRANITE_BLACK_BRICKS_CHISELED,
+ GRANITE_BLACK_SMOOTH,
+ GRANITE_RED_STONE,
+ GRANITE_RED_COBBLE,
+ GRANITE_RED_COBBLE_MOSSY,
+ GRANITE_RED_BRICKS,
+ GRANITE_RED_BRICKS_CRACKED,
+ GRANITE_RED_BRICKS_MOSSY,
+ GRANITE_RED_BRICKS_CHISELED,
+ GRANITE_RED_SMOOTH,
+ },
+ CONCRETES = {
+ CONCRETE_DARK_STONE,
+ CONCRETE_DARK_COBBLE,
+ CONCRETE_DARK_COBBLE_MOSSY,
+ CONCRETE_DARK_BRICKS,
+ CONCRETE_DARK_BRICKS_CRACKED,
+ CONCRETE_DARK_BRICKS_MOSSY,
+ CONCRETE_DARK_BRICKS_CHISELED,
+ CONCRETE_DARK_SMOOTH,
+ CONCRETE_LIGHT_STONE,
+ CONCRETE_LIGHT_COBBLE,
+ CONCRETE_LIGHT_COBBLE_MOSSY,
+ CONCRETE_LIGHT_BRICKS,
+ CONCRETE_LIGHT_BRICKS_CRACKED,
+ CONCRETE_LIGHT_BRICKS_MOSSY,
+ CONCRETE_LIGHT_BRICKS_CHISELED,
+ CONCRETE_LIGHT_SMOOTH,
+ },
+ STONES = {
+ MARBLE_STONE,
+ MARBLE_COBBLE,
+ MARBLE_COBBLE_MOSSY,
+ MARBLE_BRICKS,
+ MARBLE_BRICKS_CRACKED,
+ MARBLE_BRICKS_MOSSY,
+ MARBLE_BRICKS_CHISELED,
+ MARBLE_SMOOTH,
+ BASALT_STONE,
+ BASALT_COBBLE,
+ BASALT_COBBLE_MOSSY,
+ BASALT_BRICKS,
+ BASALT_BRICKS_CRACKED,
+ BASALT_BRICKS_MOSSY,
+ BASALT_BRICKS_CHISELED,
+ BASALT_SMOOTH,
+ },
+ TURBINE = {
+ LARGETURBINE_ST1,
+ LARGETURBINE_ST2,
+ LARGETURBINE_ST3,
+ LARGETURBINE_ST4,
+ LARGETURBINE_ST5,
+ LARGETURBINE_ST6,
+ LARGETURBINE_ST7,
+ LARGETURBINE_ST8,
+ LARGETURBINE_ST9
+ },
+ TURBINE_ACTIVE = {
+ LARGETURBINE_ST_ACTIVE1,
+ LARGETURBINE_ST_ACTIVE2,
+ LARGETURBINE_ST_ACTIVE3,
+ LARGETURBINE_ST_ACTIVE4,
+ LARGETURBINE_ST_ACTIVE5,
+ LARGETURBINE_ST_ACTIVE6,
+ LARGETURBINE_ST_ACTIVE7,
+ LARGETURBINE_ST_ACTIVE8,
+ LARGETURBINE_ST_ACTIVE9
+ },
+ TURBINE_EMPTY = {
+ LARGETURBINE_ST_EMPTY1,
+ LARGETURBINE_ST_EMPTY2,
+ LARGETURBINE_ST_EMPTY3,
+ LARGETURBINE_ST_EMPTY4,
+ LARGETURBINE_ST_EMPTY5,
+ LARGETURBINE_ST_EMPTY6,
+ LARGETURBINE_ST_EMPTY7,
+ LARGETURBINE_ST_EMPTY8,
+ LARGETURBINE_ST_EMPTY9
+ },
+ TURBINE1 = {
+ LARGETURBINE_SS1,
+ LARGETURBINE_SS2,
+ LARGETURBINE_SS3,
+ LARGETURBINE_SS4,
+ LARGETURBINE_SS5,
+ LARGETURBINE_SS6,
+ LARGETURBINE_SS7,
+ LARGETURBINE_SS8,
+ LARGETURBINE_SS9
+ },
+ TURBINE_ACTIVE1 = {
+ LARGETURBINE_SS_ACTIVE1,
+ LARGETURBINE_SS_ACTIVE2,
+ LARGETURBINE_SS_ACTIVE3,
+ LARGETURBINE_SS_ACTIVE4,
+ LARGETURBINE_SS_ACTIVE5,
+ LARGETURBINE_SS_ACTIVE6,
+ LARGETURBINE_SS_ACTIVE7,
+ LARGETURBINE_SS_ACTIVE8,
+ LARGETURBINE_SS_ACTIVE9
+ },
+ TURBINE_EMPTY1 = {
+ LARGETURBINE_SS_EMPTY1,
+ LARGETURBINE_SS_EMPTY2,
+ LARGETURBINE_SS_EMPTY3,
+ LARGETURBINE_SS_EMPTY4,
+ LARGETURBINE_SS_EMPTY5,
+ LARGETURBINE_SS_EMPTY6,
+ LARGETURBINE_SS_EMPTY7,
+ LARGETURBINE_SS_EMPTY8,
+ LARGETURBINE_SS_EMPTY9
+ },
+ TURBINE2 = {
+ LARGETURBINE_TI1,
+ LARGETURBINE_TI2,
+ LARGETURBINE_TI3,
+ LARGETURBINE_TI4,
+ LARGETURBINE_TI5,
+ LARGETURBINE_TI6,
+ LARGETURBINE_TI7,
+ LARGETURBINE_TI8,
+ LARGETURBINE_TI9
+ },
+ TURBINE_ACTIVE2 = {
+ LARGETURBINE_TI_ACTIVE1,
+ LARGETURBINE_TI_ACTIVE2,
+ LARGETURBINE_TI_ACTIVE3,
+ LARGETURBINE_TI_ACTIVE4,
+ LARGETURBINE_TI_ACTIVE5,
+ LARGETURBINE_TI_ACTIVE6,
+ LARGETURBINE_TI_ACTIVE7,
+ LARGETURBINE_TI_ACTIVE8,
+ LARGETURBINE_TI_ACTIVE9
+ },
+ TURBINE_EMPTY2 = {
+ LARGETURBINE_TI_EMPTY1,
+ LARGETURBINE_TI_EMPTY2,
+ LARGETURBINE_TI_EMPTY3,
+ LARGETURBINE_TI_EMPTY4,
+ LARGETURBINE_TI_EMPTY5,
+ LARGETURBINE_TI_EMPTY6,
+ LARGETURBINE_TI_EMPTY7,
+ LARGETURBINE_TI_EMPTY8,
+ LARGETURBINE_TI_EMPTY9
+ },
+ TURBINE3 = {
+ LARGETURBINE_TU1,
+ LARGETURBINE_TU2,
+ LARGETURBINE_TU3,
+ LARGETURBINE_TU4,
+ LARGETURBINE_TU5,
+ LARGETURBINE_TU6,
+ LARGETURBINE_TU7,
+ LARGETURBINE_TU8,
+ LARGETURBINE_TU9
+ },
+ TURBINE_ACTIVE3 = {
+ LARGETURBINE_TU_ACTIVE1,
+ LARGETURBINE_TU_ACTIVE2,
+ LARGETURBINE_TU_ACTIVE3,
+ LARGETURBINE_TU_ACTIVE4,
+ LARGETURBINE_TU_ACTIVE5,
+ LARGETURBINE_TU_ACTIVE6,