From 20b7c0aff349183b82f3151568819ea4ce01df86 Mon Sep 17 00:00:00 2001 From: Casper233 Date: Sat, 24 Dec 2022 15:10:41 +0800 Subject: [PATCH] Upgrade and add new blocks and more. --- readme.md | 12 +++++++++++- readme_en.md | 12 +++++++++++- .../com/Casper_233/aciday/init/BlockInit.java | 15 ++++++++++++++- .../com/Casper_233/aciday/init/ItemInit.java | 4 ++++ .../world/feature/ModConfiguredFeatures.java | 13 ++++++++++++- .../aciday/world/feature/ModPlacedFeatures.java | 6 ++++++ .../assets/aciday/blockstates/bronze_block.json | 7 +++++++ .../assets/aciday/blockstates/bronze_ore.json | 7 +++++++ .../aciday/blockstates/deepslate_bronze_ore.json | 7 +++++++ src/main/resources/assets/aciday/lang/en_us.json | 4 ++++ src/main/resources/assets/aciday/lang/zh_cn.json | 4 ++++ .../assets/aciday/models/block/bronze_block.json | 6 ++++++ .../assets/aciday/models/block/bronze_ore.json | 6 ++++++ .../models/block/deepslate_bronze_ore.json | 6 ++++++ .../assets/aciday/models/item/bronze_block.json | 3 +++ .../assets/aciday/models/item/bronze_ingot.json | 6 ++++++ .../assets/aciday/models/item/bronze_ore.json | 3 +++ .../aciday/models/item/deepslate_bronze_ore.json | 3 +++ .../aciday/textures/block/bronze_block.png | Bin 0 -> 5615 bytes .../assets/aciday/textures/block/bronze_ore.png | Bin 0 -> 5950 bytes .../textures/block/deepslate_bronze_ore.png | Bin 0 -> 6020 bytes .../assets/aciday/textures/item/bronze_ingot.png | Bin 0 -> 5742 bytes .../forge/biome_modifier/add_bronze_ore.json | 6 ++++++ .../aciday/loot_tables/blocks/bronze_block.json | 14 ++++++++++++++ .../aciday/loot_tables/blocks/bronze_ore.json | 14 ++++++++++++++ .../loot_tables/blocks/deepslate_bronze_ore.json | 14 ++++++++++++++ .../minecraft/tags/blocks/mineable/pickaxe.json | 5 ++++- 27 files changed, 172 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/aciday/blockstates/bronze_block.json create mode 100644 src/main/resources/assets/aciday/blockstates/bronze_ore.json create mode 100644 src/main/resources/assets/aciday/blockstates/deepslate_bronze_ore.json create mode 100644 src/main/resources/assets/aciday/models/block/bronze_block.json create mode 100644 src/main/resources/assets/aciday/models/block/bronze_ore.json create mode 100644 src/main/resources/assets/aciday/models/block/deepslate_bronze_ore.json create mode 100644 src/main/resources/assets/aciday/models/item/bronze_block.json create mode 100644 src/main/resources/assets/aciday/models/item/bronze_ingot.json create mode 100644 src/main/resources/assets/aciday/models/item/bronze_ore.json create mode 100644 src/main/resources/assets/aciday/models/item/deepslate_bronze_ore.json create mode 100644 src/main/resources/assets/aciday/textures/block/bronze_block.png create mode 100644 src/main/resources/assets/aciday/textures/block/bronze_ore.png create mode 100644 src/main/resources/assets/aciday/textures/block/deepslate_bronze_ore.png create mode 100644 src/main/resources/assets/aciday/textures/item/bronze_ingot.png create mode 100644 src/main/resources/data/aciday/forge/biome_modifier/add_bronze_ore.json create mode 100644 src/main/resources/data/aciday/loot_tables/blocks/bronze_block.json create mode 100644 src/main/resources/data/aciday/loot_tables/blocks/bronze_ore.json create mode 100644 src/main/resources/data/aciday/loot_tables/blocks/deepslate_bronze_ore.json diff --git a/readme.md b/readme.md index 289c657..a557b9e 100644 --- a/readme.md +++ b/readme.md @@ -17,10 +17,20 @@ ## 更新日志 +**2022-12-24-1** +添加了以下物品/方块： +- 青铜 +- 青铜矿石 +- 深层青铜矿石 +- 青铜块 +#### 以下矿石可以在主世界中被正常生成 +- 深层青铜矿石 +- 深层碎片矿石 + **2022-12-16-1** 添加了readme，添加了以下物品/方块： - 碎片 - 碎片矿石 - 深层碎片矿石 -- 矿石块 +- 碎片块 diff --git a/readme_en.md b/readme_en.md index ec234e8..c5eb7f4 100644 --- a/readme_en.md +++ b/readme_en.md @@ -16,10 +16,20 @@ The debris are now deeply under the soil. ## Others -This mod needs to put in both client and server. +This mod needs to put in both client and server side. ## Update log +**2022-12-24-1** +Added following items/blocks: +- Bronze Ingot +- Bronze Ore +- Deepslate Bronze Ore +- Bronze Block +#### These following blocks can be spawned in the world +- Deepslate Bronze Ore +- Deepslate Debris Ore + **2022-12-16-1** Updated the Readme, and add these items/blocks diff --git a/src/main/java/com/Casper_233/aciday/init/BlockInit.java b/src/main/java/com/Casper_233/aciday/init/BlockInit.java index d3a2023..b372fe3 100644 --- a/src/main/java/com/Casper_233/aciday/init/BlockInit.java +++ b/src/main/java/com/Casper_233/aciday/init/BlockInit.java @@ -33,15 +33,28 @@ public class BlockInit { DropExperienceBlock(BlockBehaviour.Properties.of(Material.STONE).strength(5f) .requiresCorrectToolForDrops(), UniformInt.of(3, 10)), Main.ACIDAY_TAB); + public static final RegistryObject BRONZE_ORE = registerBlock("bronze_ore", () -> new + DropExperienceBlock(BlockBehaviour.Properties.of(Material.STONE).strength(5f) + .requiresCorrectToolForDrops(), UniformInt.of(3, 10)), Main.ACIDAY_TAB); + //ore_deep public static final RegistryObject DEEPSLATE_DEBRIS_ORE = registerBlock("deepslate_debris_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).strength(7f).requiresCorrectToolForDrops()), Main.ACIDAY_TAB); + public static final RegistryObject DEEPSLATE_BRONZE_ORE = registerBlock("deepslate_bronze_ore", () -> + new Block(BlockBehaviour.Properties.of(Material.STONE).strength(7f).requiresCorrectToolForDrops()), + Main.ACIDAY_TAB); + //Blocks public static final RegistryObject DEBRIS_BLOCK = register("debris_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BROWN).strength(3f, - 4f).sound(SoundType.STONE).requiresCorrectToolForDrops()), object -> () -> new + 4f).sound(SoundType.STONE).requiresCorrectToolForDrops()), object -> () -> new + BlockItem(object.get(), new Item.Properties().tab(Main.ACIDAY_TAB))); + + public static final RegistryObject BRONZE_BLOCK = register("bronze_block", () -> new + Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BROWN).strength(3f, + 4f).sound(SoundType.METAL).requiresCorrectToolForDrops()), object -> () -> new BlockItem(object.get(), new Item.Properties().tab(Main.ACIDAY_TAB))); private static RegistryObject registryBlock(final String name, diff --git a/src/main/java/com/Casper_233/aciday/init/ItemInit.java b/src/main/java/com/Casper_233/aciday/init/ItemInit.java index 1671b79..8b922b0 100644 --- a/src/main/java/com/Casper_233/aciday/init/ItemInit.java +++ b/src/main/java/com/Casper_233/aciday/init/ItemInit.java @@ -11,9 +11,13 @@ public class ItemInit { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Main.MOD_ID); + //items public static final RegistryObject DEBRIS = register("debris", () -> new Item(new Item.Properties().tab(Main.ACIDAY_TAB))); + public static final RegistryObject BRONZE_INGOT = register("bronze_ingot", + () -> new Item(new Item.Properties().tab(Main.ACIDAY_TAB))); + private static RegistryObject register(final String name, final Supplier item) { return ITEMS.register(name, item); } diff --git a/src/main/java/com/Casper_233/aciday/world/feature/ModConfiguredFeatures.java b/src/main/java/com/Casper_233/aciday/world/feature/ModConfiguredFeatures.java index 5d0d460..c3de1e8 100644 --- a/src/main/java/com/Casper_233/aciday/world/feature/ModConfiguredFeatures.java +++ b/src/main/java/com/Casper_233/aciday/world/feature/ModConfiguredFeatures.java @@ -27,8 +27,19 @@ public class ModConfiguredFeatures { .get().defaultBlockState()) )); + public static final Supplier> OVERWORLD_BRONZE_ORES = Suppliers + .memoize(() -> List.of(OreConfiguration.target(OreFeatures.STONE_ORE_REPLACEABLES, BlockInit.BRONZE_ORE + .get().defaultBlockState()), + OreConfiguration.target(OreFeatures.DEEPSLATE_ORE_REPLACEABLES, BlockInit.DEEPSLATE_BRONZE_ORE + .get().defaultBlockState()) + )); + public static final RegistryObject> DEBRIS_ORES = CONFIGURED_FEATURES.register( - "debris_ore", () -> new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(OVERWORLD_DEBRIS_ORES + "debris_ores", () -> new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(OVERWORLD_DEBRIS_ORES + .get(), 7))); + + public static final RegistryObject> BRONZE_ORES = CONFIGURED_FEATURES.register( + "bronze_ores", () -> new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(OVERWORLD_BRONZE_ORES .get(), 7))); public static void register(IEventBus eventBus) { diff --git a/src/main/java/com/Casper_233/aciday/world/feature/ModPlacedFeatures.java b/src/main/java/com/Casper_233/aciday/world/feature/ModPlacedFeatures.java index 5337ccc..8945d8d 100644 --- a/src/main/java/com/Casper_233/aciday/world/feature/ModPlacedFeatures.java +++ b/src/main/java/com/Casper_233/aciday/world/feature/ModPlacedFeatures.java @@ -22,6 +22,12 @@ public class ModPlacedFeatures { commonOrePlacement(7, HeightRangePlacement.triangle(VerticalAnchor.aboveBottom(-60), VerticalAnchor.aboveBottom(60))))); + public static final RegistryObject BRONZE_ORE_PLACED = PLACED_FEATURES.register( + "bronze_ore_placed", () -> new PlacedFeature(ModConfiguredFeatures.BRONZE_ORES.getHolder().get(), + commonOrePlacement(24, HeightRangePlacement.triangle(VerticalAnchor.aboveBottom(-60), + VerticalAnchor.aboveBottom(60))))); + + public static void register(IEventBus eventBus) { PLACED_FEATURES.register(eventBus); } diff --git a/src/main/resources/assets/aciday/blockstates/bronze_block.json b/src/main/resources/assets/aciday/blockstates/bronze_block.json new file mode 100644 index 0000000..e0e0b79 --- /dev/null +++ b/src/main/resources/assets/aciday/blockstates/bronze_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aciday:block/bronze_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/blockstates/bronze_ore.json b/src/main/resources/assets/aciday/blockstates/bronze_ore.json new file mode 100644 index 0000000..26fbe48 --- /dev/null +++ b/src/main/resources/assets/aciday/blockstates/bronze_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aciday:block/bronze_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/blockstates/deepslate_bronze_ore.json b/src/main/resources/assets/aciday/blockstates/deepslate_bronze_ore.json new file mode 100644 index 0000000..dbfbf3a --- /dev/null +++ b/src/main/resources/assets/aciday/blockstates/deepslate_bronze_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aciday:block/deepslate_bronze_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/lang/en_us.json b/src/main/resources/assets/aciday/lang/en_us.json index 5580e6c..521c4b4 100644 --- a/src/main/resources/assets/aciday/lang/en_us.json +++ b/src/main/resources/assets/aciday/lang/en_us.json @@ -1,7 +1,11 @@ { "item.aciday.debris": "Debris", + "item.aciday.bronze_ingot": "Bronze Ingot", "block.aciday.debris_ore": "Debris Ore", + "block.aciday.bronze_ore": "Bronze Ore", "block.aciday.debris_block": "Debris Block", + "block.aciday.bronze_block": "Bronze Block", "block.aciday.deepslate_debris_ore": "Deepslate Debris Ore", + "block.aciday.deepslate_bronze_ore": "Deepslate Bronze Ore", "itemGroup.aciday": "Ancient Days" } \ No newline at end of file diff --git a/src/main/resources/assets/aciday/lang/zh_cn.json b/src/main/resources/assets/aciday/lang/zh_cn.json index f3a0b11..5a0edb0 100644 --- a/src/main/resources/assets/aciday/lang/zh_cn.json +++ b/src/main/resources/assets/aciday/lang/zh_cn.json @@ -1,7 +1,11 @@ { "item.aciday.debris": "碎片", + "item.aciday.bronze_ingot": "青铜锭", "block.aciday.debris_ore": "碎片矿石", + "block.aciday.bronze_ore": "青铜矿石", "block.aciday.debris_block": "碎片块", + "block.aciday.bronze_block": "青铜块", "block.aciday.deepslate_debris_ore": "深层碎片矿石", + "block.aciday.deepslate_bronze_ore": "深层青铜矿石", "itemGroup.aciday": "古代时期" } \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/block/bronze_block.json b/src/main/resources/assets/aciday/models/block/bronze_block.json new file mode 100644 index 0000000..5b0722e --- /dev/null +++ b/src/main/resources/assets/aciday/models/block/bronze_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aciday:block/bronze_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/block/bronze_ore.json b/src/main/resources/assets/aciday/models/block/bronze_ore.json new file mode 100644 index 0000000..faed626 --- /dev/null +++ b/src/main/resources/assets/aciday/models/block/bronze_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aciday:block/bronze_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/block/deepslate_bronze_ore.json b/src/main/resources/assets/aciday/models/block/deepslate_bronze_ore.json new file mode 100644 index 0000000..1b442e3 --- /dev/null +++ b/src/main/resources/assets/aciday/models/block/deepslate_bronze_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aciday:block/deepslate_bronze_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/item/bronze_block.json b/src/main/resources/assets/aciday/models/item/bronze_block.json new file mode 100644 index 0000000..0c55448 --- /dev/null +++ b/src/main/resources/assets/aciday/models/item/bronze_block.json @@ -0,0 +1,3 @@ +{ + "parent": "aciday:block/bronze_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/item/bronze_ingot.json b/src/main/resources/assets/aciday/models/item/bronze_ingot.json new file mode 100644 index 0000000..fe4fd88 --- /dev/null +++ b/src/main/resources/assets/aciday/models/item/bronze_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aciday:item/bronze_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/item/bronze_ore.json b/src/main/resources/assets/aciday/models/item/bronze_ore.json new file mode 100644 index 0000000..4bbdc2a --- /dev/null +++ b/src/main/resources/assets/aciday/models/item/bronze_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "aciday:block/bronze_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/models/item/deepslate_bronze_ore.json b/src/main/resources/assets/aciday/models/item/deepslate_bronze_ore.json new file mode 100644 index 0000000..89f23b1 --- /dev/null +++ b/src/main/resources/assets/aciday/models/item/deepslate_bronze_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "aciday:block/deepslate_bronze_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/aciday/textures/block/bronze_block.png b/src/main/resources/assets/aciday/textures/block/bronze_block.png new file mode 100644 index 0000000000000000000000000000000000000000..17c5449fa2302b0dfad64f13d55ec128bad25b37 GIT binary patch literal 5615 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 VzdpMx_!Y!G%-z+~rNSvB@n6+*q7VQ8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aciday/textures/block/bronze_ore.png b/src/main/resources/assets/aciday/textures/block/bronze_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..785c30a13f87f58c5d0e1e1b52e4ae36ef413f07 GIT binary patch literal 5950 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aciday/textures/block/deepslate_bronze_ore.png b/src/main/resources/assets/aciday/textures/block/deepslate_bronze_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..9f44489d51b98c9747b4fdea5e99172a09302f17 GIT binary patch literal 6020 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

