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.
2026-04-12 01:24:49 +02:00
parent 73d70e212d
commit a71093ba9c
482 changed files with 8500 additions and 5155 deletions
--- a/src/main/java/com/tiedup/remake/compat/mca/MCABondageManager.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/MCABondageManager.java
@@ -10,10 +10,10 @@ import com.tiedup.remake.core.TiedUpMod;
 import com.tiedup.remake.state.IRestrainable;
 import java.util.Map;
 import java.util.WeakHashMap;
-import org.jetbrains.annotations.Nullable;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;

 /**
 * Central coordinator for all MCA-TiedUp integration.
@@ -48,9 +48,7 @@ public class MCABondageManager {
        return INSTANCE;
    }

-    // ========================================
    // LIFECYCLE EVENTS
-    // ========================================

    /** Dialogue broadcast radius in blocks */
    private static final double DIALOGUE_RADIUS = 16.0;
@@ -290,9 +288,7 @@ public class MCABondageManager {
        syncBondageState(villager);
    }

-    // ========================================
    // AI CONTROL
-    // ========================================

    /**
     * Get or create AI controller for villager.
@@ -354,9 +350,7 @@ public class MCABondageManager {
        return getAILevel(villager) != MCABondageAILevel.NONE;
    }

-    // ========================================
    // SYNC
-    // ========================================

    /**
     * Sync all bondage state to tracking clients.
@@ -403,9 +397,7 @@ public class MCABondageManager {
            });
    }

-    // ========================================
    // QUERIES
-    // ========================================

    /**
     * Get IRestrainable adapter for MCA villager.
@@ -430,9 +422,7 @@ public class MCABondageManager {
        return aiControllers.containsKey(living);
    }

-    // ========================================
    // CLEANUP
-    // ========================================

    /**
     * Remove all tracking for a villager.
--- a/src/main/java/com/tiedup/remake/compat/mca/ai/MCABondageAIController.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/ai/MCABondageAIController.java
@@ -90,9 +90,7 @@ public class MCABondageAIController {
            personality != null ? personality : MCAPersonality.UNKNOWN;
    }

-    // ========================================
    // LEVEL MANAGEMENT
-    // ========================================

    /**
     * Recalculate and apply appropriate AI level based on current state.
@@ -215,9 +213,7 @@ public class MCABondageAIController {
        }
    }

-    // ========================================
    // SPEED REDUCTION
-    // ========================================

    private void applySpeedReduction() {
        LivingEntity villager = villagerRef.get();
@@ -248,9 +244,7 @@ public class MCABondageAIController {
        );
    }

-    // ========================================
    // GOAL INJECTION (MODIFIED LEVEL)
-    // ========================================

    private void injectBondageGoals() {
        LivingEntity villager = villagerRef.get();
@@ -326,9 +320,7 @@ public class MCABondageAIController {
        );
    }

-    // ========================================
    // FULL AI OVERRIDE
-    // ========================================

    private void backupAndClearGoals() {
        LivingEntity villager = villagerRef.get();
@@ -399,9 +391,7 @@ public class MCABondageAIController {
        );
    }

-    // ========================================
    // MCA BRAIN CONTROL
-    // ========================================

    /**
     * Suspend MCA's brain activities (for OVERRIDE level).
@@ -503,9 +493,7 @@ public class MCABondageAIController {
        mcaBrainSuspended = false;
    }

-    // ========================================
    // CLEANUP
-    // ========================================

    /**
     * Clean up all AI modifications.
--- a/src/main/java/com/tiedup/remake/compat/mca/capability/MCAKidnappedAdapter.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/capability/MCAKidnappedAdapter.java
@@ -7,14 +7,14 @@ import com.tiedup.remake.items.base.IHasGaggingEffect;
 import com.tiedup.remake.items.base.IHasResistance;
 import com.tiedup.remake.items.base.ILockable;
 import com.tiedup.remake.items.base.ItemBind;
+import com.tiedup.remake.state.ICaptor;
 import com.tiedup.remake.state.IRestrainable;
 import com.tiedup.remake.state.IRestrainableEntity;
-import com.tiedup.remake.v2.BodyRegionV2;
-import com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper;
-import com.tiedup.remake.state.ICaptor;
 import com.tiedup.remake.state.PlayerBindState;
 import com.tiedup.remake.util.tasks.ItemTask;
 import com.tiedup.remake.util.teleport.Position;
+import com.tiedup.remake.v2.BodyRegionV2;
+import com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper;
 import java.util.UUID;
 import javax.annotation.Nullable;
 import net.minecraft.server.level.ServerLevel;
@@ -46,9 +46,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        this.cap = cap;
    }

-    // ========================================
    // 1. CAPTURE LIFECYCLE
-    // ========================================

    @Override
    public boolean getCapturedBy(ICaptor captor) {
@@ -114,9 +112,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        getCapturedBy(newCaptor);
    }

-    // ========================================
    // 2. STATE QUERIES - CAPTURE
-    // ========================================

    @Override
    public boolean isEnslavable() {
@@ -214,9 +210,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        return null;
    }

-    // ========================================
    // 3. STATE QUERIES - BONDAGE EQUIPMENT
-    // ========================================

    @Override
    public boolean isTiedUp() {
@@ -301,9 +295,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        return false;
    }

-    // ========================================
    // 4. EQUIPMENT MANAGEMENT - PUT ON
-    // ========================================

    public void putBindOn(ItemStack bind) {
        cap.setBind(bind);
@@ -357,9 +349,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        checkMittensAfterApply();
    }

-    // ========================================
    // 5. EQUIPMENT MANAGEMENT - UNEQUIP (V2)
-    // ========================================

    @Override
    public ItemStack unequip(BodyRegionV2 region) {
@@ -395,7 +385,9 @@ public class MCAKidnappedAdapter implements IRestrainable {
                ItemStack current = cap.getGag();
                if (current.isEmpty()) yield ItemStack.EMPTY;
                cap.setGag(ItemStack.EMPTY);
-                MCABondageManager.getInstance().onSensoryRestrictionChanged(entity);
+                MCABondageManager.getInstance().onSensoryRestrictionChanged(
+                    entity
+                );
                syncToClients();
                yield current;
            }
@@ -403,7 +395,9 @@ public class MCAKidnappedAdapter implements IRestrainable {
                ItemStack current = cap.getBlindfold();
                if (current.isEmpty()) yield ItemStack.EMPTY;
                cap.setBlindfold(ItemStack.EMPTY);
-                MCABondageManager.getInstance().onSensoryRestrictionChanged(entity);
+                MCABondageManager.getInstance().onSensoryRestrictionChanged(
+                    entity
+                );
                syncToClients();
                yield current;
            }
@@ -425,9 +419,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        };
    }

-    // ========================================
    // 5b. EQUIPMENT MANAGEMENT - TAKE OFF (local helpers)
-    // ========================================

    public ItemStack takeBindOff() {
        ItemStack current = cap.getBind();
@@ -509,9 +501,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        return current;
    }

-    // ========================================
    // V2 Region-Based Equipment Access
-    // ========================================

    @Override
    public ItemStack getEquipment(BodyRegionV2 region) {
@@ -537,16 +527,19 @@ public class MCAKidnappedAdapter implements IRestrainable {
            case NECK -> putCollarOn(stack);
            case TORSO -> putClothesOn(stack);
            case HANDS -> putMittensOn(stack);
-            default -> {}
+            default -> {
+            }
        }
    }

-    // ========================================
    // 7. EQUIPMENT MANAGEMENT - REPLACE (V2 region-based)
-    // ========================================

    @Override
-    public ItemStack replaceEquipment(BodyRegionV2 region, ItemStack newStack, boolean force) {
+    public ItemStack replaceEquipment(
+        BodyRegionV2 region,
+        ItemStack newStack,
+        boolean force
+    ) {
        return switch (region) {
            case ARMS -> {
                ItemStack old = cap.getBind();
@@ -580,7 +573,9 @@ public class MCAKidnappedAdapter implements IRestrainable {
                if (!force && isLocked(old, false)) yield ItemStack.EMPTY;
                cap.setCollar(newStack);
                if (newStack.getItem() instanceof IHasResistance resistance) {
-                    cap.setCollarResistance(resistance.getBaseResistance(entity));
+                    cap.setCollarResistance(
+                        resistance.getBaseResistance(entity)
+                    );
                }
                yield old;
            }
@@ -599,9 +594,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        };
    }

-    // ========================================
    // 8. BULK OPERATIONS
-    // ========================================

    @Override
    public void applyBondage(
@@ -694,9 +687,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        return count;
    }

-    // ========================================
    // 9. CLOTHES PERMISSION SYSTEM
-    // ========================================

    @Override
    public boolean canTakeOffClothes(Player player) {
@@ -714,9 +705,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        return true;
    }

-    // ========================================
    // 10. SPECIAL INTERACTIONS
-    // ========================================

    @Override
    public void tighten(Player tightener) {
@@ -777,9 +766,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        }
    }

-    // ========================================
    // 11. POST-APPLY CALLBACKS
-    // ========================================

    /**
     * Sync bondage state to tracking clients.
@@ -819,9 +806,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        syncToClients();
    }

-    // ========================================
    // 12. DEATH & LIFECYCLE
-    // ========================================

    @Override
    public boolean onDeathKidnapped(Level world) {
@@ -835,9 +820,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        return true;
    }

-    // ========================================
    // 13. UTILITY & METADATA
-    // ========================================

    @Override
    public UUID getKidnappedUniqueId() {
@@ -893,9 +876,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        }
    }

-    // ========================================
    // 14.5. RESISTANCE SYSTEM
-    // ========================================

    @Override
    public int getCurrentBindResistance() {
@@ -917,9 +898,7 @@ public class MCAKidnappedAdapter implements IRestrainable {
        cap.setCollarResistance(resistance);
    }

-    // ========================================
    // 15. ENTITY REFERENCE
-    // ========================================

    @Override
    public LivingEntity asLivingEntity() {
--- a/src/main/java/com/tiedup/remake/compat/mca/capability/MCAKidnappedCapability.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/capability/MCAKidnappedCapability.java
@@ -1,8 +1,8 @@
 package com.tiedup.remake.compat.mca.capability;

 import com.tiedup.remake.compat.mca.personality.TiedUpTrait;
-import com.tiedup.remake.v2.BodyRegionV2;
 import com.tiedup.remake.util.tasks.ItemTask;
+import com.tiedup.remake.v2.BodyRegionV2;
 import java.util.UUID;
 import javax.annotation.Nullable;
 import net.minecraft.nbt.CompoundTag;
@@ -20,9 +20,7 @@ import net.minecraftforge.common.util.INBTSerializable;
 */
 public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {

-    // ========================================
    // BONDAGE EQUIPMENT SLOTS
-    // ========================================

    private ItemStack bind = ItemStack.EMPTY;
    private ItemStack gag = ItemStack.EMPTY;
@@ -32,9 +30,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
    private ItemStack clothes = ItemStack.EMPTY;
    private ItemStack mittens = ItemStack.EMPTY;

-    // ========================================
    // CAPTURE STATE
-    // ========================================

    /** UUID of the captor entity (null if not captured) */
    @Nullable
@@ -47,23 +43,17 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
    @Nullable
    private ItemTask salePrice = null;

-    // ========================================
    // RESISTANCE VALUES
-    // ========================================

    private int bindResistance = 0;
    private int collarResistance = 0;

-    // ========================================
    // TIEDUP TRAIT
-    // ========================================

    /** TiedUp-specific trait (MASO, REBELLIOUS, etc.) */
    private TiedUpTrait trait = TiedUpTrait.NONE;

-    // ========================================
    // EQUIPMENT GETTERS
-    // ========================================

    public ItemStack getBind() {
        return bind;
@@ -109,9 +99,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        };
    }

