Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Add Ichorium as a material to GT Code

Browse source
This commit is contained in:
Dream-Master 2017-03-26 12:34:05 +02:00
parent 97c2c691dd
commit 73629059c9
5 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.4.1566-1.7.10 forge.version=10.13.4.1566-1.7.10
gt.version=5.09.27.36 gt.version=5.09.27.37
ae2.version=rv2-beta-33 ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407 applecore.version=1.7.10-1.2.1+107.59407

46
src/main/java/gregtech/api/enums/Materials.java
View file

@ -678,6 +678,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Infinity ( 397, TextureSet.SET_SHINY , 128.0F,2621440, 8, 1 |8 , 255, 255, 255, 0, "Infinity" , 5, 5000000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeWhite), Infinity ( 397, TextureSet.SET_SHINY , 128.0F,2621440, 8, 1 |8 , 255, 255, 255, 0, "Infinity" , 5, 5000000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeWhite),
Bedrockium ( 395, TextureSet.SET_DULL , 8.0F, 327680, 6, 1 |8 , 50, 50, 50, 0, "Bedrockium" , 0, 0, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeBlack), Bedrockium ( 395, TextureSet.SET_DULL , 8.0F, 327680, 6, 1 |8 , 50, 50, 50, 0, "Bedrockium" , 0, 0, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeBlack),
Trinium ( 868, TextureSet.SET_SHINY , 128.0F, 128, 8, 1|2 |64|128 , 200, 200, 210, 0, "Trinium" , 0, 0, 7200, 27200, true, false, 4, 1, 1, Dyes.dyeLightGray), Trinium ( 868, TextureSet.SET_SHINY , 128.0F, 128, 8, 1|2 |64|128 , 200, 200, 210, 0, "Trinium" , 0, 0, 7200, 27200, true, false, 4, 1, 1, Dyes.dyeLightGray),
Ichorium ( 978, TextureSet.SET_SHINY , 256.0F, 2048, 6, 1|2 |64|128 , 211, 120, 6, 0, "Ichorium" , 5, 250000, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeOrange),
/** /**
* Materials which are renamed automatically * Materials which are renamed automatically
@ -1027,47 +1028,47 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Mithril .addOreByProducts(Platinum ); Mithril .addOreByProducts(Platinum );
//Midasium .addOreByProducts(Gold ); //Midasium .addOreByProducts(Gold );
AstralSilver .addOreByProducts(Silver ); AstralSilver .addOreByProducts(Silver );
Graphite .addOreByProducts(Carbon ); Graphite .addOreByProducts(Carbon);
Netherrack .addOreByProducts(Sulfur ); Netherrack .addOreByProducts(Sulfur );
Flint .addOreByProducts(Obsidian ); Flint .addOreByProducts(Obsidian);
Cobaltite .addOreByProducts(Cobalt ); Cobaltite .addOreByProducts(Cobalt);
Cobalt .addOreByProducts(Cobaltite ); Cobalt .addOreByProducts(Cobaltite);
Sulfur .addOreByProducts(Sulfur ); Sulfur .addOreByProducts(Sulfur );
Saltpeter .addOreByProducts(Saltpeter ); Saltpeter .addOreByProducts(Saltpeter);
Endstone .addOreByProducts(Helium_3 ); Endstone .addOreByProducts(Helium_3 );
Osmium .addOreByProducts(Iridium ); Osmium .addOreByProducts(Iridium);
Magnesium .addOreByProducts(Olivine ); Magnesium .addOreByProducts(Olivine);
Aluminium .addOreByProducts(Bauxite ); Aluminium .addOreByProducts(Bauxite );
Titanium .addOreByProducts(Almandine ); Titanium .addOreByProducts(Almandine );
Obsidian .addOreByProducts(Olivine ); Obsidian .addOreByProducts(Olivine );
Ash .addOreByProducts(Carbon ); Ash .addOreByProducts(Carbon);
DarkAsh .addOreByProducts(Carbon ); DarkAsh .addOreByProducts(Carbon);
Redrock .addOreByProducts(Clay ); Redrock .addOreByProducts(Clay );
Marble .addOreByProducts(Calcite ); Marble .addOreByProducts(Calcite );
Clay .addOreByProducts(Clay ); Clay .addOreByProducts(Clay );
Cassiterite .addOreByProducts(Tin ); Cassiterite .addOreByProducts(Tin);
CassiteriteSand .addOreByProducts(Tin ); CassiteriteSand .addOreByProducts(Tin);
GraniteBlack .addOreByProducts(Biotite ); GraniteBlack .addOreByProducts(Biotite );
GraniteRed .addOreByProducts(PotassiumFeldspar ); GraniteRed .addOreByProducts(PotassiumFeldspar);
Phosphate .addOreByProducts(Phosphor ); Phosphate .addOreByProducts(Phosphor );
Phosphor .addOreByProducts(Phosphate ); Phosphor .addOreByProducts(Phosphate );
Tanzanite .addOreByProducts(Opal ); Tanzanite .addOreByProducts(Opal );
Opal .addOreByProducts(Tanzanite ); Opal .addOreByProducts(Tanzanite);
Amethyst .addOreByProducts(Amethyst ); Amethyst .addOreByProducts(Amethyst);
FoolsRuby .addOreByProducts(Jasper ); FoolsRuby .addOreByProducts(Jasper );
Amber .addOreByProducts(Amber ); Amber .addOreByProducts(Amber);
Topaz .addOreByProducts(BlueTopaz ); Topaz .addOreByProducts(BlueTopaz );
BlueTopaz .addOreByProducts(Topaz ); BlueTopaz .addOreByProducts(Topaz);
Niter .addOreByProducts(Saltpeter ); Niter .addOreByProducts(Saltpeter);
Vinteum .addOreByProducts(Vinteum ); Vinteum .addOreByProducts(Vinteum );
Force .addOreByProducts(Force ); Force .addOreByProducts(Force );
Dilithium .addOreByProducts(Dilithium ); Dilithium .addOreByProducts(Dilithium);
Neutronium .addOreByProducts(Neutronium ); Neutronium .addOreByProducts(Neutronium );
Lithium .addOreByProducts(Lithium ); Lithium .addOreByProducts(Lithium);
Silicon .addOreByProducts(SiliconDioxide ); Silicon .addOreByProducts(SiliconDioxide );
Salt .addOreByProducts(RockSalt ); Salt .addOreByProducts(RockSalt );
RockSalt .addOreByProducts(Salt ); RockSalt .addOreByProducts(Salt);
InfusedGold .addOreByProduct(Gold ); InfusedGold .addOreByProduct(Gold);
Glue.mChemicalFormula = "No Horses were harmed for the Production"; Glue.mChemicalFormula = "No Horses were harmed for the Production";
UUAmplifier.mChemicalFormula = "Accelerates the Mass Fabricator"; UUAmplifier.mChemicalFormula = "Accelerates the Mass Fabricator";
@ -1118,6 +1119,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
AnyCopper.mChemicalFormula="Cu"; AnyCopper.mChemicalFormula="Cu";
ElectrumFlux.mChemicalFormula="The formula is too long..."; ElectrumFlux.mChemicalFormula="The formula is too long...";
DeepIron.mChemicalFormula="Sp2Fe"; DeepIron.mChemicalFormula="Sp2Fe";
Ichorium.mChemicalFormula="IcMa";
//Duralumin.mChemicalFormula="Al6CuMnMg"; //Duralumin.mChemicalFormula="Al6CuMnMg";
} }
@ -1136,7 +1138,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
PulsatingIron, Manasteel, DarkThaumium, /**ElvenElementium**/ EnrichedCopper, DiamondCopper, Adamantium, Amordrine, Angmallen, Ardite, Aredrite, Atlarus, /**Blutonium,**/ Carmot, Celenegil, Ceruclase, DarkIron, PulsatingIron, Manasteel, DarkThaumium, /**ElvenElementium**/ EnrichedCopper, DiamondCopper, Adamantium, Amordrine, Angmallen, Ardite, Aredrite, Atlarus, /**Blutonium,**/ Carmot, Celenegil, Ceruclase, DarkIron,
Desh, Desichalkos, Duranium, ElectrumFlux, Enderium, EnderiumBase, Eximite, FierySteel, Force, Haderoth, Hematite, Hepatizon, HSLA, Infuscolium, InfusedGold, Inolashite, Mercassium, MeteoricIron, Desh, Desichalkos, Duranium, ElectrumFlux, Enderium, EnderiumBase, Eximite, FierySteel, Force, Haderoth, Hematite, Hepatizon, HSLA, Infuscolium, InfusedGold, Inolashite, Mercassium, MeteoricIron,
MeteoricSteel, Naquadah, NaquadahAlloy, NaquadahEnriched, Naquadria, ObsidianFlux, Orichalcum, Osmonium, Oureclase, Phoenixite, Prometheum, Sanguinite, /**Starconium,**/ MeteoricSteel, Naquadah, NaquadahAlloy, NaquadahEnriched, Naquadria, ObsidianFlux, Orichalcum, Osmonium, Oureclase, Phoenixite, Prometheum, Sanguinite, /**Starconium,**/
Tartarite, /**Thyrium,**/ Tritanium, Vulcanite, Vyroxeres, /**Yellorium,**/ Zectium, AluminiumBrass, Osmiridium, Sunnarium, AnnealedCopper, BatteryAlloy, Brass, Bronze, ChromiumDioxide, Cupronickel, DeepIron, Tartarite, Ichorium,/**Thyrium,**/ Tritanium, Vulcanite, Vyroxeres, /**Yellorium,**/ Zectium, AluminiumBrass, Osmiridium, Sunnarium, AnnealedCopper, BatteryAlloy, Brass, Bronze, ChromiumDioxide, Cupronickel, DeepIron,
Electrum, Invar, /**IronCompressed,**/ Kanthal, Magnalium, Nichrome, NiobiumNitride, NiobiumTitanium, PigIron, SolderingAlloy, StainlessSteel, Steel, Ultimet, VanadiumGallium, WroughtIron, Electrum, Invar, /**IronCompressed,**/ Kanthal, Magnalium, Nichrome, NiobiumNitride, NiobiumTitanium, PigIron, SolderingAlloy, StainlessSteel, Steel, Ultimet, VanadiumGallium, WroughtIron,
YttriumBariumCuprate, IronWood, Alumite, Manyullyn, ShadowIron, Shadow, ShadowSteel, Steeleaf, SterlingSilver, RoseGold, BlackBronze, BismuthBronze, BlackSteel, RedSteel, BlueSteel, DamascusSteel, YttriumBariumCuprate, IronWood, Alumite, Manyullyn, ShadowIron, Shadow, ShadowSteel, Steeleaf, SterlingSilver, RoseGold, BlackBronze, BismuthBronze, BlackSteel, RedSteel, BlueSteel, DamascusSteel,
TungstenSteel, AstralSilver, /**Midasium,**/ Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, Void, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, Knightmetal, HSSG, HSSE, HSSS, TungstenCarbide, HeeEndium, TungstenSteel, AstralSilver, /**Midasium,**/ Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, Void, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, Knightmetal, HSSG, HSSE, HSSS, TungstenCarbide, HeeEndium,

5
src/main/java/gregtech/api/enums/Textures.java
View file

File diff suppressed because one or more lines are too long

3
src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
View file

@ -316,7 +316,8 @@ public class GT_Loader_Item_Block_And_Fluid
Materials.HSSG, Materials.HSSG,
Materials.HSSE, Materials.HSSE,
Materials.HSSS, Materials.HSSS,
Materials.Steeleaf Materials.Steeleaf,
Materials.Ichorium
}, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8); }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8);
GregTech_API.sBlockGem1 = new GT_Block_Metal("gt.blockgem1", new Materials[]{ GregTech_API.sBlockGem1 = new GT_Block_Metal("gt.blockgem1", new Materials[]{

BIN
src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB