From 516bf1607c51d369abfd1c4556fa30b3572be6be Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Wed, 5 Apr 2023 03:55:48 +0200 Subject: [PATCH 1/4] added chainmail and letter --- .../java/me/jonasjones/nec/item/ModItems.java | 10 +++++++++ .../assets/nec/models/item/chainmail.json | 6 ++++++ .../assets/nec/models/item/letter.json | 6 ++++++ .../assets/nec/textures/item/chainmail.png | Bin 0 -> 251 bytes .../assets/nec/textures/item/letter.png | Bin 0 -> 223 bytes .../resources/data/nec/recipes/chainmail.json | 15 +++++++++++++ .../data/nec/recipes/chainmail_boots.json | 16 ++++++++++++++ .../nec/recipes/chainmail_chestplate.json | 16 ++++++++++++++ .../data/nec/recipes/chainmail_helmet.json | 16 ++++++++++++++ .../data/nec/recipes/chainmail_leggings.json | 16 ++++++++++++++ src/main/resources/data/nec/recipes/mail.json | 20 ++++++++++++++++++ 11 files changed, 121 insertions(+) create mode 100644 src/main/resources/assets/nec/models/item/chainmail.json create mode 100644 src/main/resources/assets/nec/models/item/letter.json create mode 100644 src/main/resources/assets/nec/textures/item/chainmail.png create mode 100644 src/main/resources/assets/nec/textures/item/letter.png create mode 100644 src/main/resources/data/nec/recipes/chainmail.json create mode 100644 src/main/resources/data/nec/recipes/chainmail_boots.json create mode 100644 src/main/resources/data/nec/recipes/chainmail_chestplate.json create mode 100644 src/main/resources/data/nec/recipes/chainmail_helmet.json create mode 100644 src/main/resources/data/nec/recipes/chainmail_leggings.json create mode 100644 src/main/resources/data/nec/recipes/mail.json diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index feb8978..6e8cb3d 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -12,6 +12,8 @@ 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; public static void register() { ToolItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Settings()); @@ -25,5 +27,13 @@ public class ModItems { Item NEGATIVE_FLINT = new Item(new FabricItemSettings()); 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); } } diff --git a/src/main/resources/assets/nec/models/item/chainmail.json b/src/main/resources/assets/nec/models/item/chainmail.json new file mode 100644 index 0000000..782ed5e --- /dev/null +++ b/src/main/resources/assets/nec/models/item/chainmail.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "nec:item/chainmail" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/nec/models/item/letter.json b/src/main/resources/assets/nec/models/item/letter.json new file mode 100644 index 0000000..da1c48a --- /dev/null +++ b/src/main/resources/assets/nec/models/item/letter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "nec:item/letter" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/nec/textures/item/chainmail.png b/src/main/resources/assets/nec/textures/item/chainmail.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ec64c40eeac396971e972fe5bd92452ef1d51e GIT binary patch literal 251 zcmVPx#wMj%lR5*>*lEJORFbqRqi!PxVG=;s6XV57l7|0kN!I{E<7DMIp_{sQUc ze_jYt5Xpn!-{S@#BIC;Ox~{j!UNAFajMQ3x`&$+fX8>;yV+3HD zCZEremt~>W`r06+GB`+7!xI3`tc=X;0a5?}002ovPDHLkV1k`g BZ3h4V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/nec/textures/item/letter.png b/src/main/resources/assets/nec/textures/item/letter.png new file mode 100644 index 0000000000000000000000000000000000000000..8d298a0ed2f2efa3ca73330aa1af4cacb6bcfe2e GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_r3fhFJ6_ zCrEs1nAq6Zn0R>0hW}48_)bI}J<+7IVAb;j2h{ai!!IwNeqJIk-iqP5@j;0{OqY1J z>&qtm`0`28@hp%xgH6DQWp)}5bAe=&@8_$t`6VTQAmReAgV~ewbF2kiHMJzn7Vlt4 zliH;JYD@<);T3K0RV8)PgDQ^ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/nec/recipes/chainmail.json b/src/main/resources/data/nec/recipes/chainmail.json new file mode 100644 index 0000000..594e020 --- /dev/null +++ b/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 + } +} diff --git a/src/main/resources/data/nec/recipes/chainmail_boots.json b/src/main/resources/data/nec/recipes/chainmail_boots.json new file mode 100644 index 0000000..a923450 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/chainmail_chestplate.json b/src/main/resources/data/nec/recipes/chainmail_chestplate.json new file mode 100644 index 0000000..72586cb --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/chainmail_helmet.json b/src/main/resources/data/nec/recipes/chainmail_helmet.json new file mode 100644 index 0000000..9d147e2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/chainmail_leggings.json b/src/main/resources/data/nec/recipes/chainmail_leggings.json new file mode 100644 index 0000000..bfa08e7 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/mail.json b/src/main/resources/data/nec/recipes/mail.json new file mode 100644 index 0000000..5cd14b0 --- /dev/null +++ b/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 + } +} \ No newline at end of file From 75767bf47016021ca6209c1fd65d930c5f08b8c9 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Wed, 5 Apr 2023 04:10:45 +0200 Subject: [PATCH 2/4] added AK-47 --- .../java/me/jonasjones/nec/item/ModItems.java | 5 +++++ .../resources/assets/nec/models/item/ak_47.json | 6 ++++++ .../resources/assets/nec/textures/item/ak_47.png | Bin 0 -> 291 bytes src/main/resources/data/nec/recipes/ak_47.json | 12 ++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 src/main/resources/assets/nec/models/item/ak_47.json create mode 100644 src/main/resources/assets/nec/textures/item/ak_47.png create mode 100644 src/main/resources/data/nec/recipes/ak_47.json diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index 6e8cb3d..4519d54 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -14,6 +14,7 @@ public class ModItems { private static Item NEGATIVE_FLINT_ITEM; private static Item LETTER_ITEM; private static Item CHAINMAIL_ITEM; + private static Item AK47_ITEM; public static void register() { ToolItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Settings()); @@ -35,5 +36,9 @@ public class ModItems { 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); } } diff --git a/src/main/resources/assets/nec/models/item/ak_47.json b/src/main/resources/assets/nec/models/item/ak_47.json new file mode 100644 index 0000000..6e2146b --- /dev/null +++ b/src/main/resources/assets/nec/models/item/ak_47.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "nec:item/ak_47" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/nec/textures/item/ak_47.png b/src/main/resources/assets/nec/textures/item/ak_47.png new file mode 100644 index 0000000000000000000000000000000000000000..b77a06592bf8e5a97f83b7261a75014a7c8f82ed GIT binary patch literal 291 zcmV+;0o?wHP)Px#-AP12R5*>jl06E-KoEt$HCkGU*m;6!QpVm3SOmO4Ai05Hp&r8v2o@eev9h#q zu*lc$%`A!R^Bmi=;Cp%tab>p!=9Km=D`aLinX__v8 zWkGD0lZuUqaJk+piuL%V1rb3+08mv_6~K(T9aNQ3w^N?ZbKA9L&rAOzivqv$PnxDs pw^nfNh}Wlc Date: Wed, 5 Apr 2023 04:10:53 +0200 Subject: [PATCH 3/4] fixed missing item names --- src/main/resources/assets/nec/lang/en_us.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index 88ffcf3..1930d99 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/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", From cc4cf42f31eab4c9abaf24fadab9f2cf692a5a73 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Wed, 5 Apr 2023 04:37:26 +0200 Subject: [PATCH 4/4] beetroot block --- src/main/resources/assets/nec/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index 1930d99..83ee859 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -54,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",