add recipe for chorus conduit, version bump

LemmaEOF · Nov 28, 2018 · 26ffafc · 26ffafc
1 parent be20531
commit 26ffafc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'java'
 
 group 'space.bbkr.aquarius'
-version '1.0'
+version '1.1'
 archivesBaseName = 'Aquarius'
 
 sourceCompatibility = 1.8

diff --git a/src/main/java/space/bbkr/aquarius/Aquarius.java b/src/main/java/space/bbkr/aquarius/Aquarius.java
@@ -41,7 +41,7 @@ public void registerItems() {
         Item.register(new ResourceLocation("aquarius:flippers"), FLIPPERS);
         Item.register(new ResourceLocation("aquarius:prismarine_rod"), PRISMARINE_ROD);
         //Item.register(new ResourceLocation("aquarius:hookshot"), HOOKSHOT);
-        Item.register(CHORUS_CONDUIT, ItemGroup.DECORATIONS);
+        Item.register(CHORUS_CONDUIT, ItemGroup.MISC);
     }
 
     @Override

diff --git a/src/main/resources/data/aquarius/recipes/chorus_conduit.json b/src/main/resources/data/aquarius/recipes/chorus_conduit.json
@@ -0,0 +1,21 @@
+{
+    "type": "crafting_shaped",
+    "pattern": [
+        "#",
+        "C",
+        "#"
+    ],
+    "key": {
+        "#": {
+            "item": "minecraft:shulker_shell"
+        },
+        "C": {
+            "item": "minecraft:conduit"
+        }
+    },
+    "result": {
+        "item": "aquarius:chorus_conduit",
+        "count": 1
+    },
+    "group": "miscellaneous"
+}