diff --git a/src/generated/resources/assets/superbwarfare/blockstates/lucky_container.json b/src/generated/resources/assets/superbwarfare/blockstates/lucky_container.json new file mode 100644 index 000000000..cfc489e7d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/lucky_container.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,opened=false": { + "model": "superbwarfare:block/container", + "y": 90 + }, + "facing=east,opened=true": { + "model": "superbwarfare:block/container", + "y": 90 + }, + "facing=north,opened=false": { + "model": "superbwarfare:block/container" + }, + "facing=north,opened=true": { + "model": "superbwarfare:block/container" + }, + "facing=south,opened=false": { + "model": "superbwarfare:block/container", + "y": 180 + }, + "facing=south,opened=true": { + "model": "superbwarfare:block/container", + "y": 180 + }, + "facing=west,opened=false": { + "model": "superbwarfare:block/container", + "y": 270 + }, + "facing=west,opened=true": { + "model": "superbwarfare:block/container", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index db05f94df..d7fc86954 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -20,6 +20,7 @@ "superbwarfare:small_container", "superbwarfare:vehicle_deployer", "superbwarfare:aircraft_catapult", - "superbwarfare:superb_item_interface" + "superbwarfare:superb_item_interface", + "superbwarfare:lucky_container" ] } \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_table/blocks/lucky_container.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/lucky_container.json new file mode 100644 index 000000000..d2dd041f2 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/lucky_container.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "superbwarfare:blocks/lucky_container" +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java index a9c6a9158..00d22b071 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java @@ -73,6 +73,8 @@ public class ModBlockLootProvider extends BlockLootSubProvider { .include(DataComponents.CONTAINER_LOOT) ) ))); + // TODO 改成正确的loot table + this.add(ModBlocks.LUCKY_CONTAINER.get(), noDrop()); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java index 4046a8647..5f03c462d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java @@ -25,6 +25,7 @@ public class ModBlockStateProvider extends BlockStateProvider { horizontalBlock(ModBlocks.REFORGING_TABLE.get(), new ModelFile.UncheckedModelFile(modLoc("block/reforging_table"))); horizontalBlock(ModBlocks.CONTAINER.get(), new ModelFile.UncheckedModelFile(modLoc("block/container"))); horizontalBlock(ModBlocks.SMALL_CONTAINER.get(), new ModelFile.UncheckedModelFile(modLoc("block/small_container"))); + horizontalBlock(ModBlocks.LUCKY_CONTAINER.get(), new ModelFile.UncheckedModelFile(modLoc("block/container"))); horizontalBlock(ModBlocks.CHARGING_STATION.get(), new ModelFile.UncheckedModelFile(modLoc("block/charging_station"))); horizontalBlock(ModBlocks.CREATIVE_CHARGING_STATION.get(), new ModelFile.UncheckedModelFile(modLoc("block/creative_charging_station"))); horizontalBlock(ModBlocks.VEHICLE_DEPLOYER.get(), models().cubeBottomTop("vehicle_deployer", Mod.loc("block/vehicle_deployer_side"), diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java index 3fcfcfa58..a36f5080e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java @@ -38,7 +38,7 @@ public class ModBlockTagProvider extends BlockTagsProvider { ModBlocks.CEMENTED_CARBIDE_BLOCK.get(), ModBlocks.SILVER_ORE.get(), ModBlocks.DEEPSLATE_SILVER_ORE.get(), ModBlocks.SILVER_BLOCK.get(), ModBlocks.JUMP_PAD.get(), ModBlocks.CONTAINER.get(), ModBlocks.CHARGING_STATION.get(), ModBlocks.FUMO_25.get(), ModBlocks.SMALL_CONTAINER.get(), ModBlocks.VEHICLE_DEPLOYER.get(), ModBlocks.AIRCRAFT_CATAPULT.get(), - ModBlocks.SUPERB_ITEM_INTERFACE.get()); + ModBlocks.SUPERB_ITEM_INTERFACE.get(), ModBlocks.LUCKY_CONTAINER.get()); this.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(ModBlocks.SANDBAG.get()); this.tag(ModTags.Blocks.SOFT_COLLISION) diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java index 54e2c7749..205a46275 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java @@ -4,7 +4,7 @@ import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.ContainerBlockItem; +import com.atsuishio.superbwarfare.item.common.container.ContainerBlockItem; import com.atsuishio.superbwarfare.recipe.AmmoBoxAddAmmoRecipe; import com.atsuishio.superbwarfare.recipe.AmmoBoxExtractAmmoRecipe; import com.atsuishio.superbwarfare.recipe.PotionMortarShellRecipe; diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 2df087935..be6d5b5c3 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -317,6 +317,7 @@ "block.superbwarfare.aircraft_catapult": "Aircraft Catapult", "block.superbwarfare.superb_item_interface": "Superb Item Interface", "des.superbwarfare.superb_item_interface": "A fast omnidirectional hopper for transferring items to targeted entities", + "block.superbwarfare.lucky_container": "Lucky Container", "item.superbwarfare.high_energy_explosives": "High Energy Explosives", "item.superbwarfare.grain": "Grain", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 53a56abe8..2b4d65de9 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -317,6 +317,7 @@ "block.superbwarfare.aircraft_catapult": "飞行器弹射装置", "block.superbwarfare.superb_item_interface": "卓越物品接口", "des.superbwarfare.superb_item_interface": "可快速给指向实体传输物品的全方向漏斗", + "block.superbwarfare.lucky_container": "幸运补给箱", "item.superbwarfare.high_energy_explosives": "高能炸药", "item.superbwarfare.grain": "推进药柱", diff --git a/src/main/resources/assets/superbwarfare/models/block/lucky_container.json b/src/main/resources/assets/superbwarfare/models/block/lucky_container.json new file mode 100644 index 000000000..38b5591ca --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/block/lucky_container.json @@ -0,0 +1,6 @@ +{ + "parent": "superbwarfare:item/lucky_container", + "textures": { + "particle": "minecraft:block/orange_terracotta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/custom/container_particle.json b/src/main/resources/assets/superbwarfare/models/custom/container_particle.json deleted file mode 100644 index 4535e2f0c..000000000 --- a/src/main/resources/assets/superbwarfare/models/custom/container_particle.json +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "parent": "superbwarfare:displaysettings/container.item", - "textures": { - "particle": "superbwarfare:block/container" - } -}