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:
@@ -8,9 +8,9 @@ import com.tiedup.remake.entities.KidnapperTheme;
|
||||
import com.tiedup.remake.personality.PersonalityState;
|
||||
import com.tiedup.remake.personality.PersonalityType;
|
||||
import com.tiedup.remake.util.MessageDispatcher;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Bridge between the legacy EntityDialogueManager and the new DialogueManager.
|
||||
@@ -221,9 +221,7 @@ public class DialogueBridge {
|
||||
return DialogueManager.getDialogue(dialogueId, context);
|
||||
}
|
||||
|
||||
// ===========================================
|
||||
// UNIVERSAL SPEAKER METHODS (IDialogueSpeaker)
|
||||
// ===========================================
|
||||
|
||||
/**
|
||||
* Build a DialogueContext from any IDialogueSpeaker.
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.tiedup.remake.dialogue;
|
||||
|
||||
import com.tiedup.remake.personality.PersonalityType;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Context information for dialogue selection.
|
||||
|
||||
@@ -15,10 +15,10 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.packs.resources.Resource;
|
||||
import net.minecraft.server.packs.resources.ResourceManager;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Loads dialogue entries from JSON files.
|
||||
@@ -55,12 +55,10 @@ public class DialogueLoader {
|
||||
"fear",
|
||||
"reaction",
|
||||
"environment",
|
||||
// Phase 12: New dialogue categories
|
||||
"discipline",
|
||||
"home",
|
||||
"leash",
|
||||
"resentment",
|
||||
// Phase 14: Personality hints and conversations
|
||||
"personality",
|
||||
"conversation",
|
||||
// Master NPC dialogues
|
||||
|
||||
@@ -7,8 +7,8 @@ import java.util.EnumMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.server.packs.resources.ResourceManager;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Central manager for the data-driven dialogue system.
|
||||
|
||||
@@ -4,14 +4,14 @@ import com.tiedup.remake.entities.EntityDamsel;
|
||||
import com.tiedup.remake.personality.NpcCommand;
|
||||
import com.tiedup.remake.personality.NpcNeeds;
|
||||
import com.tiedup.remake.personality.PersonalityState;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* System for selecting proactive dialogues based on NPC state.
|
||||
* Makes NPCs feel alive by having them speak about their needs, mood, and environment.
|
||||
*
|
||||
* Personality System Phase 4: Living NPCs
|
||||
* Personality System Living NPCs
|
||||
*/
|
||||
public class DialogueTriggerSystem {
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ import net.minecraft.world.entity.player.Player;
|
||||
/**
|
||||
* Complete dialogue system for EntityDamsel and EntityKidnapper.
|
||||
*
|
||||
* Phase 14.3: Centralized NPC dialogue management
|
||||
*
|
||||
* Features:
|
||||
* - Multiple dialogue variants per action category
|
||||
@@ -21,9 +20,7 @@ import net.minecraft.world.entity.player.Player;
|
||||
*/
|
||||
public class EntityDialogueManager {
|
||||
|
||||
// ========================================
|
||||
// DIALOGUE CATEGORIES
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Dialogue categories for different NPC actions.
|
||||
@@ -110,9 +107,7 @@ public class EntityDialogueManager {
|
||||
PERSONALITY_HINT_SADIST, // Hint for SADIST personality (kidnappers)
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// DIALOGUE RETRIEVAL (Data-Driven Only)
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Get random dialogue for a category using the data-driven system.
|
||||
@@ -183,9 +178,7 @@ public class EntityDialogueManager {
|
||||
return getDialogue(category);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// MESSAGE SENDING METHODS
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Send a dialogue message to a specific player.
|
||||
@@ -416,9 +409,7 @@ public class EntityDialogueManager {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// CONVENIENCE METHODS
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Make entity say something to their target (if player).
|
||||
@@ -472,9 +463,7 @@ public class EntityDialogueManager {
|
||||
}
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// COMPOUND MESSAGES
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Get a dialogue for job assignment with item name.
|
||||
@@ -547,9 +536,7 @@ public class EntityDialogueManager {
|
||||
);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// PERSONALITY SYSTEM HELPERS
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Get personality hint dialogue based on personality type name.
|
||||
|
||||
@@ -18,7 +18,6 @@ import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/**
|
||||
* Phase 16: GagTalk System V4 - Realistic phonetic transformation
|
||||
*
|
||||
* <p>Features:
|
||||
* <ul>
|
||||
@@ -415,9 +414,7 @@ public class GagTalkManager {
|
||||
};
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// SUFFOCATION & CRITICAL FAILURE HELPERS
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Apply suffocation effects if message is too long.
|
||||
@@ -490,9 +487,7 @@ public class GagTalkManager {
|
||||
return null;
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// MCA INTEGRATION METHODS
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* Transform a message to gagged speech without side effects.
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.tiedup.remake.dialogue;
|
||||
|
||||
import com.tiedup.remake.personality.PersonalityType;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Interface for entities that can speak dialogue.
|
||||
|
||||
@@ -2,8 +2,8 @@ package com.tiedup.remake.dialogue;
|
||||
|
||||
import com.tiedup.remake.entities.EntityKidnapper;
|
||||
import com.tiedup.remake.entities.ai.kidnapper.KidnapperState;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Proactive dialogue trigger system for Kidnappers.
|
||||
|
||||
@@ -16,18 +16,17 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.level.Level;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* Manages interactive conversations between players and NPCs.
|
||||
* Handles topic availability, dialogue retrieval, conversation state,
|
||||
* cooldowns, refusals, and topic effects.
|
||||
*
|
||||
* Phase 5: Enhanced Conversation System
|
||||
*/
|
||||
public class ConversationManager {
|
||||
|
||||
@@ -344,7 +343,10 @@ public class ConversationManager {
|
||||
}
|
||||
|
||||
// Apply effects for action topics
|
||||
if (speaker.asEntity() instanceof EntityDamsel damsel && NpcTypeHelper.isDamselOnly(speaker.asEntity())) {
|
||||
if (
|
||||
speaker.asEntity() instanceof EntityDamsel damsel &&
|
||||
NpcTypeHelper.isDamselOnly(speaker.asEntity())
|
||||
) {
|
||||
applyTopicEffects(damsel, player, topic);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ package com.tiedup.remake.dialogue.conversation;
|
||||
* Reasons why an NPC might refuse to engage in conversation.
|
||||
* Each reason has a corresponding dialogue ID for personality-specific responses.
|
||||
*
|
||||
* Phase 5: Enhanced Conversation System
|
||||
*/
|
||||
public enum ConversationRefusalReason {
|
||||
/** No refusal - NPC will talk */
|
||||
|
||||
@@ -9,7 +9,6 @@ import java.util.Set;
|
||||
* Simplified conversation topics for interactive dialogue.
|
||||
* 8 core topics with significant effects, organized in 2 categories.
|
||||
*
|
||||
* Phase 5: Enhanced Conversation System
|
||||
*/
|
||||
public enum ConversationTopic {
|
||||
// === ACTIONS (Always visible) ===
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.tiedup.remake.dialogue.conversation;
|
||||
|
||||
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.entities.ai.master.MasterPlaceBlockGoal;
|
||||
@@ -11,6 +10,7 @@ import com.tiedup.remake.items.base.BindVariant;
|
||||
import com.tiedup.remake.network.ModNetwork;
|
||||
import com.tiedup.remake.network.master.PacketOpenPetRequestMenu;
|
||||
import com.tiedup.remake.state.PlayerBindState;
|
||||
import com.tiedup.remake.v2.BodyRegionV2;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
@@ -58,10 +58,7 @@ public class PetRequestManager {
|
||||
|
||||
// Send packet to open GUI on client
|
||||
ModNetwork.sendToPlayer(
|
||||
new PacketOpenPetRequestMenu(
|
||||
master.getId(),
|
||||
master.getNpcName()
|
||||
),
|
||||
new PacketOpenPetRequestMenu(master.getId(), master.getNpcName()),
|
||||
pet
|
||||
);
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ import com.tiedup.remake.personality.PersonalityType;
|
||||
* Represents the effects of a conversation topic on an NPC's state.
|
||||
* Effects are applied with personality modifiers.
|
||||
*
|
||||
* Phase 5: Enhanced Conversation System
|
||||
*/
|
||||
public record TopicEffect(
|
||||
/** Mood change (-20 to +20) */
|
||||
|
||||
Reference in New Issue
Block a user