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/entities/ai/master/MasterBuyPlayerGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterBuyPlayerGoal.java
@@ -1,11 +1,11 @@
 package com.tiedup.remake.entities.ai.master;

 import com.tiedup.remake.core.TiedUpMod;
-import com.tiedup.remake.v2.BodyRegionV2;
 import com.tiedup.remake.dialogue.DialogueBridge;
 import com.tiedup.remake.entities.EntityKidnapper;
 import com.tiedup.remake.entities.EntityMaster;
 import com.tiedup.remake.state.IRestrainable;
+import com.tiedup.remake.v2.BodyRegionV2;
 import java.util.EnumSet;
 import java.util.List;
 import net.minecraft.server.level.ServerPlayer;
@@ -157,9 +157,7 @@ public class MasterBuyPlayerGoal extends Goal {
        TiedUpMod.LOGGER.debug(
            "[MasterBuyPlayerGoal] {} approaching {} to buy player",
            master.getNpcName(),
-            targetKidnapper != null
-                ? targetKidnapper.getNpcName()
-                : "unknown"
+            targetKidnapper != null ? targetKidnapper.getNpcName() : "unknown"
        );
    }

@@ -484,19 +482,29 @@ public class MasterBuyPlayerGoal extends Goal {

        // Manually remove each region EXCEPT neck (collar) and torso (clothes)
        com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper.unequipFromRegion(
-            player, com.tiedup.remake.v2.BodyRegionV2.ARMS, true
+            player,
+            com.tiedup.remake.v2.BodyRegionV2.ARMS,
+            true
        );
        com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper.unequipFromRegion(
-            player, com.tiedup.remake.v2.BodyRegionV2.MOUTH, true
+            player,
+            com.tiedup.remake.v2.BodyRegionV2.MOUTH,
+            true
        );
        com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper.unequipFromRegion(
-            player, com.tiedup.remake.v2.BodyRegionV2.EYES, true
+            player,
+            com.tiedup.remake.v2.BodyRegionV2.EYES,
+            true
        );
        com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper.unequipFromRegion(
-            player, com.tiedup.remake.v2.BodyRegionV2.EARS, true
+            player,
+            com.tiedup.remake.v2.BodyRegionV2.EARS,
+            true
        );
        com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper.unequipFromRegion(
-            player, com.tiedup.remake.v2.BodyRegionV2.HANDS, true
+            player,
+            com.tiedup.remake.v2.BodyRegionV2.HANDS,
+            true
        );

        // V1 speed reduction handled by MovementStyleManager (V2 tick-based).
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterDogwalkGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterDogwalkGoal.java
@@ -1,11 +1,11 @@
 package com.tiedup.remake.entities.ai.master;

-import com.tiedup.remake.v2.BodyRegionV2;
 import com.tiedup.remake.core.TiedUpMod;
 import com.tiedup.remake.dialogue.DialogueBridge;
 import com.tiedup.remake.entities.EntityMaster;
 import com.tiedup.remake.state.IPlayerLeashAccess;
 import com.tiedup.remake.state.PlayerBindState;
+import com.tiedup.remake.v2.BodyRegionV2;
 import java.util.EnumSet;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterHumanChairGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterHumanChairGoal.java
@@ -1,13 +1,13 @@
 package com.tiedup.remake.entities.ai.master;

 import com.tiedup.remake.core.TiedUpMod;
-import com.tiedup.remake.v2.BodyRegionV2;
 import com.tiedup.remake.dialogue.DialogueBridge;
 import com.tiedup.remake.entities.EntityMaster;
 import com.tiedup.remake.items.ModItems;
 import com.tiedup.remake.items.base.BindVariant;
 import com.tiedup.remake.state.HumanChairHelper;
 import com.tiedup.remake.state.PlayerBindState;
+import com.tiedup.remake.v2.BodyRegionV2;
 import java.util.EnumSet;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerPlayer;
@@ -156,9 +156,7 @@ public class MasterHumanChairGoal extends Goal {
        }
    }

