From 98f5253b5c6978dab9b44db694f46c94b17fcfca Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:31:44 +0300
Subject: Update to 20w15a, bump version to 1.8.1

---
 gradle.properties                                          | 10 +++++-----
 .../cottonmc/cotton/gui/CottonCraftingController.java      |  2 +-
 .../java/io/github/cottonmc/cotton/gui/EmptyInventory.java | 14 +++++++-------
 .../java/io/github/cottonmc/cotton/gui/ValidatedSlot.java  |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9d3b564..eac0999 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
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
-- 
cgit