From 55c2a522ee295d6a0a7bfaeb14d3132a7fb86c34 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 23:22:38 -0600 Subject: [PATCH] Preliminary 3d lexicon --- .../core/handler/ClientMethodHandles.java | 31 +++- .../client/core/handler/RenderLexicon.java | 164 ++++++++++++++++++ .../client/core/proxy/ClientProxy.java | 3 +- .../client/render/item/RenderLexicon.java | 120 ------------- .../botania/common/lib/LibObfuscation.java | 8 + 5 files changed, 204 insertions(+), 122 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java delete mode 100644 src/main/java/vazkii/botania/client/render/item/RenderLexicon.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index e4db866bc..94f828af9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -1,6 +1,7 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; +import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -9,11 +10,15 @@ import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; +import java.lang.reflect.Method; public final class ClientMethodHandles { public static final MethodHandle - renderPosX_getter, renderPosY_getter, renderPosZ_getter; // RenderManager + renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager + farPlaneDistance_getter, + hurtCameraEffect, setupViewBobbing, getFOVModifier, + enableLightmap, disableLightmap; // EntityRenderer static { try { @@ -28,6 +33,30 @@ public final class ClientMethodHandles { f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); f.setAccessible(true); renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(EntityRenderer.class, LibObfuscation.FAR_PLANE_DISTANCE); + f.setAccessible(true); + farPlaneDistance_getter = MethodHandles.publicLookup().unreflectGetter(f); + + Method m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.HURT_CAMERA_EFFECT, float.class); + m.setAccessible(true); + hurtCameraEffect = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.SETUP_VIEW_BOBBING, float.class); + m.setAccessible(true); + setupViewBobbing = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.ENABLE_LIGHTMAP); + m.setAccessible(true); + enableLightmap = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.DISABLE_LIGHTMAP); + m.setAccessible(true); + disableLightmap = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.GET_FOV_MODIFIER, float.class, boolean.class); + m.setAccessible(true); + getFOVModifier = MethodHandles.publicLookup().unreflect(m); } catch (IllegalAccessException e) { FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); throw Throwables.propagate(e); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java new file mode 100644 index 000000000..8b7e42a37 --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -0,0 +1,164 @@ +package vazkii.botania.client.core.handler; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.model.ModelBook; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.util.glu.Project; +import vazkii.botania.client.gui.lexicon.GuiLexicon; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.item.ItemLexicon; +import vazkii.botania.common.item.ModItems; + +public class RenderLexicon { + + ModelBook model = new ModelBook(); + ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + + @SubscribeEvent + public void renderItem(RenderHandEvent evt) { + Minecraft mc = Minecraft.getMinecraft(); + if(mc.gameSettings.thirdPersonView != 0 || mc.thePlayer.getHeldItem() == null || mc.thePlayer.getHeldItem().getItem() != ModItems.lexicon) + return; + evt.setCanceled(true); + + try { + GlStateManager.clear(256); + // Begin copy EntityRenderer.renderHand + GlStateManager.matrixMode(5889); + GlStateManager.loadIdentity(); + float f = 0.07F; + + if (mc.gameSettings.anaglyph) + { + GlStateManager.translate((float)(-(/*xOffset*/0 * 2 - 1)) * f, 0.0F, 0.0F); + } + + float fovModifier = ((float) ClientMethodHandles.getFOVModifier.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks, false)); + float farPlane = ((float) ClientMethodHandles.farPlaneDistance_getter.invokeExact(mc.entityRenderer)); + Project.gluPerspective(fovModifier, (float)mc.displayWidth / (float)mc.displayHeight, 0.05F, farPlane * 2.0F); + GlStateManager.matrixMode(5888); + GlStateManager.loadIdentity(); + + if (mc.gameSettings.anaglyph) + { + GlStateManager.translate((float)(/*xOffset*/0 * 2 - 1) * 0.1F, 0.0F, 0.0F); + } + + GlStateManager.pushMatrix(); + ClientMethodHandles.hurtCameraEffect.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + + if (mc.gameSettings.viewBobbing) + { + ClientMethodHandles.setupViewBobbing.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + } + + boolean flag = mc.getRenderViewEntity() instanceof EntityLivingBase && ((EntityLivingBase)mc.getRenderViewEntity()).isPlayerSleeping(); + + if (mc.gameSettings.thirdPersonView == 0 && !flag && !mc.gameSettings.hideGUI && !mc.playerController.isSpectator()) + { + ClientMethodHandles.enableLightmap.invokeExact(mc.entityRenderer); + // this.itemRenderer.renderItemInFirstPerson(partialTicks); + this.doRender(); + ClientMethodHandles.disableLightmap.invokeExact(mc.entityRenderer); + } + + GlStateManager.popMatrix(); + + if (mc.gameSettings.thirdPersonView == 0 && !flag) + { + mc.getItemRenderer().renderOverlays(ClientTickHandler.partialTicks); + ClientMethodHandles.hurtCameraEffect.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + } + + if (mc.gameSettings.viewBobbing) + { + ClientMethodHandles.setupViewBobbing.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + } + // End EntityRenderer.renderHand copy + } catch (Throwable throwable) { + FMLLog.warning("[Botania]: Failed to render lexicon"); + throwable.printStackTrace(); + } + + + } + + private void doRender() { + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + float opening = 0F; + float pageFlip = 0F; + + float ticks = ClientTickHandler.ticksWithLexicaOpen; + if(ticks > 0 && ticks < 10) { + if(Minecraft.getMinecraft().currentScreen instanceof GuiLexicon) + ticks += ClientTickHandler.partialTicks; + else ticks -= ClientTickHandler.partialTicks; + } + + 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); + opening = ticks / 12F; + + float pageFlipTicks = ClientTickHandler.pageFlipTicks; + if(pageFlipTicks > 0) + pageFlipTicks -= ClientTickHandler.partialTicks; + + pageFlip = pageFlipTicks / 5F; + + model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); + if(ticks < 3) { + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.3F, -0.21F, -0.07F); + GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); + boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); + boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); + + String title = ModItems.lexicon.getItemStackDisplayName(null); + String origTitle = title; + + if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) + title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); + if(title.equals(origTitle) && bevo) + title = StatCollector.translateToLocal("item.botania:lexicon.bevo"); + if(title.equals(origTitle) && saice) + title = StatCollector.translateToLocal("item.botania:lexicon.saice"); + + font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); + GlStateManager.translate(0F, 10F, 0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); + + GlStateManager.translate(0F, 15F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, 10F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, 50F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, 10F, 0F); + font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + + if(bevo || saice) { + GlStateManager.translate(0F, 10F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); + } + } + + GlStateManager.popMatrix(); + } + +} 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 5f89fbdf5..1fe3aacb5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -57,6 +57,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.handler.RenderLexicon; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -200,7 +201,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); - MinecraftForge.EVENT_BUS.register(new CorporeaAutoCompleteHandler()); + MinecraftForge.EVENT_BUS.register(new RenderLexicon()); if(ConfigHandler.useAdaptativeConfig) MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java deleted file mode 100644 index 0cd0b4b9e..000000000 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ /dev/null @@ -1,120 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 25, 2014, 8:49:01 PM (GMT)] - *//* - -package vazkii.botania.client.render.item; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.model.ModelBook; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.item.ModItems; - -public class RenderLexicon implements IItemRenderer { - - ModelBook model = new ModelBook(); - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.EQUIPPED_FIRST_PERSON; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GlStateManager.pushMatrix(); - Minecraft mc = Minecraft.getMinecraft(); - mc.renderEngine.bindTexture(texture); - float opening = 0F; - float pageFlip = 0F; - - float ticks = ClientTickHandler.ticksWithLexicaOpen; - if(ticks > 0 && ticks < 10) { - if(mc.currentScreen instanceof GuiLexicon) - ticks += ClientTickHandler.partialTicks; - else ticks -= ClientTickHandler.partialTicks; - } - - 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); - opening = ticks / 12F; - - float pageFlipTicks = ClientTickHandler.pageFlipTicks; - if(pageFlipTicks > 0) - pageFlipTicks -= ClientTickHandler.partialTicks; - - pageFlip = pageFlipTicks / 5F; - - model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); - if(ticks < 3) { - FontRenderer font = Minecraft.getMinecraft().fontRenderer; - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.3F, -0.21F, -0.07F); - GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); - boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); - - String title = ModItems.lexicon.getItemStackDisplayName(null); - String origTitle = title; - - if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) - title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); - if(title.equals(origTitle) && bevo) - title = StatCollector.translateToLocal("item.botania:lexicon.bevo"); - if(title.equals(origTitle) && saice) - title = StatCollector.translateToLocal("item.botania:lexicon.saice"); - - font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); - GlStateManager.translate(0F, 10F, 0F); - GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); - - GlStateManager.translate(0F, 15F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); - - GlStateManager.translate(0F, 10F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); - - GlStateManager.translate(0F, 50F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); - - GlStateManager.translate(0F, 10F, 0F); - font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); - - if(bevo || saice) { - GlStateManager.translate(0F, 10F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); - } - } - - GlStateManager.popMatrix(); - } - -} -*/ diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 8a4b74d7a..f1eeec021 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -98,4 +98,12 @@ public final class LibObfuscation { public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "q" }; public static final String[] GL_SKY_LIST2 = new String[] { "glSkyList2", "field_72781_x", "r" }; + // EntityRenderer + public static final String[] FAR_PLANE_DISTANCE = { "farPlaneDistance", "field_78530_s", "k" }; + public static final String[] HURT_CAMERA_EFFECT = { "hurtCameraEffect", "func_78482_e", "d" }; + public static final String[] SETUP_VIEW_BOBBING = { "setupViewBobbing", "func_78475_f", "e" }; + public static final String[] ENABLE_LIGHTMAP = { "enableLightmap", "func_180436_i", "i" }; + public static final String[] DISABLE_LIGHTMAP = { "disableLightmap", "func_175072_h", "h" }; + public static final String[] GET_FOV_MODIFIER = { "getFOVModifier", "func_78481_a", "a" }; + }