-    // ========================================
    // EQUIPMENT SETTERS
-    // ========================================

    public void setBind(ItemStack stack) {
        this.bind = stack.copy();
@@ -153,7 +141,8 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
            case NECK -> setCollar(stack);
            case TORSO -> setClothes(stack);
            case HANDS -> setMittens(stack);
-            default -> {} // Unsupported region — no-op
+            default -> {
+            } // Unsupported region — no-op
        }
    }

@@ -166,9 +155,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        return old;
    }

-    // ========================================
    // STATE QUERIES
-    // ========================================

    public boolean hasBind() {
        return !bind.isEmpty();
@@ -198,9 +185,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        return !mittens.isEmpty();
    }

-    // ========================================
    // CAPTURE STATE
-    // ========================================

    @Nullable
    public UUID getCaptorUUID() {
@@ -232,9 +217,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        this.salePrice = price;
    }

-    // ========================================
    // RESISTANCE
-    // ========================================

    public int getBindResistance() {
        return bindResistance;
@@ -252,9 +235,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        this.collarResistance = Math.max(0, resistance);
    }

-    // ========================================
    // TIEDUP TRAIT
-    // ========================================

    public TiedUpTrait getTrait() {
        return trait;
@@ -264,9 +245,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        this.trait = trait != null ? trait : TiedUpTrait.NONE;
    }

