移除打火石的合成返还，修复耐久度合并的bug，调整透明建材代码

src/main/java/com/yipkei/vanilladdition/VanillaAddition.java

@@ -9,8 +9,6 @@
 import net.fabricmc.api.ModInitializer;
 
 import net.fabricmc.fabric.api.registry.FuelRegistry;
-import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
-import net.minecraft.client.render.RenderLayer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +39,6 @@ public void onInitialize() {
 
 		FuelRegistry.INSTANCE.add(ModBlocks.COMPRESS_WOOL, 800);
 
-		BlockRenderLayerMapImpl blockRenderLayerMap = new BlockRenderLayerMapImpl();
-		blockRenderLayerMap.putBlocks(RenderLayer.getTranslucent(), ModBlocks.ICE_SLAB, ModBlocks.ICE_STAIRS, ModBlocks.ICE_WALL);
+
 	}
 }

src/main/java/com/yipkei/vanilladdition/VanillaAdditionClient.java

@@ -1,10 +1,14 @@
 package com.yipkei.vanilladdition;
 
+import com.yipkei.vanilladdition.init.ModBlocks;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
+import net.minecraft.client.render.RenderLayer;
 
 public class VanillaAdditionClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-
+        BlockRenderLayerMapImpl blockRenderLayerMap = new BlockRenderLayerMapImpl();
+        blockRenderLayerMap.putBlocks(RenderLayer.getTranslucent(), ModBlocks.ICE_SLAB, ModBlocks.ICE_STAIRS, ModBlocks.ICE_WALL);
     }
 }

src/main/java/com/yipkei/vanilladdition/block/TranslucentIce.java → src/main/java/com/yipkei/vanilladdition/block/AbstractTranslucentBlock.java

@@ -1,4 +1,4 @@
 package com.yipkei.vanilladdition.block;
 
-public interface TranslucentIce {
+public interface AbstractTranslucentBlock {
 }

src/main/java/com/yipkei/vanilladdition/block/TranslucentSlab.java

@@ -0,0 +1,71 @@
+package com.yipkei.vanilladdition.block;
+
+import net.minecraft.block.*;
+import net.minecraft.block.enums.BlockHalf;
+import net.minecraft.block.enums.SlabType;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.Direction;
+
+import static com.yipkei.vanilladdition.helper.BlockStateHelper.hasCompleteSlabSurface;
+import static com.yipkei.vanilladdition.helper.BlockStateHelper.hasCompleteStairSurface;
+
+public class TranslucentSlab extends SlabBlock implements AbstractTranslucentBlock{
+    public TranslucentSlab(AbstractBlock.Settings settings) {
+        super(settings);
+    }
+
+    private Block blockSeries;
+
+    public Block setBlockSeriesAtSetting(Block block){
+        this.setBlockSeries(block);
+        return this;
+    }
+
+    public void setBlockSeries(Block block){
+        this.blockSeries = block;
+    }
+
+    public Block getBlockSeries(){
+        return blockSeries;
+    }
+
+    @Override
+    protected boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) {
+        if (!(stateFrom.getBlock() instanceof AbstractTranslucentBlock)) {
+            return super.isSideInvisible(state, stateFrom, direction);
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentBlock) {
+            if (this.getBlockSeries() != stateFrom.getBlock()){
+                return super.isSideInvisible(state, stateFrom, direction);
+            }
+            return switch (state.get(Properties.SLAB_TYPE)) {
+                case DOUBLE -> true;
+                case TOP -> direction != Direction.DOWN || super.isSideInvisible(state, stateFrom, direction);
+                case BOTTOM -> direction != Direction.UP || super.isSideInvisible(state, stateFrom, direction);
+            };
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentSlab) {
+            if (this.getBlockSeries() != ((TranslucentSlab)(stateFrom.getBlock())).getBlockSeries())
+                return super.isSideInvisible(state, stateFrom, direction);
+            return switch (state.get(Properties.SLAB_TYPE)){
+                case DOUBLE -> (hasCompleteSlabSurface(stateFrom,direction.getOpposite())) || super.isSideInvisible(state, stateFrom, direction);
+                case TOP -> ((direction == Direction.UP && stateFrom.get(Properties.SLAB_TYPE) != SlabType.TOP) || ((direction.getAxis() != Direction.Axis.Y) && stateFrom.get(Properties.SLAB_TYPE) != SlabType.BOTTOM)) || super.isSideInvisible(state, stateFrom, direction);
+                case BOTTOM -> ((direction == Direction.DOWN && stateFrom.get(Properties.SLAB_TYPE) != SlabType.BOTTOM)||((direction.getAxis() != Direction.Axis.Y) && stateFrom.get(Properties.SLAB_TYPE) != SlabType.TOP)) || super.isSideInvisible(state, stateFrom, direction);
+            };
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentStairs){
+            if (this.getBlockSeries() != ((TranslucentStairs)(stateFrom.getBlock())).getBlockSeries())
+                return super.isSideInvisible(state, stateFrom, direction);
+            return switch (state.get(Properties.SLAB_TYPE)){
+                case DOUBLE -> (hasCompleteStairSurface(stateFrom,direction.getOpposite())) || super.isSideInvisible(state, stateFrom, direction);
+                case TOP -> ((direction == Direction.UP && stateFrom.get(Properties.BLOCK_HALF) == BlockHalf.BOTTOM) || ((direction.getAxis() != Direction.Axis.Y) && stateFrom.get(Properties.BLOCK_HALF) == BlockHalf.TOP)) || super.isSideInvisible(state, stateFrom, direction);
+                case BOTTOM -> ((direction == Direction.DOWN && stateFrom.get(Properties.BLOCK_HALF) == BlockHalf.TOP) || ((direction.getAxis() != Direction.Axis.Y) && stateFrom.get(Properties.BLOCK_HALF) == BlockHalf.BOTTOM)) || super.isSideInvisible(state, stateFrom, direction);
+            };
+        }
+
+        return super.isSideInvisible(state, stateFrom, direction);
+    }
+}

