Merge pull request #15 from J-onasJones/1.19.2-early-dev

added feature parity

src/main/java/me/jonasjones/nec/block/ModBlocks.java

@@ -11,8 +11,8 @@ import net.minecraft.world.level.block.RotatedPillarBlock;
 import net.minecraft.world.level.material.Material;
 
 import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID;
-import static net.minecraft.core.registries.BuiltInRegistries.BLOCK;
-import static net.minecraft.core.registries.BuiltInRegistries.ITEM;
+import static net.minecraft.core.Registry.BLOCK;
+import static net.minecraft.core.Registry.ITEM;
 
 public class ModBlocks {
     public static final Block GREEN_BIRCH_LOG = new RotatedPillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f));

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

@@ -8,9 +8,9 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.SwordItem;
 import net.minecraft.world.item.TieredItem;
-import static net.minecraft.core.registries.BuiltInRegistries.ITEM;
 
 import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID;
+import static net.minecraft.core.Registry.ITEM;
 
 public class ModItems {
     private static Item STEEL_ITEM;
@@ -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);
     }
 }

src/main/java/me/jonasjones/nec/util/ModRegistries.java

@@ -1,8 +1,6 @@
 package me.jonasjones.nec.util;
 
 import me.jonasjones.nec.block.ModBlocks;
-import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
-import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.fabricmc.fabric.api.registry.StrippableBlockRegistry;

src/main/resources/assets/minecraft/texts/splashes.txt

@@ -0,0 +1,3 @@
+uwu
+ôwo
+keep calm and watch hentai

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

@@ -1,8 +1,15 @@
 {
+    "advancements.story.bedrock.title": "\u00A78B E D R O C K",
+    "advancements.story.bedrock.description": "\u00A7a\u00A7o\u00A7lhow the fuck did you get it?!?",
+
     "advancements.nec.ak_47.description": "Obtain an AK47",
     "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",
 
@@ -19,12 +26,14 @@
     "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",
     "itemGroup.nec.not_enough_cursedness": "Not Enough Cursedness",
 
     "block.minecraft.ancient_debris": "Cinnamon Roll",
+    "block.minecraft.calibrated_sculk_sensor": "Variable Resistor",
     "block.minecraft.chiseled_polished_blackstone": "Chiseled Polish Blackstone",
     "block.minecraft.cracked_polished_blackstone_bricks": "Cracked Polish Blackstone Bricks",
     "block.minecraft.crying_obsidian": "Obsadian",
@@ -60,6 +69,7 @@
     "block.minecraft.polished_granite_slab": "Polish Granite Slab",
     "block.minecraft.polished_granite_stairs": "Polish Granite Stairs",
     "block.minecraft.raw_gold_block": "Block of Raw Butter",
+    "block.minecraft.sculk_sensor": "Resistor",
     "block.minecraft.stone": "Rock",
     "block.minecraft.stripped_mangrove_log": "Beetroot Block",
     "item.minecraft.enchanted_golden_apple": "Enchanted Buttered Apple",
@@ -90,6 +100,8 @@
     "item.minecraft.netherite_shovel": "Cinnamone Butter Shovel",
     "item.minecraft.netherite_sword": "Cinnamone Butter Sword",
     "item.minecraft.raw_gold": "Raw Butter",
+    "subtitles.block.sculk_sensor.clicking": "Resistor starts clicking",
+    "subtitles.block.sculk_sensor.clicking_stop": "Resistor stops clicking",
     "subtitles.item.armor.equip_gold": "butter armor clinks",
     "trim_material.minecraft.gold": "Butter Material"
 }

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/minecraft/tags/blocks/beacon_base_blocks.json

@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:tnt",
+    "minecraft:polished_deepslate"
+  ]
+}

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

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

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:pocket_block",
+  "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
+}