exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 07:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle Hoppers for Distillers and MCBarrels

Browse Source 
Removed most mentions of Persistent
This commit is contained in:
Sn0wStorm
2019-11-14 15:46:15 +01:00
parent 3332354846
commit f483f03560
13 changed files with 65 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/MCBarrel.java
+8 -14
View File
@@ -80,8 +80,7 @@ public class MCBarrel {
// This is the last viewer
for (ItemStack item : inv.getContents()) {
if (item != null) {
Brew brew = Brew.get(item);
if (brew != null) { // TODO replace this and others with isBrew
if (Brew.isBrew(item)) {
// We found a brew, so set time on this Barrel
if (inv.getHolder() instanceof org.bukkit.block.Barrel) {
Barrel barrel = (Barrel) inv.getHolder();
@@ -101,8 +100,7 @@ public class MCBarrel {
brews = 0;
for (ItemStack item : inv.getContents()) {
if (item != null) {
Brew brew = Brew.get(item);
if (brew != null) {
if (Brew.isBrew(item)) {
brews++;
}
}
@@ -113,6 +111,7 @@ public class MCBarrel {
return inv;
}
public static void onUpdate() {
mcBarrelTime++;
}
@@ -133,11 +132,9 @@ public class MCBarrel {
case SWAP_WITH_CURSOR:
// Placing Brew in MC Barrel
if (event.getCursor() != null && event.getClickedInventory() != null && event.getClickedInventory().getType() == InventoryType.BARREL && event.getCursor().getType() == Material.POTION) {
Brew b = Brew.get(event.getCursor());
if (b != null) {
if (Brew.isBrew(event.getCursor())) {
if (event.getAction() == InventoryAction.SWAP_WITH_CURSOR && event.getCurrentItem() != null && event.getCurrentItem().getType() == Material.POTION) {
Brew bb = Brew.get(event.getCurrentItem());
if (bb != null) {
if (Brew.isBrew(event.getCurrentItem())) {
// The item we are swapping with is also a brew, dont change the count and allow
break;
}
@@ -150,8 +147,7 @@ public class MCBarrel {
if (event.getCurrentItem() != null && event.getCurrentItem().getType() == Material.POTION && event.getClickedInventory() != null) {
if (event.getClickedInventory().getType() == InventoryType.BARREL) {
// Moving Brew out of MC Barrel
Brew b = Brew.get(event.getCurrentItem());
if (b != null) {
if (Brew.isBrew(event.getCurrentItem())) {
if (brews == -1) {
countBrews();
}
@@ -160,8 +156,7 @@ public class MCBarrel {
break;
} else if (event.getClickedInventory().getType() == InventoryType.PLAYER) {
// Moving Brew into MC Barrel
Brew b = Brew.get(event.getCurrentItem());
if (b != null) {
if (Brew.isBrew(event.getCurrentItem())) {
adding = true;
}
}
@@ -175,8 +170,7 @@ public class MCBarrel {
case COLLECT_TO_CURSOR:
// Pickup Brew from MC Barrel
if (event.getCurrentItem() != null && event.getClickedInventory() != null && event.getClickedInventory().getType() == InventoryType.BARREL && event.getCurrentItem().getType() == Material.POTION) {
Brew b = Brew.get(event.getCurrentItem());
if (b != null) {
if (Brew.isBrew(event.getCurrentItem())) {
if (brews == -1) {
countBrews();
}