diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index a92d1d7f2..c42e8f87e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -10,6 +10,10 @@ */ package vazkii.botania.client.render.tile; +import java.util.Arrays; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -22,13 +26,15 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.MinecraftForge; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.TinyPotatoRenderEvent; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -42,9 +48,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; -import javax.annotation.Nonnull; -import java.util.Arrays; - public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); @@ -134,7 +137,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer= 0) { + ItemStack stackAt = getItemHandler().getStackInSlot(index); + if(stackAt != null && stack == null) { + player.setHeldItem(hand, stackAt); + getItemHandler().setStackInSlot(index, null); + } else if(stack != null) { + ItemStack copy = stack.copy(); + copy.stackSize = 1; + stack.stackSize--; + + if(stack.stackSize == 0) + player.setHeldItem(hand, stackAt); + else if(stackAt != null) { + if(!player.inventory.addItemStackToInventory(stackAt)) + player.dropItem(stackAt, false); + } + + getItemHandler().setStackInSlot(index, copy); + } + } + jump(); if(name.toLowerCase().trim().endsWith("shia labeouf") && !worldObj.isRemote && nextDoIt == 0) { nextDoIt = 40; @@ -49,11 +75,19 @@ public class TileTinyPotato extends TileMod { @Override public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setString(TAG_NAME, name); } @Override public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); name = cmp.getString(TAG_NAME); } + + @Override + public int getSizeInventory() { + return 6; + } + }