Merge pull request #121 from Polari-Stars-MC/baka4n-update

baka4n · web-flow · commit 8248bc4f5f39 · 2025-03-11T22:11:53.000+08:00
注册磨制方块
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,4 @@
-2025/3/6
-    Textures and I18n bug fixes
-    Replace the trunk of the rhododendron tree with azalea wood
-    Sculk jaw texture and block model.
-2025/3/10
-    Fixed incorrect name translations, added salt ore generation and recipes.
+2025/3/11
+    Sort for the creative item tabs.
+    Register Concrete Powder.
+    Register Polished Stone [default block, wall, stairs, slab]
diff --git a/src/main/java/org/polaris2023/wild_wind/common/init/ModBlocks.java b/src/main/java/org/polaris2023/wild_wind/common/init/ModBlocks.java
@@ -107,7 +107,6 @@ public class ModBlocks {
     public static final DeferredBlock<BrittleIceBlock> BRITTLE_ICE =
             register("brittle_ice", BrittleIceBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.ICE)
                     .strength(0.1F).isValidSpawn(Blocks::never).pushReaction(PushReaction.DESTROY));
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> BRITTLE_ICE_ITEM =
             register("brittle_ice", BRITTLE_ICE);
   
@@ -118,21 +117,23 @@ public class ModBlocks {
             .strength(0.8F)
             .sound(SoundType.WOOL)
             .ignitedByLava());
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> WOOL_ITEM = register("wool", WOOL);
 
     @I18n(en_us = "carpet", zh_cn = "地毯", zh_tw = "地毯")
     public static final DeferredBlock<CarpetBlock> CARPET =
             register("carpet", CarpetBlock::new, BlockBehaviour.Properties.of().strength(0.1F).sound(SoundType.WOOL).ignitedByLava() );
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> CARPET_ITEM = register("carpet", CARPET);
 
     @I18n(en_us = "Concrete", zh_cn = "混凝土", zh_tw = "混凝土")
     @CubeAll
     public static final DeferredBlock<Block> CONCRETE =
             register("concrete", BlockBehaviour.Properties.of().strength(0.8F).sound(SoundType.STONE).ignitedByLava());
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> CONCRETE_ITEM = register("concrete", CONCRETE);
+    @I18n(en_us = "Concrete Powder", zh_cn = "混凝土粉末", zh_tw = "混凝土粉末")
+    @CubeAll
+    public static final DeferredBlock<Block> CONCRETE_POWDER =
+            register("concrete_powder", properties -> new ConcretePowderBlock(CONCRETE.get(), properties), BlockBehaviour.Properties.of().sound(SoundType.STONE).ignitedByLava());
+    public static final DeferredItem<BlockItem> CONCRETE_POWDER_ITEM = register("concrete_powder", CONCRETE_POWDER);
     @I18n(en_us ="Glazed Terracotta", zh_cn = "带釉陶瓦", zh_tw = "带釉陶瓦")
     public static final DeferredBlock<GlazedTerracottaBlock> GLAZED_TERRACOTTA =
             register("glazed_terracotta",  GlazedTerracottaBlock::new, BlockBehaviour.Properties.of().strength(1.25F).sound(SoundType.STONE).ignitedByLava());
@@ -181,14 +182,39 @@ public class ModBlocks {
     public static final DeferredItem<BlockItem> GLISTERING_MELON_ITEM =
             register("glistering_melon", GLISTERING_MELON);
 
+    @I18n(en_us = "Stone Wall", zh_tw = "石牆", zh_cn = "石墙")
+    public static final DeferredBlock<WallBlock> STONE_WALL =
+            register("stone_wall", WallBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.STONE));
+
+    @BasicBlockItem
+    public static final DeferredItem<BlockItem> STONE_WALL_ITEM =
+            register("stone_wall", STONE_WALL);
+
     @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);
