Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Event Interpretation Improvements. Modified ItemStack similar.

Browse Source
This commit is contained in:
Olof Larsson 2016-08-28 12:32:56 +02:00
parent 2941e9b9b8
commit 43ef6d26e2
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
2 changed files with 72 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/massivecore/item/DataItemStack.java
View File

@ -470,7 +470,9 @@ public class DataItemStack implements Comparable<DataItemStack>
public boolean isSimilar(DataItemStack that)
{
// Just copy equals and comment out count check.
// A copy of the equals logic above. However we comment out:
// * Count
// * Repaircost
return MUtil.equals(
this.getId(), that.getId(),
// this.getCount(), that.getCount(),
@ -478,7 +480,7 @@ public class DataItemStack implements Comparable<DataItemStack>
this.getName(), that.getName(),
this.getLore(), that.getLore(),
this.getEnchants(), that.getEnchants(),
this.getRepaircost(), that.getRepaircost(),
// this.getRepaircost(), that.getRepaircost(),
this.getTitle(), that.getTitle(),
this.getAuthor(), that.getAuthor(),
this.getPages(), that.getPages(),

78
src/com/massivecraft/massivecore/util/InventoryUtil.java
View File

@ -470,18 +470,20 @@ public class InventoryUtil
}
// -------------------------------------------- //
// EVENT INTERPRETATION
// EVENT INTERPRETATION > WHERE
// -------------------------------------------- //
public static boolean isOutside(int rawSlot)
{
return rawSlot < 0;
}
public static boolean isTopInventory(int rawSlot, Inventory inventory)
{
if (isOutside(rawSlot)) return false;
return rawSlot < inventory.getSize();
}
public static boolean isBottomInventory(int rawSlot, Inventory inventory)
{
if (isOutside(rawSlot)) return false;
@ -492,21 +494,44 @@ public class InventoryUtil
{
return isOutside(event.getRawSlot());
}
public static boolean isTopInventory(InventoryClickEvent event)
{
return isTopInventory(event.getRawSlot(), event.getInventory());
}
public static boolean isBottomInventory(InventoryClickEvent event)
{
return isBottomInventory(event.getRawSlot(), event.getInventory());
}
public static boolean isAltering(InventoryClickEvent event)
// -------------------------------------------- //
// EVENT INTERPRETATION > ALTER
// -------------------------------------------- //
public static boolean isAltering(InventoryInteractEvent event)
{
return getAlter(event).isAltering();
}
public static InventoryAlter getAlter(InventoryClickEvent event)
public static InventoryAlter getAlter(InventoryInteractEvent event)
{
if (event instanceof InventoryClickEvent)
{
InventoryClickEvent clickEvent = (InventoryClickEvent)event;
return getAlter(clickEvent);
}
if (event instanceof InventoryDragEvent)
{
InventoryDragEvent dragEvent = (InventoryDragEvent)event;
return getAlter(dragEvent);
}
throw new IllegalArgumentException("Neither InventoryClickEvent nor InventoryDragEvent: " + event);
}
private static InventoryAlter getAlter(InventoryClickEvent event)
{
if (isOutside(event)) return InventoryAlter.NONE;
boolean topClicked = isTopInventory(event);
@ -526,7 +551,7 @@ public class InventoryUtil
boolean give = isSomething(hotbar);
boolean take = isSomething(current);
return getAlter(give, take);
return InventoryAlter.get(give, take);
// Neither give nor take
case NOTHING: return InventoryAlter.NONE;
@ -569,12 +594,33 @@ public class InventoryUtil
}
}
private static InventoryAlter getAlter(boolean give, boolean take)
// Drag events by nature only matters when they affect the top inventory.
// What you are holding in the cursor is already yours.
// If you drag it into your own inventory you are not really taking anything.
// If you drag into the top inventory however, you may both give and take.
// You "take" by dragging over an existing item.
private static InventoryAlter getAlter(InventoryDragEvent event)
{
if (give && take) return InventoryAlter.BOTH;
if (give) return InventoryAlter.GIVE;
if (take) return InventoryAlter.TAKE;
return InventoryAlter.NONE;
// Create
boolean giving = false;
boolean taking = false;
// Fill
final Inventory inventory = event.getInventory();
for (Entry<Integer, ItemStack> entry : event.getNewItems().entrySet())
{
int rawSlot = entry.getKey();
if (InventoryUtil.isBottomInventory(rawSlot, inventory)) continue;
ItemStack take = inventory.getItem(rawSlot);
if (isSomething(take)) taking = true;
ItemStack give = entry.getValue();
if (isSomething(give)) giving = true;
}
// Return
return InventoryAlter.get(giving, taking);
}
public enum InventoryAlter
@ -600,13 +646,25 @@ public class InventoryUtil
return this == TAKE || this == BOTH;
}
public boolean isNone()
public boolean isNothing()
{
return this == NONE;
}
public static InventoryAlter get(boolean giving, boolean taking)
{
if (giving && taking) return BOTH;
if (giving) return GIVE;
if (taking) return TAKE;
return NONE;
}
}
// -------------------------------------------- //
// EVENT INTERPRETATION > EQUIPPING
// -------------------------------------------- //
/**
* This method will return the ItemStack the player is trying to equip.
* If the click event would not result in equipping something null will be returned.