diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BasicBlock.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java | 27 |
3 files changed, 16 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index 0083380bcb..2823fcc5b7 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -30,7 +30,7 @@ public class BasicBlock extends BlockContainer { public static enum BlockTypes { STANDARD("blockBlock", "pickaxe", soundTypeMetal), FRAME("blockFrameGt", "wrench", soundTypeMetal), - ORE("blockOre", "pickaxe", soundTypeStone); + ORE("blockStone", "pickaxe", soundTypeStone); private String TEXTURE_NAME; private String HARVEST_TOOL; diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 325d83f67d..9e71370197 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -26,7 +26,7 @@ public class BlockBaseModular extends BasicBlock{ } public BlockBaseModular(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) { - super(blockType.getTexture()+unlocalizedName, vanillaMaterial); + super(unlocalizedName, vanillaMaterial); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); this.blockColour = colour; diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index dca12e0272..c57aa248b4 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -16,42 +16,43 @@ public class BlockBaseOre extends BlockBaseModular{ @SuppressWarnings("unused") private IIcon overlay; - @Override + /*@Override public boolean renderAsNormalBlock() { - return false; - } + return true; + }*/ public BlockBaseOre(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2); } public BlockBaseOre(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) { - super(blockType.getTexture()+unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); + super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } /** * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha */ - @Override + + /*@Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { - return 1; - } + return 0; + } */ - @Override + /*@Override public boolean isOpaqueCube() { - return false; - } + return true; + }*/ @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iIcon) { - //this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); - this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); - this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay"); + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); + //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); + //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay"); } @Override |