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

@@ -1,23 +1,22 @@
package com.tiedup.remake.state;
import com.tiedup.remake.core.TiedUpMod;
import com.tiedup.remake.v2.BodyRegionV2;
import com.tiedup.remake.items.base.ItemCollar;
import com.tiedup.remake.v2.BodyRegionV2;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
// C6-V2: IRestrainable → IBondageState (narrowed API)
/**
* Phase 8: Master-Captive Relationships
* Phase 17: Renamed from PlayerKidnapperManager, terminology slave → captive
*
* Manages capture relationships for player captors.
*
* Terminology (Phase 17):
* Terminology:
* - "Captive" = Entity attached by leash (active physical control)
* - "Slave" = Entity wearing a collar owned by someone (passive ownership via CollarRegistry)
*
@@ -50,8 +49,6 @@ public class PlayerCaptorManager implements ICaptor {
* List of all captives currently owned by this captor.
* Thread-safe to avoid concurrent modification during iteration.
*
* Phase 14.1.6: Changed from List<PlayerBindState> to List<IBondageState>
* Phase 17: Renamed from slaves to captives
*/
private final List<IBondageState> captives;
@@ -65,13 +62,9 @@ public class PlayerCaptorManager implements ICaptor {
this.captives = new CopyOnWriteArrayList<>();
}
// ========================================
// ICaptor Implementation
// ========================================
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from addSlave to addCaptive
*/
@Override
public synchronized void addCaptive(IBondageState captive) {
@@ -94,8 +87,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from removeSlave to removeCaptive
*
* Thread Safety: Synchronized on 'this' to match addCaptive and freeAllCaptives.
*/
@@ -127,8 +118,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from canEnslave to canCapture
*/
@Override
public boolean canCapture(IBondageState target) {
@@ -141,7 +130,6 @@ public class PlayerCaptorManager implements ICaptor {
// - Target is tied up, OR
// - Target has collar AND collar has this captor as owner
// Phase 14.1.6: Use asLivingEntity() instead of getPlayer()
net.minecraft.world.entity.LivingEntity targetEntity =
target.asLivingEntity();
if (targetEntity == null) {
@@ -169,8 +157,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from canFree to canRelease
*/
@Override
public boolean canRelease(IBondageState captive) {
@@ -183,7 +169,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 17: Renamed from allowSlaveTransfer to allowCaptiveTransfer
*/
@Override
public boolean allowCaptiveTransfer() {
@@ -192,7 +177,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 17: Renamed from allowMultipleSlaves to allowMultipleCaptives
*/
@Override
public boolean allowMultipleCaptives() {
@@ -201,8 +185,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from onSlaveLogout to onCaptiveLogout
* Note: For NPC captives, this is never called (NPCs don't log out)
*/
@Override
@@ -223,8 +205,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from onSlaveReleased to onCaptiveReleased
*/
@Override
public void onCaptiveReleased(IBondageState captive) {
@@ -242,8 +222,6 @@ public class PlayerCaptorManager implements ICaptor {
}
/**
* Phase 14.1.6: Changed parameter from PlayerBindState to IBondageState
* Phase 17: Renamed from onSlaveStruggle to onCaptiveStruggle
*/
@Override
public void onCaptiveStruggle(IBondageState captive) {
@@ -256,13 +234,9 @@ public class PlayerCaptorManager implements ICaptor {
captive.getKidnappedName(),
captor.getName().getString()
);
// Phase 8: No action for basic struggle
// Phase 14: Shock collar would activate here
}
/**
* Phase 17: Renamed from hasSlaves to hasCaptives
*/
@Override
public boolean hasCaptives() {
@@ -274,14 +248,11 @@ public class PlayerCaptorManager implements ICaptor {
return captor;
}
// ========================================
// Additional Methods
// ========================================
/**
* Frees all captives currently owned by this captor.
*
* Phase 17: Renamed from freeAllSlaves to freeAllCaptives
*
* Thread Safety: Synchronized on 'this' to match addCaptive and removeCaptive.
*
@@ -307,7 +278,6 @@ public class PlayerCaptorManager implements ICaptor {
* Get a copy of the captive list.
* Safe for iteration without concurrent modification issues.
*
* Phase 17: Renamed from getSlaves to getCaptives
*
* @return Copy of the current captive list
*/
@@ -318,7 +288,6 @@ public class PlayerCaptorManager implements ICaptor {
/**
* Get the number of captives currently owned.
*
* Phase 17: Renamed from getSlaveCount to getCaptiveCount
*
* @return Captive count
*/
@@ -334,7 +303,6 @@ public class PlayerCaptorManager implements ICaptor {
* - When a player gets captured, their captives transfer to new captor
* - Prevents circular capture issues
*
* Phase 17: Renamed from transferAllSlavesTo to transferAllCaptivesTo
*
* @param newCaptor The new captor to transfer captives to
*/
@@ -389,7 +357,6 @@ public class PlayerCaptorManager implements ICaptor {
* Clean up invalid captives from the list.
* Removes captives that are no longer valid (offline, transport gone, etc.).
*
* Phase 17: Renamed from cleanupInvalidSlaves to cleanupInvalidCaptives
*
* Should be called periodically (e.g., on tick).
*/
@@ -421,7 +388,5 @@ public class PlayerCaptorManager implements ICaptor {
});
}
// ========================================
// Backward Compatibility (Phase 17)
// ========================================
// Backward Compatibility
}