In working state

This commit is contained in:
Vincent Lee committed 2016-03-12 00:23:51 -06:00
1 parent 55c2a522ee
commit e031b3b52c
3 files changed
+96 -5

No files matched your search

@@ -2,6 +2,7 @@ package vazkii.botania.client.core.handler;
import com.google.common.base.Throwables;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
@@ -18,7 +19,8 @@ public final class ClientMethodHandles {
renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager
farPlaneDistance_getter,
hurtCameraEffect, setupViewBobbing, getFOVModifier,
enableLightmap, disableLightmap; // EntityRenderer
enableLightmap, disableLightmap, // EntityRenderer
prevEquippedProgress_getter, equippedProgress_getter; // ItemRenderer
static {
try {
@@ -57,6 +59,14 @@ public final class ClientMethodHandles {
m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.GET_FOV_MODIFIER, float.class, boolean.class);
m.setAccessible(true);
getFOVModifier = MethodHandles.publicLookup().unreflect(m);
f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.PREV_EQUIPPED_PROGRESS);
f.setAccessible(true);
prevEquippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f);
f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.EQUIPPED_PROGRESS);
f.setAccessible(true);
equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f);
} catch (IllegalAccessException e) {
FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!");
throw Throwables.propagate(e);
@@ -1,11 +1,17 @@
package vazkii.botania.client.core.handler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.model.ModelBook;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraftforge.client.event.RenderHandEvent;
@@ -17,6 +23,7 @@ import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.item.ItemLexicon;
import vazkii.botania.common.item.ModItems;
// Hacky way to render 3D lexicon, will be reevaluated in the future.
public class RenderLexicon {
ModelBook model = new ModelBook();
@@ -30,6 +37,7 @@ public class RenderLexicon {
evt.setCanceled(true);
try {
// Called immediately before EntityRenderer.renderHand
GlStateManager.clear(256);
// Begin copy EntityRenderer.renderHand
GlStateManager.matrixMode(5889);
@@ -65,8 +73,7 @@ public class RenderLexicon {
if (mc.gameSettings.thirdPersonView == 0 && !flag && !mc.gameSettings.hideGUI && !mc.playerController.isSpectator())
{
ClientMethodHandles.enableLightmap.invokeExact(mc.entityRenderer);
// this.itemRenderer.renderItemInFirstPerson(partialTicks);
this.doRender();
renderItemInFirstPerson();
ClientMethodHandles.disableLightmap.invokeExact(mc.entityRenderer);
}
@@ -91,6 +98,30 @@ public class RenderLexicon {
}
private void renderItemInFirstPerson() throws Throwable {
// Cherry picked from ItemRenderer.renderItemInFirstPerson
float prevEquippedProgress = ((float) ClientMethodHandles.prevEquippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer()));
float equippedProgress = ((float) ClientMethodHandles.equippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer()));
float f = 1.0F - (prevEquippedProgress + (equippedProgress - prevEquippedProgress) * ClientTickHandler.partialTicks);
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
float f1 = player.getSwingProgress(ClientTickHandler.partialTicks);
float f2 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * ClientTickHandler.partialTicks;
float f3 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * ClientTickHandler.partialTicks;
this.func_178101_a(f2, f3);
this.func_178109_a(player);
this.func_178110_a(player, ClientTickHandler.partialTicks);
GlStateManager.enableRescaleNormal();
GlStateManager.pushMatrix();
this.func_178105_d(f1);
this.transformFirstPersonItem(f, f1);
doRender();
GlStateManager.popMatrix();
GlStateManager.disableRescaleNormal();
RenderHelper.disableStandardItemLighting();
}
private void doRender() {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
@@ -106,8 +137,7 @@ public class RenderLexicon {
GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks);
GlStateManager.rotate(87.5F + ticks * 5, 0F, 1F, 0F);
GlStateManager.rotate(ticks * 2.5F, 0F, 0F, 1F);
GlStateManager.scale(0.9F, 0.9F, 0.9F);
GlStateManager.rotate(ticks * 2.85F, 0F, 0F, 1F);
opening = ticks / 12F;
float pageFlipTicks = ClientTickHandler.pageFlipTicks;
@@ -161,4 +191,51 @@ public class RenderLexicon {
GlStateManager.popMatrix();
}
// ItemRenderer.func_178101_a
private void func_178101_a(float angle, float p_178101_2_) {
GlStateManager.pushMatrix();
GlStateManager.rotate(angle, 1.0F, 0.0F, 0.0F);
GlStateManager.rotate(p_178101_2_, 0.0F, 1.0F, 0.0F);
RenderHelper.enableStandardItemLighting();
GlStateManager.popMatrix();
}
// Copy - ItemRenderer.func_178109_a
private void func_178109_a(AbstractClientPlayer clientPlayer) {
int i = Minecraft.getMinecraft().theWorld.getCombinedLight(new BlockPos(clientPlayer.posX, clientPlayer.posY + (double)clientPlayer.getEyeHeight(), clientPlayer.posZ), 0);
float f = (float)(i & 65535);
float f1 = (float)(i >> 16);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, f, f1);
}
// Copy - ItemRenderer.func_178110_a
private void func_178110_a(EntityPlayerSP entityplayerspIn, float partialTicks) {
float f = entityplayerspIn.prevRenderArmPitch + (entityplayerspIn.renderArmPitch - entityplayerspIn.prevRenderArmPitch) * partialTicks;
float f1 = entityplayerspIn.prevRenderArmYaw + (entityplayerspIn.renderArmYaw - entityplayerspIn.prevRenderArmYaw) * partialTicks;
GlStateManager.rotate((entityplayerspIn.rotationPitch - f) * 0.1F, 1.0F, 0.0F, 0.0F);
GlStateManager.rotate((entityplayerspIn.rotationYaw - f1) * 0.1F, 0.0F, 1.0F, 0.0F);
}
// Copy - ItemRenderer.func_178105_d
private void func_178105_d(float p_178105_1_) {
float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * (float)Math.PI);
float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * (float)Math.PI * 2.0F);
float f2 = -0.2F * MathHelper.sin(p_178105_1_ * (float)Math.PI);
GlStateManager.translate(f, f1, f2);
}
// Copy with modification - ItemRenderer.transformFirstPersonItem
private void transformFirstPersonItem(float equipProgress, float swingProgress) {
GlStateManager.translate(1F, -1F, -0.71999997F); // Botania - x(0.56) -> 1; y(-0.52) -> -1
GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F);
GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); // Botania - 45 -> 90
GlStateManager.rotate(-20, 0, 0, 1); // Botania - added
float f = MathHelper.sin(swingProgress * swingProgress * (float)Math.PI);
float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI);
GlStateManager.rotate(f * -20.0F, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(f1 * -20.0F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F);
// GlStateManager.scale(0.4F, 0.4F, 0.4F); Botania - removed
}
}
@@ -106,4 +106,8 @@ public final class LibObfuscation {
public static final String[] DISABLE_LIGHTMAP = { "disableLightmap", "func_175072_h", "h" };
public static final String[] GET_FOV_MODIFIER = { "getFOVModifier", "func_78481_a", "a" };
// ItemRenderer
public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" };
public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" };
}