From 8540deee698bfd5877defea1a0cfd056f82ffde6 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 15 Aug 2015 17:25:40 +0100 Subject: [PATCH] Some cleanup. --- ...ismarineIcon.java => InterpolatedIcon.java} | 18 ++++++++++-------- .../common/block/decor/BlockPrismarine.java | 4 ++-- .../botania/common/lib/LibObfuscation.java | 5 ++++- 3 files changed, 16 insertions(+), 11 deletions(-) rename src/main/java/vazkii/botania/client/render/block/{PrismarineIcon.java => InterpolatedIcon.java} (84%) diff --git a/src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java similarity index 84% rename from src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java rename to src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java index 57e49a642..edc9aec21 100644 --- a/src/main/java/vazkii/botania/client/render/block/PrismarineIcon.java +++ b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.block; import java.lang.reflect.Field; +import vazkii.botania.common.lib.LibObfuscation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.data.AnimationMetadataSection; @@ -21,14 +22,14 @@ 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 { +public class InterpolatedIcon extends TextureAtlasSprite { protected int[][] interpolatedFrameData; private Field fanimationMetadata; - public PrismarineIcon(String name) { + public InterpolatedIcon(String name) { super(name); - fanimationMetadata = ReflectionHelper.findField(TextureAtlasSprite.class, "animationMetadata", "field_110982_k"); + fanimationMetadata = ReflectionHelper.findField(TextureAtlasSprite.class, LibObfuscation.ANIMATION_METADATA); fanimationMetadata.setAccessible(true); } @@ -37,7 +38,8 @@ public class PrismarineIcon extends TextureAtlasSprite { super.updateAnimation(); try { updateAnimationInterpolated(); - } catch (Exception e) { + } catch(Exception e) { + // NO-OP } } @@ -49,18 +51,18 @@ public class PrismarineIcon extends TextureAtlasSprite { int j = animationMetadata.getFrameCount() == 0 ? framesTextureData.size() : animationMetadata.getFrameCount(); int k = animationMetadata.getFrameIndex((frameCounter + 1) % j); - if (i != k && k >= 0 && k < framesTextureData.size()) { + 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) + if(interpolatedFrameData == null || interpolatedFrameData.length != aint.length) interpolatedFrameData = new int[aint.length][]; - for (int l = 0; l < aint.length; l++) { + 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) + 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]; 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 d73922e1c..10c678026 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -28,7 +28,7 @@ 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.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -87,7 +87,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) public void loadTextures(TextureStitchEvent.Pre event) { if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new PrismarineIcon("botania:prismarine0"); + TextureAtlasSprite icon = new InterpolatedIcon("botania:prismarine0"); if(event.map.setTextureEntry("botania:prismarine0", icon)) icons[0] = icon; } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index b618bff60..d9e465f3b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -78,5 +78,8 @@ public final class LibObfuscation { public static final String[] COMPLETE_FLAG = new String[] { "field_146414_r", "r" }; // Entityliving - public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "t" }; + public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "t" }; + + // TextureAtlasSprite + public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "j" }; }