From 33a1703896cbc37b9986c71038e20c659edb7814 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Mon, 29 Jan 2018 14:26:51 +1000 Subject: % Improved tooltip for Fluorite Ore. % More ASM work on getDrops fix. $ Made GT++ Materials utilise GT TextureSets. $ Made Ore blocks use the most prominent texture set based on it's component materials. $ Fixed https://github.com/GTNewHorizons/NewHorizons/issues/2522. $ Fixed materials that require a blast furnace being fluid extractable. $ Fixed https://github.com/GTNewHorizons/NewHorizons/issues/2530. --- src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/core/block/base') diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index d8ccc13259..2bea09d806 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -34,7 +34,7 @@ import net.minecraft.world.IBlockAccess; public class BlockBaseOre extends BasicBlock implements ITexturedBlock { private final Material blockMaterial; - + public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) { super(Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock); this.blockMaterial = material; @@ -96,7 +96,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { public ITexture[] getTexture(Block block, byte side) { if (this.blockMaterial != null){ - GT_RenderedTexture aIconSet = new GT_RenderedTexture(Materials.Iron.mIconSet.mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); + GT_RenderedTexture aIconSet = new GT_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); if (aIconSet != null){ //Logger.INFO("[Render] Good Overlay."); return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet}; -- cgit