aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Materials.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2015-11-10 16:35:54 +0100
committerDream-Master <dream-master@gmx.net>2015-11-10 16:35:54 +0100
commit694a087c75952f2c987abff6ada8139282b9c8c5 (patch)
treef43e56892dfa30435af40a8137a3dae3e14e4ace /src/main/java/gregtech/api/enums/Materials.java
parent5d3b9496dfb2f0b179b91e6ceef8008ac6f740d7 (diff)
downloadGT5-Unofficial-694a087c75952f2c987abff6ada8139282b9c8c5.tar.gz
GT5-Unofficial-694a087c75952f2c987abff6ada8139282b9c8c5.tar.bz2
GT5-Unofficial-694a087c75952f2c987abff6ada8139282b9c8c5.zip
Integrated Ender IO Alloys into GT (EBF, Mixer, Shapeless)
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index c459dab3da..cf91caf239 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -150,7 +150,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Legendary(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Legendary", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
MutatedIron(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Mutated Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
Witheria(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Witheria", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
- RedstoneAlloy ( 381, TextureSet.SET_METALLIC , 6.0F, 128, 2, 1|2 |8 |64|128 , 181, 51, 51, 0, "Redstone Alloy" , 0, 0, 500, 0, false, false, 3, 1, 1, Dyes.dyeRed ),
+ RedstoneAlloy ( 381, TextureSet.SET_METALLIC , 3.0F, 128, 2, 1|2 |64|128 , 181, 51, 51, 0, "Redstone Alloy" , 0, 0, 500, 1000, true, false, 1, 1, 1, Dyes.dyeRed ),
OsmiumTetroxide(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Osmium Tetroxide", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
NitricAcid(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 0, 255, 255, 255, 0, "Nitric Acid", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
RubberTreeSap(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 0, 255, 255, 255, 0, "Rubber Tree Sap", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
@@ -161,17 +161,17 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Lumium(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2, 255, 255, 255, 0, "Lumium", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
PhasedIron(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2, 255, 255, 255, 0, "Phased Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
PhasedGold(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2, 255, 255, 255, 0, "Phased Gold", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
- Soularium ( 379, TextureSet.SET_METALLIC , 12.0F, 256, 2, 1|2 |8 |64|128 , 65, 46, 29, 0, "Soularium" , 0, 0, 1400, 0, false, false, 3, 1, 1, Dyes.dyeBrown ),
+ Soularium ( 379, TextureSet.SET_METALLIC , 8.0F, 256, 2, 1|2 |64|128 , 65, 46, 29, 0, "Soularium" , 0, 0, 800, 1000, true, false, 3, 1, 1, Dyes.dyeBrown ),
Endium ( 770, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8 , 165, 220, 250, 0, "Endium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ),
Prismarine(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 4, 255, 255, 255, 0, "Prismarine", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
GraveyardDirt(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Graveyard Dirt", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
- DarkSteel ( 364, TextureSet.SET_DULL , 8.0F, 512, 3, 1|2 |8 |64 , 80, 70, 80, 0, "Dark Steel" , 0, 0, 1811, 0, false, false, 5, 1, 1, Dyes.dyePurple ),
- Terrasteel ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Terrasteel" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ),
- ConductiveIron ( 369, TextureSet.SET_METALLIC , 6.0F, 256, 2, 1|2 |8 |64|128 , 217, 178, 171, 0, "Conductive Iron" , 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeRed ),
- ElectricalSteel ( 365, TextureSet.SET_METALLIC , 6.0F, 512, 2, 1|2 |8 |64|128 , 185, 185, 185, 0, "Electrical Steel" , 0, 0, 1811, 1000, true, false, 5, 1, 1, Dyes.dyeGray ),
- EnergeticAlloy ( 366, TextureSet.SET_METALLIC , 12.0F, 64, 2, 1|2 |8 |64|128 , 255, 170, 81, 0, "Energetic Alloy" , 0, 0, 1400, 0, false, false, 3, 1, 1, Dyes.dyeOrange ),
- VibrantAlloy ( 367, TextureSet.SET_METALLIC , 18.0F, 128, 2, 1|2 |8 |64|128 , 157, 188, 53, 0, "Vibrant Alloy" , 0, 0, 2000, 0, false, false, 5, 1, 1, Dyes.dyeLime ),
- PulsatingIron ( 378, TextureSet.SET_METALLIC , 9.0F, 256, 2, 1|2 |8 |64|128 , 128, 246, 155, 0, "Pulsating Iron" , 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLime ),
+ DarkSteel ( 364, TextureSet.SET_METALLIC , 8.0F, 512, 3, 1|2 |64|128 , 80, 70, 80, 0, "Dark Steel" , 0, 0, 1811, 1500, true, false, 3, 1, 1, Dyes.dyePurple ),
+ Terrasteel ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Terrasteel" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ),
+ ConductiveIron ( 369, TextureSet.SET_METALLIC , 6.0F, 256, 3, 1|2 |64|128 , 217, 178, 171, 0, "Conductive Iron" , 0, 0, 1811, 1200, true, false, 4, 1, 1, Dyes.dyeRed ),
+ ElectricalSteel ( 365, TextureSet.SET_METALLIC , 6.0F, 512, 2, 1|2 |64|128 , 185, 185, 185, 0, "Electrical Steel" , 0, 0, 1811, 1000, true, false, 4, 1, 1, Dyes.dyeGray ),
+ EnergeticAlloy ( 366, TextureSet.SET_METALLIC , 12.0F, 1024, 3, 1|2 |64|128 , 255, 170, 81, 0, "Energetic Alloy" , 0, 0, 1800, 1500, true, false, 3, 1, 1, Dyes.dyeOrange ),
+ VibrantAlloy ( 367, TextureSet.SET_METALLIC , 18.0F, 4048, 4, 1|2 |64|128 , 157, 188, 53, 0, "Vibrant Alloy" , 0, 0, 3300, 3000, true, false, 4, 1, 1, Dyes.dyeLime ),
+ PulsatingIron ( 378, TextureSet.SET_METALLIC , 6.0F, 256, 3, 1|2 |64|128 , 128, 246, 155, 0, "Pulsating Iron" , 0, 0, 1811, 1600, true, false, 4, 1, 1, Dyes.dyeLime ),
Rutile(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Rutile", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL), // TiO2
Teslatite(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1, 60, 180, 200, 0, "Teslatite", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
Fluix(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 4, 255, 255, 255, 0, "Fluix", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
@@ -210,7 +210,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Amordrine(-1, TextureSet.SET_NONE, 6.0F, 64, 2, 1 | 2 | 8 | 16 | 64, 255, 255, 255, 0, "Amordrine", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
Andesite(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 8, 255, 255, 255, 0, "Andesite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
Angmallen(958, TextureSet.SET_METALLIC, 10.0F, 128, 2, 1 | 2 | 8 | 16 | 64, 215, 225, 138, 0, "Angmallen", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
- Ardite ( 382, TextureSet.SET_METALLIC , 18.0F, 1024, 4, 1|2 |8 |64 , 250, 129, 0, 0, "Ardite" , 0, 0, 2000, 0, false, false, 1, 1, 1, Dyes.dyeRed),
+ Ardite ( 382, TextureSet.SET_METALLIC , 18.0F, 1024, 4, 1|2 |8 |64|128 , 250, 129, 0, 0, "Ardite" , 0, 0, 1200, 1500, true, false, 1, 1, 1, Dyes.dyeRed),
Aredrite(-1, TextureSet.SET_NONE, 6.0F, 64, 2, 1 | 2 | 8 | 64, 255, 0, 0, 0, "Aredrite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow),
Atlarus(965, TextureSet.SET_METALLIC, 6.0F, 64, 2, 1 | 2 | 8 | 64, 255, 255, 255, 0, "Atlarus", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
Bitumen(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 8, 255, 255, 255, 0, "Bitumen", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
@@ -248,8 +248,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Eclogite(860, TextureSet.SET_DULL, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Eclogite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
ElectrumFlux(320, TextureSet.SET_SHINY, 16.0F, 512, 3, 1 | 2 | 64, 255, 255, 120, 0, "Fluxed Electrum", 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeYellow),
Emery(861, TextureSet.SET_DULL, 1.0F, 0, 2, 1 | 8, 255, 255, 255, 0, "Emery", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
- Enderium ( 321, TextureSet.SET_DULL , 8.0F, 256, 3, 1|2 |64 , 89, 145, 135, 0, "Enderium" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))),
- EnderiumBase ( 380, TextureSet.SET_DULL , 16.0F, 512, 4, 1|2 |8 |64 , 72, 119, 153, 0, "Enderium Base" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))),
+ Enderium ( 321, TextureSet.SET_DULL , 8.0F, 1500, 3, 1|2 |64|128 , 89, 145, 135, 0, "Enderium" , 0, 0, 3500, 3500, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))),
+ EnderiumBase ( 380, TextureSet.SET_DULL , 16.0F, 768, 4, 1|2 |64|128 , 72, 119, 153, 0, "Enderium Base" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))),
Energized(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 0, 255, 255, 255, 0, "Energized", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
Epidote(862, TextureSet.SET_DULL, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Epidote", 0, 0, -1, 0, false, false, 0, 1, 1, Dyes._NULL),
Eximite(959, TextureSet.SET_METALLIC, 5.0F, 2560, 3, 1 | 2 | 8 | 64, 124, 90, 150, 0, "Eximite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL),
generated by cgit (git 2.46.0) at 2025-03-05 04:10:13 +0000