Merge pull request #1 from J-onasJones/thiccc-resolve-conflict

pulling working code to mask branch

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

@@ -14,6 +14,9 @@ public class ModItems {
     private static Item STEEL_ITEM;
     private static ToolItem DIRT_SWORD_ITEM;
     private static Item NEGATIVE_FLINT_ITEM;
+    private static Item LETTER_ITEM;
+    private static Item CHAINMAIL_ITEM;
+    private static Item AK47_ITEM;
     private static Item MASK_ITEM;
 
     public static void register() {
@@ -29,6 +32,18 @@ public class ModItems {
         NEGATIVE_FLINT_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "negative_flint"), NEGATIVE_FLINT);
         ModRegistries.register_item(NEGATIVE_FLINT_ITEM);
 
+        Item LETTER = new Item(new FabricItemSettings());
+        LETTER_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "letter"), LETTER);
+        ModRegistries.register_item(LETTER_ITEM);
+
+        Item CHAINMAIL = new Item(new FabricItemSettings());
+        CHAINMAIL_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "chainmail"), CHAINMAIL);
+        ModRegistries.register_item(CHAINMAIL_ITEM);
+
+        Item AK47 = new Item(new FabricItemSettings());
+        AK47_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "ak_47"), AK47);
+        ModRegistries.register_item(AK47_ITEM);
+
         ArmorMaterial MaskArmorMaterial = new MaskArmorMaterial();
         MaskItem MASK = new MaskItem(MaskArmorMaterial, MaskItem.Type.HELMET, new Item.Settings());
         MASK_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "mask"), MASK);

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

@@ -9,7 +9,10 @@
     "block.nec.gun_block": "Gun Block",
     "block.nec.java_block": "Java Block",
     "block.nec.pocket_block": "Pocket Block",
+    "item.nec.ak_47": "AK-47",
+    "item.nec.chainmail": "Chainmail",
     "item.nec.dirt_sword": "Dirt Sword",
+    "item.nec.letter": "Letter",
     "item.nec.negative_flint": "Negative Flint",
     "item.nec.steel": "Steel",
     "itemGroup.nec.not_enough_cursedness": "Not Enough Cursedness",
@@ -51,6 +54,7 @@
     "block.minecraft.polished_granite_stairs": "Polish Granite Stairs",
     "block.minecraft.raw_gold_block": "Block of Raw Butter",
     "block.minecraft.stone": "Rock",
+    "block.minecraft.stripped_mangrove_log": "Beetroot Block",
     "item.minecraft.enchanted_golden_apple": "Enchanted Buttered Apple",
     "item.minecraft.gold_ingot": "Butter",
     "item.minecraft.gold_nugget": "Butter Nugget",

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:smithing",
+  "base": {
+    "item": "minecraft:bow"
+  },
+  "addition": {
+    "item": "minecraft:iron_ingot"
+  },
+  "result": {
+    "item": "nec:ak_47"
+  }
+}

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

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "nec:letter"
+    },
+    {
+      "item": "minecraft:chain"
+    }
+  ],
+  "result": {
+    "item": "nec:chainmail",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "   ",
+    "A A",
+    "A A"
+  ],
+  "key": {
+    "A": {
+      "item": "nec:chainmail"
+    }
+  },
+  "result": {
+    "item": "minecraft:chainmail_boots"
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "A A",
+    "AAA",
+    "AAA"
+  ],
+  "key": {
+    "A": {
+      "item": "nec:chainmail"
+    }
+  },
+  "result": {
+    "item": "minecraft:chainmail_chestplate"
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AAA",
+    "A A",
+    "   "
+  ],
+  "key": {
+    "A": {
+      "item": "nec:chainmail"
+    }
+  },
+  "result": {
+    "item": "minecraft:chainmail_helmet"
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AAA",
+    "A A",
+    "A A"
+  ],
+  "key": {
+    "A": {
+      "item": "nec:chainmail"
+    }
+  },
+  "result": {
+    "item": "minecraft:chainmail_leggings"
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "ABA",
+    "AAA",
+    "AAA"
+  ],
+  "key": {
+    "A": {
+      "item": "minecraft:paper"
+    },
+    "B": {
+      "item": "minecraft:honeycomb"
+    }
+  },
+  "result": {
+    "item": "nec:letter",
+    "count": 8
+  }
+}