Merge pull request #29 from IceDragon200/applecore-int-fixes

Applecore integration fixes
GrowthcraftCE · Aug 10, 2015 · 6eadf97 · 6eadf97
2 parents 24837d8 + 95898cd
commit 6eadf97
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ repositories {
 
 apply plugin: 'forge'
 
-version = "2.2.0"
+version = "2.2.1"
 group= "mod.growthcraft"
 archivesBaseName = "growthcraft"
 
@@ -64,7 +64,8 @@ processResources {
 }
 
 dependencies {
-    compile "applecore:AppleCore:1.7.10-1.2.1+104.62391:api"
+    //compile "applecore:AppleCore:1.7.10-1.2.1+104.62391:api"
+    compile "applecore:AppleCore:1.7.10-1.1.0:api"
 }
 
 // --------------------

diff --git a/src/java/growthcraft/core/integration/AppleCore.java b/src/java/growthcraft/core/integration/AppleCore.java
@@ -31,7 +31,11 @@ public static Event.Result validateGrowthTick(Block block, World world, int x, i
 	@Optional.Method(modid = "AppleCore")
 	private static void announceGrowthTick_AC(Block block, World world, int x, int y, int z, int previousMetadata)
 	{
-		AppleCoreAPI.dispatcher.announcePlantGrowth(block, world, x, y, z, previousMetadata);
+		// 1.2.x - until there is an official 1.2.x release of AppleCore
+		//AppleCoreAPI.dispatcher.announcePlantGrowth(block, world, x, y, z, previousMetadata);
+
+		// 1.1.x
+		AppleCoreAPI.dispatcher.announcePlantGrowth(block, world, x, y, z);
 	}
 
 	public static void announceGrowthTick(Block block, World world, int x, int y, int z, int previousMetadata)

diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
@@ -4,7 +4,7 @@
     "name": "Growthcraft Apples",
     "description": "Growthcraft Apples is a mod which changes how apples are farmed in-game. In addition to this, it also adds Apple Ciders as a new product from apples.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -22,7 +22,7 @@
     "name": "Growthcraft Bamboo",
     "description": "Growthcraft Bamboo is a mod which adds a new plant to the game: bamboos, which focuses on construction rather food.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -40,7 +40,7 @@
     "name": "Growthcraft Bees",
     "description": "Growthcraft Bees is a mod which adds a new in-game hobby: beekeeping.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -58,7 +58,7 @@
     "name": "Growthcraft Cellar",
     "description": "Growthcraft Cellar is a mod which adds a new in-game hobby: brewing alcoholic beverages.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -76,7 +76,7 @@
     "name": "Growthcraft",
     "description": "Growthcraft Core is as a mod which acts a central hub for the other mods. It will provide of resources needed in common by two or more Growthcraft mods.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -94,7 +94,7 @@
     "name": "Growthcraft Fishtrap",
     "description": "Growthcraft Fishtrap is a mod which adds a block; Fishtrap, that automatically catches fish (and other stuff) for you! ",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -112,7 +112,7 @@
     "name": "Growthcraft Grapes",
     "description": "Growthcraft Grapes is a mod which adds a new totally crop to the game: grapes. It also comes with Wine-making.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -130,7 +130,7 @@
     "name": "Growthcraft Hops",
     "description": "Growthcraft Hops is a mod which adds a new crop to the game, hops. It also comes with Ale-brewing. ",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],
@@ -148,7 +148,7 @@
     "name": "Growthcraft Rice",
     "description": "Growthcraft Rice is a mod which adds a new crop; rice. Alongside it also comes a new brew type; sake.",
     "version": "${version}",
-    "mcversion": "${mcversion}"
+    "mcversion": "${mcversion}",
     "url": "http://www.minecraftforum.net/topic/1510394-/",
     "updateUrl": "",
     "authors": [ "Gwafu" ],