Anvilcraft
/
equivalent-exchange-3
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #904 from Virtuoel/Virtuoel-patch-2 

Fix for dupe bugs #835 and #866
This commit is contained in:
Pahimar 2015-06-03 21:01:59 -04:00
parent a6b06b50ae 13c9f8d8c2
commit 30f1a05872
4 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
View File

@ -96,4 +96,11 @@ public class GuiAlchemicalBag extends GuiContainer
}
}
}
@Override
protected boolean checkHotbarKeys(int key)
{
return false;
}
}

6
src/main/java/com/pahimar/ee3/client/gui/inventory/GuiTransmutationTablet.java
View File

@ -169,6 +169,12 @@ public class GuiTransmutationTablet extends GuiBase
tickCount++;
}
@Override
protected boolean checkHotbarKeys(int key)
{
return false;
}
@Override
public void handleElementButtonClick(String buttonName, int mouseButton)
{

45
src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
View File

@ -95,15 +95,54 @@ public class ContainerAlchemicalBag extends ContainerEE
{
if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 0)
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162));
if(!(entityPlayer.inventory.getStackInSlot(actionBarSlotIndex)==inventoryAlchemicalBag.parentItemStack))
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162));
}
else
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162)
{
public boolean canTakeStack(EntityPlayer p_82869_1_)
{
return false;
}
});
}
}
else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 1)
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216));
if(!(entityPlayer.inventory.getStackInSlot(actionBarSlotIndex)==inventoryAlchemicalBag.parentItemStack))
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216));
}
else
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216)
{
public boolean canTakeStack(EntityPlayer p_82869_1_)
{
return false;
}
});
}
}
else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 2)
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232));
if(!(entityPlayer.inventory.getStackInSlot(actionBarSlotIndex)==inventoryAlchemicalBag.parentItemStack))
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232));
}
else
{
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232)
{
public boolean canTakeStack(EntityPlayer p_82869_1_)
{
return false;
}
});
}
}
}
}

2
src/main/java/com/pahimar/ee3/inventory/InventoryTransmutationTablet.java
View File

@ -130,7 +130,7 @@ public class InventoryTransmutationTablet implements IInventory
@Override
public String getInventoryName()
{
return Names.Containers.ALCHEMICAL_TOME;
return Names.Containers.TRANSMUTATION_TABLET;
}
@Override