Skip to content

Commit

Permalink
Update to 20w15a, bump version to 1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Juuxel committed Apr 9, 2020
1 parent 54cab88 commit 98f5253
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=20w12a
yarn_mappings=20w12a+build.14
loader_version=0.7.8+build.186
minecraft_version=20w15a
yarn_mappings=20w15a+build.3
loader_version=0.8.2+build.194

# Mod Properties
mod_version = 1.8.0
mod_version = 1.8.1
maven_group = io.github.cottonmc
archives_base_name = LibGui

# Dependencies
fabric_version=0.5.5+build.311-1.16
fabric_version=0.5.9+build.319-1.16
jankson_version=2.0.1+j1.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ public int getCraftingSlotCount() {
//(implied) extends Container {
@Override
public boolean canUse(PlayerEntity entity) {
return (blockInventory!=null) ? blockInventory.canPlayerUseInv(entity) : true;
return (blockInventory!=null) ? blockInventory.canPlayerUse(entity) : true;
}
//}
//}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/io/github/cottonmc/cotton/gui/EmptyInventory.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,40 @@ private EmptyInventory() {}
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
public void markDirty() {
}

@Override
public boolean canPlayerUseInv(PlayerEntity player) {
public boolean canPlayerUse(PlayerEntity player) {
return true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ public ValidatedSlot(Inventory inventoryIn, int index, int xPosition, int yPosit

@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
Expand Down

0 comments on commit 98f5253

Please sign in to comment.