Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed ItemBlocks coloring

Browse source
This commit is contained in:
LemADEC 2017-04-29 01:44:16 +02:00
parent 49412c52fa
commit b0a6f7a036
2 changed files with 9 additions and 19 deletions
src/main/java/cr0s/warpdrive/block
ItemBlockAbstractBase.java
hull
ItemBlockHull.java

9
src/main/java/cr0s/warpdrive/block/ItemBlockAbstractBase.java
View file

@ -29,8 +29,13 @@ public class ItemBlockAbstractBase extends ItemBlock {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int p_77617_1_) {
return field_150939_a.getIcon(2, p_77617_1_);
public IIcon getIconFromDamage(int damage) {
return field_150939_a.getIcon(2, damage);
}
@Override
public int getColorFromItemStack(ItemStack itemStack, int indexPass) {
return Block.getBlockFromItem(itemStack.getItem()).getRenderColor(itemStack.getItemDamage());
}
@Override

19
src/main/java/cr0s/warpdrive/block/hull/ItemBlockHull.java
View file

@ -1,19 +1,15 @@
package cr0s.warpdrive.block.hull;
import cr0s.warpdrive.api.IBlockBase;
import cr0s.warpdrive.block.ItemBlockAbstractBase;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemDye;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockHull extends ItemBlock {
public class ItemBlockHull extends ItemBlockAbstractBase {
public ItemBlockHull(Block block) {
super(block); // sets field_150939_a to block
@ -22,17 +18,6 @@ public class ItemBlockHull extends ItemBlock {
setUnlocalizedName("warpdrive.hull");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(final int damage) {
return field_150939_a.getIcon(2, damage);
}
@Override
public int getMetadata(int damage) {
return damage;
}
@Override
public String getUnlocalizedName(ItemStack itemstack) {
if (itemstack == null || field_150939_a instanceof BlockHullStairs) {