NotEvil/TiedUp-
2
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(i18n): complete migration — items, entities, AI goals, GUI screens

Browse Source 
119 new translation keys across 3 domains:
- Items/Blocks/Misc (46 keys): tooltips, action messages, trap states
- Entities/AI Goals (55 keys): NPC speech, maid/master/guard messages
- Client GUI (18 keys): widget labels, screen buttons, merchant display

Remaining 119 Component.literal() are all intentional:
- Debug/Admin/Command wands (47) — dev tools, not player-facing
- Entity display names (~25) — dynamic getNpcName() calls
- Empty string roots (~15) — .append() chain bases
- User-typed text (~10) — /me, /pm, /norp chat content
- Runtime data (~12) — StringBuilder, gag muffling, MCA compat
This commit is contained in:
NotEvil
2026-04-16 12:33:13 +02:00
parent 9b2c5dec8e
commit fd60086322
51 changed files with 325 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/tiedup/remake/blocks/BlockKidnapBomb.java
View File

@@ -244,7 +244,7 @@ public class BlockKidnapBomb
beTag.contains("collar")
) {
tooltip.add(
Component.literal("Loaded:").withStyle(
Component.translatable("block.tiedup.kidnap_bomb.loaded").withStyle(
ChatFormatting.YELLOW
)
);
@@ -282,12 +282,12 @@ public class BlockKidnapBomb
);
} else {
tooltip.add(
Component.literal("Empty").withStyle(ChatFormatting.GREEN)
Component.translatable("block.tiedup.kidnap_bomb.empty").withStyle(ChatFormatting.GREEN)
);
}
} else {
tooltip.add(
Component.literal("Empty").withStyle(ChatFormatting.GREEN)
Component.translatable("block.tiedup.kidnap_bomb.empty").withStyle(ChatFormatting.GREEN)
);
}
}

6
src/main/java/com/tiedup/remake/blocks/BlockRopeTrap.java
View File

@@ -328,7 +328,7 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
// Check if armed
if (beTag.contains("bind")) {
tooltip.add(
Component.literal("Armed").withStyle(
Component.translatable("block.tiedup.trap.armed").withStyle(
ChatFormatting.DARK_RED
)
);
@@ -366,14 +366,14 @@ public class BlockRopeTrap extends Block implements EntityBlock, ICanBeLoaded {
);
} else {
tooltip.add(
Component.literal("Disarmed").withStyle(
Component.translatable("block.tiedup.trap.disarmed").withStyle(
ChatFormatting.GREEN
)
);
}
} else {
tooltip.add(
Component.literal("Disarmed").withStyle(ChatFormatting.GREEN)
Component.translatable("block.tiedup.trap.disarmed").withStyle(ChatFormatting.GREEN)
);
}
}

6
src/main/java/com/tiedup/remake/blocks/BlockTrappedChest.java
View File

@@ -200,7 +200,7 @@ public class BlockTrappedChest extends ChestBlock implements ICanBeLoaded {
beTag.contains("collar")
) {
tooltip.add(
Component.literal("Armed").withStyle(
Component.translatable("block.tiedup.trap.armed").withStyle(
ChatFormatting.DARK_RED
)
);
@@ -231,14 +231,14 @@ public class BlockTrappedChest extends ChestBlock implements ICanBeLoaded {
);
} else {
tooltip.add(
Component.literal("Disarmed").withStyle(
Component.translatable("block.tiedup.trap.disarmed").withStyle(
ChatFormatting.GREEN
)
);
}
} else {
tooltip.add(
Component.literal("Disarmed").withStyle(ChatFormatting.GREEN)
Component.translatable("block.tiedup.trap.disarmed").withStyle(ChatFormatting.GREEN)
);
}
}

5
src/main/java/com/tiedup/remake/bounty/BountyManager.java
View File

@@ -382,9 +382,8 @@ public class BountyManager extends SavedData {
server
.getPlayerList()
.broadcastSystemMessage(
Component.literal("[Bounty] " + message).withStyle(
ChatFormatting.GOLD
),
Component.translatable("msg.tiedup.bounty.broadcast", message)
.withStyle(ChatFormatting.GOLD),
false
);
}

11
src/main/java/com/tiedup/remake/cells/CampLifecycleManager.java
View File

