diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 9687208e3..cea4053a9 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2025-06-23T22:10:47.8046106 Recipes +// 1.21.1 2025-06-25T01:13:00.7389797 Recipes 9775e550332c69f1ee2ac4a09834a35db6f6a2ed data/minecraft/recipe/ammo_box_add_ammo.json 9775e550332c69f1ee2ac4a09834a35db6f6a2ed data/minecraft/recipe/ammo_box_extract_ammo.json 2e1d1bbf32801f3d355c0d3f78ebbb1122cebd4c data/minecraft/recipe/potion_mortar_shell.json @@ -195,7 +195,7 @@ f2777c054b27e9fb44deeb72ddb6325e0385a270 data/superbwarfare/recipe/steel_action. 7b363808065613de9eddce4331e667ac2956f08c data/superbwarfare/recipe/steel_pipe.json e6f83a418c7ee3b596206deaf86a46a2a4b34fe8 data/superbwarfare/recipe/steel_spring.json 21d12a61558a3bf820796be67bd7b58047d929dc data/superbwarfare/recipe/steel_trigger.json -ed037f70d05cc2e410045d812dccd3a33da10eaf data/superbwarfare/recipe/superb_item_interface.json +3b402dd93baca56ce6a34b3b13ccee1a011ea99d data/superbwarfare/recipe/superb_item_interface.json 940339216a1dc73e8e9f090af1b5a638db81581a data/superbwarfare/recipe/svd_blueprint.json a25453be786b0f279d622dd69e4ad85d7a2dae0e data/superbwarfare/recipe/svd_smithing.json 74f766c560a92652471e00af24019caec23cf85c data/superbwarfare/recipe/taser_blueprint.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 1cc58fac2..2fcd35fe5 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-06-02T00:25:28.2267193 Item Models: superbwarfare +// 1.21.1 2025-06-25T01:13:00.7502287 Item Models: superbwarfare 7ce9bc62784ee26359f21ebb2856a2ea39c420f7 assets/superbwarfare/models/item/aa_12.json fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json @@ -220,6 +220,7 @@ b06878332d05a1b61e9eb323e4d7079f7dcd4e18 assets/superbwarfare/models/item/sniper b4e009177af3af6ad6dda54e3e2fed43dc243ff2 assets/superbwarfare/models/item/steel_ingot.json 28e5cc26e694d0cded97b343de94764b28f1651f assets/superbwarfare/models/item/steel_spring.json 7d3c98a32815191ef716a8595dda392a8dfea6ec assets/superbwarfare/models/item/steel_trigger.json +ecb4f21db226a0db9db975d285c5f67d2acca316 assets/superbwarfare/models/item/superb_item_interface.json dc8719bdcca10c016c9e15cea724d2cf73c09ae5 assets/superbwarfare/models/item/svd.json 674f667820b8ae1ab71782c72208e6891152ae87 assets/superbwarfare/models/item/svd_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/svd_blueprint.json diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f index 2f0d3bf64..75b50c772 100644 --- a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -1,4 +1,4 @@ -// 1.21.1 2025-06-16T00:14:13.2039625 Block States: superbwarfare +// 1.21.1 2025-06-25T01:13:00.7311221 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 @@ -18,6 +18,7 @@ d765539a643378e4f8ce56dc42bcff579d666e8a assets/superbwarfare/blockstates/reforg cf801445ce7cec678d5e811b5985506472e6ba4c assets/superbwarfare/blockstates/silver_ore.json 2a91b72f2d7974e100ae502006a2384bd66b29e5 assets/superbwarfare/blockstates/small_container.json a175c908c9aabee3a073844cd58ec9dfe6498bf0 assets/superbwarfare/blockstates/steel_block.json +bad8951260726316ce820c77508c81c29bea9c9b assets/superbwarfare/blockstates/superb_item_interface.json d4bbef5040ef43c362b28ea12ea73fb4a3db9adc assets/superbwarfare/blockstates/tungsten_block.json df138042591221cb2091c7e2f86a0ce5c77949be assets/superbwarfare/blockstates/vehicle_deployer.json 294cefbc4897066e81517a157d139c4298e6f0db assets/superbwarfare/models/block/aircraft_catapult.json @@ -31,6 +32,7 @@ e9bea7028029623e5dc9d8b0eead6add93c36931 assets/superbwarfare/models/block/galen 455a1b32d0f5bfabc0db86c818b8e0a55a19e5f5 assets/superbwarfare/models/block/silver_block.json f6e316518c0718e0feb6f81d7d86b3d2fdfaa3b0 assets/superbwarfare/models/block/silver_ore.json ad3ee9a1e2c9302c8dfdecd28091693fca0bcff8 assets/superbwarfare/models/block/steel_block.json +2a3701ac8a6fd2ab9648948cbd4cf897b3e3c8e2 assets/superbwarfare/models/block/superb_item_interface.json b5310729f19d8d9f7090760bbdc1b629ab2b4262 assets/superbwarfare/models/block/tungsten_block.json 4deddc7d84204f7942d0fa211f9815b26af415d9 assets/superbwarfare/models/block/vehicle_deployer.json fe85ea7492fe2006dbb0027914f3688a43c2d2c9 assets/superbwarfare/models/item/cemented_carbide_block.json diff --git a/src/generated/resources/assets/superbwarfare/blockstates/superb_item_interface.json b/src/generated/resources/assets/superbwarfare/blockstates/superb_item_interface.json new file mode 100644 index 000000000..706d1faaf --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/superb_item_interface.json @@ -0,0 +1,56 @@ +{ + "variants": { + "enabled=false,facing=down": { + "model": "superbwarfare:block/superb_item_interface", + "x": 180 + }, + "enabled=false,facing=east": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90, + "y": 90 + }, + "enabled=false,facing=north": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90 + }, + "enabled=false,facing=south": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90, + "y": 180 + }, + "enabled=false,facing=up": { + "model": "superbwarfare:block/superb_item_interface" + }, + "enabled=false,facing=west": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90, + "y": 270 + }, + "enabled=true,facing=down": { + "model": "superbwarfare:block/superb_item_interface", + "x": 180 + }, + "enabled=true,facing=east": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90, + "y": 90 + }, + "enabled=true,facing=north": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90 + }, + "enabled=true,facing=south": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90, + "y": 180 + }, + "enabled=true,facing=up": { + "model": "superbwarfare:block/superb_item_interface" + }, + "enabled=true,facing=west": { + "model": "superbwarfare:block/superb_item_interface", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/superb_item_interface.json b/src/generated/resources/assets/superbwarfare/models/block/superb_item_interface.json new file mode 100644 index 000000000..7f62dfc2b --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/superb_item_interface.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "superbwarfare:block/superb_item_interface_bottom", + "particle": "superbwarfare:block/superb_item_interface_bottom", + "side": "superbwarfare:block/superb_item_interface_side", + "top": "superbwarfare:block/superb_item_interface_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/superb_item_interface.json b/src/generated/resources/assets/superbwarfare/models/item/superb_item_interface.json new file mode 100644 index 000000000..8991ebb4d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/superb_item_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/superb_item_interface" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/recipe/superb_item_interface.json b/src/generated/resources/data/superbwarfare/recipe/superb_item_interface.json index 87415a846..1b7679260 100644 --- a/src/generated/resources/data/superbwarfare/recipe/superb_item_interface.json +++ b/src/generated/resources/data/superbwarfare/recipe/superb_item_interface.json @@ -7,12 +7,15 @@ }, "b": { "item": "minecraft:dropper" + }, + "c": { + "tag": "superbwarfare:ingots/steel" } }, "pattern": [ - " aa", + "cac", "aba", - "aa " + "cac" ], "result": { "count": 1, diff --git a/src/main/java/com/atsuishio/superbwarfare/block/SuperbItemInterfaceBlock.java b/src/main/java/com/atsuishio/superbwarfare/block/SuperbItemInterfaceBlock.java index 8c30a1e5a..a8625d72c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/block/SuperbItemInterfaceBlock.java +++ b/src/main/java/com/atsuishio/superbwarfare/block/SuperbItemInterfaceBlock.java @@ -35,7 +35,7 @@ import javax.annotation.ParametersAreNonnullByDefault; public class SuperbItemInterfaceBlock extends BaseEntityBlock { public static final BooleanProperty ENABLED = BlockStateProperties.ENABLED; - public static final DirectionProperty FACING = DirectionProperty.create("facing"); + public static final DirectionProperty FACING = BlockStateProperties.FACING; public SuperbItemInterfaceBlock() { super(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).requiresCorrectToolForDrops().strength(3.0F, 4.8F).sound(SoundType.METAL)); @@ -59,6 +59,9 @@ public class SuperbItemInterfaceBlock extends BaseEntityBlock { @Override public BlockState getStateForPlacement(@NotNull BlockPlaceContext context) { Direction direction = context.getClickedFace().getOpposite(); + if (context.getPlayer() != null && context.getPlayer().isShiftKeyDown()) { + direction = direction.getOpposite(); + } return this.defaultBlockState().setValue(FACING, direction).setValue(ENABLED, true); } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java index 5d3f8fa8e..4046a8647 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java @@ -40,6 +40,13 @@ public class ModBlockStateProvider extends BlockStateProvider { Mod.loc("block/aircraft_catapult_side2")) .texture("particle", Mod.loc("block/aircraft_catapult_top"))); + directionalBlock(ModBlocks.SUPERB_ITEM_INTERFACE.get(), models().cubeBottomTop("superb_item_interface", + Mod.loc("block/superb_item_interface_side"), + Mod.loc("block/superb_item_interface_bottom"), + Mod.loc("block/superb_item_interface_top")) + .texture("particle", Mod.loc("block/superb_item_interface_bottom")) + ); + blockWithItem(ModBlocks.GALENA_ORE); blockWithItem(ModBlocks.DEEPSLATE_GALENA_ORE); blockWithItem(ModBlocks.SCHEELITE_ORE); diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index ba6a9a2cf..786b7a35c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -204,6 +204,7 @@ public class ModItemModelProvider extends ItemModelProvider { evenSimplerBlockItem(ModBlocks.CREATIVE_CHARGING_STATION); evenSimplerBlockItem(ModBlocks.VEHICLE_DEPLOYER); evenSimplerBlockItem(ModBlocks.AIRCRAFT_CATAPULT); + evenSimplerBlockItem(ModBlocks.SUPERB_ITEM_INTERFACE); } private void simpleMaterials(ModItems.Materials materials) { diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java index 2cef96827..1e78da8f3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java @@ -60,11 +60,12 @@ public class ModRecipeProvider extends RecipeProvider { // 方块 ShapedRecipeBuilder.shaped(RecipeCategory.REDSTONE, ModItems.SUPERB_ITEM_INTERFACE.get()) - .pattern(" aa") + .pattern("cac") .pattern("aba") - .pattern("aa ") + .pattern("cac") .define('a', Items.HOPPER) .define('b', Items.DROPPER) + .define('c', ModTags.Items.INGOTS_STEEL) .unlockedBy(getHasName(Items.HOPPER), has(Items.DROPPER)) .save(writer, Mod.loc(getItemName(ModItems.SUPERB_ITEM_INTERFACE.get()))); diff --git a/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_bottom.png b/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_bottom.png new file mode 100644 index 000000000..5325210c3 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_bottom.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_side.png b/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_side.png new file mode 100644 index 000000000..a685fa401 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_side.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_top.png b/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_top.png new file mode 100644 index 000000000..d6296f396 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/block/superb_item_interface_top.png differ