Merge branch 'feature/recipes' into develop

src/main/java/com/novamachina/exnihilosequentia/common/tileentity/barrel/BarrelTile.java

@@ -5,9 +5,12 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.fluid.Fluids;
+import net.minecraft.item.Item;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.server.SUpdateTileEntityPacket;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.TagCollection;
 import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResultType;
@@ -28,6 +31,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Collection;
 
 public class BarrelTile extends TileEntity implements ITickableTileEntity {
     private ItemStackHandler inventory;

src/main/java/com/novamachina/exnihilosequentia/common/utility/Constants.java

@@ -71,7 +71,7 @@ public static class Items {
         public static final String PEBBLE_DIORITE      = createPebbleName("diorite");
         public static final String PEBBLE_ANDESITE     = createPebbleName("andesite");
         public static final String WITCH_WATER_BUCKET  = "bucket_witchwater";
-        public static final String CRAFTING_DOLL = "doll";
+        public static final String CRAFTING_DOLL = "doll_crafting";
 
         private static String createHammername(String name) {
             return "hammer_" + name;

src/main/resources/assets/exnihilosequentia/lang/en_us.json

@@ -6,15 +6,71 @@
   "block.exnihilosequentia.crushed_andesite": "Crushed Andesite",
   "block.exnihilosequentia.crushed_diorite": "Crushed Diorite",
   "block.exnihilosequentia.crushed_granite": "Crushed Granite",
+
   "block.exnihilosequentia.sieve": "Sieve",
-  "item.exnihilosequentia.andesite_crook": "Andesite Crook",
-  "item.exnihilosequentia.bone_crook": "Bone Crook",
-  "item.exnihilosequentia.diamond_crook": "Diamond Crook",
-  "item.exnihilosequentia.diorite_crook": "Diorite Crook",
-  "item.exnihilosequentia.gold_crook": "Gold Crook",
-  "item.exnihilosequentia.granite_crook": "Granite Crook",
-  "item.exnihilosequentia.iron_crook": "Iron Crook",
-  "item.exnihilosequentia.stone_crook": "Stone Crook",
-  "item.exnihilosequentia.wood_crook": "Wood Crook",
-  "item.exnihilosequentia.silkworm": "Silkworm"
+  "block.exnihilosequentia.barrel_wood": "Wooden Barrel",
+  "block.exnihilosequentia.crucible_unfired": "Unfired Crucible",
+  "block.exnihilosequentia.crucible_fired": "Fired Crucible",
+  "block.exnihilosequentia.crucible_wood": "Wooden Crucible",
+
+  "block.exnihilosequentia.end_cake": "End Cake",
+
+  "item.exnihilosequentia.crook_andesite": "Andesite Crook",
+  "item.exnihilosequentia.crook_bone": "Bone Crook",
+  "item.exnihilosequentia.crook_diamond": "Diamond Crook",
+  "item.exnihilosequentia.crook_diorite": "Diorite Crook",
+  "item.exnihilosequentia.crook_gold": "Gold Crook",
+  "item.exnihilosequentia.crook_granite": "Granite Crook",
+  "item.exnihilosequentia.crook_iron": "Iron Crook",
+  "item.exnihilosequentia.crook_stone": "Stone Crook",
+  "item.exnihilosequentia.crook_wood": "Wood Crook",
+
+  "item.exnihilosequentia.hammer_wood": "Wood Hammer",
+  "item.exnihilosequentia.hammer_stone": "Stone Hammer",
+  "item.exnihilosequentia.hammer_iron": "Iron Hammer",
+  "item.exnihilosequentia.hammer_gold": "Gold Hammer",
+  "item.exnihilosequentia.hammer_diamond": "Diamond Hammer",
+
+  "item.exnihilosequentia.silkworm": "Silkworm",
+  "item.exnihilosequentia.cooked_silkworm": "Cooked Silkworm",
+
+  "item.exnihilosequentia.bucket_witchwater": "Witchwater Bucket",
+
+  "item.exnihilosequentia.doll_crafting": "Porcelain Doll",
+  "item.exnihilosequentia.doll_blaze": "Blazing Doll",
+  "item.exnihilosequentia.doll_enderman": "Creeping Doll",
+  "item.exnihilosequentia.doll_shulker": "Floating Doll",
+  "item.exnihilosequentia.doll_guardian": "Protecting Doll",
+
+  "item.exnihilosequentia.chunk_iron": "Iron Ore Chunk",
+  "item.exnihilosequentia.chunk_gold": "Gold Ore Chunk",
+
+  "item.exnihilosequentia.piece_iron": "Iron Ore Piece",
+  "item.exnihilosequentia.piece_gold": "Gold Ore Piece",
+
+  "item.exnihilosequentia.seed_oak": "Oak Seed",
+  "item.exnihilosequentia.seed_spruce": "Spruce Seed",
+  "item.exnihilosequentia.seed_birch": "Birch Seed",
+  "item.exnihilosequentia.seed_jungle": "Jungle Seed",
+  "item.exnihilosequentia.seed_acacia": "Acacia Seed",
+  "item.exnihilosequentia.seed_darkoak": "Dark Oak Seed",
+  "item.exnihilosequentia.seed_cactus": "Cactus Seeds",
+  "item.exnihilosequentia.seed_sugarcane": "Sugarcane Seeds",
+  "item.exnihilosequentia.seed_carrot": "Carrot Seeds",
+  "item.exnihilosequentia.seed_potato": "Potato Seeds",
+  "item.exnihilosequentia.seed_berry": "Sweet Berry Seeds",
+  "item.exnihilosequentia.ancient_spores": "Ancient Spores",
+  "item.exnihilosequentia.grass_seeds": "Grass Seeds",
+
+  "item.exnihilosequentia.porcelain_clay": "Porcelain Clay",
+
+  "item.exnihilosequentia.pebble_stone": "Stone Pebble",
+  "item.exnihilosequentia.pebble_granite": "Granite Pebble",
+  "item.exnihilosequentia.pebble_diorite": "diorite Pebble",
+  "item.exnihilosequentia.pebble_andesite": "Andesite Pebble",
+
+  "item.exnihilosequentia.mesh_string": "String Mesh",
+  "item.exnihilosequentia.mesh_flint": "Flint Mesh",
+  "item.exnihilosequentia.mesh_iron": "Iron Mesh",
+  "item.exnihilosequentia.mesh_diamond": "Diamond Mesh"
 }

src/main/resources/data/exnihilosequentia/recipes/andesite.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    "xx"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_andesite"
+    }
+  },
+  "result": {
+    "item": "minecraft:andesite"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/barrel_wood.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "x x",
+    "x x",
+    "x-x"
+  ],
+  "key": {
+    "x": {
+      "tag": "minecraft:planks"
+    },
+    "-": {
+      "tag": "minecraft:wooden_slabs"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:barrel_wood"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/cobblestone.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    "xx"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_stone"
+    }
+  },
+  "result": {
+    "item": "minecraft:cobblestone"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_andesite.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_andesite"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_andesite"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_bone.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "tag": "forge:bones"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_bone"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_diamond.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "tag": "forge:gems/diamond"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_diamond"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_diorite.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_diorite"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_diorite"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_gold.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "tag": "forge:nuggets/gold"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_gold"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_granite.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_granite"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_granite"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_iron.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "tag": "forge:nuggets/iron"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_iron"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_stone.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_stone"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_stone"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crook_wood.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    " x",
+    " x"
+  ],
+  "key": {
+    "x": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crook_wood"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crucible_fired.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smelting",
+  "ingredient": {
+    "item": "exnihilosequentia:crucible_unfired"
+  },
+  "result": "exnihilosequentia:crucible_fired",
+  "experience": 0.7,
+  "cookingtime": 200
+}

src/main/resources/data/exnihilosequentia/recipes/crucible_unfired.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "x x",
+    "x x",
+    "xxx"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:porcelain_clay"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:crucible_unfired"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/crucible_wood.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "p p",
+    "plp",
+    "s s"
+  ],
+  "key": {
+    "p": {
+      "tag": "minecraft:logs"
+    },
+    "l": {
+      "tag": "minecraft:wooden_slabs"
+    },
+    "s": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "exnihilosequentia:sieve"
+  }
+}

src/main/resources/data/exnihilosequentia/recipes/diorite.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "xx",
+    "xx"
+  ],
+  "key": {
+    "x": {
+      "item": "exnihilosequentia:pebble_diorite"
+    }
+  },
+  "result": {
+    "item": "minecraft:diorite"
+  }
+}