From 1a1c45c24b76bb96520a693816ec11dcd1fa2f26 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 9 Sep 2024 20:39:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8D=B7=E5=BE=84=E5=8C=85?= =?UTF-8?q?=EF=BC=88=E7=A1=AE=E4=BF=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/superbwarfare/init/ModItems.java | 1 + .../assets/superbwarfare/lang/en_us.json | 1 + .../assets/superbwarfare/lang/zh_cn.json | 1 + .../models/displaysettings/aa12.item.json | 51 +++++++++ .../models/displaysettings/abekiri.item.json | 102 ++++++++++++++++++ .../models/displaysettings/ak47.item.json | 24 +++++ .../models/displaysettings/bocek.item.json | 46 ++++++++ .../superbwarfare/models/item/aa_12_base.json | 50 +-------- .../models/item/abekiri_base.json | 101 +---------------- .../superbwarfare/models/item/ak_47_base.json | 23 +--- .../superbwarfare/models/item/bocek_base.json | 45 +------- .../models/item/shortcut_pack.json | 6 ++ .../textures/item/perk/shortcut_pack.png | Bin 0 -> 531 bytes .../recipes/shortcut_pack_crafting.json | 27 +++++ 14 files changed, 263 insertions(+), 215 deletions(-) create mode 100644 src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json create mode 100644 src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json create mode 100644 src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json create mode 100644 src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json create mode 100644 src/main/resources/assets/superbwarfare/models/item/shortcut_pack.json create mode 100644 src/main/resources/assets/superbwarfare/textures/item/perk/shortcut_pack.png create mode 100644 src/main/resources/data/superbwarfare/recipes/shortcut_pack_crafting.json diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 39f7ddd75..928c6f52e 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -236,6 +236,7 @@ public class ModItems { /** * 单独注册，用于Tab图标，不要删 */ + public static final RegistryObject SHORTCUT_PACK = PERKS.register("shortcut_pack", () -> new Item(new Item.Properties().rarity(Rarity.EPIC))); public static final RegistryObject EMPTY_PERK = PERKS.register("empty_perk", () -> new Item(new Item.Properties())); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 98b6b5b76..acf11adce 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -233,6 +233,7 @@ "des.superbwarfare.volt_overload": "Increases the shock damage of Taser Gun", "item.superbwarfare.empty_perk": "Empty Perk", + "item.superbwarfare.shortcut_pack": "Shortcut Pack", "perk.superbwarfare.tips": "[Perks]", "perk.superbwarfare.slot": "Type: ", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 4d630c2dd..559dff0b1 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -238,6 +238,7 @@ "perk.superbwarfare.slot_Functional": "功能模组", "perk.superbwarfare.slot_Damage": "伤害模组", "item.superbwarfare.empty_perk": "空白模组", + "item.superbwarfare.shortcut_pack": "捷径包", "death.attack.gunfire": "%1$s被%2$s射爆了", "death.attack.gunfire.entity": "%1$s被%2$s射爆了", diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json new file mode 100644 index 000000000..ca0479a46 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json @@ -0,0 +1,51 @@ +{ + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 256, + 256 + ], + "display": { + "firstperson_righthand": { + "translation": [ + -4.75, + -2.75, + -4.5 + ], + "scale": [ + 2, + 2, + 2 + ] + }, + "firstperson_lefthand": { + "translation": [ + 8.75, + -61, + -21 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "gui": { + "rotation": [ + 165.69, + -39.63, + 178.66 + ], + "translation": [ + -2.4, + -4.75, + 0 + ], + "scale": [ + 0.21, + 0.21, + 0.21 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json new file mode 100644 index 000000000..4230a2743 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json @@ -0,0 +1,102 @@ +{ + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 64, + 64 + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [ + 0, + 5.5, + -0.25 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "firstperson_righthand": { + "translation": [ + -1.5, + -12.5, + -26.5 + ], + "scale": [ + 3, + 3, + 3 + ] + }, + "firstperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 4.25, + 0 + ], + "scale": [ + 1.2, + 1.2, + 1.2 + ] + }, + "gui": { + "rotation": [ + 90, + 45, + -90 + ], + "translation": [ + -5.75, + -1.5, + 0 + ], + "scale": [ + 1.6, + 1.6, + 1.6 + ] + }, + "head": { + "translation": [ + 0, + 23.75, + 0 + ], + "scale": [ + 3, + 3, + 3 + ] + }, + "fixed": { + "rotation": [ + 90, + -45, + 90 + ], + "translation": [ + -6.5, + 7.5, + 0 + ], + "scale": [ + 2, + 2, + 2 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json new file mode 100644 index 000000000..3f3b46bf2 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json @@ -0,0 +1,24 @@ +{ + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 128, + 128 + ], + "display": { + "firstperson_righthand": { + "translation": [ + -6.5, + 3.75, + 5 + ] + }, + "firstperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json new file mode 100644 index 000000000..e51b6ff0c --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json @@ -0,0 +1,46 @@ +{ + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 64, + 64 + ], + "display": { + "firstperson_righthand": { + "translation": [ + -10.25, + -2.5, + -7.25 + ] + }, + "firstperson_lefthand": { + "translation": [ + -80, + -80, + -80 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "gui": { + "rotation": [ + 165.69, + -39.63, + 178.66 + ], + "translation": [ + 0.25, + -3.5, + 0 + ], + "scale": [ + 0.45, + 0.45, + 0.45 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json b/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json index adaac296a..fd3292bd0 100644 --- a/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json @@ -1,53 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 256, - 256 - ], - "display": { - "firstperson_righthand": { - "translation": [ - -4.75, - -2.75, - -4.5 - ], - "scale": [ - 2, - 2, - 2 - ] - }, - "firstperson_lefthand": { - "translation": [ - 8.75, - -61, - -21 - ], - "scale": [ - 0, - 0, - 0 - ] - }, - "gui": { - "rotation": [ - 165.69, - -39.63, - 178.66 - ], - "translation": [ - -2.4, - -4.75, - 0 - ], - "scale": [ - 0.21, - 0.21, - 0.21 - ] - } - }, + "parent": "superbwarfare:displaysettings/aa12.item", "textures": { "layer0": "superbwarfare:item/aa12_new" } diff --git a/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json b/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json index 712d703b4..bf57be8bc 100644 --- a/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json @@ -1,104 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 64, - 64 - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [ - 0, - 5.5, - -0.25 - ] - }, - "thirdperson_lefthand": { - "scale": [ - 0, - 0, - 0 - ] - }, - "firstperson_righthand": { - "translation": [ - -1.5, - -12.5, - -26.5 - ], - "scale": [ - 3, - 3, - 3 - ] - }, - "firstperson_lefthand": { - "scale": [ - 0, - 0, - 0 - ] - }, - "ground": { - "translation": [ - 0, - 4.25, - 0 - ], - "scale": [ - 1.2, - 1.2, - 1.2 - ] - }, - "gui": { - "rotation": [ - 90, - 45, - -90 - ], - "translation": [ - -5.75, - -1.5, - 0 - ], - "scale": [ - 1.6, - 1.6, - 1.6 - ] - }, - "head": { - "translation": [ - 0, - 23.75, - 0 - ], - "scale": [ - 3, - 3, - 3 - ] - }, - "fixed": { - "rotation": [ - 90, - -45, - 90 - ], - "translation": [ - -6.5, - 7.5, - 0 - ], - "scale": [ - 2, - 2, - 2 - ] - } - }, + "parent": "superbwarfare:displaysettings/abekiri.item", "textures": { "layer0": "superbwarfare:item/abekiri" } diff --git a/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json b/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json index 829ae5187..509de9910 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json @@ -1,26 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 128, - 128 - ], - "display": { - "firstperson_righthand": { - "translation": [ - -6.5, - 3.75, - 5 - ] - }, - "firstperson_lefthand": { - "scale": [ - 0, - 0, - 0 - ] - } - }, + "parent": "superbwarfare:displaysettings/ak47.item", "textures": { "layer0": "superbwarfare:item/ak47" } diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek_base.json b/src/main/resources/assets/superbwarfare/models/item/bocek_base.json index 77a162668..9dabcaa9a 100644 --- a/src/main/resources/assets/superbwarfare/models/item/bocek_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/bocek_base.json @@ -1,48 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 64, - 64 - ], - "display": { - "firstperson_righthand": { - "translation": [ - -10.25, - -2.5, - -7.25 - ] - }, - "firstperson_lefthand": { - "translation": [ - -80, - -80, - -80 - ], - "scale": [ - 0, - 0, - 0 - ] - }, - "gui": { - "rotation": [ - 165.69, - -39.63, - 178.66 - ], - "translation": [ - 0.25, - -3.5, - 0 - ], - "scale": [ - 0.45, - 0.45, - 0.45 - ] - } - }, + "parent": "superbwarfare:displaysettings/bocek.item", "textures": { "layer0": "superbwarfare:item/bocek" } diff --git a/src/main/resources/assets/superbwarfare/models/item/shortcut_pack.json b/src/main/resources/assets/superbwarfare/models/item/shortcut_pack.json new file mode 100644 index 000000000..f7970d4d6 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/shortcut_pack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/perk/shortcut_pack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/perk/shortcut_pack.png b/src/main/resources/assets/superbwarfare/textures/item/perk/shortcut_pack.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb0b954e2e5f29e589459e1833d02e4c5d88402 GIT binary patch literal 531 zcmV+u0_^>XP)LlFv&NVHn3hGdpf;L5Cvg;19?~ghEoXyy-z*tUn+T za&V!em!fDpCMsb!E<$vaMc9J}54y@O$i_w!c-cd0Djs%roOXCSyw2Oq#&+?6 zhnMI1KHulZ`#f*~acqS4zkqBeEdbtqT>B@^u@L|*6J#@KF))0W-;IDusX{bSNN$-R zn@J1vP7h~Z9e`x&3T??0l~RSw=vpk+XePg&n-t%_Rq5{SP(I(Q;d?c@dpj_#*ckB+ zURo34R^Lqk@~cIjca;Iy9he2+QmS26O