aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/io/github/cottonmc/cotton/gui/CottonCraftingController.java2
-rw-r--r--src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java14
-rw-r--r--src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java4
3 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/CottonCraftingController.java b/src/main/java/io/github/cottonmc/cotton/gui/CottonCraftingController.java
index 000d63d..6bc7dcd 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/CottonCraftingController.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/CottonCraftingController.java
@@ -421,7 +421,7 @@ public class CottonCraftingController extends AbstractRecipeScreenHandler<Invent
//(implied) extends Container {
@Override
public boolean canUse(PlayerEntity entity) {
- return (blockInventory!=null) ? blockInventory.canPlayerUseInv(entity) : true;
+ return (blockInventory!=null) ? blockInventory.canPlayerUse(entity) : true;
}
//}
//}
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java b/src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java
index da54dda..84eee0f 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java
@@ -13,32 +13,32 @@ public class EmptyInventory implements Inventory {
public void clear() {}
@Override
- public int getInvSize() {
+ public int size() {
return 0;
}
@Override
- public boolean isInvEmpty() {
+ public boolean isEmpty() {
return true;
}
@Override
- public ItemStack getInvStack(int slot) {
+ public ItemStack getStack(int slot) {
return ItemStack.EMPTY;
}
@Override
- public ItemStack takeInvStack(int slot, int count) {
+ public ItemStack removeStack(int slot, int count) {
return ItemStack.EMPTY;
}
@Override
- public ItemStack removeInvStack(int slot) {
+ public ItemStack removeStack(int slot) {
return ItemStack.EMPTY;
}
@Override
- public void setInvStack(int slot, ItemStack stack) {
+ public void setStack(int slot, ItemStack stack) {
}
@Override
@@ -46,7 +46,7 @@ public class EmptyInventory implements Inventory {
}
@Override
- public boolean canPlayerUseInv(PlayerEntity player) {
+ public boolean canPlayerUse(PlayerEntity player) {
return true;
}
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java b/src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java
index e6b30af..cce4cfe 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java
@@ -17,12 +17,12 @@ public class ValidatedSlot extends Slot {
@Override
public boolean canInsert(ItemStack stack) {
- return modifiable && inventory.isValidInvStack(slotNumber, stack);
+ return modifiable && inventory.isValid(slotNumber, stack);
}
@Override
public boolean canTakeItems(PlayerEntity player) {
- return modifiable && inventory.canPlayerUseInv(player);
+ return modifiable && inventory.canPlayerUse(player);
}
@Override