diff --git a/src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java b/src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java new file mode 100644 index 000000000..57e49a642 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java @@ -0,0 +1,77 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 15, 2015, 5:11:16 PM (GMT)] + */ +package vazkii.botania.client.render.block; + +import java.lang.reflect.Field; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.client.resources.data.AnimationMetadataSection; +import cpw.mods.fml.relauncher.ReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +// This is all vanilla code from 1.8, thanks to ganymedes01 porting it to 1.7 :D +@SideOnly(Side.CLIENT) +public class PrismarineIcon extends TextureAtlasSprite { + + protected int[][] interpolatedFrameData; + private Field fanimationMetadata; + + public PrismarineIcon(String name) { + super(name); + fanimationMetadata = ReflectionHelper.findField(TextureAtlasSprite.class, "animationMetadata", "field_110982_k"); + fanimationMetadata.setAccessible(true); + } + + @Override + public void updateAnimation() { + super.updateAnimation(); + try { + updateAnimationInterpolated(); + } catch (Exception e) { + } + } + + private void updateAnimationInterpolated() throws IllegalArgumentException, IllegalAccessException { + AnimationMetadataSection animationMetadata = (AnimationMetadataSection) fanimationMetadata.get(this); + + double d0 = 1.0D - tickCounter / (double) animationMetadata.getFrameTimeSingle(frameCounter); + int i = animationMetadata.getFrameIndex(frameCounter); + int j = animationMetadata.getFrameCount() == 0 ? framesTextureData.size() : animationMetadata.getFrameCount(); + int k = animationMetadata.getFrameIndex((frameCounter + 1) % j); + + if (i != k && k >= 0 && k < framesTextureData.size()) { + int[][] aint = (int[][]) framesTextureData.get(i); + int[][] aint1 = (int[][]) framesTextureData.get(k); + + if (interpolatedFrameData == null || interpolatedFrameData.length != aint.length) + interpolatedFrameData = new int[aint.length][]; + + for (int l = 0; l < aint.length; l++) { + if (interpolatedFrameData[l] == null) + interpolatedFrameData[l] = new int[aint[l].length]; + + if (l < aint1.length && aint1[l].length == aint[l].length) + for (int i1 = 0; i1 < aint[l].length; ++i1) { + int j1 = aint[l][i1]; + int k1 = aint1[l][i1]; + int l1 = (int) (((j1 & 16711680) >> 16) * d0 + ((k1 & 16711680) >> 16) * (1.0D - d0)); + int i2 = (int) (((j1 & 65280) >> 8) * d0 + ((k1 & 65280) >> 8) * (1.0D - d0)); + int j2 = (int) ((j1 & 255) * d0 + (k1 & 255) * (1.0D - d0)); + interpolatedFrameData[l][i1] = j1 & -16777216 | l1 << 16 | i2 << 8 | j2; + } + } + + TextureUtil.uploadTextureMipmap(interpolatedFrameData, width, height, originX, originY, false, false); + } + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 3fe6fa3c2..d73922e1c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.render.block.PrismarineIcon; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPrismarine extends BlockMod implements ILexiconable { @@ -42,6 +50,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeStone); setBlockName(LibBlockNames.PRISMARINE); + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -67,10 +76,21 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + for(int i = 1; i < TYPES; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new PrismarineIcon("botania:prismarine0"); + if(event.map.setTextureEntry("botania:prismarine0", icon)) + icons[0] = icon; + } } @Override diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine0.png b/src/main/resources/assets/botania/textures/blocks/prismarine0.png index bb50d257a..fe133e294 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/prismarine0.png and b/src/main/resources/assets/botania/textures/blocks/prismarine0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta new file mode 100644 index 000000000..e0b5ef9e3 --- /dev/null +++ b/src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta @@ -0,0 +1,30 @@ +{ + "animation": { + "frametime": 300, + "interpolate": true, + "frames": [ + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 1, + 2, + 1, + 3, + 1, + 0, + 2, + 1, + 2, + 3, + 2, + 0, + 3, + 1, + 3 + ] + } +} \ No newline at end of file