@@ -250,10 +250,8 @@ public final class CampLifecycleManager {
// Notify prisoner
prisoner.sendSystemMessage(
Component.literal("Your captor has died. You are FREE!").withStyle(
ChatFormatting.GREEN,
ChatFormatting.BOLD
)
Component.translatable("msg.tiedup.camp.captor_died")
.withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)
);
// Grant grace period (5 minutes = 6000 ticks)
@@ -261,9 +259,8 @@ public final class CampLifecycleManager {
manager.release(prisoner.getUUID(), level.getGameTime(), 6000);
prisoner.sendSystemMessage(
Component.literal(
"You have 5 minutes of protection from kidnappers."
).withStyle(ChatFormatting.AQUA)
Component.translatable("msg.tiedup.camp.grace_period")
.withStyle(ChatFormatting.AQUA)
);
TiedUpMod.LOGGER.info(

12
src/main/java/com/tiedup/remake/client/gui/screens/BaseAdjustmentScreen.java
View File

@@ -198,12 +198,12 @@ public abstract class BaseAdjustmentScreen extends BaseScreen {
int totalWidth = buttonWidth * 3 + MARGIN_S * 2;
int actionStartX = this.leftPos + (this.imageWidth - totalWidth) / 2;
resetButton = Button.builder(Component.literal("0"), b -> resetValue())
resetButton = Button.builder(Component.translatable("gui.tiedup.adjustment.btn.reset"), b -> resetValue())
.bounds(actionStartX, actionY, buttonWidth, BUTTON_HEIGHT)
.build();
this.addRenderableWidget(resetButton);
decrementButton = Button.builder(Component.literal("-0.25"), b ->
decrementButton = Button.builder(Component.translatable("gui.tiedup.adjustment.btn.decrement"), b ->
slider.decrement()
)
.bounds(
@@ -215,7 +215,7 @@ public abstract class BaseAdjustmentScreen extends BaseScreen {
.build();
this.addRenderableWidget(decrementButton);
incrementButton = Button.builder(Component.literal("+0.25"), b ->
incrementButton = Button.builder(Component.translatable("gui.tiedup.adjustment.btn.increment"), b ->
slider.increment()
)
.bounds(
@@ -235,14 +235,14 @@ public abstract class BaseAdjustmentScreen extends BaseScreen {
int totalWidth = buttonWidth * 3 + MARGIN_S * 2;
int scaleStartX = this.leftPos + (this.imageWidth - totalWidth) / 2;
scaleResetButton = Button.builder(Component.literal("1x"), b ->
scaleResetButton = Button.builder(Component.translatable("gui.tiedup.adjustment.btn.scale_reset"), b ->
applyScale(AdjustmentHelper.DEFAULT_SCALE)
)
.bounds(scaleStartX, scaleY, buttonWidth, BUTTON_HEIGHT)
.build();
this.addRenderableWidget(scaleResetButton);
scaleDecrementButton = Button.builder(Component.literal("-0.1"), b ->
scaleDecrementButton = Button.builder(Component.translatable("gui.tiedup.adjustment.btn.scale_decrement"), b ->
applyScale(currentScaleValue - AdjustmentHelper.SCALE_STEP)
)
.bounds(
@@ -254,7 +254,7 @@ public abstract class BaseAdjustmentScreen extends BaseScreen {
.build();
this.addRenderableWidget(scaleDecrementButton);
scaleIncrementButton = Button.builder(Component.literal("+0.1"), b ->
scaleIncrementButton = Button.builder(Component.translatable("gui.tiedup.adjustment.btn.scale_increment"), b ->
applyScale(currentScaleValue + AdjustmentHelper.SCALE_STEP)
)
.bounds(

2
src/main/java/com/tiedup/remake/client/gui/screens/CellManagerScreen.java
View File

@@ -565,7 +565,7 @@ public class CellManagerScreen extends BaseScreen {
if (cell.prisoners.isEmpty()) {
graphics.drawString(
this.font,
Component.literal(" \u2514\u2500 ")
Component.translatable("gui.tiedup.cell_manager.tree_prefix")
.append(
Component.translatable(
"gui.tiedup.cell_manager.label.empty"

15
src/main/java/com/tiedup/remake/client/gui/screens/CommandWandScreen.java
View File

@@ -548,12 +548,9 @@ public class CommandWandScreen extends Screen {
}
private void addFollowDistanceCycleButton(int x, int y, int width) {
String modeText = switch (followDistanceMode) {
case "HEEL" -> "H";
case "CLOSE" -> "C";
case "FAR" -> "F";
default -> "?";
};
Component modeLabel = Component.translatable(
"gui.tiedup.command_wand.follow_distance.abbrev." + followDistanceMode.toLowerCase()
);
Component tooltip = Component.translatable(
"gui.tiedup.command_wand.follow_distance.tooltip"
@@ -571,7 +568,7 @@ public class CommandWandScreen extends Screen {
)
);
Button btn = Button.builder(Component.literal(modeText), b ->
Button btn = Button.builder(modeLabel, b ->
cycleFollowDistance()
)
.bounds(x, y, width, BUTTON_HEIGHT)
@@ -857,7 +854,7 @@ public class CommandWandScreen extends Screen {
) {
graphics.renderTooltip(
this.font,
Component.literal((int) hunger + "%"),
Component.translatable("gui.tiedup.command_wand.percent", (int) hunger),
mouseX,
mouseY
);
@@ -871,7 +868,7 @@ public class CommandWandScreen extends Screen {
) {
graphics.renderTooltip(
this.font,
Component.literal((int) rest + "%"),
Component.translatable("gui.tiedup.command_wand.percent", (int) rest),
mouseX,
mouseY
);

10
src/main/java/com/tiedup/remake/client/gui/screens/MerchantTradingScreen.java
View File

@@ -216,24 +216,24 @@ public class MerchantTradingScreen extends BaseScreen {
int goldIngots = countItemInInventory(player, Items.GOLD_INGOT);
int goldNuggets = countItemInInventory(player, Items.GOLD_NUGGET);
Component goldText = Component.literal("Your Gold: ")
Component goldText = Component.translatable("gui.tiedup.merchant.your_gold")
.append(
Component.literal(goldIngots + "x ").withStyle(style ->
Component.translatable("gui.tiedup.merchant.gold_amount", goldIngots).withStyle(style ->
style.withColor(0xFFFFD700)
)
)
.append(
Component.literal("⚜ ").withStyle(style ->
Component.translatable("gui.tiedup.merchant.gold_icon").withStyle(style ->
style.withColor(0xFFFFD700)
)
)
.append(
Component.literal("+ " + goldNuggets + "x ").withStyle(
Component.translatable("gui.tiedup.merchant.nugget_amount", goldNuggets).withStyle(
style -> style.withColor(0xFFFFA500)
)
)
.append(
Component.literal("✦").withStyle(style ->
Component.translatable("gui.tiedup.merchant.nugget_icon").withStyle(style ->
style.withColor(0xFFFFA500)
)
);

2
src/main/java/com/tiedup/remake/client/gui/screens/NpcInventoryScreen.java
View File

@@ -53,7 +53,7 @@ public class NpcInventoryScreen
Inventory playerInventory,
Component title
) {
super(menu, playerInventory, Component.literal(menu.getNpcName()));
super(menu, playerInventory, Component.translatable("gui.tiedup.npc_inventory.title_name", menu.getNpcName()));
// Calculate rows from NPC inventory size
this.npcRows = (menu.getNpcSlotCount() + 8) / 9;

2
src/main/java/com/tiedup/remake/client/gui/widgets/ActionPanel.java
View File

@@ -86,7 +86,7 @@ public class ActionPanel extends AbstractWidget {
private int hoveredIndex = -1;
public ActionPanel(int x, int y, int width, int height) {
super(x, y, width, height, Component.literal("Actions"));
super(x, y, width, height, Component.translatable("gui.tiedup.action_panel"));
}
public void setMode(ScreenMode mode) {

2
src/main/java/com/tiedup/remake/client/gui/widgets/ItemPickerOverlay.java
View File

@@ -51,7 +51,7 @@ public class ItemPickerOverlay extends AbstractWidget {
private int screenHeight;
public ItemPickerOverlay() {
super(0, 0, 0, 0, Component.literal("Item Picker"));
super(0, 0, 0, 0, Component.translatable("gui.tiedup.item_picker"));
this.active = false;
this.visible = false;
}

2
src/main/java/com/tiedup/remake/client/gui/widgets/RegionTabBar.java
View File

@@ -98,7 +98,7 @@ public class RegionTabBar extends AbstractWidget {
private LivingEntity targetEntity;
public RegionTabBar(int x, int y, int width) {
super(x, y, width, TAB_HEIGHT, Component.literal("Tab Bar"));
super(x, y, width, TAB_HEIGHT, Component.translatable("gui.tiedup.tab_bar.label"));
}
public void setOnTabChanged(Consumer<BodyTab> callback) {

2
src/main/java/com/tiedup/remake/client/gui/widgets/StatusBarWidget.java
View File

@@ -40,7 +40,7 @@ public class StatusBarWidget extends AbstractWidget {
private static final int CLOSE_BTN_HEIGHT = 22;
public StatusBarWidget(int x, int y, int width, int height) {
super(x, y, width, height, Component.literal("Status Bar"));
super(x, y, width, height, Component.translatable("gui.tiedup.status_bar"));
}
public void setMode(ActionPanel.ScreenMode mode) {

6
src/main/java/com/tiedup/remake/dialogue/conversation/PetRequestManager.java
View File

@@ -51,7 +51,7 @@ public class PetRequestManager {
double dist = master.distanceTo(pet);
if (dist > MAX_DISTANCE) {
pet.sendSystemMessage(
Component.literal("You are too far from your Master to talk.")
Component.translatable("entity.tiedup.pet.too_far_to_talk")
);
return;
}
@@ -95,7 +95,7 @@ public class PetRequestManager {
double dist = master.distanceTo(pet);
if (dist > MAX_DISTANCE) {
pet.sendSystemMessage(
Component.literal("You are too far from your Master.")
Component.translatable("entity.tiedup.pet.too_far_from_master")
);
return;
}
@@ -109,7 +109,7 @@ public class PetRequestManager {
// Display what the player "says"
pet.sendSystemMessage(
Component.literal("You: " + request.getPlayerText())
Component.translatable("entity.tiedup.pet.you_say", request.getPlayerText())
);
// Handle specific request

12
src/main/java/com/tiedup/remake/entities/EntityDamsel.java
View File

@@ -644,8 +644,8 @@ public class EntityDamsel
player instanceof net.minecraft.server.level.ServerPlayer sp
) {
sp.displayClientMessage(
Component.literal(
"This NPC needs a collar before you can feed them."
Component.translatable(
"entity.tiedup.damsel.needs_collar_to_feed"
).withStyle(ChatFormatting.RED),
true
);
@@ -660,8 +660,8 @@ public class EntityDamsel
net.minecraft.server.level.ServerPlayer sp
) {
sp.displayClientMessage(
Component.literal(
"You don't own this NPC's collar."
Component.translatable(
"entity.tiedup.damsel.not_collar_owner"
).withStyle(ChatFormatting.RED),
true
);
@@ -675,8 +675,8 @@ public class EntityDamsel
player instanceof net.minecraft.server.level.ServerPlayer sp
) {
sp.displayClientMessage(
Component.literal(
"This NPC can't eat that right now."
Component.translatable(
"entity.tiedup.damsel.cant_eat_now"
).withStyle(ChatFormatting.RED),
true
);

6
src/main/java/com/tiedup/remake/entities/EntityLaborGuard.java
View File

@@ -341,7 +341,7 @@ public class EntityLaborGuard extends EntityDamsel {
}
prisoner.sendSystemMessage(
Component.literal("Attacking your guard is punished!").withStyle(
Component.translatable("entity.tiedup.guard.attack_punished").withStyle(
ChatFormatting.DARK_RED
)
);
@@ -529,8 +529,8 @@ public class EntityLaborGuard extends EntityDamsel {
.getPlayer(prisonerUUID);
if (prisoner != null) {
prisoner.sendSystemMessage(
Component.literal(
"Your guard has been eliminated! You are free!"
Component.translatable(
"entity.tiedup.guard.eliminated_free"
).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)
);
}

4
src/main/java/com/tiedup/remake/entities/EntityMaid.java
View File

@@ -447,8 +447,8 @@ public class EntityMaid extends EntityKidnapperElite {
player.position().distanceTo(this.position()) <= 50
) {
player.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"The maid has died. Work is paused. A replacement will arrive in 5 minutes."
net.minecraft.network.chat.Component.translatable(
"entity.tiedup.maid.died_work_paused"
).withStyle(net.minecraft.ChatFormatting.GOLD)
);
}

4
src/main/java/com/tiedup/remake/entities/EntityMaster.java
View File

@@ -606,8 +606,8 @@ public class EntityMaster extends EntityKidnapperElite {
// Send warning message to pet
pet.sendSystemMessage(
Component.literal(
this.getNpcName() + " caught you trying to escape!"
Component.translatable(
"entity.tiedup.master.caught_escaping", this.getNpcName()
).withStyle(Style.EMPTY.withColor(MASTER_NAME_COLOR))
);
}

8
src/main/java/com/tiedup/remake/entities/EntitySlaveTrader.java
View File

@@ -200,8 +200,8 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
Component.literal("[" + this.getNpcName() + "] ")
.withStyle(Style.EMPTY.withColor(TRADER_NAME_COLOR))
.append(
Component.literal(
"You don't have a trader token. Leave now, or I'll make you leave."
Component.translatable(
"entity.tiedup.trader.no_token_warning"
).withStyle(ChatFormatting.RED)
)
);
@@ -711,8 +711,8 @@ public class EntitySlaveTrader extends EntityKidnapperElite {
ServerLevel level,
BlockPos campCenter
) {
Component message = Component.literal(
"A slave trader camp has been destroyed!"
Component message = Component.translatable(
"entity.tiedup.trader.camp_destroyed"
).withStyle(ChatFormatting.GOLD, ChatFormatting.BOLD);
// Send to all players within 200 blocks

10
src/main/java/com/tiedup/remake/entities/MerchantTrade.java
View File

@@ -93,15 +93,15 @@ public class MerchantTrade {
*/
public Component getPriceDisplay() {
if (ingotPrice > 0 && nuggetPrice > 0) {
return Component.literal(
ingotPrice + " gold + " + nuggetPrice + " nuggets"
return Component.translatable(
"entity.tiedup.trade.price_both", ingotPrice, nuggetPrice
);
} else if (ingotPrice > 0) {
return Component.literal(ingotPrice + " gold");
return Component.translatable("entity.tiedup.trade.price_gold", ingotPrice);
} else if (nuggetPrice > 0) {
return Component.literal(nuggetPrice + " nuggets");
return Component.translatable("entity.tiedup.trade.price_nuggets", nuggetPrice);
} else {
return Component.literal("Free");
return Component.translatable("entity.tiedup.trade.price_free");
}
}

8
src/main/java/com/tiedup/remake/entities/ai/guard/GuardMonitorGoal.java
View File

@@ -202,8 +202,8 @@ public class GuardMonitorGoal extends Goal {
);
prisoner.sendSystemMessage(
Component.literal(
"You are too far from your guard! Return within 15 seconds or escape will be triggered!"
Component.translatable(
"goal.tiedup.guard_monitor.too_far"
).withStyle(ChatFormatting.RED, ChatFormatting.BOLD)
);
@@ -227,8 +227,8 @@ public class GuardMonitorGoal extends Goal {
);
prisoner.sendSystemMessage(
Component.literal(
"You returned to your guard. Stay close!"
Component.translatable(
"goal.tiedup.guard_monitor.returned"
).withStyle(ChatFormatting.YELLOW)
);
}

4
src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperDecideNextActionGoal.java
View File

@@ -604,8 +604,8 @@ public class KidnapperDecideNextActionGoal extends Goal {
);
player.sendSystemMessage(
Component.literal(
"You're still tied up - struggle to break free!"
Component.translatable(
"goal.tiedup.kidnapper_decide.still_tied"
).withStyle(ChatFormatting.YELLOW)
);

8
src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperWaitForBuyerGoal.java
View File

@@ -351,14 +351,14 @@ public class KidnapperWaitForBuyerGoal extends Goal {
);
Component announcement = Component.literal("")
.append(Component.literal("[SALE] ").withStyle(ChatFormatting.GOLD))
.append(Component.translatable("goal.tiedup.kidnapper_sale.tag").withStyle(ChatFormatting.GOLD))
.append(
Component.literal(this.kidnapper.getNpcName()).withStyle(
ChatFormatting.RED
)
)
.append(
Component.literal(" is selling ").withStyle(
Component.translatable("goal.tiedup.kidnapper_sale.is_selling").withStyle(
ChatFormatting.YELLOW
)
)
@@ -367,13 +367,13 @@ public class KidnapperWaitForBuyerGoal extends Goal {
ChatFormatting.AQUA
)
)
.append(Component.literal(" for ").withStyle(ChatFormatting.YELLOW))
.append(Component.translatable("goal.tiedup.kidnapper_sale.for").withStyle(ChatFormatting.YELLOW))
.append(
Component.literal(price.toDisplayString()).withStyle(
ChatFormatting.GREEN
)
)
.append(Component.literal(" at ").withStyle(ChatFormatting.YELLOW))
.append(Component.translatable("goal.tiedup.kidnapper_sale.at").withStyle(ChatFormatting.YELLOW))
.append(
Component.literal(location).withStyle(ChatFormatting.WHITE)
);

12
src/main/java/com/tiedup/remake/entities/ai/maid/MaidDeliverCaptiveGoal.java
View File

@@ -331,9 +331,9 @@ public class MaidDeliverCaptiveGoal extends Goal {
buyerEntity.getName().getString()
);
buyerEntity.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
captiveEntity.getName().getString() +
" is now on your leash."
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_deliver.on_leash",
captiveEntity.getName().getString()
).withStyle(net.minecraft.ChatFormatting.GREEN)
);
} else {
@@ -342,9 +342,9 @@ public class MaidDeliverCaptiveGoal extends Goal {
);
kidnappedState.free(true);
buyerEntity.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
captiveEntity.getName().getString() +
" has been delivered to you."
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_deliver.delivered",
captiveEntity.getName().getString()
).withStyle(net.minecraft.ChatFormatting.GREEN)
);
}

12
src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidAssignTaskGoal.java
View File

@@ -200,13 +200,13 @@ public class MaidAssignTaskGoal extends Goal {
// Notify prisoner
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Task assigned: " + task.getDescription()
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_assign.task_assigned", task.getDescription()
).withStyle(net.minecraft.ChatFormatting.YELLOW)
);
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Reward: " + task.getValue() + " emeralds toward your debt."
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_assign.task_reward", task.getValue()
).withStyle(net.minecraft.ChatFormatting.GRAY)
);
@@ -289,8 +289,8 @@ public class MaidAssignTaskGoal extends Goal {
}
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Your debt is paid. You are FREE!"
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid.debt_paid_free"
).withStyle(
net.minecraft.ChatFormatting.GREEN,
net.minecraft.ChatFormatting.BOLD

4
src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidExtractGoal.java
View File

@@ -346,8 +346,8 @@ public class MaidExtractGoal extends Goal {
// 7. Notify prisoner
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"You have been extracted for labor. Complete your task: " +
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_extract.extracted",
task.getDescription()
).withStyle(net.minecraft.ChatFormatting.YELLOW)
);

15
src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidIdleGoal.java
View File

@@ -146,8 +146,8 @@ public class MaidIdleGoal extends Goal {
labor.completeTask(currentTime);
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Task complete! Walk back to camp."
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_idle.task_complete"
).withStyle(net.minecraft.ChatFormatting.GREEN)
);
@@ -207,17 +207,16 @@ public class MaidIdleGoal extends Goal {
// Max punishment - fail task
labor.failTask(currentTime);
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Task failed due to inactivity! You will be returned to your cell."
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_idle.task_failed"
).withStyle(net.minecraft.ChatFormatting.RED)
);
} else {
// Warning
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Warning: Work or face punishment! (" +
shockLevel +
"/3)"
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_idle.inactivity_warning",
shockLevel
).withStyle(net.minecraft.ChatFormatting.YELLOW)
);

10
src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidInitPrisonerGoal.java
View File

@@ -165,18 +165,16 @@ public class MaidInitPrisonerGoal extends Goal {
// 6. Notify prisoner
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
String.format(
"You have been imprisoned. Your debt: %d emeralds.",
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_init.imprisoned",
totalRansom
)
).withStyle(net.minecraft.ChatFormatting.RED)
);
if (!confiscated.isEmpty()) {
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Your valuables have been confiscated."
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid_init.confiscated"
).withStyle(net.minecraft.ChatFormatting.GRAY)
);
}

4
src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidReturnGoal.java
View File

@@ -671,8 +671,8 @@ public class MaidReturnGoal extends Goal {
}
prisoner.sendSystemMessage(
net.minecraft.network.chat.Component.literal(
"Your debt is paid. You are FREE!"
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.maid.debt_paid_free"
).withStyle(
net.minecraft.ChatFormatting.GREEN,
net.minecraft.ChatFormatting.BOLD

13
src/main/java/com/tiedup/remake/entities/ai/master/MasterInventoryInspectGoal.java
View File

@@ -124,11 +124,10 @@ public class MasterInventoryInspectGoal extends Goal {
ServerPlayer pet = master.getPetPlayer();
if (pet != null && !confiscatedItems.isEmpty()) {
pet.sendSystemMessage(
Component.literal(
master.getNpcName() +
" confiscated " +
confiscatedItems.size() +
" contraband item(s) from you!"
Component.translatable(
"goal.tiedup.master_inspect.confiscated",
master.getNpcName(),
confiscatedItems.size()
).withStyle(
Style.EMPTY.withColor(EntityMaster.MASTER_NAME_COLOR)
)
@@ -180,8 +179,8 @@ public class MasterInventoryInspectGoal extends Goal {
*/
private void performInspection(ServerPlayer pet) {
pet.sendSystemMessage(
Component.literal(
master.getNpcName() + " is inspecting your inventory..."
Component.translatable(
"goal.tiedup.master_inspect.inspecting", master.getNpcName()
).withStyle(Style.EMPTY.withColor(0xFFFF00))
);

4
src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java
View File

@@ -331,8 +331,8 @@ public class MasterTaskAssignGoal extends Goal {
// FIX: Use MessageDispatcher for consistency with earplug system
MessageDispatcher.sendChat(
pet,
Component.literal(
master.getNpcName() + ": \"" + message + "\""
Component.translatable(
"goal.tiedup.master_assign.task_speech", master.getNpcName(), message
).withStyle(Style.EMPTY.withColor(EntityMaster.MASTER_NAME_COLOR))
);

16
src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java
View File

@@ -269,8 +269,8 @@ public class MasterTaskWatchGoal extends Goal {
if (remainingSec > 0) {
MessageDispatcher.sendActionBar(
pet,
Component.literal(
task.name() + " - " + remainingSec + "s remaining"
Component.translatable(
"goal.tiedup.master_watch.time_remaining", task.name(), remainingSec
).withStyle(Style.EMPTY.withColor(0xFFAA00))
);
}
@@ -357,8 +357,8 @@ public class MasterTaskWatchGoal extends Goal {
) {
MessageDispatcher.sendChat(
pet,
Component.literal(
master.getNpcName() + ": \"I'm waiting...\""
Component.translatable(
"goal.tiedup.master_watch.speak_waiting", master.getNpcName()
).withStyle(
Style.EMPTY.withColor(
EntityMaster.MASTER_NAME_COLOR
@@ -384,8 +384,8 @@ public class MasterTaskWatchGoal extends Goal {
.nextInt(demandWarnings.length)];
MessageDispatcher.sendChat(
pet,
Component.literal(
master.getNpcName() + ": \"" + warning + "\""
Component.translatable(
"goal.tiedup.master_watch.demand_warning", master.getNpcName(), warning
).withStyle(
Style.EMPTY.withColor(
EntityMaster.MASTER_NAME_COLOR
@@ -431,8 +431,8 @@ public class MasterTaskWatchGoal extends Goal {
String message = messages[master.getRandom().nextInt(messages.length)];
MessageDispatcher.sendChat(
pet,
Component.literal(
master.getNpcName() + ": \"" + message + "\""
Component.translatable(
"goal.tiedup.master_watch.punishment", master.getNpcName(), message
).withStyle(Style.EMPTY.withColor(EntityMaster.MASTER_NAME_COLOR))
);

8
src/main/java/com/tiedup/remake/entities/ai/personality/NpcGuardCommandGoal.java
View File

@@ -450,8 +450,8 @@ public class NpcGuardCommandGoal extends Goal {
if (player.getUUID().equals(commanderUUID)) {
String slaveName = slave.getNpcName();
player.displayClientMessage(
net.minecraft.network.chat.Component.literal(
npc.getNpcName() + " is chasing " + slaveName + "!"
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.guard_command.chasing", npc.getNpcName(), slaveName
).withStyle(net.minecraft.ChatFormatting.RED),
true // Action bar
);
@@ -545,8 +545,8 @@ public class NpcGuardCommandGoal extends Goal {
// Send alert message (could be enhanced with dialogue system)
String threatName = threat.getName().getString();
player.displayClientMessage(
net.minecraft.network.chat.Component.literal(
npc.getNpcName() + " spotted: " + threatName + "!"
net.minecraft.network.chat.Component.translatable(
"goal.tiedup.guard_command.spotted", npc.getNpcName(), threatName
).withStyle(net.minecraft.ChatFormatting.YELLOW),
true // Action bar
);

6
src/main/java/com/tiedup/remake/entities/ai/trader/goals/TraderSellGoal.java
View File

@@ -185,13 +185,13 @@ public class TraderSellGoal extends Goal {
);
potentialBuyer.sendSystemMessage(
Component.literal(
"[" + trader.getNpcName() + "] " + greeting
Component.translatable(
"goal.tiedup.trader_sell.greeting", trader.getNpcName(), greeting
).withStyle(net.minecraft.ChatFormatting.GOLD)
);
potentialBuyer.sendSystemMessage(
Component.literal("Right-click me to browse my stock.").withStyle(
Component.translatable("goal.tiedup.trader_sell.browse_hint").withStyle(
net.minecraft.ChatFormatting.GRAY
)
);

30
src/main/java/com/tiedup/remake/entities/maid/components/MaidPrisonInteraction.java
View File

@@ -165,8 +165,8 @@ public class MaidPrisonInteraction {
sayToPlayer(player, "Very well. Here are your tools.");
player.sendSystemMessage(
Component.literal(
"The maid manually assigns you to: " + task.getDescription()
Component.translatable(
"entity.tiedup.maid.manual_assign", task.getDescription()
).withStyle(ChatFormatting.YELLOW)
);
@@ -206,8 +206,8 @@ public class MaidPrisonInteraction {
sayToPlayer(worker, "Good. You've completed your task.");
worker.sendSystemMessage(
Component.literal(
"A Maid will come to collect you shortly."
Component.translatable(
"entity.tiedup.maid.collect_shortly"
).withStyle(ChatFormatting.YELLOW)
);
@@ -229,13 +229,13 @@ public class MaidPrisonInteraction {
@Nullable LaborRecord laborRecord
) {
player.sendSystemMessage(
Component.literal("=== Labor Status ===").withStyle(
Component.translatable("entity.tiedup.maid.labor_status_header").withStyle(
ChatFormatting.GOLD
)
);
player.sendSystemMessage(
Component.literal("State: " + record.getState().name()).withStyle(
Component.translatable("entity.tiedup.maid.labor_status_state", record.getState().name()).withStyle(
ChatFormatting.GRAY
)
);
@@ -243,13 +243,13 @@ public class MaidPrisonInteraction {
if (laborRecord != null && laborRecord.getTask() != null) {
LaborTask task = laborRecord.getTask();
player.sendSystemMessage(
Component.literal("Task: " + task.getDescription()).withStyle(
Component.translatable("entity.tiedup.maid.labor_status_task", task.getDescription()).withStyle(
ChatFormatting.GRAY
)
);
player.sendSystemMessage(
Component.literal(
"Progress: " + task.getProgress() + "/" + task.getQuota()
Component.translatable(
"entity.tiedup.maid.labor_status_progress", task.getProgress(), task.getQuota()
).withStyle(ChatFormatting.GRAY)
);
}
@@ -262,8 +262,8 @@ public class MaidPrisonInteraction {
RansomRecord ransom = manager.getRansomRecord(player.getUUID());
int remaining = ransom != null ? ransom.getRemainingDebt() : 0;
player.sendSystemMessage(
Component.literal(
"Remaining debt: " + remaining + " emeralds"
Component.translatable(
"entity.tiedup.maid.labor_status_debt", remaining
).withStyle(ChatFormatting.GRAY)
);
@@ -273,8 +273,8 @@ public class MaidPrisonInteraction {
laborRecord.getPhase() == LaborRecord.WorkPhase.PENDING_EXTRACTION
) {
player.sendSystemMessage(
Component.literal(
"Shift+Right-Click to manually start task"
Component.translatable(
"entity.tiedup.maid.labor_hint_start_task"
).withStyle(ChatFormatting.YELLOW)
);
} else if (
@@ -283,8 +283,8 @@ public class MaidPrisonInteraction {
laborRecord.getTask().isComplete()
) {
player.sendSystemMessage(
Component.literal(
"Shift+Right-Click to manually turn in task"
Component.translatable(
"entity.tiedup.maid.labor_hint_turn_in"
).withStyle(ChatFormatting.GREEN)
);
}

4
src/main/java/com/tiedup/remake/entities/master/components/MasterPetManager.java
View File

@@ -199,8 +199,8 @@ public class MasterPetManager {
// Send message to player
player.sendSystemMessage(
Component.literal(
"You are free! Your master " + master.getNpcName() + " is gone."
Component.translatable(
"entity.tiedup.master.pet_freed", master.getNpcName()
).withStyle(Style.EMPTY.withColor(0x00FF00))
);
}

14
src/main/java/com/tiedup/remake/events/restriction/PetPlayRestrictionHandler.java
View File

@@ -77,7 +77,7 @@ public class PetPlayRestrictionHandler {
sendThrottledMessage(
player,
"You cannot eat from your hand! Use a bowl."
"msg.tiedup.petplay.cannot_eat_hand"
);
TiedUpMod.LOGGER.debug(
@@ -175,7 +175,7 @@ public class PetPlayRestrictionHandler {
sendThrottledMessage(
player,
"You cannot sleep in a bed! Use your pet bed."
"msg.tiedup.petplay.cannot_sleep_bed"
);
TiedUpMod.LOGGER.debug(
@@ -222,8 +222,8 @@ public class PetPlayRestrictionHandler {
// Start sleeping (simplified - real implementation would need proper sleep mechanics)
serverPlayer.sendSystemMessage(
Component.literal(
"You curl up in your pet bed..."
Component.translatable(
"msg.tiedup.petplay.curl_up_bed"
).withStyle(Style.EMPTY.withColor(0x888888))
);
@@ -242,7 +242,7 @@ public class PetPlayRestrictionHandler {
} else {
sendThrottledMessage(
player,
"You can only sleep at night or during thunderstorms."
"msg.tiedup.petplay.sleep_time_only"
);
}
}
@@ -325,14 +325,14 @@ public class PetPlayRestrictionHandler {
/**
* Send a message with cooldown to prevent spam.
*/
private static void sendThrottledMessage(Player player, String message) {
private static void sendThrottledMessage(Player player, String translationKey) {
long now = System.currentTimeMillis();
Long lastTime = lastMessageTime.get(player.getUUID());
if (lastTime == null || now - lastTime > MESSAGE_COOLDOWN_MS) {
lastMessageTime.put(player.getUUID(), now);
player.sendSystemMessage(
Component.literal(message).withStyle(
Component.translatable(translationKey).withStyle(
Style.EMPTY.withColor(EntityMaster.MASTER_NAME_COLOR)
)
);

14
src/main/java/com/tiedup/remake/items/GenericKnife.java
View File

@@ -75,20 +75,14 @@ public class GenericKnife extends Item implements IKnife {
// Show cutting speed
tooltip.add(
Component.literal("Cutting speed: " + speed + " res/s").withStyle(
ChatFormatting.GRAY
)
Component.translatable("item.tiedup.knife.cutting_speed", speed)
.withStyle(ChatFormatting.GRAY)
);
// Show cutting time remaining
tooltip.add(
Component.literal(
"Cutting time: " +
cuttingSeconds +
"s (" +
remaining +
" total res)"
).withStyle(ChatFormatting.DARK_GRAY)
Component.translatable("item.tiedup.knife.cutting_time", cuttingSeconds, remaining)
.withStyle(ChatFormatting.DARK_GRAY)
);
}

4
src/main/java/com/tiedup/remake/items/ItemCellKey.java
View File

@@ -36,12 +36,12 @@ public class ItemCellKey extends Item {
TooltipFlag flag
) {
tooltip.add(
Component.literal("Unlocks any Iron Bar Door").withStyle(
Component.translatable("item.tiedup.cell_key.desc").withStyle(
ChatFormatting.GRAY
)
);
tooltip.add(
Component.literal("Does not work on bondage items").withStyle(
Component.translatable("item.tiedup.cell_key.restriction").withStyle(
ChatFormatting.DARK_GRAY
)
);

7
src/main/java/com/tiedup/remake/items/ItemGpsLocator.java
View File

@@ -39,13 +39,8 @@ public class ItemGpsLocator extends ItemOwnerTarget {
if (hasTarget(stack)) {
String displayName = resolveTargetDisplayName(stack, level);
tooltip.add(
Component.literal("Target: ")
Component.translatable("item.tiedup.gps_locator.target", displayName)
.withStyle(ChatFormatting.BLUE)
.append(
Component.literal(displayName).withStyle(
ChatFormatting.WHITE
)
)
);
}
}

21
src/main/java/com/tiedup/remake/items/ItemKey.java
View File

@@ -85,36 +85,25 @@ public class ItemKey extends ItemOwnerTarget {
if (hasOwner(stack)) {
tooltip.add(
Component.literal("Owner: ")
Component.translatable("item.tiedup.key.owner", getOwnerName(stack))
.withStyle(ChatFormatting.GOLD)
.append(
Component.literal(getOwnerName(stack)).withStyle(
ChatFormatting.WHITE
)
)
);
} else {
tooltip.add(
Component.literal(
"Unclaimed (Right-click a collar wearer to claim)"
).withStyle(ChatFormatting.GRAY)
Component.translatable("item.tiedup.key.unclaimed")
.withStyle(ChatFormatting.GRAY)
);
}
if (hasTarget(stack)) {
tooltip.add(
Component.literal("Target: ")
Component.translatable("item.tiedup.key.target", getTargetName(stack))
.withStyle(ChatFormatting.BLUE)
.append(
Component.literal(getTargetName(stack)).withStyle(
ChatFormatting.WHITE
)
)
);
}
tooltip.add(
Component.literal("Right-click a collared player to toggle LOCK")
Component.translatable("item.tiedup.key.hint")
.withStyle(ChatFormatting.DARK_GRAY)
.withStyle(ChatFormatting.ITALIC)
);

13
src/main/java/com/tiedup/remake/items/ItemLockpick.java
View File

@@ -63,16 +63,15 @@ public class ItemLockpick extends Item {
int remaining = stack.getMaxDamage() - stack.getDamageValue();
tooltip.add(
Component.literal(
"Uses: " + remaining + "/" + stack.getMaxDamage()
).withStyle(ChatFormatting.DARK_GRAY)
Component.translatable("item.tiedup.lockpick.uses", remaining, stack.getMaxDamage())
.withStyle(ChatFormatting.DARK_GRAY)
);
// LOW FIX: Removed server config access from client tooltip (desync issue)
// Success/break chances depend on server config, not client config
// Displaying client config values here would be misleading in multiplayer
tooltip.add(
Component.literal("Success/break chances: Check server config")
Component.translatable("item.tiedup.lockpick.chances_hint")
.withStyle(ChatFormatting.GRAY)
.withStyle(ChatFormatting.ITALIC)
);
@@ -354,11 +353,11 @@ public class ItemLockpick extends Item {
) {
if (player.getServer() == null) return;
Component warning = Component.literal("ALERT: ")
Component warning = Component.translatable("item.tiedup.lockpick.alert_prefix")
.withStyle(ChatFormatting.RED, ChatFormatting.BOLD)
.append(
Component.literal(
player.getName().getString() + " tried to pick a lock!"
Component.translatable(
"item.tiedup.lockpick.alert_attempt", player.getName().getString()
).withStyle(ChatFormatting.GOLD)
);

15
src/main/java/com/tiedup/remake/items/ItemRag.java
View File

@@ -60,20 +60,17 @@ public class ItemRag extends Item {
int ticksRemaining = getWetTime(stack);
int secondsRemaining = ticksRemaining / 20;
tooltip.add(
Component.literal("Soaked with chloroform").withStyle(
ChatFormatting.GREEN
)
Component.translatable("item.tiedup.rag.soaked")
.withStyle(ChatFormatting.GREEN)
);
tooltip.add(
Component.literal(
"Evaporates in: " + secondsRemaining + "s"
).withStyle(ChatFormatting.GRAY)
Component.translatable("item.tiedup.rag.evaporates", secondsRemaining)
.withStyle(ChatFormatting.GRAY)
);
} else {
tooltip.add(
Component.literal("Dry - needs chloroform").withStyle(
ChatFormatting.GRAY
)
Component.translatable("item.tiedup.rag.dry")
.withStyle(ChatFormatting.GRAY)
);
}
}

26
src/main/java/com/tiedup/remake/items/ItemShockerController.java
View File

@@ -47,20 +47,18 @@ public class ItemShockerController extends ItemOwnerTarget {
if (isBroadcastEnabled(stack)) {
tooltip.add(
Component.literal("MODE: BROADCAST").withStyle(
ChatFormatting.DARK_RED
)
Component.translatable("item.tiedup.shocker.mode_broadcast")
.withStyle(ChatFormatting.DARK_RED)
);
tooltip.add(
Component.literal("(Affects ALL your slaves in radius)")
Component.translatable("item.tiedup.shocker.broadcast_desc")
.withStyle(ChatFormatting.GRAY)
.withStyle(ChatFormatting.ITALIC)
);
} else {
tooltip.add(
Component.literal("MODE: TARGETED").withStyle(
ChatFormatting.BLUE
)
Component.translatable("item.tiedup.shocker.mode_targeted")
.withStyle(ChatFormatting.BLUE)
);
if (hasTarget(stack)) {
String displayName = getTargetName(stack);
@@ -102,7 +100,7 @@ public class ItemShockerController extends ItemOwnerTarget {
if (isDisconnected) {
targetComp.append(
Component.literal(" [FREED]")
Component.translatable("item.tiedup.shocker.freed")
.withStyle(ChatFormatting.RED)
.withStyle(ChatFormatting.BOLD)
);
@@ -110,20 +108,18 @@ public class ItemShockerController extends ItemOwnerTarget {
tooltip.add(targetComp);
} else {
tooltip.add(
Component.literal(" > No target connected").withStyle(
ChatFormatting.GRAY
)
Component.translatable("item.tiedup.shocker.no_target")
.withStyle(ChatFormatting.GRAY)
);
}
}
tooltip.add(
Component.literal("Radius: " + getRadius(stack) + "m").withStyle(
ChatFormatting.GREEN
)
Component.translatable("item.tiedup.shocker.radius", getRadius(stack))
.withStyle(ChatFormatting.GREEN)
);
tooltip.add(
Component.literal("Shift + Right-click to toggle Broadcast mode")
Component.translatable("item.tiedup.shocker.hint")
.withStyle(ChatFormatting.DARK_GRAY)
.withStyle(ChatFormatting.ITALIC)
);

14
src/main/java/com/tiedup/remake/items/ItemTiedUpGuide.java
View File

@@ -1,6 +1,7 @@
package com.tiedup.remake.items;
import com.tiedup.remake.core.TiedUpMod;
import net.minecraft.ChatFormatting;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
@@ -38,9 +39,8 @@ public class ItemTiedUpGuide extends Item {
// Check if Patchouli is installed
if (!ModList.get().isLoaded("patchouli")) {
player.displayClientMessage(
Component.literal(
"§cPatchouli is not installed! Install it to use this guide."
),
Component.translatable("item.tiedup.guide.no_patchouli")
.withStyle(ChatFormatting.RED),
false
);
return InteractionResultHolder.fail(stack);
@@ -52,9 +52,8 @@ public class ItemTiedUpGuide extends Item {
);
if (guideBookItem == null) {
player.displayClientMessage(
Component.literal(
"§cFailed to find Patchouli guide_book item."
),
Component.translatable("item.tiedup.guide.book_not_found")
.withStyle(ChatFormatting.RED),
false
);
return InteractionResultHolder.fail(stack);
@@ -76,7 +75,8 @@ public class ItemTiedUpGuide extends Item {
stack.shrink(1);
player.displayClientMessage(
Component.literal("§aReceived TiedUp! Guide Book!"),
Component.translatable("item.tiedup.guide.received")
.withStyle(ChatFormatting.GREEN),
true
);
}

8
src/main/java/com/tiedup/remake/items/ItemToken.java
View File

@@ -39,25 +39,25 @@ public class ItemToken extends Item {
TooltipFlag flag
) {
tooltip.add(
Component.literal("Camp Access Token").withStyle(
Component.translatable("item.tiedup.token.title").withStyle(
ChatFormatting.GOLD,
ChatFormatting.BOLD
)
);
tooltip.add(Component.literal(""));
tooltip.add(
Component.literal("Kidnappers won't target you").withStyle(
Component.translatable("item.tiedup.token.effect_no_target").withStyle(
ChatFormatting.GREEN
)
);
tooltip.add(
Component.literal("Allows trading with Slave Traders").withStyle(
Component.translatable("item.tiedup.token.effect_trading").withStyle(
ChatFormatting.GREEN
)
);
tooltip.add(Component.literal(""));
tooltip.add(
Component.literal("Keep in your inventory for effect").withStyle(
Component.translatable("item.tiedup.token.hint").withStyle(
ChatFormatting.GRAY,
ChatFormatting.ITALIC
)

4
src/main/java/com/tiedup/remake/prison/service/PrisonerService.java
View File

@@ -893,8 +893,8 @@ public class PrisonerService {
) guardEntity.discard();
}
player.sendSystemMessage(
Component.literal(
"You have been returned to your cell."
Component.translatable(
"msg.tiedup.prison.returned_to_cell"
).withStyle(ChatFormatting.GRAY)
);
TiedUpMod.LOGGER.info(

9
src/main/java/com/tiedup/remake/tasks/ForceFeedingTask.java
View File

@@ -141,8 +141,8 @@ public class ForceFeedingTask extends TimedInteractTask {
if (feeder instanceof ServerPlayer serverFeeder) {
serverFeeder.displayClientMessage(
Component.literal(
"You force fed " + targetName + "."
Component.translatable(
"msg.tiedup.forcefeeding.you_fed", targetName
).withStyle(ChatFormatting.GRAY),
true
);
@@ -150,9 +150,8 @@ public class ForceFeedingTask extends TimedInteractTask {
if (targetEntity instanceof ServerPlayer serverTarget) {
serverTarget.displayClientMessage(
Component.literal("You have been force fed.").withStyle(
ChatFormatting.GRAY
),
Component.translatable("msg.tiedup.forcefeeding.been_fed")
.withStyle(ChatFormatting.GRAY),
true
);
}

4
src/main/java/com/tiedup/remake/util/RestraintApplicator.java
View File

@@ -96,8 +96,8 @@ public final class RestraintApplicator {
// Notify the prisoner
if (prisoner instanceof ServerPlayer serverPlayer) {
serverPlayer.sendSystemMessage(
Component.literal(
"Your restraints have been tightened!"
Component.translatable(
"msg.tiedup.restraint.tightened"
).withStyle(ChatFormatting.RED)
);
}

123
src/main/resources/assets/tiedup/lang/en_us.json
View File

@@ -263,6 +263,11 @@
"gui.tiedup.merchant.title": "Merchant Trading",
"gui.tiedup.merchant.buy": "Buy",
"gui.tiedup.merchant.your_gold": "Your Gold: ",
"gui.tiedup.merchant.gold_amount": "%sx ",
"gui.tiedup.merchant.gold_icon": "\u269c ",
"gui.tiedup.merchant.nugget_amount": "+ %sx ",
"gui.tiedup.merchant.nugget_icon": "\u2726",
"item.tiedup.clothes.tooltip.has_url": "Dynamic texture set",
"item.tiedup.clothes.tooltip.no_url": "No dynamic texture (use /tiedup clothes url set)",
@@ -297,6 +302,11 @@
"gui.tiedup.command_wand.relationship": "Relationship",
"gui.tiedup.command_wand.follow_distance.tooltip": "How closely the NPC follows. Click to cycle.",
"gui.tiedup.command_wand.follow_distance.current": "Current",
"gui.tiedup.command_wand.follow_distance.abbrev.heel": "H",
"gui.tiedup.command_wand.follow_distance.abbrev.close": "C",
"gui.tiedup.command_wand.follow_distance.abbrev.far": "F",
"gui.tiedup.command_wand.follow_distance.abbrev.unknown": "?",
"gui.tiedup.command_wand.percent": "%s%%",
"tiedup.follow_distance.far": "Far",
"tiedup.follow_distance.close": "Close",
"tiedup.follow_distance.heel": "Heel",
@@ -306,6 +316,7 @@
"gui.tiedup.npc_inventory": "NPC Inventory",
"gui.tiedup.npc_inventory.title": "Inventory",
"gui.tiedup.npc_inventory.title_name": "%s's Inventory",
"gui.tiedup.npc_inventory.take_all": "Take All",
"gui.tiedup.equipment": "Equipment",
"gui.tiedup.equipment.short": "Gear",
@@ -523,6 +534,12 @@
"gui.tiedup.adjustment.no_gag": "No gag equipped",
"gui.tiedup.adjustment.no_blindfold": "No blindfold equipped",
"gui.tiedup.adjustment.both": "Adjusting both items",
"gui.tiedup.adjustment.btn.reset": "0",
"gui.tiedup.adjustment.btn.decrement": "-0.25",
"gui.tiedup.adjustment.btn.increment": "+0.25",
"gui.tiedup.adjustment.btn.scale_reset": "1x",
"gui.tiedup.adjustment.btn.scale_decrement": "-0.1",
"gui.tiedup.adjustment.btn.scale_increment": "+0.1",
"gui.tiedup.continuous_struggle.label.resistance": "RESISTANCE:",
"gui.tiedup.continuous_struggle.status.shocked": "SHOCKED!",
@@ -560,6 +577,7 @@
"gui.tiedup.cell_manager.label.op_mode": "(OP Mode)",
"gui.tiedup.cell_manager.label.owner": "Owner: %s",
"gui.tiedup.cell_manager.label.empty": "(empty)",
"gui.tiedup.cell_manager.tree_prefix": " \u2514\u2500 ",
"gui.tiedup.cell_manager.status.rename_hint": "Press Enter to save, Escape to cancel",
"gui.tiedup.cell_manager.status.no_cells": "No cells created",
"gui.tiedup.cell_manager.status.use_cellwand": "Use CellWand to create cells",
@@ -651,6 +669,7 @@
"gui.tiedup.tab.lower": "Lower",
"gui.tiedup.tab.special": "Special",
"gui.tiedup.tab_bar": "Tab bar, active: %s",
"gui.tiedup.tab_bar.label": "Tab Bar",
"gui.tiedup.equip": "+ Equip",
"gui.tiedup.close_esc": "Close [ESC]",
"gui.tiedup.action.equip": "Equip",
@@ -689,6 +708,7 @@
"gui.tiedup.status.no_key": "No key",
"gui.tiedup.status.target_info": "Target: %s",
"gui.tiedup.status_bar": "Status bar",
"gui.tiedup.item_picker": "Item Picker",
"msg.tiedup.system.being_tied": "%1$s is tying you up!",
"msg.tiedup.system.tied_up": "%1$s tied you up, you can't move!",
@@ -998,5 +1018,106 @@
"msg.tiedup.network.at_location": " at ",
"item.tiedup.owner_target.owner": "Owner: ",
"item.tiedup.owner_target.unclaimed": "Unclaimed (%1$s)"
"item.tiedup.owner_target.unclaimed": "Unclaimed (%1$s)",
"item.tiedup.key.owner": "Owner: %1$s",
"item.tiedup.key.unclaimed": "Unclaimed (Right-click a collar wearer to claim)",
"item.tiedup.key.target": "Target: %1$s",
"item.tiedup.key.hint": "Right-click a collared player to toggle LOCK",
"item.tiedup.shocker.mode_broadcast": "MODE: BROADCAST",
"item.tiedup.shocker.broadcast_desc": "(Affects ALL your slaves in radius)",
"item.tiedup.shocker.mode_targeted": "MODE: TARGETED",
"item.tiedup.shocker.freed": " [FREED]",
"item.tiedup.shocker.no_target": " > No target connected",
"item.tiedup.shocker.radius": "Radius: %1$sm",
"item.tiedup.shocker.hint": "Shift + Right-click to toggle Broadcast mode",
"item.tiedup.rag.soaked": "Soaked with chloroform",
"item.tiedup.rag.evaporates": "Evaporates in: %1$ss",
"item.tiedup.rag.dry": "Dry - needs chloroform",
"item.tiedup.gps_locator.target": "Target: %1$s",
"item.tiedup.lockpick.uses": "Uses: %1$s/%2$s",
"item.tiedup.lockpick.chances_hint": "Success/break chances: Check server config",
"item.tiedup.lockpick.alert_prefix": "ALERT: ",
"item.tiedup.lockpick.alert_attempt": "%1$s tried to pick a lock!",
"item.tiedup.token.title": "Camp Access Token",
"item.tiedup.token.effect_no_target": "Kidnappers won't target you",
"item.tiedup.token.effect_trading": "Allows trading with Slave Traders",
"item.tiedup.token.hint": "Keep in your inventory for effect",
"item.tiedup.cell_key.desc": "Unlocks any Iron Bar Door",
"item.tiedup.cell_key.restriction": "Does not work on bondage items",
"item.tiedup.guide.no_patchouli": "Patchouli is not installed! Install it to use this guide.",
"item.tiedup.guide.book_not_found": "Failed to find Patchouli guide_book item.",
"item.tiedup.guide.received": "Received TiedUp! Guide Book!",
"item.tiedup.knife.cutting_speed": "Cutting speed: %1$s res/s",
"item.tiedup.knife.cutting_time": "Cutting time: %1$ss (%2$s total res)",
"block.tiedup.trap.armed": "Armed",
"block.tiedup.trap.disarmed": "Disarmed",
"block.tiedup.kidnap_bomb.loaded": "Loaded:",
"block.tiedup.kidnap_bomb.empty": "Empty",
"msg.tiedup.bounty.broadcast": "[Bounty] %1$s",
"msg.tiedup.prison.returned_to_cell": "You have been returned to your cell.",
"msg.tiedup.forcefeeding.you_fed": "You force fed %1$s.",
"msg.tiedup.forcefeeding.been_fed": "You have been force fed.",
"msg.tiedup.restraint.tightened": "Your restraints have been tightened!",
"msg.tiedup.camp.captor_died": "Your captor has died. You are FREE!",
"msg.tiedup.camp.grace_period": "You have 5 minutes of protection from kidnappers.",
"msg.tiedup.petplay.cannot_eat_hand": "You cannot eat from your hand! Use a bowl.",
"msg.tiedup.petplay.cannot_sleep_bed": "You cannot sleep in a bed! Use your pet bed.",
"msg.tiedup.petplay.sleep_time_only": "You can only sleep at night or during thunderstorms.",
"msg.tiedup.petplay.curl_up_bed": "You curl up in your pet bed...",
"entity.tiedup.maid.died_work_paused": "The maid has died. Work is paused. A replacement will arrive in 5 minutes.",
"entity.tiedup.maid.manual_assign": "The maid manually assigns you to: %1$s",
"entity.tiedup.maid.collect_shortly": "A Maid will come to collect you shortly.",
"entity.tiedup.maid.labor_status_header": "=== Labor Status ===",
"entity.tiedup.maid.labor_status_state": "State: %1$s",
"entity.tiedup.maid.labor_status_task": "Task: %1$s",
"entity.tiedup.maid.labor_status_progress": "Progress: %1$s/%2$s",
"entity.tiedup.maid.labor_status_debt": "Remaining debt: %1$s emeralds",
"entity.tiedup.maid.labor_hint_start_task": "Shift+Right-Click to manually start task",
"entity.tiedup.maid.labor_hint_turn_in": "Shift+Right-Click to manually turn in task",
"entity.tiedup.master.caught_escaping": "%1$s caught you trying to escape!",
"entity.tiedup.master.pet_freed": "You are free! Your master %1$s is gone.",
"entity.tiedup.trader.no_token_warning": "You don't have a trader token. Leave now, or I'll make you leave.",
"entity.tiedup.trader.camp_destroyed": "A slave trader camp has been destroyed!",
"entity.tiedup.guard.attack_punished": "Attacking your guard is punished!",
"entity.tiedup.guard.eliminated_free": "Your guard has been eliminated! You are free!",
"entity.tiedup.damsel.needs_collar_to_feed": "This NPC needs a collar before you can feed them.",
"entity.tiedup.damsel.not_collar_owner": "You don't own this NPC's collar.",
"entity.tiedup.damsel.cant_eat_now": "This NPC can't eat that right now.",
"entity.tiedup.trade.price_both": "%1$s gold + %2$s nuggets",
"entity.tiedup.trade.price_gold": "%1$s gold",
"entity.tiedup.trade.price_nuggets": "%1$s nuggets",
"entity.tiedup.trade.price_free": "Free",
"entity.tiedup.pet.too_far_to_talk": "You are too far from your Master to talk.",
"entity.tiedup.pet.too_far_from_master": "You are too far from your Master.",
"entity.tiedup.pet.you_say": "You: %1$s",
"goal.tiedup.trader_sell.greeting": "[%1$s] %2$s",
"goal.tiedup.trader_sell.browse_hint": "Right-click me to browse my stock.",
"goal.tiedup.guard_monitor.too_far": "You are too far from your guard! Return within 15 seconds or escape will be triggered!",
"goal.tiedup.guard_monitor.returned": "You returned to your guard. Stay close!",
"goal.tiedup.maid_deliver.on_leash": "%1$s is now on your leash.",
"goal.tiedup.maid_deliver.delivered": "%1$s has been delivered to you.",
"goal.tiedup.guard_command.chasing": "%1$s is chasing %2$s!",
"goal.tiedup.guard_command.spotted": "%1$s spotted: %2$s!",
"goal.tiedup.maid_extract.extracted": "You have been extracted for labor. Complete your task: %1$s",
"goal.tiedup.master_watch.time_remaining": "%1$s - %2$ss remaining",
"goal.tiedup.master_watch.speak_waiting": "%1$s: \"I'm waiting...\"",
"goal.tiedup.master_watch.demand_warning": "%1$s: \"%2$s\"",
"goal.tiedup.master_watch.punishment": "%1$s: \"%2$s\"",
"goal.tiedup.master_inspect.confiscated": "%1$s confiscated %2$s contraband item(s) from you!",
"goal.tiedup.master_inspect.inspecting": "%1$s is inspecting your inventory...",
"goal.tiedup.master_assign.task_speech": "%1$s: \"%2$s\"",
"goal.tiedup.maid_idle.task_complete": "Task complete! Walk back to camp.",
"goal.tiedup.maid_idle.task_failed": "Task failed due to inactivity! You will be returned to your cell.",
"goal.tiedup.maid_idle.inactivity_warning": "Warning: Work or face punishment! (%1$s/3)",
"goal.tiedup.maid_assign.task_assigned": "Task assigned: %1$s",
"goal.tiedup.maid_assign.task_reward": "Reward: %1$s emeralds toward your debt.",
"goal.tiedup.maid.debt_paid_free": "Your debt is paid. You are FREE!",
"goal.tiedup.maid_init.imprisoned": "You have been imprisoned. Your debt: %1$s emeralds.",
"goal.tiedup.maid_init.confiscated": "Your valuables have been confiscated.",
"goal.tiedup.kidnapper_decide.still_tied": "You're still tied up - struggle to break free!",
"goal.tiedup.kidnapper_sale.tag": "[SALE] ",
"goal.tiedup.kidnapper_sale.is_selling": " is selling ",
"goal.tiedup.kidnapper_sale.for": " for ",
"goal.tiedup.kidnapper_sale.at": " at "
}