Merge pull request #12 from J-onasJones/1.19.x-dev

pull new content

src/main/java/me/jonasjones/nec/item/ModItems.java

@@ -19,6 +19,7 @@ public class ModItems {
     private static Item LETTER_ITEM;
     private static Item CHAINMAIL_ITEM;
     private static Item AK47_ITEM;
+    private static Item HELMET_ON_A_STICK_ITEM;
 
     public static void register() {
         TieredItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Properties());
@@ -44,5 +45,9 @@ public class ModItems {
         Item AK47 = new Item(new FabricItemSettings());
         AK47_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "ak_47"), AK47);
         ModRegistries.register_item(AK47_ITEM);
+
+        Item HELMET_ON_A_STICK = new Item(new FabricItemSettings());
+        HELMET_ON_A_STICK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "helmet_on_a_stick"), HELMET_ON_A_STICK);
+        ModRegistries.register_item(HELMET_ON_A_STICK_ITEM);
     }
 }

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

@@ -6,6 +6,10 @@
     "advancements.nec.ak_47.title": "Congrats, You're f*cking useless!",
     "advancements.nec.dirt_sword.description": "Haha, get it? ... -_-",
     "advancements.nec.dirt_sword.title": "You are now dirty",
+    "advancements.nec.pocket_block.description": "Craft a Pocket Block",
+    "advancements.nec.pocket_block.title": "It's basically Bedrock",
+    "advancements.nec.java_block.description": "Craft a Java Block",
+    "advancements.nec.java_block.title": "You Idiot, this is wrong!",
     "advancements.nec.root.description": "uwu",
     "advancements.nec.root.title": "Not Enough Cursedness",
 
@@ -22,6 +26,7 @@
     "item.nec.ak_47": "AK-47",
     "item.nec.chainmail": "Chainmail",
     "item.nec.dirt_sword": "Dirt Sword",
+    "item.nec.helmet_on_a_stick": "Helmet on a Stick",
     "item.nec.letter": "Letter",
     "item.nec.negative_flint": "Negative Flint",
     "item.nec.steel": "Steel",

src/main/resources/assets/nec/models/item/helmet_on_a_stick.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/handheld",
+    "textures": {
+      "layer0": "nec:item/helmet_on_a_stick"
+    }
+  }

src/main/resources/data/nec/advancements/java_block.json

@@ -0,0 +1,31 @@
+{
+  "display": {
+    "icon": {
+      "item": "nec:java_block"
+    },
+    "title": {
+      "translate": "advancements.nec.java_block.title"
+    },
+    "description": {
+      "translate": "advancements.nec.java_block.description"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "annouce_to_chat": true
+  },
+  "parent": "nec:nec",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "nec:java_block"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/data/nec/advancements/pocket_block.json

@@ -0,0 +1,31 @@
+{
+  "display": {
+    "icon": {
+      "item": "nec:pocket_block"
+    },
+    "title": {
+      "translate": "advancements.nec.pocket_block.title"
+    },
+    "description": {
+      "translate": "advancements.nec.pocket_block.description"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "annouce_to_chat": true
+  },
+  "parent": "nec:nec",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "nec:pocket_block"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/data/nec/recipes/bedrock.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "tag": "minecraft:beds"
+    },
+    {
+      "item": "minecraft:stone"
+    }
+  ],
+  "result": {
+    "item": "minecraft:bedrock"
+  }
+}

src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AAA",
+    "ABA",
+    "AAA"
+  ],
+  "key": {
+    "A": {
+      "item": "minecraft:deepslate"
+    },
+    "B": {
+      "item": "minecraft:deepslate_diamond_ore"
+    }
+  },
+  "result": {
+    "item": "nec:deepslate_diamond_ore_ore"
+  }
+}

src/main/resources/data/nec/recipes/diamond_ore_ore.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AAA",
+    "ABA",
+    "AAA"
+  ],
+  "key": {
+    "A": {
+      "item": "minecraft:stone"
+    },
+    "B": {
+      "item": "minecraft:diamond_ore"
+    }
+  },
+  "result": {
+    "item": "nec:diamond_ore_ore"
+  }
+}

src/main/resources/data/nec/recipes/java_block.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "building",
+  "ingredients": [
+    {
+      "item": "nec:pocket_block"
+    }
+  ],
+  "result": {
+    "item": "nec:java_block"
+  },
+  "show_notification": true
+}

src/main/resources/data/nec/recipes/netherite_chestplate.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "1": {
+      "item": "minecraft:golden_chestplate"
+    },
+    "2": {
+      "item": "minecraft:leather_chestplate"
+    }
+  },
+  "pattern": [
+    "111",
+    "1 2",
+    "222"
+  ],
+  "result": {
+    "item": "minecraft:netherite_chestplate"
+  },
+  "show_notification": true
+}

src/main/resources/data/nec/recipes/pocket_block.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "building",
+  "ingredients": [
+  {
+      "item": "minecraft:bedrock"
+  }
+    ],
+  "result": {
+    "item": "nec:pocket_block"
+  },
+  "show_notification": true
+}