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:
@@ -64,9 +64,7 @@ import net.minecraft.world.level.Level;
|
||||
*/
|
||||
public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
|
||||
// ========================================
|
||||
// CONSTANTS
|
||||
// ========================================
|
||||
|
||||
public static final double TRADER_MAX_HEALTH = 50.0D;
|
||||
public static final double TRADER_MOVEMENT_SPEED = 0.30D;
|
||||
@@ -75,9 +73,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
public static final double TRADER_ATTACK_DAMAGE = 10.0D;
|
||||
public static final int TRADER_NAME_COLOR = 0xFFD700; // Gold
|
||||
|
||||
// ========================================
|
||||
// STATE
|
||||
// ========================================
|
||||
|
||||
/** UUID of the maid that serves this trader */
|
||||
@Nullable
|
||||
@@ -107,9 +103,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
private int hostileCooldownTicks = 0;
|
||||
private static final int HOSTILE_DURATION_TICKS = 600; // 30 seconds max hostility
|
||||
|
||||
// ========================================
|
||||
// CONSTRUCTOR
|
||||
// ========================================
|
||||
|
||||
public EntitySlaveTrader(
|
||||
EntityType<? extends EntitySlaveTrader> type,
|
||||
@@ -118,9 +112,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
super(type, level);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// ATTRIBUTES
|
||||
// ========================================
|
||||
|
||||
public static AttributeSupplier.Builder createAttributes() {
|
||||
return Mob.createMobAttributes()
|
||||
@@ -131,9 +123,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
.add(Attributes.ATTACK_DAMAGE, TRADER_ATTACK_DAMAGE);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// AI GOALS
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
protected void registerGoals() {
|
||||
@@ -151,7 +141,6 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
// Priority 5: Idle/patrol behavior
|
||||
this.goalSelector.addGoal(5, new TraderIdleGoal(this));
|
||||
|
||||
// FUTURE: Trader command goals require personality system (EntityDamsel-only).
|
||||
// These were non-functional before (Traders have no PersonalityState).
|
||||
// Proper fix: Create TraderCommandGoals that use collar owner instead.
|
||||
// DamselAIController.registerCommandGoals(this.goalSelector, this, 6);
|
||||
@@ -172,9 +161,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// INTERACTION
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public InteractionResult mobInteract(Player player, InteractionHand hand) {
|
||||
@@ -249,11 +236,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
|
||||
// Send packet to open screen
|
||||
ModNetwork.sendToPlayer(
|
||||
new PacketOpenTraderScreen(
|
||||
this.getId(),
|
||||
this.getNpcName(),
|
||||
offers
|
||||
),
|
||||
new PacketOpenTraderScreen(this.getId(), this.getNpcName(), offers),
|
||||
player
|
||||
);
|
||||
}
|
||||
@@ -319,9 +302,8 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
continue;
|
||||
}
|
||||
|
||||
IRestrainable kidnappedState = KidnappedHelper.getKidnappedState(
|
||||
captiveEntity
|
||||
);
|
||||
IRestrainable kidnappedState =
|
||||
KidnappedHelper.getKidnappedState(captiveEntity);
|
||||
if (kidnappedState == null || !kidnappedState.isForSell()) {
|
||||
continue;
|
||||
}
|
||||
@@ -355,9 +337,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
|
||||
// Uses EntityKidnapper.hasTokenInInventory(player) - inherited from parent
|
||||
|
||||
// ========================================
|
||||
// TARGETING - Trader doesn't capture
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public void setTarget(@Nullable LivingEntity target) {
|
||||
@@ -386,9 +366,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
return entity == this.getLastAttacker();
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// MAID & CAMP MANAGEMENT
|
||||
// ========================================
|
||||
|
||||
@Nullable
|
||||
public UUID getMaidUUID() {
|
||||
@@ -461,9 +439,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DEATH HANDLING
|
||||
// ========================================
|
||||
|
||||
/** Guard against double-cleanup (die() triggers remove(KILLED)) */
|
||||
private boolean cleanedUp = false;
|
||||
@@ -509,9 +485,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
super.remove(reason);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// VARIANT SYSTEM
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public KidnapperVariant lookupVariantById(String variantId) {
|
||||
@@ -554,9 +528,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DISPLAY
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public Component getDisplayName() {
|
||||
@@ -565,9 +537,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// NBT PERSISTENCE
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public void addAdditionalSaveData(CompoundTag tag) {
|
||||
@@ -615,9 +585,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// CAPTURE DETECTION
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Check if trader has been captured and removed from camp.
|
||||
@@ -761,9 +729,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// STRUGGLE DETECTION
|
||||
// ========================================
|
||||
|
||||
/** Target prisoner to approach after catching them struggling */
|
||||
@Nullable
|
||||
@@ -874,9 +840,7 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
|
||||
this.strugglePunishmentTarget = null;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DIALOGUE SPEAKER (Trader-specific)
|
||||
// ========================================
|
||||
|
||||
@Override
|
||||
public SpeakerType getSpeakerType() {
|
||||
|
||||
Reference in New Issue
Block a user