Fix textures of leaves and remove redundant enum (replace LeafType to EnumLeafType from Forestry)

This commit is contained in:
marcin212 committed 2016-10-27 05:16:43 +02:00
1 parent d7b5954d42
commit c91a0c601f
3 files changed
+82 -97

No files matched your search

@@ -126,9 +126,9 @@ public class BlockHedge extends Block implements IBlockFence {
// public void registerBlockIcons(final IIconRegister p_149651_1_) {
// }
private ExtraTreeSpecies.LeafType getType(final int meta) {
return ExtraTreeSpecies.LeafType.values()[meta % 8];
}
// private ExtraTreeSpecies.LeafType getType(final int meta) {
// return ExtraTreeSpecies.LeafType.values()[meta % 8];
// }
private boolean isFull(final int meta) {
return meta / 8 > 0;
@@ -158,10 +158,11 @@ public class BlockHedge extends Block implements IBlockFence {
// }
public static int getColor(final int meta) {
final ExtraTreeSpecies.LeafType type = ExtraTreeSpecies.LeafType.values()[meta % 6];
if (type == ExtraTreeSpecies.LeafType.Conifer) {
return ColorizerFoliage.getFoliageColorPine();
}
//TODO fix color
// final ExtraTreeSpecies.LeafType type = ExtraTreeSpecies.LeafType.values()[meta % 6];
// if (type == ExtraTreeSpecies.LeafType.Conifer) {
// return ColorizerFoliage.getFoliageColorPine();
// }
final double d0 = 0.5;
final double d2 = 1.0;
return ColorizerFoliage.getFoliageColor(d0, d2);
@@ -13,6 +13,7 @@ public class ItemHedge extends ItemBlock {
@Override
public String getItemStackDisplayName(final ItemStack item) {
final int meta = item.getItemDamage();
return ExtraTreeSpecies.LeafType.values()[meta % 6].descript + ((meta >= 8) ? " Full" : "") + " Hedge";
//TODO Fix to proper name
return "" ;//ExtraTreeSpecies.LeafType.values()[meta % 6].descript + ((meta >= 8) ? " Full" : "") + " Hedge";
}
}