From eb7f6c124d27c40e0970bd9184118d4b0587aa5f Mon Sep 17 00:00:00 2001
From: Falkreon <falkreon@gmail.com>
Date: Sun, 21 Jul 2019 19:32:16 -0500
Subject: [PATCH] Update to 1.14.4, deprecate CommonBlocks

---
 build.gradle                                              | 8 ++++----
 .../io/github/cottonmc/cotton/commons/CommonBlocks.java   | 5 +++++
 .../io/github/cottonmc/cotton/commons/CottonCommons.java  | 4 ++++
 modules/module-base.gradle                                | 6 +++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index ffbf859..53442fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@ plugins {
     id "fabric-loom" version "0.2.4-SNAPSHOT"
 }
 
-def minecraftVersion = "1.14.3"
-def yarnMappings = "1.14.3+build.12"
-def loaderVersion = "0.4.8+build.155"
+def minecraftVersion = "1.14.4"
+def yarnMappings = "1.14.4+build.2"
+def loaderVersion = "0.4.8+build.157"
 
 archivesBaseName = "cotton"
 version = "1.0.0-rc.2"
@@ -46,7 +46,7 @@ dependencies {
     compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false }
 
     // For ModMenu compatibility tests
-    modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.187"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.200"
     modImplementation "io.github.prospector.modmenu:ModMenu:1.6.3-94"
 }
 
diff --git a/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CommonBlocks.java b/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CommonBlocks.java
index b181023..844419f 100644
--- a/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CommonBlocks.java
+++ b/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CommonBlocks.java
@@ -9,12 +9,15 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
+/** @deprecated The functionality from this class is moving to Cotton Resources */
+@Deprecated
 public class CommonBlocks {
 
 	/**Attempts to get a common block by name. If no block with this name was found register the given block and create a BlockItem for it.
 	 * @param name The block name to look for. This is the path and does not include the namespace.
 	 * @param block A block that will be registered if no block with this name was found.
 	 * @return Returns either an already existing block with the specified name or a new one that was register under the given name.
+	 * @deprecated This function is moving to Cotton Resources
 	 */
 	public static Block register(String name, Block block) {
 		BlockItem item = new BlockItem(block, new Item.Settings().group(CottonCommons.ITEM_GROUP));
@@ -27,6 +30,7 @@ public static Block register(String name, Block block) {
 	 * @param block A block that will be registered if no block with this name was found.
 	 * @param item The settings of the new Blocks BlockItem.
 	 * @return Returns either an already existing block with the specified name or a new one that was register under the given name.
+	 * @deprecated This function is moving to Cotton Resources
 	 */
 	public static Block register(String name, Block block, BlockItem item) {
 		Identifier id = new Identifier(CottonDatapack.SHARED_NAMESPACE, name);
@@ -46,6 +50,7 @@ public static Block register(String name, Block block, BlockItem item) {
 	 *
 	 * @param name The name to look for.
 	 * @return Either the block if it is found or null if no such Common Block exists
+	 * @deprecated This function is moving to Cotton Resources
 	 */
 	public static Block getBlock(String name){
 		Identifier id = new Identifier(CottonDatapack.SHARED_NAMESPACE, name);
diff --git a/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CottonCommons.java b/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CottonCommons.java
index 452646e..415cdcd 100644
--- a/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CottonCommons.java
+++ b/modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CottonCommons.java
@@ -13,6 +13,10 @@ public class CottonCommons implements ModInitializer {
 
 	public static final String MODID = "cotton-commons";
 
+	/**
+	 * @deprecated The "Common Items" group, and all registration logic for it, is moving to the "Cotton Resources" mod.
+	 */
+	@Deprecated
 	public static final ItemGroup ITEM_GROUP = FabricItemGroupBuilder.build(
 			new Identifier("cotton-commons", "common_item_group"), () -> new ItemStack(Blocks.LIGHT_BLUE_WOOL));
 
diff --git a/modules/module-base.gradle b/modules/module-base.gradle
index 2b03c6b..2323a57 100644
--- a/modules/module-base.gradle
+++ b/modules/module-base.gradle
@@ -1,6 +1,6 @@
-def minecraftVersion = "1.14.3"
-def yarnMappings = "1.14.3+build.12"
-def loaderVersion = "0.4.8+build.155"
+def minecraftVersion = "1.14.4"
+def yarnMappings = "1.14.4+build.2"
+def loaderVersion = "0.4.8+build.157"
 
 //Publishing details
 if (rootProject.file("../../private.gradle").exists()) {