0M*4q=L=L-+bu3)8w-2#K znx|7>)Vnq>wyKZ6v|c2y+eF^m@b2A#yTOe^+iZsV)vj`y#-{E0Z7`)%ZP&dPlV5L! zwVJAfC!7~#c^pt2ksuFgI9VI-QLB9zgps|PUwf<|7BPQ{6hdy8b~4Is4MOyFrT3*Af}JWyD->j-+jL z{blP7ijhy;Z)4N{+_JF8eA5kk*?|_R$j)_EA{SWJJYOh$?hF`^Aj)kADYtZG@(8iM_&I7Ni&3M O2F7snrk`|KllU)r`D5Pz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aciday/textures/item/bronze_ingot.png b/src/main/resources/assets/aciday/textures/item/bronze_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..2966cf1e9d8950d52c89048457013611a1b6aab7 GIT binary patch literal 5742 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/aciday/forge/biome_modifier/add_bronze_ore.json b/src/main/resources/data/aciday/forge/biome_modifier/add_bronze_ore.json new file mode 100644 index 0000000..fcfff6c --- /dev/null +++ b/src/main/resources/data/aciday/forge/biome_modifier/add_bronze_ore.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#minecraft:is_overworld", + "features": "aciday:bronze_ore_placed", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/data/aciday/loot_tables/blocks/bronze_block.json b/src/main/resources/data/aciday/loot_tables/blocks/bronze_block.json new file mode 100644 index 0000000..a6243b0 --- /dev/null +++ b/src/main/resources/data/aciday/loot_tables/blocks/bronze_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "aciday:bronze_block" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aciday/loot_tables/blocks/bronze_ore.json b/src/main/resources/data/aciday/loot_tables/blocks/bronze_ore.json new file mode 100644 index 0000000..0f7e24d --- /dev/null +++ b/src/main/resources/data/aciday/loot_tables/blocks/bronze_ore.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "aciday:bronze_ore" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aciday/loot_tables/blocks/deepslate_bronze_ore.json b/src/main/resources/data/aciday/loot_tables/blocks/deepslate_bronze_ore.json new file mode 100644 index 0000000..79d02d6 --- /dev/null +++ b/src/main/resources/data/aciday/loot_tables/blocks/deepslate_bronze_ore.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "aciday:deepslate_bronze_ore" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index e833e27..3cb7286 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -3,6 +3,9 @@ "values": [ "aciday:debris_ore", "aciday:debris_block", - "aciday:deepslate_debris_ore" + "aciday:bronze_block", + "aciday:deepslate_debris_ore", + "aciday:bronze_ore", + "aciday:deepslate_bronze_ore" ] } \ No newline at end of file