From 725ae1cef13aa810c73d1dfe53dde2b21bf05937 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 08:34:30 -0500 Subject: [PATCH] Fix crystal cube, closes #253 --- .../tile/RenderTileCorporeaCrystalCube.java | 26 +++++++++++----- .../corporea/TileCorporeaCrystalCube.java | 30 ++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index b01b6eafe..5eaae7487 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -32,6 +33,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.animation.Event; import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; @@ -43,8 +45,8 @@ import vazkii.botania.common.core.handler.MethodHandles; public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { - ModelCrystalCube model = new ModelCrystalCube(); - EntityItem entity = null; + private EntityItem entity = null; + private RenderEntityItem itemRenderer = null; @Override public void renderTileEntityAt(TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { @@ -53,6 +55,14 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer> pair = null; + Pair> pair = te.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null).apply(time); // handleEvents(te, time, pair.getRight()); IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean()); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 5f9f3017f..1b4e3fdc6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -10,9 +10,17 @@ */ package vazkii.botania.common.block.tile.corporea; +import com.google.common.collect.ImmutableMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.model.animation.CapabilityAnimation; +import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.corporea.CorporeaHelper; @@ -34,13 +42,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor int ticks = 0; public int compValue = 0; - //private final IAnimationStateMachine asm; + private final IAnimationStateMachine asm; public TileCorporeaCrystalCube() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); } else { - //asm = null; + asm = null; } } @@ -161,9 +169,17 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor onUpdateCount(); } } -/* todo 1.9 + @Override - public IAnimationStateMachine asm() { - return asm; - }*/ + public boolean hasCapability(Capability cap, EnumFacing side) { + return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); + } + + @Override + public T getCapability(Capability cap, EnumFacing side) { + if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) { + return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); + } else return super.getCapability(cap, side); + } + }