From 14d0731c07e0a15163315f1a642588b1e2980de5 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 21 Mar 2025 17:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8B=86=E5=BC=B9=E5=99=A8?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=92=AC=E6=A3=8D=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.cache/b69ee8a2655365569b979911c0440daa8c470ac2 | 5 +++-- .../assets/superbwarfare/models/item/crowbar.json | 2 +- .../assets/superbwarfare/models/item/defuser.json | 6 ++++++ .../superbwarfare/datagen/ModItemModelProvider.java | 7 ++++++- .../com/atsuishio/superbwarfare/init/ModItems.java | 1 + .../com/atsuishio/superbwarfare/item/Defuser.java | 11 +++++++++++ .../resources/assets/superbwarfare/lang/en_us.json | 1 + .../resources/assets/superbwarfare/lang/zh_cn.json | 1 + .../textures/item/{defusals.png => defuser.png} | Bin 9 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/defuser.json create mode 100644 src/main/java/com/atsuishio/superbwarfare/item/Defuser.java rename src/main/resources/assets/superbwarfare/textures/item/{defusals.png => defuser.png} (100%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 7b1255786..7a9dfe874 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-11T20:56:29.5501616 Item Models: superbwarfare +// 1.20.1 2025-03-21T17:02:34.294309 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json @@ -20,7 +20,8 @@ a52a7f9dc18d5af69903c2249239c15cb6d38c8e assets/superbwarfare/models/item/coal_p 5ccef04175adcc9fa0797caca6bf04526f702d5c assets/superbwarfare/models/item/common_material_pack.json fc892b610a110980dbc6f8e2c080672b5dc06e99 assets/superbwarfare/models/item/copper_plate.json 7e43d8e9c4b8589f7665c46d4b67de645949cc6b assets/superbwarfare/models/item/creative_charging_station.json -0d3ef5e99a28f03b41c39bb7a173b77a0d42467d assets/superbwarfare/models/item/crowbar.json +b0296c3d68f3b5ae4945b46384fa20a1ff32cac5 assets/superbwarfare/models/item/crowbar.json +d81b738e17048945459ff8b59f8f83e872171473 assets/superbwarfare/models/item/defuser.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/devotion_blueprint.json 6f4a829dc159f1740f52265d01730ecb6a840d81 assets/superbwarfare/models/item/dog_tag.json dd455cf29eed0ef5eb5e90ef3d7140cb8de61efe assets/superbwarfare/models/item/drone.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/crowbar.json b/src/generated/resources/assets/superbwarfare/models/item/crowbar.json index 309865057..587f9bb71 100644 --- a/src/generated/resources/assets/superbwarfare/models/item/crowbar.json +++ b/src/generated/resources/assets/superbwarfare/models/item/crowbar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "superbwarfare:item/crowbar" } diff --git a/src/generated/resources/assets/superbwarfare/models/item/defuser.json b/src/generated/resources/assets/superbwarfare/models/item/defuser.json new file mode 100644 index 000000000..e50a885f8 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/defuser.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "superbwarfare:item/defuser" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index e08c020d1..3955028d3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -68,7 +68,8 @@ public class ModItemModelProvider extends ItemModelProvider { simpleItem(ModItems.TRANSCRIPT); simpleItem(ModItems.RAW_SILVER); simpleItem(ModItems.SILVER_INGOT); - simpleItem(ModItems.CROWBAR); + handheldItem(ModItems.CROWBAR); + handheldItem(ModItems.DEFUSER); simpleItem(ModItems.FIRING_PARAMETERS); simpleItem(ModItems.BEAM_TEST); simpleItem(ModItems.HANDGUN_AMMO); @@ -189,4 +190,8 @@ public class ModItemModelProvider extends ItemModelProvider { .texture("layer0", ModUtils.loc("item/cannon_blueprint")); } + private ItemModelBuilder handheldItem(RegistryObject item) { + return withExistingParent(item.getId().getPath(), new ResourceLocation("item/handheld")) + .texture("layer0", ModUtils.loc("item/" + item.getId().getPath())); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index f0d7a2b60..1cb9f87d3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -138,6 +138,7 @@ public class ModItems { public static final RegistryObject KNIFE = ITEMS.register("knife", Knife::new); public static final RegistryObject HAMMER = ITEMS.register("hammer", Hammer::new); public static final RegistryObject CROWBAR = ITEMS.register("crowbar", Crowbar::new); + public static final RegistryObject DEFUSER = ITEMS.register("defuser", Defuser::new); public static final RegistryObject ARMOR_PLATE = ITEMS.register("armor_plate", ArmorPlate::new); public static final RegistryObject RU_HELMET_6B47 = ITEMS.register("ru_helmet_6b47", RuHelmet6b47::new); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/Defuser.java b/src/main/java/com/atsuishio/superbwarfare/item/Defuser.java new file mode 100644 index 000000000..563eabe43 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/item/Defuser.java @@ -0,0 +1,11 @@ +package com.atsuishio.superbwarfare.item; + +import net.minecraft.world.item.Item; + +public class Defuser extends Item { + + public Defuser() { + super(new Properties().durability(8)); + } + +} diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index bb32c3b92..dae20a88c 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -175,6 +175,7 @@ "item.superbwarfare.knife": "Knife", "item.superbwarfare.hammer": "Hammer", "item.superbwarfare.crowbar": "Crowbar", + "item.superbwarfare.defuser": "Defuser", "item.superbwarfare.mortar_bipod": "Mortar Bipod", "item.superbwarfare.mortar_base_plate": "Mortar Base Plate", "item.superbwarfare.mortar_barrel": "Mortar Barrel", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 03af983f0..0737777e9 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -175,6 +175,7 @@ "item.superbwarfare.knife": "军刀", "item.superbwarfare.hammer": "大锤", "item.superbwarfare.crowbar": "撬棍", + "item.superbwarfare.defuser": "拆弹器", "item.superbwarfare.mortar_bipod": "迫击炮架", "item.superbwarfare.mortar_base_plate": "迫击炮座钣", "item.superbwarfare.mortar_barrel": "迫击炮管", diff --git a/src/main/resources/assets/superbwarfare/textures/item/defusals.png b/src/main/resources/assets/superbwarfare/textures/item/defuser.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/defusals.png rename to src/main/resources/assets/superbwarfare/textures/item/defuser.png