src/main/java/com/yipkei/vanilladdition/block/TranslucentStairs.java

@@ -0,0 +1,64 @@
+package com.yipkei.vanilladdition.block;
+
+import net.minecraft.block.*;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.Direction;
+
+import static com.yipkei.vanilladdition.helper.BlockStateHelper.*;
+
+public class TranslucentStairs extends StairsBlock implements AbstractTranslucentBlock {
+    public TranslucentStairs(BlockState baseBlockState, Settings settings) {
+        super(baseBlockState, settings);
+    }
+
+    private Block blockSeries;
+
+    public Block setBlockSeriesAtSetting(Block block){
+        this.setBlockSeries(block);
+        return this;
+    }
+
+    public void setBlockSeries(Block block){
+        this.blockSeries = block;
+    }
+
+    public Block getBlockSeries(){
+        return blockSeries;
+    }
+
+    @Override
+    protected boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) {
+
+        if (!(stateFrom.getBlock() instanceof AbstractTranslucentBlock))
+            return super.isSideInvisible(state, stateFrom, direction);
+
+        if (stateFrom.getBlock() instanceof TranslucentBlock) {
+            return (this.getBlockSeries() == stateFrom.getBlock()) || super.isSideInvisible(state, stateFrom, direction);
+        }
+
+        if (this.getBlockSeries() == stateFrom.getBlock()) return true;
+
+        if (stateFrom.getBlock() instanceof TranslucentStairs) {
+            if (this.getBlockSeries() != ((TranslucentStairs)(stateFrom.getBlock())).getBlockSeries())
+                return super.isSideInvisible(state, stateFrom, direction);
+            if (hasCompleteStairSurface(stateFrom, direction.getOpposite())) return true;
+            Direction facing = state.get(Properties.HORIZONTAL_FACING);
+            if (state.get(Properties.BLOCK_HALF) == stateFrom.get(Properties.BLOCK_HALF)) {
+                if (direction.getAxis() == facing.getAxis()) {
+                    if (facing == stateFrom.get(Properties.HORIZONTAL_FACING))
+                        return super.isSideInvisible(state, stateFrom, direction);
+                    return true;
+                }
+                if (direction.getAxis() == Direction.Axis.Y){
+                    return super.isSideInvisible(state, stateFrom, direction);
+                }
+                return true;
+            }
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentSlab && this.getBlockSeries() == ((TranslucentSlab)(stateFrom.getBlock())).getBlockSeries() && hasCompleteSlabSurface(stateFrom, direction.getOpposite()))
+            return true;
+        return super.isSideInvisible(state, stateFrom, direction);
+    }
+}
+

src/main/java/com/yipkei/vanilladdition/block/TranslucentWall.java

@@ -0,0 +1,48 @@
+package com.yipkei.vanilladdition.block;
+
+import net.minecraft.block.*;
+import net.minecraft.util.math.Direction;
+
+import static com.yipkei.vanilladdition.helper.BlockStateHelper.*;
+
+public class TranslucentWall extends WallBlock implements AbstractTranslucentBlock {
+    public TranslucentWall(Settings settings) {
+        super(settings);
+    }
+
+    private Block blockSeries;
+
+    public Block setBlockSeriesAtSetting(Block block){
+        this.setBlockSeries(block);
+        return this;
+    }
+
+    public void setBlockSeries(Block block){
+        this.blockSeries = block;
+    }
+
+    public Block getBlockSeries(){
+        return blockSeries;
+    }
+
+    @Override
+    protected boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) {
+        if (!(stateFrom.getBlock() instanceof AbstractTranslucentBlock)){
+            return super.isSideInvisible(state, stateFrom, direction);
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentBlock || stateFrom.getBlock() instanceof TranslucentWall) {
+            return (this.getBlockSeries() == stateFrom.getBlock()) || super.isSideInvisible(state, stateFrom, direction);
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentStairs) {
+            return (this.getBlockSeries() == ((TranslucentStairs)(stateFrom.getBlock())).getBlockSeries() && hasCompleteStairSurface(stateFrom,direction.getOpposite())) || super.isSideInvisible(state, stateFrom, direction);
+        }
+
+        if (stateFrom.getBlock() instanceof TranslucentSlab){
+            return (this.getBlockSeries() == ((TranslucentSlab)(stateFrom.getBlock())).getBlockSeries() && hasCompleteSlabSurface(stateFrom,direction.getOpposite())) || super.isSideInvisible(state, stateFrom, direction);
+        }
+        return super.isSideInvisible(state, stateFrom, direction);
+    }
+
+}