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

Removed unused variable, fixed gt small ores textures?

Browse source
This commit is contained in:
Technus 2016-10-08 10:32:51 +02:00
parent be22a87f84
commit 61a01ce3ea
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtech/api/GregTech_API.java
View file

@ -177,7 +177,7 @@ public class GregTech_API {
*/ */
public static Block sBlockMachines; public static Block sBlockMachines;
public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, sBlockGem, sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, /*sBlockGem,*/ sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced;
public static Block sBlockGranites, sBlockConcretes, sBlockStones; public static Block sBlockGranites, sBlockConcretes, sBlockStones;
public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5; public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5;
/** /**

20
src/main/java/gregtech/common/blocks/GT_Block_Ores.java
View file

@ -33,11 +33,27 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
@Override @Override
public Materials[] getDroppedDusts() { //Must have 8 entries; can be null. public Materials[] getDroppedDusts() { //Must have 8 entries; can be null.
return new Materials[]{Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Marble, Materials.Basalt, Materials.Stone}; return new Materials[]{Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Marble, Materials.Basalt, null};
} }
@Override @Override
public ITexture[] getTextureSet() { //Must have 16 entries. public ITexture[] getTextureSet() { //Must have 16 entries.
return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0), new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0), new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE), new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE), new GT_RenderedTexture(Textures.BlockIcons.MARBLE_STONE), new GT_RenderedTexture(Textures.BlockIcons.BASALT_STONE), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0)}; return new ITexture[]{
new GT_CopiedBlockTexture(Blocks.stone, 0, 0),
new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0),
new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0),
new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE),
new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE),
new GT_RenderedTexture(Textures.BlockIcons.MARBLE_STONE),
new GT_RenderedTexture(Textures.BlockIcons.BASALT_STONE),
new GT_CopiedBlockTexture(Blocks.stone, 0, 0),
new GT_CopiedBlockTexture(Blocks.stone, 0, 0),
new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0),
new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0),
new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE),
new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE),
new GT_RenderedTexture(Textures.BlockIcons.MARBLE_STONE),
new GT_RenderedTexture(Textures.BlockIcons.BASALT_STONE),
new GT_CopiedBlockTexture(Blocks.stone, 0, 0)};
} }
} }