Upgrade and add new blocks and more.

readme.md

@@ -17,10 +17,20 @@
 
 ## 更新日志
 
+**2022-12-24-1**
+添加了以下物品/方块：
+- 青铜
+- 青铜矿石
+- 深层青铜矿石
+- 青铜块
+#### 以下矿石可以在主世界中被正常生成
+- 深层青铜矿石
+- 深层碎片矿石
+
 **2022-12-16-1**
 
 添加了readme，添加了以下物品/方块：
 - 碎片
 - 碎片矿石
 - 深层碎片矿石
-- 矿石块
+- 碎片块

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

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<Block> 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<Block> DEEPSLATE_DEBRIS_ORE = registerBlock("deepslate_debris_ore", () ->
             new Block(BlockBehaviour.Properties.of(Material.STONE).strength(7f).requiresCorrectToolForDrops()),
             Main.ACIDAY_TAB);
 
+    public static final RegistryObject<Block> 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<Block> 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<Block> 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 <T extends Block> RegistryObject<T> registryBlock(final String name,

src/main/java/com/Casper_233/aciday/init/ItemInit.java

@@ -11,9 +11,13 @@
 public class ItemInit {
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Main.MOD_ID);
 
+    //items
     public static final RegistryObject<Item> DEBRIS = register("debris",
             () -> new Item(new Item.Properties().tab(Main.ACIDAY_TAB)));
 
+    public static final RegistryObject<Item> BRONZE_INGOT = register("bronze_ingot",
+            () -> new Item(new Item.Properties().tab(Main.ACIDAY_TAB)));
+
     private static <T extends Item> RegistryObject<T> register(final String name, final Supplier<T> item) {
         return ITEMS.register(name, item);
     }

src/main/java/com/Casper_233/aciday/world/feature/ModConfiguredFeatures.java

@@ -27,8 +27,19 @@ public class ModConfiguredFeatures {
                             .get().defaultBlockState())
                     ));
 
+    public static final Supplier<List<OreConfiguration.TargetBlockState>> 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<ConfiguredFeature<?, ?>> 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<ConfiguredFeature<?, ?>> BRONZE_ORES = CONFIGURED_FEATURES.register(
+            "bronze_ores", () -> new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(OVERWORLD_BRONZE_ORES
                     .get(), 7)));
 
     public static void register(IEventBus eventBus) {

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<PlacedFeature> 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);
     }

src/main/resources/assets/aciday/blockstates/bronze_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aciday:block/bronze_block"
+    }
+  }
+}

src/main/resources/assets/aciday/blockstates/bronze_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aciday:block/bronze_ore"
+    }
+  }
+}

src/main/resources/assets/aciday/blockstates/deepslate_bronze_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aciday:block/deepslate_bronze_ore"
+    }
+  }
+}

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"
 }

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": "古代时期"
 }

src/main/resources/assets/aciday/models/block/bronze_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "aciday:block/bronze_block"
+  }
+}

src/main/resources/assets/aciday/models/block/bronze_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "aciday:block/bronze_ore"
+  }
+}

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"
+  }
+}

src/main/resources/assets/aciday/models/item/bronze_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "aciday:block/bronze_block"
+}

src/main/resources/assets/aciday/models/item/bronze_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "aciday:item/bronze_ingot"
+  }
+}

src/main/resources/assets/aciday/models/item/bronze_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "aciday:block/bronze_ore"
+}

src/main/resources/assets/aciday/models/item/deepslate_bronze_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "aciday:block/deepslate_bronze_ore"
+}

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"
+}

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"
+        }
+      ]
+    }
+  ]
+}

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"
+        }
+      ]
+    }
+  ]
+}

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"
+        }
+      ]
+    }
+  ]
+}

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"
   ]
 }