mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Implemented the new textures for the glimmering flowers.
This commit is contained in:
1 parent
c1b8cf8428
commit
d1d5c8d977
2 files changed
+14
-4
No files matched your search
@@ -19,8 +19,10 @@ import net.minecraft.world.World;
|
||||
import thaumcraft.api.crafting.IInfusionStabiliser;
|
||||
import vazkii.botania.api.item.IHornHarvestable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.block.BlockModFlower;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
@@ -29,6 +31,9 @@ import cpw.mods.fml.common.Optional;
|
||||
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
|
||||
public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable {
|
||||
|
||||
private static IIcon[] icons;
|
||||
private static IIcon[] iconsAlt;
|
||||
|
||||
public BlockShinyFlower() {
|
||||
super(LibBlockNames.SHINY_FLOWER);
|
||||
setLightLevel(1F);
|
||||
@@ -41,13 +46,18 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister par1IconRegister) {
|
||||
// NO-OP
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
icons = new IIcon[16];
|
||||
iconsAlt = new IIcon[16];
|
||||
for(int i = 0; i < 16; i++) {
|
||||
icons[i] = IconHelper.forName(register, "flowerGlimmering" + i);
|
||||
iconsAlt[i] = IconHelper.forName(register, "flowerGlimmering" + i, BlockModFlower.ALT_DIR);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(int par1, int par2) {
|
||||
return ModBlocks.flower.getIcon(par1, par2);
|
||||
return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)];
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -29,7 +29,7 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower {
|
||||
return retStack;
|
||||
}
|
||||
|
||||
return new ItemStack(ModBlocks.flower, 1, getBlockMetadata());
|
||||
return new ItemStack(ModBlocks.shinyFlower, 1, getBlockMetadata());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user