From 1be6ccb493c36d47691d1b951122cd8ef1a2b320 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 13 May 2025 14:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B9=E5=9D=97=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 3 ++- .../f93f628a3b0902e77de76541bcff68d1e5e3578f | 4 ++-- .../models/block/aircraft_catapult.json | 13 ++++++----- .../models/item/vehicle_deployer.json | 3 +++ .../datagen/ModBlockStateProvider.java | 12 ++++++---- .../datagen/ModItemModelProvider.java | 1 + .../models/item/vehicle_deployer.json | 22 ------------------- 7 files changed, 24 insertions(+), 34 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/vehicle_deployer.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/vehicle_deployer.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 29cfd6e76..aa1c905e6 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-12T23:49:56.0161244 Item Models: superbwarfare +// 1.21.1 2025-05-13T23:25:47.0587486 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 0a9bfb695c2b5668863a2de4770f5bfca663c1dc assets/superbwarfare/models/item/agm.json 29ad5daadcdf7c10771fc45b649c527d16325cbb assets/superbwarfare/models/item/aircraft_catapult.json @@ -130,5 +130,6 @@ b4e6c184478f8dc764fb7071ac5e30939cd01d9d assets/superbwarfare/models/item/tungst fe78719387b06e37de4abe02c808a8f2dba179f8 assets/superbwarfare/models/item/us_chest_iotv.json 01dabedc256e53d58a14f4ba9ce83b839f3a7bdb assets/superbwarfare/models/item/us_helmet_pastg.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/vector_blueprint.json +ff779e964b86c402bc9661fe5a7eaaa204e5d248 assets/superbwarfare/models/item/vehicle_deployer.json 7e4ba98653b69bcdc7e9bdbd05d2e8b8b20df293 assets/superbwarfare/models/item/wheel.json a2b4b6f79b504888b66681107ce9c8307d1a3abc assets/superbwarfare/models/item/wire_guide_missile.json diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f index f42f77690..80badb823 100644 --- a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-13T23:23:11.1533404 Block States: superbwarfare +// 1.21.1 2025-05-13T23:25:47.0567948 Block States: superbwarfare d91c9c8e6e02a0f7c75b02aaccfd1ecf98ad199b assets/superbwarfare/blockstates/aircraft_catapult.json f3b778ca36ca78c3d80f1b778078897f59bdb0c5 assets/superbwarfare/blockstates/barbed_wire.json 0cfad4f53a8047c402edf978d0c8cf6269f063cb assets/superbwarfare/blockstates/cemented_carbide_block.json @@ -20,7 +20,7 @@ cf801445ce7cec678d5e811b5985506472e6ba4c assets/superbwarfare/blockstates/silver a175c908c9aabee3a073844cd58ec9dfe6498bf0 assets/superbwarfare/blockstates/steel_block.json d4bbef5040ef43c362b28ea12ea73fb4a3db9adc assets/superbwarfare/blockstates/tungsten_block.json df138042591221cb2091c7e2f86a0ce5c77949be assets/superbwarfare/blockstates/vehicle_deployer.json -4deddc7d84204f7942d0fa211f9815b26af415d9 assets/superbwarfare/models/block/aircraft_catapult.json +294cefbc4897066e81517a157d139c4298e6f0db assets/superbwarfare/models/block/aircraft_catapult.json 5f1c22b64ff3ca4db9987f91a7179c9e705c7601 assets/superbwarfare/models/block/cemented_carbide_block.json 0fe4613a4446ac485eee58bed6d0d8f5b38f6253 assets/superbwarfare/models/block/deepslate_galena_ore.json 84f584f684519f686e976b994f0a2639a98a7851 assets/superbwarfare/models/block/deepslate_scheelite_ore.json diff --git a/src/generated/resources/assets/superbwarfare/models/block/aircraft_catapult.json b/src/generated/resources/assets/superbwarfare/models/block/aircraft_catapult.json index 35d4dada9..0da77d7bd 100644 --- a/src/generated/resources/assets/superbwarfare/models/block/aircraft_catapult.json +++ b/src/generated/resources/assets/superbwarfare/models/block/aircraft_catapult.json @@ -1,9 +1,12 @@ { - "parent": "minecraft:block/cube_bottom_top", + "parent": "minecraft:block/cube", "textures": { - "bottom": "superbwarfare:block/vehicle_deployer_bottom", - "particle": "superbwarfare:block/vehicle_deployer_bottom", - "side": "superbwarfare:block/vehicle_deployer_side", - "top": "superbwarfare:block/vehicle_deployer_top" + "down": "superbwarfare:block/vehicle_deployer_bottom", + "east": "superbwarfare:block/aircraft_catapult_side2", + "north": "superbwarfare:block/aircraft_catapult_side", + "particle": "superbwarfare:block/aircraft_catapult_top", + "south": "superbwarfare:block/aircraft_catapult_side", + "up": "superbwarfare:block/aircraft_catapult_top", + "west": "superbwarfare:block/aircraft_catapult_side2" } } \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/vehicle_deployer.json b/src/generated/resources/assets/superbwarfare/models/item/vehicle_deployer.json new file mode 100644 index 000000000..f20966057 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/vehicle_deployer.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/vehicle_deployer" +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java index 4556ac3f5..5d3f8fa8e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java @@ -31,10 +31,14 @@ public class ModBlockStateProvider extends BlockStateProvider { Mod.loc("block/vehicle_deployer_bottom"), Mod.loc("block/vehicle_deployer_top")) .texture("particle", Mod.loc("block/vehicle_deployer_bottom"))); - // TODO 替换模型 - horizontalBlock(ModBlocks.AIRCRAFT_CATAPULT.get(), models().cubeBottomTop("aircraft_catapult", Mod.loc("block/vehicle_deployer_side"), - Mod.loc("block/vehicle_deployer_bottom"), Mod.loc("block/vehicle_deployer_top")) - .texture("particle", Mod.loc("block/vehicle_deployer_bottom"))); + horizontalBlock(ModBlocks.AIRCRAFT_CATAPULT.get(), models().cube("aircraft_catapult", + Mod.loc("block/vehicle_deployer_bottom"), + Mod.loc("block/aircraft_catapult_top"), + Mod.loc("block/aircraft_catapult_side"), + Mod.loc("block/aircraft_catapult_side"), + Mod.loc("block/aircraft_catapult_side2"), + Mod.loc("block/aircraft_catapult_side2")) + .texture("particle", Mod.loc("block/aircraft_catapult_top"))); blockWithItem(ModBlocks.GALENA_ORE); blockWithItem(ModBlocks.DEEPSLATE_GALENA_ORE); diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 2bbbff9cd..60f9ed812 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -167,6 +167,7 @@ public class ModItemModelProvider extends ItemModelProvider { evenSimplerBlockItem(ModBlocks.REFORGING_TABLE); evenSimplerBlockItem(ModBlocks.CHARGING_STATION); evenSimplerBlockItem(ModBlocks.CREATIVE_CHARGING_STATION); + evenSimplerBlockItem(ModBlocks.VEHICLE_DEPLOYER); evenSimplerBlockItem(ModBlocks.AIRCRAFT_CATAPULT); } diff --git a/src/main/resources/assets/superbwarfare/models/item/vehicle_deployer.json b/src/main/resources/assets/superbwarfare/models/item/vehicle_deployer.json deleted file mode 100644 index 4d9891b0c..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/vehicle_deployer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/vehicle_deployer", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file