diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 3d8078735..5f89fbdf5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -242,7 +242,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TilePrism.class, new RenderTilePrism()); ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaIndex.class, new RenderTileCorporeaIndex()); ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new AnimationTESR<>()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new AnimationTESR<>()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new RenderTileCorporeaCrystalCube()); ClientRegistry.bindTileEntitySpecialRenderer(TileIncensePlate.class, new RenderTileIncensePlate()); ClientRegistry.bindTileEntitySpecialRenderer(TileHourglass.class, new RenderTileHourglass()); ClientRegistry.bindTileEntitySpecialRenderer(TileSparkChanger.class, new RenderTileSparkChanger()); 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 d5c18e13b..63bdf3d9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -10,17 +10,38 @@ */ package vazkii.botania.client.render.tile; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.client.model.animation.Event; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.Properties; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -29,6 +50,8 @@ import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lib.LibObfuscation; +import java.util.concurrent.TimeUnit; + public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE); @@ -57,10 +80,10 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(10).expireAfterWrite(100, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() + { + public IBakedModel load(Pair key) throws Exception + { + IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(key.getLeft().getClean()); + if(model instanceof ISmartBlockModel) + { + model = ((ISmartBlockModel)model).handleBlockState(key.getLeft().withProperty(Properties.AnimationProperty, key.getRight())); + } + return model; + } + }); + + private static IBakedModel getModel(IExtendedBlockState state, IModelState modelState) + { + return modelCache.getUnchecked(Pair.of(state, modelState)); + } + + private void renderAnimatedModel(TileCorporeaCrystalCube te, double x, double y, double z, float partialTick) { + // From FastTESR.renderTileEntityAt + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldRenderer = tessellator.getWorldRenderer(); + this.bindTexture(TextureMap.locationBlocksTexture); + RenderHelper.disableStandardItemLighting(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.disableCull(); + + if (Minecraft.isAmbientOcclusionEnabled()) + { + GlStateManager.shadeModel(GL11.GL_SMOOTH); + } + else + { + GlStateManager.shadeModel(GL11.GL_FLAT); + } + + worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); + + // Inlined AnimationTESR.renderTileEntityFast + if(blockRenderer == null) blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); + BlockPos pos = te.getPos(); + IBlockAccess world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos); + IBlockState state = world.getBlockState(pos); + if(state.getPropertyNames().contains(Properties.StaticProperty)) + { + state = state.withProperty(Properties.StaticProperty, false); + } + if(state instanceof IExtendedBlockState) + { + IExtendedBlockState exState = (IExtendedBlockState)state; + if(exState.getUnlistedNames().contains(Properties.AnimationProperty)) + { + float time = Animation.getWorldTime(getWorld(), partialTick); + Pair> pair = te.asm().apply(time); + // handleEvents(te, time, pair.getRight()); + + IBakedModel model = getModel(exState, pair.getLeft()); + + worldRenderer.setTranslation(x - pos.getX(), y - pos.getY(), z - pos.getZ()); + + blockRenderer.getBlockModelRenderer().renderModel(world, model, state, pos, worldRenderer, false); + } + } + // End inline AnimationTESR.renderTileEntityFast + + worldRenderer.setTranslation(0, 0, 0); + + tessellator.draw(); + + RenderHelper.enableStandardItemLighting(); } } diff --git a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json b/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json index 4d895e08e..9b76c413e 100644 --- a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json @@ -10,7 +10,7 @@ "variable": "offset_y", "type": "uniform", "interpolation": "linear", - "samples": [ 0, 0.5, 0 ] + "samples": [ 0.275, 0.2875, 0.29665, 0.3, 0.29665, 0.2875, 0.275, 0.2625, 0.25335, 0.25, 0.25335, 0.2625, 0.275 ] }] }, "events": {} diff --git a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json b/src/main/resources/assets/botania/asms/block/crystalcube_cube.json index b979aa474..969465469 100644 --- a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/asms/block/crystalcube_cube.json @@ -1,6 +1,6 @@ { "parameters": { - "world_to_cycle": [ "/", 10 ] + "world_to_cycle": [ "/", 4 ] }, "clips": { "moving": [ "apply", "botania:block/crystalcube_cube@moving", "#world_to_cycle" ]