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
@@ -10,13 +10,13 @@ import com.tiedup.remake.entities.master.components.MasterStateManager;
|
||||
import com.tiedup.remake.entities.master.components.MasterTaskManager;
|
||||
import com.tiedup.remake.entities.skins.Gender;
|
||||
import com.tiedup.remake.entities.skins.MasterSkinManager;
|
||||
import com.tiedup.remake.v2.BodyRegionV2;
|
||||
import com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper;
|
||||
import com.tiedup.remake.minigame.ContinuousStruggleMiniGameState;
|
||||
import com.tiedup.remake.minigame.StruggleSessionManager;
|
||||
import com.tiedup.remake.network.ModNetwork;
|
||||
import com.tiedup.remake.network.master.PacketMasterStateSync;
|
||||
import com.tiedup.remake.state.PlayerBindState;
|
||||
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.nbt.CompoundTag;
|
||||
@@ -58,9 +58,7 @@ import net.minecraft.world.level.Level;
|
||||
*/
|
||||
public class EntityMaster extends EntityKidnapperElite {
|
||||
|
||||
// ========================================
|
||||
// CONSTANTS
|
||||
// ========================================
|
||||
|
||||
public static final double MASTER_MAX_HEALTH = 150.0D;
|
||||
public static final double MASTER_MOVEMENT_SPEED = 0.30D;
|
||||
@@ -85,9 +83,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
private static final String NBT_PLACED_BLOCK_POS = "PlacedBlockPos";
|
||||
private static final String NBT_DOGWALK_MASTER_LEADS = "DogwalkMasterLeads";
|
||||
|
||||
// ========================================
|
||||
// DATA SYNC
|
||||
// ========================================
|
||||
|
||||
/** Current state synced to client */
|
||||
private static final EntityDataAccessor<String> DATA_MASTER_STATE =
|
||||
@@ -103,9 +99,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
EntityDataSerializers.BOOLEAN
|
||||
);
|
||||
|
||||
// ========================================
|
||||
// COMPONENTS
|
||||
// ========================================
|
||||
|
||||
/** State manager for master behavioral states */
|
||||
private final MasterStateManager stateManager;
|
||||
@@ -146,9 +140,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
/** Whether the next punishment is an attack punishment (dual: choke + physical restraint) */
|
||||
private boolean pendingAttackPunishment = false;
|
||||
|
||||
// ========================================
|
||||
// CONSTRUCTOR
|
||||
// ========================================
|
||||
|
||||
public EntityMaster(EntityType<? extends EntityMaster> type, Level level) {
|
||||
super(type, level);
|
||||
@@ -160,9 +152,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
this.taskManager = new MasterTaskManager(this);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// ATTRIBUTES
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Create master attributes.
|
||||
@@ -178,9 +168,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
.add(Attributes.ARMOR, MASTER_ARMOR);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DATA SYNC
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
protected void defineSynchedData() {
|
||||
@@ -237,9 +225,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return this.entityData.get(DATA_DISTRACTED);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// SELLING KIDNAPPER (for approach/purchase)
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Set the kidnapper that is selling a player to this Master.
|
||||
@@ -280,9 +266,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
this.sellingKidnapper = null;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// AI GOALS
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
protected void registerGoals() {
|
||||
@@ -326,7 +310,6 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
// FollowPlayer (MOVE+LOOK) at prio 3 was blocking all prio 4-7 goals!
|
||||
this.goalSelector.addGoal(8, new MasterFollowPlayerGoal(this));
|
||||
|
||||
// FUTURE: Master command goals require personality system (EntityDamsel-only).
|
||||
// These were non-functional before (Masters have no PersonalityState).
|
||||
// Proper fix: Create MasterCommandGoals that use collar owner instead.
|
||||
// DamselAIController.registerCommandGoals(this.goalSelector, this, 9);
|
||||
@@ -341,9 +324,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
// Note: No target goals - Master doesn't hunt, only follows their pet
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// VARIANT SYSTEM OVERRIDES
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public KidnapperVariant lookupVariantById(String variantId) {
|
||||
@@ -353,7 +334,8 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
@Override
|
||||
public KidnapperVariant computeVariantForEntity(UUID entityUUID) {
|
||||
Gender preferredGender = SettingsAccessor.getPreferredSpawnGender(
|
||||
this.level() != null ? this.level().getGameRules() : null);
|
||||
this.level() != null ? this.level().getGameRules() : null
|
||||
);
|
||||
return MasterSkinManager.CORE.getVariantForEntity(
|
||||
entityUUID,
|
||||
preferredGender
|
||||
@@ -375,9 +357,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return NBT_MASTER_VARIANT;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// PLAYER INTERACTION
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Handle player right-click interaction.
|
||||
@@ -486,9 +466,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return super.mobInteract(player, hand);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DISPLAY
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public Component getDisplayName() {
|
||||
@@ -538,9 +516,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return Math.max(0, Math.min(100, mood));
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// TICK
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
@@ -637,11 +613,11 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#resetCollarResistance(ServerPlayer) */
|
||||
private void resetCollarResistance(ServerPlayer pet) { petManager.resetCollarResistance(pet); }
|
||||
private void resetCollarResistance(ServerPlayer pet) {
|
||||
petManager.resetCollarResistance(pet);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// COMBAT - DAMAGE REDUCTION
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public boolean hurt(DamageSource source, float amount) {
|
||||
@@ -764,16 +740,18 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
super.die(source);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// PET MANAGEMENT (delegates to MasterPetManager)
|
||||
// ========================================
|
||||
|
||||
/** Get the pet manager component. */
|
||||
public MasterPetManager getPetManager() { return petManager; }
|
||||
public MasterPetManager getPetManager() {
|
||||
return petManager;
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#getPetPlayer() */
|
||||
@Nullable
|
||||
public ServerPlayer getPetPlayer() { return petManager.getPetPlayer(); }
|
||||
public ServerPlayer getPetPlayer() {
|
||||
return petManager.getPetPlayer();
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#setPetPlayer(ServerPlayer) */
|
||||
public void setPetPlayer(ServerPlayer player) {
|
||||
@@ -782,14 +760,16 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#hasPet() */
|
||||
public boolean hasPet() { return petManager.hasPet(); }
|
||||
public boolean hasPet() {
|
||||
return petManager.hasPet();
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#isPetPlayer(Player) */
|
||||
public boolean isPetPlayer(Player player) { return petManager.isPetPlayer(player); }
|
||||
public boolean isPetPlayer(Player player) {
|
||||
return petManager.isPetPlayer(player);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// GOAL ACCESSORS
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Get the place block goal for triggering feeding/resting.
|
||||
@@ -807,9 +787,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return dogwalkGoal;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DOGWALK MODE
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Set dogwalk mode.
|
||||
@@ -830,39 +808,55 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return dogwalkMasterLeads;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// TASK MANAGEMENT (delegates to MasterTaskManager)
|
||||
// ========================================
|
||||
|
||||
/** Get the task manager component. */
|
||||
public MasterTaskManager getTaskManager() { return taskManager; }
|
||||
public MasterTaskManager getTaskManager() {
|
||||
return taskManager;
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#hasActiveTask() */
|
||||
public boolean hasActiveTask() { return taskManager.hasActiveTask(); }
|
||||
public boolean hasActiveTask() {
|
||||
return taskManager.hasActiveTask();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#getCurrentTask() */
|
||||
@Nullable
|
||||
public PetTask getCurrentTask() { return taskManager.getCurrentTask(); }
|
||||
public PetTask getCurrentTask() {
|
||||
return taskManager.getCurrentTask();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#setActiveTask(PetTask) */
|
||||
public void setActiveTask(PetTask task) { taskManager.setActiveTask(task); }
|
||||
public void setActiveTask(PetTask task) {
|
||||
taskManager.setActiveTask(task);
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#clearActiveTask() */
|
||||
public void clearActiveTask() { taskManager.clearActiveTask(); }
|
||||
public void clearActiveTask() {
|
||||
taskManager.clearActiveTask();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#getTaskStartPosition() */
|
||||
@Nullable
|
||||
public net.minecraft.world.phys.Vec3 getTaskStartPosition() { return taskManager.getTaskStartPosition(); }
|
||||
public net.minecraft.world.phys.Vec3 getTaskStartPosition() {
|
||||
return taskManager.getTaskStartPosition();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#setTaskStartPosition(net.minecraft.world.phys.Vec3) */
|
||||
public void setTaskStartPosition(net.minecraft.world.phys.Vec3 position) { taskManager.setTaskStartPosition(position); }
|
||||
public void setTaskStartPosition(net.minecraft.world.phys.Vec3 position) {
|
||||
taskManager.setTaskStartPosition(position);
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#getRequestedItem() */
|
||||
@Nullable
|
||||
public net.minecraft.world.item.Item getRequestedItem() { return taskManager.getRequestedItem(); }
|
||||
public net.minecraft.world.item.Item getRequestedItem() {
|
||||
return taskManager.getRequestedItem();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#setRequestedItem(net.minecraft.world.item.Item) */
|
||||
public void setRequestedItem(net.minecraft.world.item.Item item) { taskManager.setRequestedItem(item); }
|
||||
public void setRequestedItem(net.minecraft.world.item.Item item) {
|
||||
taskManager.setRequestedItem(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the task assign goal for force assignment.
|
||||
@@ -872,41 +866,51 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return taskAssignGoal;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// LEASH MANAGEMENT (delegates to MasterPetManager)
|
||||
// ========================================
|
||||
|
||||
/** @see MasterPetManager#attachLeashToPet() */
|
||||
public void attachLeashToPet() { petManager.attachLeashToPet(); }
|
||||
public void attachLeashToPet() {
|
||||
petManager.attachLeashToPet();
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#detachLeashFromPet() */
|
||||
public void detachLeashFromPet() { petManager.detachLeashFromPet(); }
|
||||
public void detachLeashFromPet() {
|
||||
petManager.detachLeashFromPet();
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#isPetLeashed() */
|
||||
public boolean isPetLeashed() { return petManager.isPetLeashed(); }
|
||||
public boolean isPetLeashed() {
|
||||
return petManager.isPetLeashed();
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// ENGAGEMENT CADENCE (delegates to MasterTaskManager)
|
||||
// ========================================
|
||||
|
||||
/** @see MasterTaskManager#markEngagement() */
|
||||
public void markEngagement() { taskManager.markEngagement(); }
|
||||
public void markEngagement() {
|
||||
taskManager.markEngagement();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#getEngagementMultiplier() */
|
||||
public float getEngagementMultiplier() { return taskManager.getEngagementMultiplier(); }
|
||||
public float getEngagementMultiplier() {
|
||||
return taskManager.getEngagementMultiplier();
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// COLD SHOULDER (delegates to MasterTaskManager)
|
||||
// ========================================
|
||||
|
||||
/** @see MasterTaskManager#isGivingColdShoulder() */
|
||||
public boolean isGivingColdShoulder() { return taskManager.isGivingColdShoulder(); }
|
||||
public boolean isGivingColdShoulder() {
|
||||
return taskManager.isGivingColdShoulder();
|
||||
}
|
||||
|
||||
/** @see MasterTaskManager#startColdShoulder(int) */
|
||||
public void startColdShoulder(int durationTicks) { taskManager.startColdShoulder(durationTicks); }
|
||||
public void startColdShoulder(int durationTicks) {
|
||||
taskManager.startColdShoulder(durationTicks);
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#putPetCollar(ServerPlayer) */
|
||||
public void putPetCollar(ServerPlayer player) { petManager.putPetCollar(player); }
|
||||
public void putPetCollar(ServerPlayer player) {
|
||||
petManager.putPetCollar(player);
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#freePet(ServerPlayer) */
|
||||
public void freePet(ServerPlayer player) {
|
||||
@@ -929,7 +933,9 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
}
|
||||
|
||||
/** @see MasterPetManager#syncDataToCollar(ServerPlayer) */
|
||||
private void syncDataToCollar(ServerPlayer pet) { petManager.syncDataToCollar(pet); }
|
||||
private void syncDataToCollar(ServerPlayer pet) {
|
||||
petManager.syncDataToCollar(pet);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get master UUID from player's pet collar.
|
||||
@@ -949,9 +955,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return null;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// STATE ACCESSORS
|
||||
// ========================================
|
||||
|
||||
public MasterStateManager getStateManager() {
|
||||
return stateManager;
|
||||
@@ -982,9 +986,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return pending;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// NBT SERIALIZATION
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public void addAdditionalSaveData(CompoundTag tag) {
|
||||
@@ -1114,9 +1116,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
super.remove(reason);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// STATE HOST IMPLEMENTATION
|
||||
// ========================================
|
||||
|
||||
private class MasterStateHost implements IMasterStateHost {
|
||||
|
||||
@@ -1153,9 +1153,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// BODY ROTATION OVERRIDE
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
protected float tickHeadTurn(float yRot, float animStep) {
|
||||
@@ -1171,9 +1169,7 @@ public class EntityMaster extends EntityKidnapperElite {
|
||||
return super.tickHeadTurn(yRot, animStep);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// COLLISION OVERRIDE
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public boolean isPushable() {
|
||||
|
||||
Reference in New Issue
Block a user