From dbb61cf8555125949d604ece7de0ab58aada95ef Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Sep 2017 10:39:01 -0500 Subject: [PATCH] Revert new default lexicon icon/model for now --- .../java/vazkii/botania/client/core/handler/RenderLexicon.java | 3 ++- .../resources/assets/botania/models/item/lexicon_default.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 b5a49f0aa..98ebe1431 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -28,6 +28,7 @@ import vazkii.botania.common.lexicon.page.PageText; @Mod.EventBusSubscriber(Side.CLIENT) public class RenderLexicon { private static final ModelBook model = new ModelBook(); + // todo 1.12 improve private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA_DEFAULT); private static final ResourceLocation elvenTexture = new ResourceLocation(LibResources.MODEL_LEXICA_ELVEN); @@ -79,7 +80,7 @@ public class RenderLexicon { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); - mc.renderEngine.bindTexture(((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? elvenTexture : texture); + mc.renderEngine.bindTexture(elvenTexture); float opening; float pageFlip; diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon_default.json index 0d822dd2c..62213940d 100644 --- a/src/main/resources/assets/botania/models/item/lexicon_default.json +++ b/src/main/resources/assets/botania/models/item/lexicon_default.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lexicon_default" + "layer0": "botania:items/lexicon_elven" } } \ No newline at end of file