diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 1f9f83744..9ef1846bf 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,9 +1,9 @@ -// 1.20.1 2024-12-21T01:11:41.7343972 Item Models: superbwarfare +// 1.20.1 2024-12-29T21:51:17.35717 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 c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json -13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/annihilator_blueprint.json +a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/annihilator_blueprint.json 4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json 984c08ca6f6893a15721a85e30118f9e32c65c7f assets/superbwarfare/models/item/barbed_wire.json e8f16946c6f9429989d05e9ec250a72ffc64f9e1 assets/superbwarfare/models/item/beam_test.json @@ -53,8 +53,8 @@ f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legend 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/minigun_blueprint.json c206cd345f459733399e0be4692586849ef0aac2 assets/superbwarfare/models/item/missile_engine.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mk_14_blueprint.json -13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mk_42_blueprint.json -13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mle_1934_blueprint.json +a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/mk_42_blueprint.json +a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/mle_1934_blueprint.json db96dbb75327701d7901c2de48a539bda9fe31c4 assets/superbwarfare/models/item/mortar_barrel.json 3922427d3921d3de7195614780ee8f57dfc0ee6f assets/superbwarfare/models/item/mortar_base_plate.json ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json index 7bbbd3bbb..c698e5dfc 100644 --- a/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "superbwarfare:item/gun_blueprint" + "layer0": "superbwarfare:item/cannon_blueprint" } } \ 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 8bd910ebe..a579de999 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -97,41 +97,41 @@ public class ModItemModelProvider extends ItemModelProvider { simpleItem(ModItems.GE_HELMET_M_35); // blueprints - blueprintItem(ModItems.TRACHELIUM_BLUEPRINT); - blueprintItem(ModItems.GLOCK_17_BLUEPRINT); - blueprintItem(ModItems.GLOCK_18_BLUEPRINT); - blueprintItem(ModItems.HUNTING_RIFLE_BLUEPRINT); - blueprintItem(ModItems.M_79_BLUEPRINT); - blueprintItem(ModItems.RPG_BLUEPRINT); - blueprintItem(ModItems.BOCEK_BLUEPRINT); - blueprintItem(ModItems.M_4_BLUEPRINT); - blueprintItem(ModItems.AA_12_BLUEPRINT); - blueprintItem(ModItems.HK_416_BLUEPRINT); - blueprintItem(ModItems.RPK_BLUEPRINT); - blueprintItem(ModItems.SKS_BLUEPRINT); - blueprintItem(ModItems.NTW_20_BLUEPRINT); - blueprintItem(ModItems.VECTOR_BLUEPRINT); - blueprintItem(ModItems.MINIGUN_BLUEPRINT); - blueprintItem(ModItems.MK_14_BLUEPRINT); - blueprintItem(ModItems.SENTINEL_BLUEPRINT); - blueprintItem(ModItems.M_60_BLUEPRINT); - blueprintItem(ModItems.SVD_BLUEPRINT); - blueprintItem(ModItems.MARLIN_BLUEPRINT); - blueprintItem(ModItems.M_870_BLUEPRINT); - blueprintItem(ModItems.M_98B_BLUEPRINT); - blueprintItem(ModItems.AK_12_BLUEPRINT); - blueprintItem(ModItems.AK_47_BLUEPRINT); - blueprintItem(ModItems.DEVOTION_BLUEPRINT); - blueprintItem(ModItems.TASER_BLUEPRINT); - blueprintItem(ModItems.M_1911_BLUEPRINT); - blueprintItem(ModItems.QBZ_95_BLUEPRINT); - blueprintItem(ModItems.K_98_BLUEPRINT); - blueprintItem(ModItems.MOSIN_NAGANT_BLUEPRINT); - blueprintItem(ModItems.JAVELIN_BLUEPRINT); - blueprintItem(ModItems.MK_42_BLUEPRINT); - blueprintItem(ModItems.MLE_1934_BLUEPRINT); - blueprintItem(ModItems.ANNIHILATOR_BLUEPRINT); - blueprintItem(ModItems.M_2_HB_BLUEPRINT); + gunBlueprintItem(ModItems.TRACHELIUM_BLUEPRINT); + gunBlueprintItem(ModItems.GLOCK_17_BLUEPRINT); + gunBlueprintItem(ModItems.GLOCK_18_BLUEPRINT); + gunBlueprintItem(ModItems.HUNTING_RIFLE_BLUEPRINT); + gunBlueprintItem(ModItems.M_79_BLUEPRINT); + gunBlueprintItem(ModItems.RPG_BLUEPRINT); + gunBlueprintItem(ModItems.BOCEK_BLUEPRINT); + gunBlueprintItem(ModItems.M_4_BLUEPRINT); + gunBlueprintItem(ModItems.AA_12_BLUEPRINT); + gunBlueprintItem(ModItems.HK_416_BLUEPRINT); + gunBlueprintItem(ModItems.RPK_BLUEPRINT); + gunBlueprintItem(ModItems.SKS_BLUEPRINT); + gunBlueprintItem(ModItems.NTW_20_BLUEPRINT); + gunBlueprintItem(ModItems.VECTOR_BLUEPRINT); + gunBlueprintItem(ModItems.MINIGUN_BLUEPRINT); + gunBlueprintItem(ModItems.MK_14_BLUEPRINT); + gunBlueprintItem(ModItems.SENTINEL_BLUEPRINT); + gunBlueprintItem(ModItems.M_60_BLUEPRINT); + gunBlueprintItem(ModItems.SVD_BLUEPRINT); + gunBlueprintItem(ModItems.MARLIN_BLUEPRINT); + gunBlueprintItem(ModItems.M_870_BLUEPRINT); + gunBlueprintItem(ModItems.M_98B_BLUEPRINT); + gunBlueprintItem(ModItems.AK_12_BLUEPRINT); + gunBlueprintItem(ModItems.AK_47_BLUEPRINT); + gunBlueprintItem(ModItems.DEVOTION_BLUEPRINT); + gunBlueprintItem(ModItems.TASER_BLUEPRINT); + gunBlueprintItem(ModItems.M_1911_BLUEPRINT); + gunBlueprintItem(ModItems.QBZ_95_BLUEPRINT); + gunBlueprintItem(ModItems.K_98_BLUEPRINT); + gunBlueprintItem(ModItems.MOSIN_NAGANT_BLUEPRINT); + gunBlueprintItem(ModItems.JAVELIN_BLUEPRINT); + cannonBlueprintItem(ModItems.MK_42_BLUEPRINT); + cannonBlueprintItem(ModItems.MLE_1934_BLUEPRINT); + cannonBlueprintItem(ModItems.ANNIHILATOR_BLUEPRINT); + gunBlueprintItem(ModItems.M_2_HB_BLUEPRINT); // blocks evenSimplerBlockItem(ModBlocks.BARBED_WIRE); @@ -161,9 +161,14 @@ public class ModItemModelProvider extends ItemModelProvider { modLoc("block/" + ForgeRegistries.BLOCKS.getKey(block.get()).getPath())); } - private ItemModelBuilder blueprintItem(RegistryObject item) { + private ItemModelBuilder gunBlueprintItem(RegistryObject item) { return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")) .texture("layer0", ModUtils.loc("item/gun_blueprint")); } + private ItemModelBuilder cannonBlueprintItem(RegistryObject item) { + return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")) + .texture("layer0", ModUtils.loc("item/cannon_blueprint")); + } + }