Fix crystal cube, closes #253

This commit is contained in:
Vincent Lee committed 2016-05-02 08:34:30 -05:00
1 parent 93656a9d43
commit 725ae1cef1
2 files changed
+42 -14

No files matched your search

@@ -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<TileCorporeaCrystalCube> {
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<Til
if(entity == null)
entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone));
if(itemRenderer == null)
itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem()) {
@Override
public boolean shouldBob() {
return false;
}
};
try {
MethodHandles.itemAge_setter.invokeExact(entity, ClientTickHandler.ticksInGame);
} catch (Throwable ignored) {}
@@ -80,7 +90,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
GlStateManager.translate(0F, 0.8F, 0F);
GlStateManager.scale(s, s, s);
GlStateManager.rotate(180F, 0F, 0F, 1F);
((Render) mc.getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(entity, 0, 0, 0, 1F, f);
itemRenderer.doRender(entity, 0, 0, 0, 1F, f);
GlStateManager.popMatrix();
}
@@ -127,7 +137,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
}
// Copied from AnimationTESR
protected static BlockRendererDispatcher blockRenderer;
private static BlockRendererDispatcher blockRenderer;
private void renderAnimatedModel(TileCorporeaCrystalCube te, double x, double y, double z, float partialTick) {
// From FastTESR.renderTileEntityAt
@@ -151,6 +161,10 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK);
// Inlined AnimationTESR.renderTileEntityFast
if(!te.hasCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null))
{
return;
}
if(blockRenderer == null) blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher();
BlockPos pos = te.getPos();
IBlockAccess world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos);
@@ -165,9 +179,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
if(exState.getUnlistedNames().contains(Properties.AnimationProperty))
{
float time = Animation.getWorldTime(getWorld(), partialTick);
// todo 1.9
if (true) return;
Pair<IModelState, Iterable<Event>> pair = null;
Pair<IModelState, Iterable<Event>> pair = te.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null).apply(time);
// handleEvents(te, time, pair.getRight());
IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean());
@@ -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> T getCapability(Capability<T> cap, EnumFacing side) {
if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) {
return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm);
} else return super.getCapability(cap, side);
}
}