-    // ========================================
    // CLEAR ALL
-    // ========================================

    /**
     * Clear all bondage equipment.
@@ -295,9 +274,7 @@ public class MCAKidnappedCapability implements INBTSerializable<CompoundTag> {
        // trait is NOT cleared - it persists
    }

-    // ========================================
    // NBT SERIALIZATION
-    // ========================================

    private static final String TAG_BIND = "Bind";
    private static final String TAG_GAG = "Gag";
--- a/src/main/java/com/tiedup/remake/compat/mca/dialogue/MCADialogueManager.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/dialogue/MCADialogueManager.java
@@ -24,9 +24,7 @@ public class MCADialogueManager {

    private static final Random RANDOM = new Random();

-    // ========================================
    // BEING TIED DIALOGUES
-    // ========================================

    /**
     * Get dialogue when being tied up.
@@ -151,9 +149,7 @@ public class MCADialogueManager {
        };
    }

-    // ========================================
    // TIED IDLE DIALOGUES
-    // ========================================

    /**
     * Get dialogue for idle state while tied.
@@ -232,9 +228,7 @@ public class MCADialogueManager {
        };
    }

-    // ========================================
    // STRUGGLE DIALOGUES
-    // ========================================

    /**
     * Get dialogue for struggling.
@@ -294,9 +288,7 @@ public class MCADialogueManager {
        }
    }

-    // ========================================
    // FREED DIALOGUES
-    // ========================================

    /**
     * Get dialogue for being freed.
@@ -336,9 +328,7 @@ public class MCADialogueManager {
        };
    }

-    // ========================================
    // COLLAR DIALOGUES
-    // ========================================

    /**
     * Get dialogue for collar being put on.
@@ -376,9 +366,7 @@ public class MCADialogueManager {
        };
    }

-    // ========================================
    // BROADCAST HELPER
-    // ========================================

    /**
     * Broadcast a dialogue message from a villager to nearby players.
@@ -412,9 +400,7 @@ public class MCADialogueManager {
            });
    }

-    // ========================================
    // UTILITY
-    // ========================================

    private static String pickRandom(String... options) {
        return options[RANDOM.nextInt(options.length)];
--- a/src/main/java/com/tiedup/remake/compat/mca/event/MCACompatEvents.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/event/MCACompatEvents.java
@@ -1,16 +1,16 @@
 package com.tiedup.remake.compat.mca.event;

 import com.tiedup.remake.compat.mca.MCACompat;
-import com.tiedup.remake.v2.BodyRegionV2;
 import com.tiedup.remake.compat.mca.capability.MCAKidnappedProvider;
+import com.tiedup.remake.core.SettingsAccessor;
 import com.tiedup.remake.core.TiedUpMod;
 import com.tiedup.remake.items.ItemKey;
 import com.tiedup.remake.items.ItemMasterKey;
-import com.tiedup.remake.v2.bondage.IV2BondageItem;
 import com.tiedup.remake.state.IBondageState;
 import com.tiedup.remake.tasks.UntyingPlayerTask;
 import com.tiedup.remake.util.KidnappedHelper;
-import com.tiedup.remake.core.SettingsAccessor;
+import com.tiedup.remake.v2.BodyRegionV2;
+import com.tiedup.remake.v2.bondage.IV2BondageItem;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
--- a/src/main/java/com/tiedup/remake/compat/mca/personality/MCAMoodManager.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/personality/MCAMoodManager.java
@@ -34,9 +34,7 @@ public class MCAMoodManager {

    private MCAMoodManager() {}

-    // ========================================
    // EVENT HANDLERS
-    // ========================================

    /**
     * Called when villager is tied up.
@@ -232,9 +230,7 @@ public class MCAMoodManager {
        modifyMood(entity, moodChange);
    }

-    // ========================================
    // REFLECTION-BASED MOOD ACCESS
-    // ========================================

    /**
     * Modify mood using MCA's modifyMoodValue method via reflection.
--- a/src/main/java/com/tiedup/remake/compat/mca/personality/MCAPersonalityManager.java
+++ b/src/main/java/com/tiedup/remake/compat/mca/personality/MCAPersonalityManager.java
@@ -6,8 +6,8 @@ import com.tiedup.remake.core.TiedUpMod;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.WeakHashMap;
-import org.jetbrains.annotations.Nullable;
 import net.minecraft.world.entity.LivingEntity;
+import org.jetbrains.annotations.Nullable;

 /**
 * Manages MCA personality and TiedUp trait access for villagers.
@@ -37,9 +37,7 @@ public class MCAPersonalityManager {

    private MCAPersonalityManager() {}

-    // ========================================
    // MCA PERSONALITY ACCESS (Reflection)
-    // ========================================

    /**
     * Get the MCA personality for a villager.
@@ -146,9 +144,7 @@ public class MCAPersonalityManager {
        }
    }

-    // ========================================
    // TIEDUP TRAIT ACCESS (Capability)
-    // ========================================

    /**
     * Get the TiedUp trait for a villager.
@@ -191,9 +187,7 @@ public class MCAPersonalityManager {
            });
    }

-    // ========================================
    // COMBINED CALCULATIONS
-    // ========================================

    /**
     * Get combined struggle multiplier (personality * trait).
@@ -230,9 +224,7 @@ public class MCAPersonalityManager {
        return getCombinedMoodTied(entity) > 0;
    }

-    // ========================================
    // CACHE MANAGEMENT
-    // ========================================

    /**
     * Clear personality cache for an entity.
--- a/src/main/java/com/tiedup/remake/compat/wildfire/render/WildfireDamselLayer.java
+++ b/src/main/java/com/tiedup/remake/compat/wildfire/render/WildfireDamselLayer.java
@@ -1,7 +1,6 @@
 package com.tiedup.remake.compat.wildfire.render;

 import com.mojang.blaze3d.systems.RenderSystem;
-import com.tiedup.remake.v2.BodyRegionV2;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.tiedup.remake.compat.wildfire.WildfireCompat;
@@ -10,6 +9,7 @@ import com.tiedup.remake.entities.EntityDamsel;
 import com.tiedup.remake.entities.KidnapperItemSelector;
 import com.tiedup.remake.state.IBondageState;
 import com.tiedup.remake.util.KidnappedHelper;
+import com.tiedup.remake.v2.BodyRegionV2;
 import com.wildfire.api.IGenderArmor;
 import com.wildfire.main.Breasts;
 import com.wildfire.main.GenderPlayer;
@@ -895,7 +895,9 @@ public class WildfireDamselLayer<
     */
    private ItemStack getBondageBindItem(T entity) {
        // For NPCs (AbstractTiedUpNpc and subclasses)
-        if (entity instanceof com.tiedup.remake.entities.AbstractTiedUpNpc npc) {
+        if (
+            entity instanceof com.tiedup.remake.entities.AbstractTiedUpNpc npc
+        ) {
            return npc.getEquipment(BodyRegionV2.ARMS);
        }