From a76b7764eb15ab3b34cc98e59822ce8dcbc8a16f Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Sat, 15 Apr 2023 20:10:49 +0200 Subject: [PATCH 1/8] added deepslate- and diamond ore ore --- .../recipes/deepslate_diamond_ore_ore.json | 19 +++++++++++++++++++ .../data/nec/recipes/diamond_ore_ore.json | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json create mode 100644 src/main/resources/data/nec/recipes/diamond_ore_ore.json diff --git a/src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json b/src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json new file mode 100644 index 0000000..99bf71f --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/diamond_ore_ore.json b/src/main/resources/data/nec/recipes/diamond_ore_ore.json new file mode 100644 index 0000000..6fad817 --- /dev/null +++ b/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" + } +} \ No newline at end of file From 96313c44673e4f9844ad1d27b160a432990c53cd Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:25:56 +0200 Subject: [PATCH 2/8] added recipe for bedrock --- src/main/resources/data/nec/recipes/bedrock.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/resources/data/nec/recipes/bedrock.json diff --git a/src/main/resources/data/nec/recipes/bedrock.json b/src/main/resources/data/nec/recipes/bedrock.json new file mode 100644 index 0000000..6b9ffc0 --- /dev/null +++ b/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" + } +} From 994ef87e9a9e5b8c1bfcf3de1878e38df13d5668 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:26:05 +0200 Subject: [PATCH 3/8] added recipe for netherite_chestplate --- .../nec/recipes/netherite_chestplate.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/resources/data/nec/recipes/netherite_chestplate.json diff --git a/src/main/resources/data/nec/recipes/netherite_chestplate.json b/src/main/resources/data/nec/recipes/netherite_chestplate.json new file mode 100644 index 0000000..1b6d6f6 --- /dev/null +++ b/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 +} \ No newline at end of file From 5c14e3430d9dc6253dedef7339edd1f619285afa Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:36:11 +0200 Subject: [PATCH 4/8] added java block --- .../data/nec/advancements/java_block.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/resources/data/nec/advancements/java_block.json diff --git a/src/main/resources/data/nec/advancements/java_block.json b/src/main/resources/data/nec/advancements/java_block.json new file mode 100644 index 0000000..c3a79b6 --- /dev/null +++ b/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" + ] + } + ] + } + } + } +} \ No newline at end of file From b7f14f9f5ed2d0d2da9cd1d3ccc8291255e3794e Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:36:21 +0200 Subject: [PATCH 5/8] added pocket block --- .../data/nec/advancements/pocket_block.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/resources/data/nec/advancements/pocket_block.json diff --git a/src/main/resources/data/nec/advancements/pocket_block.json b/src/main/resources/data/nec/advancements/pocket_block.json new file mode 100644 index 0000000..460907d --- /dev/null +++ b/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" + ] + } + ] + } + } + } +} \ No newline at end of file From 466142ae5a3c981410d2edaa81ea67d07d3d98fd Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:36:36 +0200 Subject: [PATCH 6/8] added java block recipe --- src/main/resources/data/nec/recipes/java_block.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/resources/data/nec/recipes/java_block.json diff --git a/src/main/resources/data/nec/recipes/java_block.json b/src/main/resources/data/nec/recipes/java_block.json new file mode 100644 index 0000000..608a143 --- /dev/null +++ b/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 +} \ No newline at end of file From 1e7452424d77d914200eda546550b259a38d1150 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:36:44 +0200 Subject: [PATCH 7/8] added pocket block recipe --- .../resources/data/nec/recipes/pocket_block.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/resources/data/nec/recipes/pocket_block.json diff --git a/src/main/resources/data/nec/recipes/pocket_block.json b/src/main/resources/data/nec/recipes/pocket_block.json new file mode 100644 index 0000000..03cbcc3 --- /dev/null +++ b/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 +} \ No newline at end of file From 836dccb151a5f5d10622ff68705c997b69f88a0e Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:36:56 +0200 Subject: [PATCH 8/8] added advancement names and descriptions --- src/main/resources/assets/nec/lang/en_us.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index e743a5e..f740dd1 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -3,6 +3,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",