From 7e72a96317083f1668db47dc662957142a9edc10 Mon Sep 17 00:00:00 2001 From: Tschipp Date: Fri, 11 Aug 2017 20:15:00 +0200 Subject: [PATCH] Changes --- .../tschipp/carryon/client/event/RenderEvents.java | 12 ++++++------ .../tschipp/carryon/common/event/ItemEvents.java | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/tschipp/carryon/client/event/RenderEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEvents.java index 669b5f9..db96a9e 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEvents.java @@ -16,6 +16,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.client.event.GuiOpenEvent; import net.minecraftforge.client.event.MouseEvent; @@ -110,26 +111,25 @@ public class RenderEvents BlockPos pos = player.getPosition(); stack = ItemTile.getItemStack(stack); - int light = world.getLight(player.getPosition()); + int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; GlStateManager.pushMatrix(); GlStateManager.scale(2.5, 2.5, 2.5); - - GlStateManager.translate(0, -0.5, -1); + GlStateManager.translate(0, -0.6, -1); if (CarryOnConfig.settings.facePlayer ? !isChest(block) : isChest(block)) { GlStateManager.rotate(180, 0, 1f, 0); - GlStateManager.rotate(-15, 1f, 0, 0); + GlStateManager.rotate(-8, 1f, 0, 0); } else - GlStateManager.rotate(15, 1f, 0, 0); + GlStateManager.rotate(8, 1f, 0, 0); - RenderHelper.enableStandardItemLighting(); if (perspective == 0) Minecraft.getMinecraft().getRenderItem().renderItem(stack, Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, world, player)); + GlStateManager.scale(1, 1, 1); GlStateManager.popMatrix(); diff --git a/src/main/java/tschipp/carryon/common/event/ItemEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEvents.java index 89900f7..8855800 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEvents.java @@ -79,12 +79,13 @@ public class ItemEvents { EntityPlayer player = event.getEntityPlayer(); ItemStack main = player.getHeldItemMainhand(); + ItemStack off = player.getHeldItemOffhand(); World world = event.getWorld(); BlockPos pos = event.getPos(); Block block = world.getBlockState(pos).getBlock(); IBlockState state = world.getBlockState(pos); - if (main.isEmpty() && player.isSneaking() && !ForbiddenTileHandler.isForbidden(block)) + if (main.isEmpty() && off.isEmpty() && player.isSneaking() && !ForbiddenTileHandler.isForbidden(block)) { ItemStack stack = new ItemStack(RegistrationHandler.itemTile);