Remove internal phase comments and format code

Strip all Phase references, TODO/FUTURE roadmap notes, and internal
planning comments from the codebase. Run Prettier for consistent
formatting across all Java files.
This commit is contained in:
NotEvil
2026-04-12 01:24:49 +02:00
parent 73d70e212d
commit a71093ba9c
482 changed files with 8500 additions and 5155 deletions

View File

@@ -9,7 +9,6 @@ import net.minecraft.world.level.material.MapColor;
/**
* Cell Door Block - Iron-like door that cannot be opened by hand.
*
* Phase 16: Blocks
*
* Features:
* - Cannot be opened by clicking (requires redstone)

View File

@@ -37,7 +37,6 @@ import net.minecraft.world.phys.BlockHitResult;
/**
* Kidnap Bomb Block - TNT that applies bondage on explosion.
*
* Phase 16: Blocks
*
* Features:
* - TNT-like block that can be ignited
@@ -61,9 +60,7 @@ public class BlockKidnapBomb
);
}
// ========================================
// BLOCK ENTITY
// ========================================
@Nullable
@Override
@@ -82,9 +79,7 @@ public class BlockKidnapBomb
: null;
}
// ========================================
// EXPLOSION HANDLING
// ========================================
@Override
public void onCaughtFire(
@@ -139,9 +134,7 @@ public class BlockKidnapBomb
}
}
// ========================================
// LOADING ITEMS
// ========================================
@Override
public InteractionResult use(
@@ -199,9 +192,7 @@ public class BlockKidnapBomb
return InteractionResult.PASS;
}
// ========================================
// DROPS WITH NBT
// ========================================
@Override
public List<ItemStack> getDrops(
@@ -225,9 +216,7 @@ public class BlockKidnapBomb
return List.of(stack);
}
// ========================================
// TOOLTIP
// ========================================
@Override
public void appendHoverText(

View File

@@ -43,7 +43,6 @@ import net.minecraft.world.phys.shapes.VoxelShape;
/**
* Rope Trap Block - Trap that ties up entities when they walk on it.
*
* Phase 16: Blocks
*
* Features:
* - Flat block (1 pixel tall) placed on solid surfaces
@@ -76,9 +75,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
);
}
// ========================================
// SHAPE AND RENDERING
// ========================================
@Override
public VoxelShape getShape(
@@ -105,9 +102,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
return RenderShape.MODEL;
}
// ========================================
// PLACEMENT RULES
// ========================================
@Override
public boolean canSurvive(
@@ -159,9 +154,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
);
}
// ========================================
// BLOCK ENTITY
// ========================================
@Nullable
@Override
@@ -175,9 +168,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
return be instanceof TrapBlockEntity ? (TrapBlockEntity) be : null;
}
// ========================================
// TRAP TRIGGER
// ========================================
@Override
public void entityInside(
@@ -239,9 +230,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
);
}
// ========================================
// LOADING ITEMS
// ========================================
@Override
public InteractionResult use(
@@ -293,9 +282,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
return InteractionResult.PASS;
}
// ========================================
// DROPS WITH NBT
// ========================================
@Override
public List<ItemStack> getDrops(
@@ -319,9 +306,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
return List.of(stack);
}
// ========================================
// TOOLTIP
// ========================================
@Override
public void appendHoverText(

View File

@@ -33,7 +33,6 @@ import net.minecraft.world.phys.BlockHitResult;
/**
* Trapped Chest Block - Chest that traps players when opened.
*
* Phase 16: Blocks
*
* Extends vanilla ChestBlock for proper chest behavior.
* Sneak + right-click to load bondage items.
@@ -47,9 +46,7 @@ public class BlockTrappedChest extends ChestBlock implements ICanBeLoaded {
);
}
// ========================================
// BLOCK ENTITY
// ========================================
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
@@ -67,9 +64,7 @@ public class BlockTrappedChest extends ChestBlock implements ICanBeLoaded {
: null;
}
// ========================================
// INTERACTION - TRAP TRIGGER
// ========================================
@Override
public InteractionResult use(
@@ -151,9 +146,7 @@ public class BlockTrappedChest extends ChestBlock implements ICanBeLoaded {
return super.use(state, level, pos, player, hand, hit);
}
// ========================================
// DROPS WITH NBT
// ========================================
@Override
public List<ItemStack> getDrops(
@@ -180,9 +173,7 @@ public class BlockTrappedChest extends ChestBlock implements ICanBeLoaded {
return drops;
}
// ========================================
// TOOLTIP
// ========================================
@Override
public void appendHoverText(

View File

@@ -3,7 +3,6 @@ package com.tiedup.remake.blocks;
/**
* Marker interface for blocks that can have bondage items loaded into them.
*
* Phase 16: Blocks
*
* Implemented by:
* - BlockRopesTrap - applies items when entity walks on it

View File

@@ -19,7 +19,6 @@ import net.minecraftforge.registries.RegistryObject;
/**
* Mod Blocks Registration
*
* Phase 16: Blocks
*
* Handles registration of all TiedUp blocks using DeferredRegister.
*
@@ -40,9 +39,7 @@ public class ModBlocks {
public static final DeferredRegister<Item> BLOCK_ITEMS =
DeferredRegister.create(ForgeRegistries.ITEMS, TiedUpMod.MOD_ID);
// ========================================
// PADDED BLOCKS
// ========================================
/**
* Base padded block properties.
@@ -83,9 +80,7 @@ public class ModBlocks {
)
);
// ========================================
// TRAP BLOCKS
// ========================================
/**
* Rope Trap - Flat trap that ties up entities that walk on it.
@@ -114,9 +109,7 @@ public class ModBlocks {
BlockTrappedChest::new
);
// ========================================
// DOOR BLOCKS
// ========================================
/**
* Cell Door - Iron-like door that requires redstone to open.
@@ -125,9 +118,7 @@ public class ModBlocks {
public static final RegistryObject<BlockCellDoor> CELL_DOOR =
registerDoorBlock("cell_door", BlockCellDoor::new);
// ========================================
// CELL SYSTEM BLOCKS
// ========================================
/**
* Marker Block - Invisible block for cell spawn points.
@@ -154,9 +145,7 @@ public class ModBlocks {
BlockCellCore::new
);
// ========================================
// REGISTRATION HELPERS
// ========================================
/**
* Register a block and its corresponding BlockItem.

View File

@@ -20,7 +20,6 @@ import net.minecraft.world.level.block.state.BlockState;
/**
* Base BlockEntity for blocks that store bondage items.
*
* Phase 16: Blocks
*
* Stores up to 6 bondage items:
* - Bind (ropes, chains, straitjacket, etc.)
@@ -42,9 +41,7 @@ public abstract class BondageItemBlockEntity
implements IBondageItemHolder
{
// ========================================
// STORED ITEMS
// ========================================
private ItemStack bind = ItemStack.EMPTY;
private ItemStack gag = ItemStack.EMPTY;
@@ -59,9 +56,7 @@ public abstract class BondageItemBlockEntity
*/
private final boolean offMode;
// ========================================
// CONSTRUCTORS
// ========================================
public BondageItemBlockEntity(
BlockEntityType<?> type,
@@ -81,9 +76,7 @@ public abstract class BondageItemBlockEntity
this.offMode = offMode;
}
// ========================================
// BIND
// ========================================
@Override
public ItemStack getBind() {
@@ -96,9 +89,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// GAG
// ========================================
@Override
public ItemStack getGag() {
@@ -111,9 +102,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// BLINDFOLD
// ========================================
@Override
public ItemStack getBlindfold() {
@@ -126,9 +115,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// EARPLUGS
// ========================================
@Override
public ItemStack getEarplugs() {
@@ -141,9 +128,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// COLLAR
// ========================================
@Override
public ItemStack getCollar() {
@@ -156,9 +141,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// CLOTHES
// ========================================
@Override
public ItemStack getClothes() {
@@ -171,9 +154,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// STATE
// ========================================
@Override
public boolean isArmed() {
@@ -194,9 +175,7 @@ public abstract class BondageItemBlockEntity
this.setChangedAndSync();
}
// ========================================
// NBT SERIALIZATION
// ========================================
@Override
public void load(CompoundTag tag) {
@@ -300,9 +279,7 @@ public abstract class BondageItemBlockEntity
return tag;
}
// ========================================
// NETWORK SYNC
// ========================================
/**
* Mark dirty and sync to clients.

View File

@@ -6,7 +6,6 @@ import net.minecraft.world.item.ItemStack;
/**
* Interface for BlockEntities that store bondage items.
*
* Phase 16: Blocks
*
* Defines the contract for storing and retrieving bondage items:
* - Bind (ropes, chains, etc.)
@@ -19,51 +18,37 @@ import net.minecraft.world.item.ItemStack;
* Based on original ITileEntityBondageItemHolder from 1.12.2
*/
public interface IBondageItemHolder {
// ========================================
// BIND
// ========================================
ItemStack getBind();
void setBind(ItemStack bind);
// ========================================
// GAG
// ========================================
ItemStack getGag();
void setGag(ItemStack gag);
// ========================================
// BLINDFOLD
// ========================================
ItemStack getBlindfold();
void setBlindfold(ItemStack blindfold);
// ========================================
// EARPLUGS
// ========================================
ItemStack getEarplugs();
void setEarplugs(ItemStack earplugs);
// ========================================
// COLLAR
// ========================================
ItemStack getCollar();
void setCollar(ItemStack collar);
// ========================================
// CLOTHES
// ========================================
ItemStack getClothes();
void setClothes(ItemStack clothes);
// ========================================
// NBT SERIALIZATION
// ========================================
/**
* Read bondage items from NBT.
@@ -78,9 +63,7 @@ public interface IBondageItemHolder {
*/
CompoundTag writeBondageData(CompoundTag tag);
// ========================================
// STATE
// ========================================
/**
* Check if this holder has any bondage items loaded.

View File

@@ -6,7 +6,6 @@ import net.minecraft.world.level.block.state.BlockState;
/**
* BlockEntity for kidnap bomb blocks.
*
* Phase 16: Blocks
*
* Stores bondage items that will be applied when the bomb explodes.
* Simple extension of BondageItemBlockEntity.

View File

@@ -10,7 +10,6 @@ import net.minecraftforge.registries.RegistryObject;
/**
* Mod Block Entities Registration
*
* Phase 16: Blocks
*
* Handles registration of all TiedUp block entities using DeferredRegister.
*/
@@ -23,9 +22,7 @@ public class ModBlockEntities {
TiedUpMod.MOD_ID
);
// ========================================
// TRAP BLOCK ENTITIES
// ========================================
/**
* Trap block entity - stores bondage items for rope trap.
@@ -40,9 +37,7 @@ public class ModBlockEntities {
// LOW FIX: Removed BED BLOCK ENTITIES section - feature not implemented
// ========================================
// BOMB BLOCK ENTITIES
// ========================================
/**
* Kidnap bomb block entity - stores bondage items for explosion effect.
@@ -56,9 +51,7 @@ public class ModBlockEntities {
).build(null)
);
// ========================================
// CHEST BLOCK ENTITIES
// ========================================
/**
* Trapped chest block entity - stores bondage items for when player opens it.
@@ -72,9 +65,7 @@ public class ModBlockEntities {
).build(null)
);
// ========================================
// CELL SYSTEM BLOCK ENTITIES
// ========================================
/**
* Marker block entity - stores cell UUID for cell system.

View File

@@ -6,7 +6,6 @@ import net.minecraft.world.level.block.state.BlockState;
/**
* BlockEntity for rope trap blocks.
*
* Phase 16: Blocks
*
* Stores bondage items that will be applied when an entity walks on the trap.
* Simple extension of BondageItemBlockEntity.

View File

@@ -15,7 +15,6 @@ import net.minecraft.world.level.block.state.BlockState;
/**
* BlockEntity for trapped chest blocks.
*
* Phase 16: Blocks
*
* Extends ChestBlockEntity for proper chest behavior,
* but also stores bondage items for the trap.
@@ -37,9 +36,7 @@ public class TrappedChestBlockEntity
super(ModBlockEntities.TRAPPED_CHEST.get(), pos, state);
}
// ========================================
// BONDAGE ITEM HOLDER IMPLEMENTATION
// ========================================
@Override
public ItemStack getBind() {
@@ -172,9 +169,7 @@ public class TrappedChestBlockEntity
return tag;
}
// ========================================
// NBT SERIALIZATION
// ========================================
@Override
public void load(CompoundTag tag) {
@@ -188,9 +183,7 @@ public class TrappedChestBlockEntity
writeBondageData(tag);
}
// ========================================
// NETWORK SYNC
// ========================================
/**
* Mark dirty and sync to clients.