Merge pull request #109 from Polaris-Bears-MC/baka4n-update

修复些许问题

Author: baka4n

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

@@ -112,6 +112,7 @@ public class ModBlocks {
             register("brittle_ice", BRITTLE_ICE);
 
     @I18n(en_us = "wool", zh_cn = "羊毛", zh_tw = "羊毛")
+    @CubeAll
     public static final DeferredBlock<Block> WOOL = register("wool", BlockBehaviour.Properties.of()
             .instrument(NoteBlockInstrument.GUITAR)
             .strength(0.8F)
@@ -127,6 +128,7 @@ public class ModBlocks {
     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
@@ -355,6 +357,7 @@ public class ModBlocks {
             registerHangingSign("palm_hanging_sign", PALM_HANGING_SIGN, PALM_WALL_HANGING_SIGN);
 
     @I18n(en_us = "Palm Crown", zh_cn = "棕榈树冠", zh_tw = "棕櫚樹冠")
+    @CubeAll
     public static final DeferredBlock<Block> PALM_CROWN =
             register("palm_crown", Block::new, BlockBehaviour.Properties.ofFullCopy(Blocks.STRIPPED_SPRUCE_WOOD));
     @BasicBlockItem
@@ -445,12 +448,14 @@ public class ModBlocks {
             registerHangingSign("baobab_hanging_sign", BAOBAB_HANGING_SIGN, BAOBAB_WALL_HANGING_SIGN);
 
     @I18n(en_us = "Palm Leaves", zh_cn = "棕榈树叶", zh_tw = "棕櫚樹葉")
+    @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

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

@@ -31,16 +31,7 @@ public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper)
             Helpers.location("block/brittle_ice_0"),
             Helpers.location("block/brittle_ice_1"),
             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")
+            Helpers.location("block/brittle_ice_3"),
     };
 
     @Override
@@ -81,21 +72,12 @@ protected void registerStatesAndModels() {
         }
 
         // Logs
-        simpleBlock(ModBlocks.PALM_CROWN.get(), models().cubeAll("palm_crown", Helpers.location("block/palm_crown")));
-        simpleBlock(ModBlocks.PALM_LEAVES.get(), models().cubeAll("palm_leaves", Helpers.location("block/palm_leaves")).renderType("cutout_mipped"));
-        simpleBlock(ModBlocks.BAOBAB_LEAVES.get(), models().cubeAll("baobab_leaves", Helpers.location("block/baobab_leaves")).renderType("cutout_mipped"));
         simpleBlock(ModBlocks.PALM_SAPLING.get(), models().cross("palm_sapling", Helpers.location("block/palm_sapling")).renderType("cutout"));
         simpleBlock(ModBlocks.BAOBAB_SAPLING.get(), models().cross("baobab_sapling", Helpers.location("block/baobab_sapling")).renderType("cutout"));
 
-        // Wool
-        simpleBlock(ModBlocks.WOOL.get(), models().cubeAll("wool", Helpers.location("block/wool")));
-
         // Carpet
         simpleBlock(ModBlocks.CARPET.get(), models().carpet("carpet", Helpers.location("block/wool")));
 
-        // Concrete
-        simpleBlock(ModBlocks.CONCRETE.get(), models().cubeAll("concrete", Helpers.location("block/concrete")));
-
         // Glazed Terracotta
         VariantBlockStateBuilder glazedTerracottaStates = getVariantBuilder(ModBlocks.GLAZED_TERRACOTTA.get());
         for (Direction facing : Direction.Plane.HORIZONTAL) {
@@ -136,39 +118,4 @@ private void brittleIceModel(VariantBlockStateBuilder brittleIceStates, int age,
                 new ConfiguredModel(models().getExistingFile(BRITTLE_ICES[age]))
         );
     }
-
-    private void logModel(VariantBlockStateBuilder woodStates, String name) {
-        ResourceLocation side = Helpers.location("block/" + name + "_log");
-        ResourceLocation top = Helpers.location("block/" + name + "_log_top");
-        woodStates.addModels(
-                woodStates.partialState().with(BlockStateProperties.AXIS, Direction.Axis.Y),
-                new ConfiguredModel(models().cubeColumn(name + "_log", side, top))
-        );
-        BlockModelBuilder azaleaLogHorizontal = models().cubeColumnHorizontal(name + "_log_horizontal", side, top);
-        woodStates.addModels(
-                woodStates.partialState().with(BlockStateProperties.AXIS, Direction.Axis.X),
-                new ConfiguredModel(azaleaLogHorizontal, 90, 90, false)
-        );
-        woodStates.addModels(
-                woodStates.partialState().with(BlockStateProperties.AXIS, Direction.Axis.Z),
-                new ConfiguredModel(azaleaLogHorizontal, 90, 0, false)
-        );
-    }
-
-    private void woodModel(VariantBlockStateBuilder woodStates, String name) {
-        ResourceLocation side = Helpers.location("block/" + name + "_log");
-        woodStates.addModels(
-                woodStates.partialState().with(BlockStateProperties.AXIS, Direction.Axis.Y),
-                new ConfiguredModel(models().cubeColumn(name + "_wood", side, side))
-        );
-        BlockModelBuilder azaleaLogHorizontal = models().cubeColumnHorizontal(name + "_wood_horizontal", side, side);
-        woodStates.addModels(
-                woodStates.partialState().with(BlockStateProperties.AXIS, Direction.Axis.X),
-                new ConfiguredModel(azaleaLogHorizontal, 90, 90, false)
-        );
-        woodStates.addModels(
-                woodStates.partialState().with(BlockStateProperties.AXIS, Direction.Axis.Z),
-                new ConfiguredModel(azaleaLogHorizontal, 90, 0, false)
-        );
-    }
 }

src/main/java/org/polaris2023/wild_wind/datagen/loot/ModBlockLootSubProvider.java

@@ -55,6 +55,8 @@ public void generate() {
         this.dropSelf(ModBlocks.STRIPPED_BAOBAB_WOOD.get());
         this.dropSelf(ModBlocks.SCULK_JAW.get());
         this.dropSelf(ModBlocks.DUCKWEED.get());
+        this.dropSelf(ModBlocks.GLISTERING_MELON.get());
+        this.dropSelf(ModBlocks.POLISHED_STONE.get());
         ModBlockFamilies.AZALEA_PLANKS.generateBlockLoot(this::dropSelf);
         ModBlockFamilies.PALM_PLANKS.generateBlockLoot(this::dropSelf);
         ModBlockFamilies.BAOBAB_PLANKS.generateBlockLoot(this::dropSelf);