Remove InterpolatedIcon. Now present natively in 1.8

This commit is contained in:
Vincent Lee committed 2015-11-28 19:57:33 -06:00
1 parent a9baf71924
commit e4b58e0c2d
7 files changed
-183

No files matched your search

@@ -1,79 +0,0 @@
/**
* This class was created by <Vazkii>. 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 vazkii.botania.common.lib.LibObfuscation;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.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 InterpolatedIcon extends TextureAtlasSprite {
protected int[][] interpolatedFrameData;
private Field fanimationMetadata;
public InterpolatedIcon(String name) {
super(name);
fanimationMetadata = ReflectionHelper.findField(TextureAtlasSprite.class, LibObfuscation.ANIMATION_METADATA);
fanimationMetadata.setAccessible(true);
}
@Override
public void updateAnimation() {
super.updateAnimation();
try {
updateAnimationInterpolated();
} catch(Exception e) {
// NO-OP
}
}
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);
}
}
}
@@ -28,7 +28,6 @@ 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.render.block.InterpolatedIcon;
import vazkii.botania.common.block.tile.TileBifrost;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lexicon.LexiconData;
@@ -14,7 +14,6 @@ import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
@@ -23,18 +22,12 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.block.InterpolatedIcon;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockEnchantedSoil extends BlockMod implements ILexiconable {
@@ -43,7 +36,6 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable {
setHardness(0.6F);
setStepSound(soundTypeGrass);
setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
@@ -51,26 +43,6 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable {
return false;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:enchantedSoil0");
if(event.map.setTextureEntry("botania:enchantedSoil0", icon))
blockIcon = icon;
icon = new InterpolatedIcon("botania:enchantedSoil1");
if(event.map.setTextureEntry("botania:enchantedSoil1", icon))
iconSide = icon;
}
}
@Override
public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) {
return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_);
@@ -16,31 +16,22 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
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.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.PrismarineVariant;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.render.block.InterpolatedIcon;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockPrismarine extends BlockMod implements ILexiconable {
@@ -52,7 +43,6 @@ public class BlockPrismarine extends BlockMod implements ILexiconable {
setResistance(10.0F);
setStepSound(soundTypeStone);
setUnlocalizedName(LibBlockNames.PRISMARINE);
MinecraftForge.EVENT_BUS.register(this);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE));
}
@@ -96,16 +86,6 @@ public class BlockPrismarine extends BlockMod implements ILexiconable {
par3List.add(new ItemStack(par1, 1, i));
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:prismarine0");
if(event.map.setTextureEntry("botania:prismarine0", icon))
icons[0] = icon;
}
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos)));
@@ -12,22 +12,15 @@ package vazkii.botania.common.block.decor;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
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.render.block.InterpolatedIcon;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockShimmerrock extends BlockMod implements ILexiconable {
@@ -37,17 +30,6 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable {
setResistance(10.0F);
setStepSound(soundTypeStone);
setUnlocalizedName(LibBlockNames.SHIMMERROCK);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerrock");
if(event.map.setTextureEntry("botania:shimmerrock", icon))
blockIcon = icon;
}
}
@Override
@@ -12,22 +12,15 @@ package vazkii.botania.common.block.decor;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
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.render.block.InterpolatedIcon;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable {
@@ -36,17 +29,6 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable {
setHardness(2.0F);
setStepSound(soundTypeWood);
setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerwoodPlanks");
if(event.map.setTextureEntry("botania:shimmerwoodPlanks", icon))
blockIcon = icon;
}
}
@Override
@@ -10,31 +10,12 @@
*/
package vazkii.botania.common.block.decor.panes;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.client.render.block.InterpolatedIcon;
import vazkii.botania.common.block.ModBlocks;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBifrostPane extends BlockModPane {
public BlockBifrostPane() {
super(ModBlocks.bifrostPerm);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrostPermPane");
if(event.map.setTextureEntry("botania:bifrostPermPane", icon))
iconTop = icon;
}
}
}