From 5f3172bd5d523ae9e03acd36050cc91cd109bc5a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 1 Apr 2016 16:51:30 -0500 Subject: [PATCH] Cleanup, fix soulscribe holding --- build.properties | 2 +- .../java/vazkii/botania/common/item/ItemCraftingHalo.java | 4 +--- .../resources/assets/botania/models/item/enderDagger.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index 0c7265eeb..2e46a4718 100644 --- a/build.properties +++ b/build.properties @@ -5,5 +5,5 @@ dir_output=../Build Output/Botania/ forge_version=12.16.0.1811-1.9 mc_version=1.9 dir_repo=./ -build_number=300 +build_number=300-ALPHA mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 5516f1df5..cafdea64a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -464,13 +464,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); if(slotStack.getItem() instanceof ItemBlock) { - GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine - + GlStateManager.translate(0, -0.5, 0.5F); IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItem().getMetadata(slotStack.getMetadata())); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F); } else { - //GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); } diff --git a/src/main/resources/assets/botania/models/item/enderDagger.json b/src/main/resources/assets/botania/models/item/enderDagger.json index 602e83a3a..013865926 100644 --- a/src/main/resources/assets/botania/models/item/enderDagger.json +++ b/src/main/resources/assets/botania/models/item/enderDagger.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/enderDagger0", "layer1": "botania:items/enderDagger1"