Merge pull request #105 from pumpkin1zz/main

更新贴图，金西瓜磨制石头

Author: baka4n

src/main/java/org/polaris2023/wild_wind/common/init/ModBlocks.java

@@ -172,6 +172,22 @@ public class ModBlocks {
     public static final DeferredItem<BlockItem> DEEPSLATE_SALT_ORE_ITEM =
             register("deepslate_salt_ore", DEEPSLATE_SALT_ORE);
 
+    @I18n(en_us = "Glistering Melon", zh_cn = "金西瓜", zh_tw = "金西瓜")
+    public static final DeferredBlock<Block> GLISTERING_MELON =
+            register("glistering_melon", Block::new, BlockBehaviour.Properties.of().mapColor(MapColor.GOLD));
+    @BasicBlockItem
+    public static final DeferredItem<BlockItem> GLISTERING_MELON_ITEM =
+            register("glistering_melon", GLISTERING_MELON);
+
+    @I18n(en_us = "Polished Stone",zh_cn = "磨制石头",zh_tw = "磨製石頭")
+    @CubeAll
+    public static final DeferredBlock<Block> POLISHED_STONE =
+            register("polished_stone", Block::new, BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(2.5f));
+    @BasicBlockItem
+    public static final DeferredItem<BlockItem> POLISHED_STONE_ITEM =
+            register("polished_stone", POLISHED_STONE);
+
+
     @AllWood
     @I18n(en_us = "Azalea Planks", zh_cn = "杜鹃木板", zh_tw = "杜鵑木材")
     public static final DeferredBlock<Block> AZALEA_PLANKS =

src/main/java/org/polaris2023/wild_wind/datagen/ModBlockStateProvider.java

@@ -33,6 +33,15 @@ public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper)
             Helpers.location("block/brittle_ice_2"),
             Helpers.location("block/brittle_ice_3")
     };
+    public static final ResourceLocation[] WOOD = new ResourceLocation[] {
+            Helpers.location("block/wood")
+    };
+    public static final ResourceLocation[] CONCRETE = new ResourceLocation[] {
+            Helpers.location("block/concrete")
+    };
+    public static final ResourceLocation[] GLAZED_TERRACOTTA = new ResourceLocation[] {
+            Helpers.location("block/glazed_terracotta")
+    };
 
     @Override
     protected void registerStatesAndModels() {
@@ -99,6 +108,16 @@ protected void registerStatesAndModels() {
             glazedTerracottaStates.partialState().with(BlockStateProperties.HORIZONTAL_FACING, facing)
                     .addModels(new ConfiguredModel(models().cubeAll("glazed_terracotta", Helpers.location("block/glazed_terracotta")), 0, yRotation, false));
         }
+
+        //glistering_melon
+        BlockModelBuilder glisteringMelonModel = models().cubeBottomTop(
+                "glistering_melon",
+                Helpers.location("block/glistering_melon_side"),
+                Helpers.location("block/glistering_melon_side"),
+                Helpers.location("block/glistering_melon_top")
+        );
+        simpleBlock(ModBlocks.GLISTERING_MELON.get(), glisteringMelonModel);
+
     }
 
     private void glowMucusModel(VariantBlockStateBuilder glowMucusStates, Direction facing, int layers, Function<Integer, ConfiguredModel> function) {