From 63a7aeb8c95147ba2c66cca6b8cd9e3f6bcc387c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Aug 2017 20:45:04 -0500 Subject: [PATCH] Same as last commit but for 3d model --- .../botania/client/core/handler/RenderLexicon.java | 5 +++-- .../vazkii/botania/client/lib/LibResources.java | 3 ++- .../textures/model/{lexica.png => lexica0.png} | Bin 3 files changed, 5 insertions(+), 3 deletions(-) rename src/main/resources/assets/botania/textures/model/{lexica.png => lexica0.png} (100%) diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 6efaf4770..b5a49f0aa 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -28,7 +28,8 @@ import vazkii.botania.common.lexicon.page.PageText; @Mod.EventBusSubscriber(Side.CLIENT) public class RenderLexicon { private static final ModelBook model = new ModelBook(); - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA_DEFAULT); + private static final ResourceLocation elvenTexture = new ResourceLocation(LibResources.MODEL_LEXICA_ELVEN); private static final String[] QUOTES = new String[] { "\"Neat!\" - Direwolf20", @@ -78,7 +79,7 @@ public class RenderLexicon { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); - mc.renderEngine.bindTexture(texture); + mc.renderEngine.bindTexture(((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? elvenTexture : texture); float opening; float pageFlip; diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index e4431fd78..d81be0141 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -77,7 +77,8 @@ public final class LibResources { public static final String MODEL_PYLON_GREEN = PREFIX_MODEL + "pylon1.png"; public static final String MODEL_PYLON_PINK_OLD = PREFIX_MODEL + "pylonOld2.png"; public static final String MODEL_PYLON_PINK = PREFIX_MODEL + "pylon2.png"; - public static final String MODEL_LEXICA = PREFIX_MODEL + "lexica.png"; + public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexica0.png"; + public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexica1.png"; public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel0.png"; public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.png"; public static final String MODEL_MANASTEEL_2 = PREFIX_MODEL + "manasteel2.png"; diff --git a/src/main/resources/assets/botania/textures/model/lexica.png b/src/main/resources/assets/botania/textures/model/lexica0.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/lexica.png rename to src/main/resources/assets/botania/textures/model/lexica0.png