+    @I18n(en_us = "Polished Stone Wall",zh_cn = "磨制石墙",zh_tw = "磨製石牆")
+    public static final DeferredBlock<WallBlock> POLISHED_STONE_WALL =
+            register("polished_stone_wall", WallBlock::new, BlockBehaviour.Properties.ofFullCopy(ModBlocks.POLISHED_STONE.get()));
+    @BasicBlockItem
+    public static final DeferredItem<BlockItem> POLISHED_STONE_WALL_ITEM =
+            register("polished_stone_wall", POLISHED_STONE_WALL);
+    @I18n(en_us = "Polished Stone Stairs",zh_cn = "磨制楼梯",zh_tw = "磨製石樓梯")
+    public static final DeferredBlock<StairBlock> POLISHED_STONE_STAIRS =
+            register("polished_stone_stairs", properties -> new StairBlock(POLISHED_STONE.get().defaultBlockState(), properties), BlockBehaviour.Properties.ofFullCopy(Blocks.STONE_STAIRS));
+    @BasicBlockItem
+    public static final DeferredItem<BlockItem> POLISHED_STONE_STAIRS_ITEM =
+            register("polished_stone_stairs", POLISHED_STONE_STAIRS);
 
+    @I18n(en_us = "Polished Stone Slab",zh_cn = "磨制石台阶",zh_tw = "磨製石半磚")
+    public static final DeferredBlock<SlabBlock> POLISHED_STONE_SLAB =
+            register("polished_stone_slab", SlabBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.STONE_SLAB));
+    @BasicBlockItem
+    public static final DeferredItem<BlockItem> POLISHED_STONE_SLAB_ITEM =
+            register("polished_stone_slab", POLISHED_STONE_SLAB);
 
     @AllWood
     @I18n(en_us = "Azalea Planks", zh_cn = "杜鹃木板", zh_tw = "杜鵑木材")
@@ -360,7 +386,6 @@ public class ModBlocks {
     @CubeAll
     public static final DeferredBlock<Block> PALM_CROWN =
             register("palm_crown", Block::new, BlockBehaviour.Properties.ofFullCopy(Blocks.STRIPPED_SPRUCE_WOOD));
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> PALM_CROWN_ITEM =
             register("palm_crown", PALM_CROWN);
 
@@ -451,14 +476,12 @@ public class ModBlocks {
     @CubeAll(render_type = "cutout_mipped")
     public static final DeferredBlock<LeavesBlock> PALM_LEAVES =
             register("palm_leaves", LeavesBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.SPRUCE_LEAVES));
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> PALM_LEAVES_ITEM =
             register("palm_leaves", PALM_LEAVES);
     @I18n(en_us = "Baobab Leaves", zh_cn = "猴面包树叶", zh_tw = "猴麵包樹葉")
     @CubeAll(render_type = "cutout_mipped")
     public static final DeferredBlock<LeavesBlock> BAOBAB_LEAVES =
             register("baobab_leaves", LeavesBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.ACACIA_LEAVES));
-    @BasicBlockItem
     public static final DeferredItem<BlockItem> BAOBAB_LEAVES_ITEM =
             register("baobab_leaves", BAOBAB_LEAVES);
 
diff --git a/src/main/java/org/polaris2023/wild_wind/common/init/ModCreativeTabs.java b/src/main/java/org/polaris2023/wild_wind/common/init/ModCreativeTabs.java
@@ -12,8 +12,10 @@
 import org.polaris2023.annotation.language.I18n;
 import org.polaris2023.wild_wind.common.init.items.ModBaseItems;
 import org.polaris2023.wild_wind.common.init.items.entity.ModBoats;
+import org.polaris2023.wild_wind.common.init.items.entity.ModMobBuckets;
 import org.polaris2023.wild_wind.common.init.items.entity.ModSpawnEggs;
 import org.polaris2023.wild_wind.common.init.items.foods.ModBaseFoods;
+import org.polaris2023.wild_wind.datagen.ModBlockFamilies;
 
 import java.util.List;
 import java.util.Locale;