-    // ========================================
    // PHASE: APPROACHING
-    // ========================================

    private void tickApproaching(ServerPlayer pet) {
        master.getLookControl().setLookAt(pet, 30.0F, 30.0F);
@@ -177,9 +175,7 @@ public class MasterHumanChairGoal extends Goal {
        }
    }

-    // ========================================
    // PHASE: SETTLING
-    // ========================================

    private void tickSettling(ServerPlayer pet) {
        master.getLookControl().setLookAt(pet, 30.0F, 30.0F);
@@ -224,9 +220,7 @@ public class MasterHumanChairGoal extends Goal {
        }
    }

-    // ========================================
    // PHASE: SITTING
-    // ========================================

    private void tickSitting(ServerPlayer pet) {
        phaseTimer++;
@@ -281,9 +275,7 @@ public class MasterHumanChairGoal extends Goal {
        }
    }

-    // ========================================
    // IDLE BEHAVIORS DURING SITTING
-    // ========================================

    private void tickIdleBehavior(ServerPlayer pet) {
        // Periodically look at nearby entities or comment
@@ -356,9 +348,7 @@ public class MasterHumanChairGoal extends Goal {
        }
    }

-    // ========================================
    // POSITIONING
-    // ========================================

    /**
     * Position master on pet's back, facing sideways (perpendicular).
@@ -390,9 +380,7 @@ public class MasterHumanChairGoal extends Goal {
        master.setDeltaMovement(0, 0, 0);
    }

-    // ========================================
    // POSE MANAGEMENT
-    // ========================================

    /**
     * Apply the human chair pose to the pet:
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterPlaceBlockGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterPlaceBlockGoal.java
@@ -403,9 +403,7 @@ public class MasterPlaceBlockGoal extends Goal {
        }
    }

-    // ========================================
    // FIX: NBT PERSISTENCE FOR PLACED BLOCKS
-    // ========================================

    /**
     * Get the currently placed block position (for NBT saving).
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterRandomEventGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterRandomEventGoal.java
@@ -360,18 +360,15 @@ public class MasterRandomEventGoal extends Goal {
        this.currentEvent = null;
    }

-    // ========================================
    // STATIC CLEANUP METHODS
-    // ========================================

    /** All body regions that can have temporary master event items */
-    private static final List<BodyRegionV2> TEMP_ITEM_CLEANUP_REGIONS =
-        List.of(
-            BodyRegionV2.ARMS,
-            BodyRegionV2.EYES,
-            BodyRegionV2.MOUTH,
-            BodyRegionV2.HANDS
-        );
+    private static final List<BodyRegionV2> TEMP_ITEM_CLEANUP_REGIONS = List.of(
+        BodyRegionV2.ARMS,
+        BodyRegionV2.EYES,
+        BodyRegionV2.MOUTH,
+        BodyRegionV2.HANDS
+    );

    /**
     * Check and cleanup any expired temporary master event items on a player.
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java
@@ -374,9 +374,7 @@ public class MasterTaskAssignGoal extends Goal {
        master.setMasterState(MasterState.TASK_ASSIGN);
    }

-    // ========================================
    // DEMAND TASK - INVENTORY SCANNING
-    // ========================================

    /**
     * Scan pet's inventory and find the most valuable item to demand.
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java
@@ -1,12 +1,12 @@
 package com.tiedup.remake.entities.ai.master;

 import com.tiedup.remake.core.TiedUpMod;
-import com.tiedup.remake.v2.BodyRegionV2;
 import com.tiedup.remake.dialogue.DialogueBridge;
 import com.tiedup.remake.entities.EntityMaster;
 import com.tiedup.remake.items.ItemChokeCollar;
 import com.tiedup.remake.state.PlayerBindState;
 import com.tiedup.remake.util.MessageDispatcher;
+import com.tiedup.remake.v2.BodyRegionV2;
 import java.util.EnumSet;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;