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,7 +1,7 @@
package com.tiedup.remake.events.restriction;
import com.tiedup.remake.core.SettingsAccessor;
import com.tiedup.remake.core.TiedUpMod;
import com.tiedup.remake.v2.BodyRegionV2;
import com.tiedup.remake.entities.EntityKidnapper;
import com.tiedup.remake.items.base.ItemCollar;
import com.tiedup.remake.minigame.StruggleSessionManager;
@@ -15,7 +15,7 @@ import com.tiedup.remake.tasks.UntyingPlayerTask;
import com.tiedup.remake.tasks.UntyingTask;
import com.tiedup.remake.util.GameConstants;
import com.tiedup.remake.util.KidnappedHelper;
import com.tiedup.remake.core.SettingsAccessor;
import com.tiedup.remake.v2.BodyRegionV2;
import java.util.List;
import java.util.UUID;
import net.minecraft.network.chat.Component;
@@ -228,7 +228,6 @@ public class RestraintTaskTickHandler {
return;
}
// Phase 13: Auto-shock collar logic (Player-specific feature)
if (playerState != null) {
playerState.checkAutoShockCollar();
}
@@ -284,9 +283,7 @@ public class RestraintTaskTickHandler {
return;
}
// ========================================
// SECURITY: Distance and line-of-sight validation
// ========================================
double maxUntieDistance = 4.0; // Max distance to untie (blocks)
double distance = helper.distanceTo(targetEntity);
if (distance > maxUntieDistance) {
@@ -310,7 +307,10 @@ public class RestraintTaskTickHandler {
}
// Check for Kidnapper fight back - block untying if Kidnapper is nearby
if (targetEntity instanceof com.tiedup.remake.entities.AbstractTiedUpNpc npc) {
if (
targetEntity instanceof
com.tiedup.remake.entities.AbstractTiedUpNpc npc
) {
if (
npc.getCaptor() instanceof EntityKidnapper kidnapper &&
kidnapper.isAlive()
@@ -413,9 +413,11 @@ public class RestraintTaskTickHandler {
// Get untying duration (default: 10 seconds)
int untyingSeconds = getUntyingDuration(helper);
// Phase 11: Check collar ownership for TiedUp NPCs
// Non-owners take 3x longer and trigger alert to owners
if (targetEntity instanceof com.tiedup.remake.entities.AbstractTiedUpNpc npc) {
if (
targetEntity instanceof
com.tiedup.remake.entities.AbstractTiedUpNpc npc
) {
if (!npc.isCollarOwner(helper)) {
// Non-owner: triple the untying time
untyingSeconds *= 3;
@@ -513,7 +515,9 @@ public class RestraintTaskTickHandler {
* @return Duration in seconds (default: 10)
*/
private static int getUntyingDuration(Player player) {
return SettingsAccessor.getUntyingPlayerTime(player.level().getGameRules());
return SettingsAccessor.getUntyingPlayerTime(
player.level().getGameRules()
);
}
// ========== FORCE FEEDING MECHANIC ==========
@@ -627,7 +631,6 @@ public class RestraintTaskTickHandler {
/**
* Alert all collar owners that someone is trying to free their slave.
* Phase 11: Multiplayer protection system
*
* @param slave The slave being freed
* @param liberator The player trying to free them