From 42c242dfe8330b4925bf1f64686d1173d0ae44cf Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Wed, 9 Apr 2025 02:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djson=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0codec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/block/ContainerBlock.java         | 13 ++++++++-----
 .../com/atsuishio/superbwarfare/init/ModBlocks.java |  2 +-
 src/main/resources/META-INF/enumextensions.json     |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java b/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java
index 08766834d..dedaab47d 100644
--- a/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java
+++ b/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java
@@ -28,6 +28,7 @@ import net.minecraft.world.level.block.*;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -48,10 +49,13 @@ public class ContainerBlock extends BaseEntityBlock {
     public static final BooleanProperty OPENED = BooleanProperty.create("opened");
 
     public ContainerBlock() {
-        super(Properties.of().sound(SoundType.METAL).strength(3.0f).noOcclusion().requiresCorrectToolForDrops());
-        this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(OPENED, false));
+        this(Properties.of().sound(SoundType.METAL).strength(3.0f).noOcclusion().requiresCorrectToolForDrops());
     }
 
+    public ContainerBlock(BlockBehaviour.Properties properties) {
+        super(properties);
+        this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(OPENED, false));
+    }
 
     @Override
     @ParametersAreNonnullByDefault
@@ -188,10 +192,9 @@ public class ContainerBlock extends BaseEntityBlock {
         return state.getValue(OPENED) ? box(1, 0, 1, 15, 14, 15) : box(0, 0, 0, 16, 15, 16);
     }
 
-    // TODO codec
     @Override
-    protected @NotNull MapCodec<? extends BaseEntityBlock> codec() {
-        return null;
+    protected MapCodec<? extends BaseEntityBlock> codec() {
+        return simpleCodec(ContainerBlock::new);
     }
 
     @Override
diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java b/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java
index 72a778d15..e34f37f9b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java
+++ b/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java
@@ -43,7 +43,7 @@ public class ModBlocks {
             () -> new Block(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()));
     public static final DeferredHolder<Block, Block> CEMENTED_CARBIDE_BLOCK = REGISTRY.register("cemented_carbide_block",
             () -> new Block(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()));
-    public static final DeferredHolder<Block, Block> CONTAINER = REGISTRY.register("container", ContainerBlock::new);
+    public static final DeferredHolder<Block, Block> CONTAINER = REGISTRY.register("container", () -> new ContainerBlock());
     public static final DeferredHolder<Block, Block> SMALL_CONTAINER = REGISTRY.register("small_container", () -> new SmallContainerBlock());
     public static final DeferredHolder<Block, Block> CHARGING_STATION = REGISTRY.register("charging_station", ChargingStationBlock::new);
     public static final DeferredHolder<Block, Block> CREATIVE_CHARGING_STATION = REGISTRY.register("creative_charging_station", () -> new CreativeChargingStationBlock());
diff --git a/src/main/resources/META-INF/enumextensions.json b/src/main/resources/META-INF/enumextensions.json
index 6fe377596..07d506dcb 100644
--- a/src/main/resources/META-INF/enumextensions.json
+++ b/src/main/resources/META-INF/enumextensions.json
@@ -5,7 +5,7 @@
       "name": "SUPERBWARFARE_LEGENDARY",
       "constructor": "(ILjava/lang/String;Lnet/minecraft/ChatFormatting;)V",
       "parameters": {
-        "class": "com/atsuishio/superbwarfare/init/ModEnumExtends",
+        "class": "com/atsuishio/superbwarfare/init/ModEnumExtensions",
         "field": "SUPERBWARFARE_LEGENDARY"
       }
     },
@@ -14,7 +14,7 @@
       "name": "SUPERBWARFARE_LUNGE_MINE_POSE",
       "constructor": "(ZLnet/neoforged/neoforge/client/IArmPoseTransformer;)V",
       "parameters": {
-        "class": "com/atsuishio/superbwarfare/init/ModEnumExtends",
+        "class": "com/atsuishio/superbwarfare/init/ModEnumExtensions",
         "field": "SUPERBWARFARE_LUNGE_MINE_POSE"
       }
     }