@@ -27,101 +29,96 @@
 public enum ModCreativeTabs implements Supplier<CreativeModeTab> {
     @I18n(en_us = "Wild wind: Building block", zh_cn = "原野之风：建筑方块", zh_tw = "原野之風：建築方塊")
     BUILDING_BLOCK(ModBlocks.BRITTLE_ICE::toStack, () -> (__, output) -> {
-        output.accept(ModBlocks.BRITTLE_ICE_ITEM);
-        output.accept(ModBlocks.SALT_BLOCK_ITEM);
-        output.accept(ModBlocks.WOOL_ITEM);
-        output.accept(ModBlocks.CONCRETE_ITEM);
-
-        for (DeferredHolder<Item, ? extends Item> holder : ModInitializer.items()) {
-            Item item = holder.get();
-            switch (item) {
-                case BoatItem ignored -> output.accept(item);
-                default -> {}
-            }
-        }
-        for (DeferredHolder<Block, ? extends Block> holder : ModInitializer.blocks()) {
-            Block block = holder.get();
-            switch (block) {
-                case ButtonBlock ignored -> output.accept(block);
-                case FenceBlock ignored -> output.accept(block);
-                case FenceGateBlock ignored -> output.accept(block);
-                case PressurePlateBlock ignored -> output.accept(block);
-                case SlabBlock ignored -> output.accept(block);
-                case StairBlock ignored -> output.accept(block);
-                case DoorBlock ignored -> output.accept(block);
-                case TrapDoorBlock ignored -> output.accept(block);
-                case SignBlock ignored -> output.accept(block);
-                case GlazedTerracottaBlock ignored -> output.accept(block);
-                default -> {
-                    String path = holder.getId().getPath();
-                    if (
-                            path.contains("log") ||
-                                    path.contains("wood") ||
-                                    path.contains("planks")
-                    ) {
-                        output.accept(block);
-                    }
-                }
 
-            }
-        }
+        output.accept(ModBlocks.AZALEA_LOG);
+        output.accept(ModBlocks.AZALEA_WOOD);
+        output.accept(ModBlocks.STRIPPED_AZALEA_LOG);
+        output.accept(ModBlocks.STRIPPED_AZALEA_WOOD);
+        ModBlockFamilies.AZALEA_PLANKS.addCreativeTab(output);
+        output.accept(ModBlocks.PALM_LOG);
+        output.accept(ModBlocks.PALM_WOOD);
+        output.accept(ModBlocks.STRIPPED_PALM_LOG);
+        output.accept(ModBlocks.STRIPPED_PALM_WOOD);
+        ModBlockFamilies.PALM_PLANKS.addCreativeTab(output);
+        output.accept(ModBlocks.BAOBAB_LOG);
+        output.accept(ModBlocks.BAOBAB_WOOD);
+        output.accept(ModBlocks.STRIPPED_BAOBAB_LOG);
+        output.accept(ModBlocks.STRIPPED_BAOBAB_WOOD);
+        ModBlockFamilies.BAOBAB_PLANKS.addCreativeTab(output);
+        output.accept(ModBlocks.STONE_WALL);
+        output.accept(ModBlocks.POLISHED_STONE);
+        output.accept(ModBlocks.POLISHED_STONE_STAIRS);
+        output.accept(ModBlocks.POLISHED_STONE_SLAB);
+        output.accept(ModBlocks.POLISHED_STONE_WALL);
+
+        output.accept(ModBlocks.SALT_BLOCK);
+        output.accept(ModBlocks.WOOL);
+        output.accept(ModBlocks.CARPET);
+        output.accept(ModBlocks.CONCRETE);
+        output.accept(ModBlocks.CONCRETE_POWDER);
+        output.accept(ModBlocks.GLAZED_TERRACOTTA);
     }),
     @I18n(en_us = "Wild wind: Natural block", zh_cn = "原野之风：自然方块", zh_tw = "原野之風：自然方塊")
     NATURAL_BLOCKS(ModBlocks.SALT_BLOCK_ITEM::toStack, () -> (__, output) -> {
         output.accept(ModBlocks.BRITTLE_ICE_ITEM);
-
-        output.accept(ModBlocks.SALT_BLOCK_ITEM);
-
-        //缺少灰烬,块,淤泥，块,沙子系列
-        output.accept(ModBlocks.SALT_ORE_ITEM);
+        output.accept(ModBlocks.SALT_ORE);
         output.accept(ModBlocks.DEEPSLATE_SALT_ORE);
-        output.accept(ModBlocks.REEDS);
-        output.accept(ModBlocks.CATTAILS);
-        output.accept(ModBlocks.GLAREFLOWER);
-        output.accept(ModBlocks.DUCKWEED_ITEM);
-        output.accept(ModBlocks.GLAREFLOWER_SEEDS);
-//        output.accept(ModBlocks.SPIDER_ATTACHMENTS);
-//        output.accept(ModBlocks.SPIDER_MUCOSA);
-//        output.accept(ModBlocks.SPIDER_EGG);
-        output.accept(ModBlocks.SCULK_JAW_ITEM);
+        output.accept(ModBlocks.AZALEA_LOG);
+        output.accept(ModBlocks.PALM_LOG);
+        output.accept(ModBlocks.PALM_CROWN);
+        output.accept(ModBlocks.BAOBAB_LOG);
+        output.accept(ModBlocks.PALM_LEAVES);
+        output.accept(ModBlocks.BAOBAB_LEAVES);
+        output.accept(ModBlocks.PALM_SAPLING);
+        output.accept(ModBlocks.BAOBAB_SAPLING);
     }),
     @I18n(en_us = "Wild wind: Tools and Utilities", zh_cn = "原野之风：工具与实用物品", zh_tw = "原野之風：工具與實用物品")
     TOOLS_AND_UTILITIES(ModItems.MAGIC_FLUTE::toStack, () -> (__, output) -> {
-        output.accept(ModItems.MAGIC_FLUTE);
         output.accept(Items.BUCKET);
-        for (DeferredHolder<Item, ? extends Item> holder : ModInitializer.items()) {
-            if (holder.get() instanceof MobBucketItem item) {
-                output.accept(item);
-            }
-        }
+        output.accept(ModMobBuckets.TROUT_BUCKET);
+        output.accept(ModMobBuckets.PIRANHA_BUCKET);
+        output.accept(ModItems.MAGIC_FLUTE);
         output.accept(ModBlocks.GLOW_MUCUS);
+        output.accept(ModBoats.AZALEA_BOAT);
+        output.accept(ModBoats.AZALEA_CHEST_BOAT);
+        output.accept(ModBoats.PALM_BOAT);
+        output.accept(ModBoats.PALM_CHEST_BOAT);
+        output.accept(ModBoats.BAOBAB_BOAT);
+        output.accept(ModBoats.BAOBAB_CHEST_BOAT);
 
     }),
     @I18n(en_us = "Wild wind: Food & drink", zh_cn = "原野之风：食物与饮品", zh_tw = "原野之風：食物與飲品")
     FOOD_AND_DRINK(ModBaseFoods.PUMPKIN_SLICE.entry::toStack,
             () -> (__, output) -> {
-                List<Item> ignoresFood =
-                        List.of(ModItems.NETHER_MUSHROOM_STEW.get(), ModBaseFoods.FISH_CHOWDER.get());// ignore some food
-                for (DeferredHolder<Item, ? extends Item> item : ModInitializer.items()) {
-                    Item it = item.get();
-                    if (it.components().has(DataComponents.FOOD) && !ignoresFood.contains(it)) {
-                        output.accept(it);
-                    }
-                }
+                output.accept(ModBaseFoods.BAKED_APPLE);
+                output.accept(ModBaseFoods.BAKED_MELON_SLICE);
+                output.accept(ModBaseFoods.PUMPKIN_SLICE);
+                output.accept(ModBaseFoods.BAKED_PUMPKIN_SLICE);
+                output.accept(ModBaseFoods.BAKED_MUSHROOM);
+                output.accept(ModBaseFoods.BAKED_SEEDS);
+                output.accept(ModBaseFoods.BAKED_BERRIES);
+                output.accept(ModBaseFoods.BAKED_CARROT);
+                output.accept(ModItems.LIVING_TUBER);
+                output.accept(ModBaseFoods.BAKED_LIVING_TUBER);
+                output.accept(ModBaseFoods.RAW_FROG_LEG);
+                output.accept(ModBaseFoods.COOKED_FROG_LEG);
+                output.accept(ModBaseFoods.RAW_TROUT);
+                output.accept(ModBaseFoods.COOKED_TROUT);
+                output.accept(ModBaseFoods.RAW_PIRANHA);
+                output.accept(ModBaseFoods.COOKED_PIRANHA);
+                output.accept(ModBaseFoods.COOKED_EGG);
             }),
     @I18n(en_us = "Wild wind: Ingredients", zh_cn = "原野之风：原材料", zh_tw = "原野之風：原材料")
     INGREDIENTS(ModBlocks.GLOW_MUCUS_ITEM::toStack, () -> (__, output) -> {
-        output.accept(ModBaseItems.GLOW_POWDER.get());
         output.accept(ModBaseFoods.DOUGH);
+        output.accept(ModBaseItems.GLOW_POWDER.get());
         output.accept(ModBaseItems.SALT);
     }),
     @I18n(en_us = "Wild wind: Spawn Eggs", zh_cn = "原野之风：刷怪蛋", zh_tw = "原野之風：生怪蛋")
     SPAWN_EGGS(ModSpawnEggs.FIREFLY_SPAWN_EGG.entry::toStack, () -> (__, output) -> {
-        for (DeferredHolder<Item, ? extends Item> holder : ModInitializer.items()) {
-            if (holder.get() instanceof DeferredSpawnEggItem item) {
-                output.accept(item);
-            }
-        }
+        output.accept(ModSpawnEggs.FIREFLY_SPAWN_EGG);
+        output.accept(ModSpawnEggs.TROUT_SPAWN_EGG);
+        output.accept(ModSpawnEggs.PIRANHA_SPAWN_EGG);
     }),
     @I18n(en_us = "Wild wind: Misc", zh_cn = "原野之风：杂项", zh_tw = "原野之風：雜項")
     WILD_WIND(ModBlocks.COOKING_POT_ITEM::toStack,
diff --git a/src/main/java/org/polaris2023/wild_wind/common/init/ModPolishedSettings.java b/src/main/java/org/polaris2023/wild_wind/common/init/ModPolishedSettings.java
@@ -0,0 +1,29 @@
+package org.polaris2023.wild_wind.common.init;
+
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.block.state.properties.BlockSetType;
+import net.minecraft.world.level.block.state.properties.WoodType;
+
+import java.util.Locale;
+
+import static org.polaris2023.wild_wind.WildWindMod.MOD_ID;
+
+/**
+ * @author : baka4n
+ * {@code @Date : 2025/03/11 22:01:59}
+ */
+public enum ModPolishedSettings {
+    POLISHED_STONE;
+    public final BlockSetType setType;
+    ModPolishedSettings() {
+        String typeName = MOD_ID + "_" + name().toLowerCase(Locale.ROOT);
+        setType = BlockSetType.register(new BlockSetType(typeName));
+
+    }
+
+    ModPolishedSettings(boolean canOpenByHand, boolean canOpenByWindCharge, boolean canButtonBeActivatedByArrows, BlockSetType.PressurePlateSensitivity pressurePlateSensitivity, SoundType soundType, SoundEvent doorClose, SoundEvent doorOpen, SoundEvent trapdoorClose, SoundEvent trapdoorOpen, SoundEvent pressurePlateClickOff, SoundEvent pressurePlateClickOn, SoundEvent buttonClickOff, SoundEvent buttonClickOn) {
+        String typeName = MOD_ID + "_" + name().toLowerCase(Locale.ROOT);
+        setType = BlockSetType.register(new BlockSetType(typeName, canOpenByHand, canOpenByWindCharge, canButtonBeActivatedByArrows, pressurePlateSensitivity, soundType, doorClose, doorOpen, trapdoorClose, trapdoorOpen, pressurePlateClickOff, pressurePlateClickOn, buttonClickOff, buttonClickOn));
+    }
+}
diff --git a/src/main/java/org/polaris2023/wild_wind/datagen/ModBlockFamily.java b/src/main/java/org/polaris2023/wild_wind/datagen/ModBlockFamily.java
@@ -5,6 +5,7 @@
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.*;
 import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
@@ -34,6 +35,20 @@ public void registerStatesAndModels(BlockStateProvider provider, String name) {
 		provider.trapdoorBlock(this.trapdoor, Helpers.location("block/" + name + "_trapdoor"), true);//replace
 	}
 
+	public void addCreativeTab(CreativeModeTab.Output output) {
+		output.accept(baseBlock);
+		output.accept(stair);
+		output.accept(slab);
+		output.accept(fence);
+		output.accept(fenceGate);
+		output.accept(door);
+		output.accept(trapdoor);
+		output.accept(pressurePlate);
+		output.accept(button);
+		output.accept(standingSign);
+		output.accept(ceilingHangingSign);
+	}
+
 	public void generateBlockLoot(Consumer<Block> dropSelf) {
 		dropSelf.accept(this.baseBlock);
 		dropSelf.accept(this.button);
diff --git a/src/main/java/org/polaris2023/wild_wind/datagen/loot/ModBlockLootSubProvider.java b/src/main/java/org/polaris2023/wild_wind/datagen/loot/ModBlockLootSubProvider.java
@@ -46,6 +46,7 @@ public void generate() {
         this.dropSelf(ModBlocks.WOOL.get());
         this.dropSelf(ModBlocks.CARPET.get());
         this.dropSelf(ModBlocks.CONCRETE.get());
+        this.dropSelf(ModBlocks.CONCRETE_POWDER.get());
         this.dropSelf(ModBlocks.GLAZED_TERRACOTTA.get());
         this.dropSelf(ModBlocks.SALT_BLOCK.get());
         this.add(ModBlocks.SALT_ORE.get(), this.createSaltOreDrops(ModBlocks.SALT_ORE.get()));
@@ -65,7 +66,11 @@ public void generate() {
         this.dropSelf(ModBlocks.SCULK_JAW.get());
         this.dropSelf(ModBlocks.DUCKWEED.get());
         this.dropSelf(ModBlocks.GLISTERING_MELON.get());
+        this.dropSelf(ModBlocks.STONE_WALL.get());
         this.dropSelf(ModBlocks.POLISHED_STONE.get());
+        this.dropSelf(ModBlocks.POLISHED_STONE_WALL.get());
+        this.dropSelf(ModBlocks.POLISHED_STONE_SLAB.get());
+        this.dropSelf(ModBlocks.POLISHED_STONE_STAIRS.get());
         ModBlockFamilies.AZALEA_PLANKS.generateBlockLoot(this::dropSelf);
         ModBlockFamilies.PALM_PLANKS.generateBlockLoot(this::dropSelf);
         ModBlockFamilies.BAOBAB_PLANKS.generateBlockLoot(this::dropSelf);
diff --git a/组织分工-Organize.task.assignments/baka4n.MD b/组织分工-Organize.task.assignments/baka4n.MD
@@ -0,0 +1,8 @@
+## 分工
+- [x] 创造物品栏分类
+- [ ] 萤火虫实体
+- [ ] 鳟鱼实体
+- [ ] 食人鱼实体
+- [ ] 食物
+- [ ] 烹饪锅
+- [ ] 烹饪系统
