diff --git a/src/main/java/com/atsuishio/superbwarfare/block/DragonTeethBlock.java b/src/main/java/com/atsuishio/superbwarfare/block/DragonTeethBlock.java
index e705df43a..bb840f535 100644
--- a/src/main/java/com/atsuishio/superbwarfare/block/DragonTeethBlock.java
+++ b/src/main/java/com/atsuishio/superbwarfare/block/DragonTeethBlock.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-// TODO 解决obj渲染问题
 public class DragonTeethBlock extends Block {
 
     public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
diff --git a/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java b/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java
index 07df4f617..66d6e3d3f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java
@@ -65,7 +65,6 @@ public class FuMO25BlockEntity extends BlockEntity implements MenuProvider, GeoB
     public int tick = 0;
 
     protected final ContainerEnergyData dataAccess = new ContainerEnergyData() {
-        // TODO energy
         @Override
         public int get(int pIndex) {
             return switch (pIndex) {
diff --git a/src/main/java/com/atsuishio/superbwarfare/capability/energy/BlockEnergyStorageProvider.java b/src/main/java/com/atsuishio/superbwarfare/capability/energy/BlockEnergyStorageProvider.java
deleted file mode 100644
index 62e32e11c..000000000
--- a/src/main/java/com/atsuishio/superbwarfare/capability/energy/BlockEnergyStorageProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.atsuishio.superbwarfare.capability.energy;
-
-import net.minecraft.core.Direction;
-import net.neoforged.neoforge.capabilities.ICapabilityProvider;
-import net.neoforged.neoforge.energy.EnergyStorage;
-import net.neoforged.neoforge.energy.IEnergyStorage;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-// TODO 共用实例问题
-// TODO 序列化问题
-public class BlockEnergyStorageProvider<T> implements ICapabilityProvider<T, Direction, IEnergyStorage> {
-
-    private final IEnergyStorage energy;
-
-    public BlockEnergyStorageProvider(int maxEnergy) {
-        this.energy = new EnergyStorage(maxEnergy);
-    }
-
-    @Override
-    public @Nullable IEnergyStorage getCapability(@NotNull T object, Direction context) {
-        return energy;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java
index 39c63b6ca..3c3f263c2 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java
@@ -26,7 +26,7 @@ public class InsidiousItemRenderer extends GeoItemRenderer<InsidiousItem> {
 
     public InsidiousItemRenderer() {
         super(new InsidiousItemModel());
-        // TODO render layer
+        // TODO layer
 //        this.addRenderLayer(new InsidiousLayer(this));
     }
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java
index cff796a9f..b847f7569 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java
@@ -38,7 +38,6 @@ public class VectorItemRenderer extends GeoItemRenderer<VectorItem> {
         super(new VectorItemModel());
         // TODO layer
 
-//        // TODO layer
 // this.addRenderLayer(new VectorLayer(this));
         
         this.renderArms = false;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java
index 3c047127b..74c97e0d3 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java
@@ -128,12 +128,6 @@ public class CannonShellEntity extends FastThrowableProjectile implements GeoEnt
         }
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.HE_5_INCHES.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java
index 38919d257..386ea368a 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java
@@ -25,12 +25,6 @@ public class FlareDecoyEntity extends Entity {
         super(ModEntities.FLARE_DECOY.get(), level);
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected void readAdditionalSaveData(@NotNull CompoundTag compoundTag) {
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/GunGrenadeEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/GunGrenadeEntity.java
index f29caa8cc..df2967323 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/GunGrenadeEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/GunGrenadeEntity.java
@@ -74,12 +74,6 @@ public class GunGrenadeEntity extends FastThrowableProjectile implements GeoEnti
         this.charged = charged;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.GRENADE_40MM.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HandGrenadeEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HandGrenadeEntity.java
index 159d3b98a..188174cf5 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HandGrenadeEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HandGrenadeEntity.java
@@ -51,12 +51,6 @@ public class HandGrenadeEntity extends FastThrowableProjectile implements GeoEnt
         this.fuse = fuse;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.HAND_GRENADE.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java
index 1c68a6a89..549588672 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java
@@ -51,12 +51,6 @@ public class HeliRocketEntity extends FastThrowableProjectile implements GeoEnti
         this.explosionRadius = explosionRadius;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.ROCKET.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java
index bcb3d37ce..2657a45ff 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java
@@ -78,12 +78,6 @@ public class JavelinMissileEntity extends FastThrowableProjectile implements Geo
         this.monsterMultiplier = monsterMultiplier;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.JAVELIN_MISSILE.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MelonBombEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MelonBombEntity.java
index 3754e6970..d8eca60c6 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MelonBombEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MelonBombEntity.java
@@ -22,12 +22,6 @@ public class MelonBombEntity extends FastThrowableProjectile {
         super(ModEntities.MELON_BOMB.get(), entity, level);
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return Items.MELON;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RgoGrenadeEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RgoGrenadeEntity.java
index 03430a42e..1ce46639c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RgoGrenadeEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RgoGrenadeEntity.java
@@ -52,12 +52,6 @@ public class RgoGrenadeEntity extends FastThrowableProjectile implements GeoEnti
         this.fuse = fuse;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.RGO_GRENADE.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java
index 554a403cc..477d27b3b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java
@@ -51,12 +51,6 @@ public class SmallCannonShellEntity extends FastThrowableProjectile implements G
         this.explosionRadius = explosionRadius;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.SMALL_SHELL.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/TaserBulletEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/TaserBulletEntity.java
index 63677d2bf..a981e14b5 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/TaserBulletEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/TaserBulletEntity.java
@@ -56,13 +56,6 @@ public class TaserBulletEntity extends AbstractArrow implements GeoEntity {
         super(type, world);
         this.noCulling = true;
     }
-
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     public void playerTouch(@NotNull Player pEntity) {
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java
index 275a4112b..3cffcd884 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java
@@ -56,12 +56,6 @@ public class WgMissileEntity extends FastThrowableProjectile implements GeoEntit
         this.explosionRadius = explosionRadius;
     }
 
-    // TODO AEP
-//    @Override
-//    public Packet<ClientGamePacketListener> getAddEntityPacket() {
-//        return NetworkHooks.getEntitySpawningPacket(this);
-//    }
-
     @Override
     protected @NotNull Item getDefaultItem() {
         return ModItems.WIRE_GUIDE_MISSILE.get();
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java
index 2ac691374..fdc43ceb3 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java
@@ -71,12 +71,6 @@ public class TaserItem extends GunItem implements GeoItem, SpecialFireWeapon, En
         return Math.round((float) (cap != null ? cap.getEnergyStored() : 0) * 13.0F / MAX_ENERGY);
     }
 
-    // TODO register cap
-//    @Override
-//    public ICapabilityProvider initCapabilities(ItemStack stack, CompoundTag tag) {
-//        return new ItemEnergyProvider(stack, energyCapacity.get());
-//    }
-
     @Override
     public int getBarColor(@NotNull ItemStack pStack) {
         return 0xFFFF00;