From 4712df8b1d57d404a42893ba7edb8dc416bfe6cd Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 15 Aug 2015 17:23:01 +0100 Subject: [PATCH] Prismarine now animates properly. --- .../client/render/block/PrismarineIcon.java | 77 ++++++++++++++++++ .../common/block/decor/BlockPrismarine.java | 24 +++++- .../botania/textures/blocks/prismarine0.png | Bin 3628 -> 3378 bytes .../textures/blocks/prismarine0.png.mcmeta | 30 +++++++ 4 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java create mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta 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 bb50d257a47414fce49192644f50556cefc588bb..fe133e294841a56f396ba17d097930006919b754 100644 GIT binary patch delta 3368 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 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