V1 fallback: if no V2 GLB model is found, falls back to JSON-based + *
Legacy fallback: if no GLB model is found, falls back to JSON-based
* PlayerAnimator animations via {@link BondageAnimationManager}.
*/
private static void updateNpcAnimation(AbstractTiedUpNpc entity) {
@@ -120,7 +120,7 @@ public class NpcAnimationTickHandler {
);
lastNpcAnimId.remove(uuid);
} else {
- // V1 fallback: JSON-based PlayerAnimator animations
+ // Legacy fallback: JSON-based PlayerAnimator animations
if (GltfAnimationApplier.hasActiveState(entity)) {
GltfAnimationApplier.clearV2Animation(entity);
}
@@ -148,7 +148,7 @@ public class NpcAnimationTickHandler {
}
/**
- * Build animation ID for an NPC from its current state (V1 path).
+ * Build animation ID for an NPC from its current state (legacy JSON path).
*/
private static String buildNpcAnimationId(AbstractTiedUpNpc entity) {
// Determine position prefix for SIT/KNEEL poses
@@ -175,7 +175,7 @@ public class NpcAnimationTickHandler {
BodyRegionV2.LEGS
);
- // V1 fallback: if no V2 regions set but NPC has a bind, derive from bind mode NBT
+ // Legacy fallback: if no V2 regions set but NPC has a bind, derive from bind mode NBT
if (!armsBound && !legsBound && BindModeHelper.isBindItem(bind)) {
armsBound = BindModeHelper.hasArmsBound(bind);
legsBound = BindModeHelper.hasLegsBound(bind);
diff --git a/src/main/java/com/tiedup/remake/client/gui/screens/BaseAdjustmentScreen.java b/src/main/java/com/tiedup/remake/client/gui/screens/BaseAdjustmentScreen.java
index b525565..e89fb6a 100644
--- a/src/main/java/com/tiedup/remake/client/gui/screens/BaseAdjustmentScreen.java
+++ b/src/main/java/com/tiedup/remake/client/gui/screens/BaseAdjustmentScreen.java
@@ -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(
diff --git a/src/main/java/com/tiedup/remake/client/gui/screens/CellManagerScreen.java b/src/main/java/com/tiedup/remake/client/gui/screens/CellManagerScreen.java
index acef816..3a5f683 100644
--- a/src/main/java/com/tiedup/remake/client/gui/screens/CellManagerScreen.java
+++ b/src/main/java/com/tiedup/remake/client/gui/screens/CellManagerScreen.java
@@ -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"
diff --git a/src/main/java/com/tiedup/remake/client/gui/screens/CommandWandScreen.java b/src/main/java/com/tiedup/remake/client/gui/screens/CommandWandScreen.java
index 49ba2d6..1011e72 100644
--- a/src/main/java/com/tiedup/remake/client/gui/screens/CommandWandScreen.java
+++ b/src/main/java/com/tiedup/remake/client/gui/screens/CommandWandScreen.java
@@ -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
);
diff --git a/src/main/java/com/tiedup/remake/client/gui/screens/MerchantTradingScreen.java b/src/main/java/com/tiedup/remake/client/gui/screens/MerchantTradingScreen.java
index b34aed9..0bf3ada 100644
--- a/src/main/java/com/tiedup/remake/client/gui/screens/MerchantTradingScreen.java
+++ b/src/main/java/com/tiedup/remake/client/gui/screens/MerchantTradingScreen.java
@@ -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)
)
);
diff --git a/src/main/java/com/tiedup/remake/client/gui/screens/NpcInventoryScreen.java b/src/main/java/com/tiedup/remake/client/gui/screens/NpcInventoryScreen.java
index b3d8e4f..c97ae37 100644
--- a/src/main/java/com/tiedup/remake/client/gui/screens/NpcInventoryScreen.java
+++ b/src/main/java/com/tiedup/remake/client/gui/screens/NpcInventoryScreen.java
@@ -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;
diff --git a/src/main/java/com/tiedup/remake/client/gui/widgets/ActionPanel.java b/src/main/java/com/tiedup/remake/client/gui/widgets/ActionPanel.java
index 72fe69a..cb15187 100644
--- a/src/main/java/com/tiedup/remake/client/gui/widgets/ActionPanel.java
+++ b/src/main/java/com/tiedup/remake/client/gui/widgets/ActionPanel.java
@@ -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) {
diff --git a/src/main/java/com/tiedup/remake/client/gui/widgets/ItemPickerOverlay.java b/src/main/java/com/tiedup/remake/client/gui/widgets/ItemPickerOverlay.java
index 833b3c8..9681da4 100644
--- a/src/main/java/com/tiedup/remake/client/gui/widgets/ItemPickerOverlay.java
+++ b/src/main/java/com/tiedup/remake/client/gui/widgets/ItemPickerOverlay.java
@@ -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;
}
diff --git a/src/main/java/com/tiedup/remake/client/gui/widgets/RegionTabBar.java b/src/main/java/com/tiedup/remake/client/gui/widgets/RegionTabBar.java
index 4da5b23..8819681 100644
--- a/src/main/java/com/tiedup/remake/client/gui/widgets/RegionTabBar.java
+++ b/src/main/java/com/tiedup/remake/client/gui/widgets/RegionTabBar.java
@@ -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 BUG-003 fix: Previously, {@code IHasResistance.getBaseResistance()}
* called {@code ModGameRules.getResistance()} which only knew 4 types (rope, gag,
* blindfold, collar) and returned hardcoded 100 for the other 10 types. Meanwhile
- * the old BindVariant.getResistance() read from ModConfig which had all 14 types.
+ * the old {@code BindVariant.getResistance()} (now removed) read from ModConfig which had all 14 types.
* This caused a display-vs-struggle desync (display: 250, struggle: 100).
* Now both paths use this method.
*
diff --git a/src/main/java/com/tiedup/remake/dialogue/conversation/PetRequestManager.java b/src/main/java/com/tiedup/remake/dialogue/conversation/PetRequestManager.java
index ba9dd8b..49b0ac8 100644
--- a/src/main/java/com/tiedup/remake/dialogue/conversation/PetRequestManager.java
+++ b/src/main/java/com/tiedup/remake/dialogue/conversation/PetRequestManager.java
@@ -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
diff --git a/src/main/java/com/tiedup/remake/entities/EntityDamsel.java b/src/main/java/com/tiedup/remake/entities/EntityDamsel.java
index 7cda2a3..ec80697 100644
--- a/src/main/java/com/tiedup/remake/entities/EntityDamsel.java
+++ b/src/main/java/com/tiedup/remake/entities/EntityDamsel.java
@@ -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
);
diff --git a/src/main/java/com/tiedup/remake/entities/EntityLaborGuard.java b/src/main/java/com/tiedup/remake/entities/EntityLaborGuard.java
index 3cbffaf..e85f8ab 100644
--- a/src/main/java/com/tiedup/remake/entities/EntityLaborGuard.java
+++ b/src/main/java/com/tiedup/remake/entities/EntityLaborGuard.java
@@ -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)
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/EntityMaid.java b/src/main/java/com/tiedup/remake/entities/EntityMaid.java
index e467321..a4b02a6 100644
--- a/src/main/java/com/tiedup/remake/entities/EntityMaid.java
+++ b/src/main/java/com/tiedup/remake/entities/EntityMaid.java
@@ -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)
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/EntityMaster.java b/src/main/java/com/tiedup/remake/entities/EntityMaster.java
index aaa9be8..c419c0f 100644
--- a/src/main/java/com/tiedup/remake/entities/EntityMaster.java
+++ b/src/main/java/com/tiedup/remake/entities/EntityMaster.java
@@ -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))
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/EntitySlaveTrader.java b/src/main/java/com/tiedup/remake/entities/EntitySlaveTrader.java
index 7e57e97..356c3b1 100644
--- a/src/main/java/com/tiedup/remake/entities/EntitySlaveTrader.java
+++ b/src/main/java/com/tiedup/remake/entities/EntitySlaveTrader.java
@@ -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
diff --git a/src/main/java/com/tiedup/remake/entities/MerchantTrade.java b/src/main/java/com/tiedup/remake/entities/MerchantTrade.java
index d8c93aa..9f55c23 100644
--- a/src/main/java/com/tiedup/remake/entities/MerchantTrade.java
+++ b/src/main/java/com/tiedup/remake/entities/MerchantTrade.java
@@ -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");
}
}
diff --git a/src/main/java/com/tiedup/remake/entities/ai/guard/GuardMonitorGoal.java b/src/main/java/com/tiedup/remake/entities/ai/guard/GuardMonitorGoal.java
index b70d948..3895c3e 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/guard/GuardMonitorGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/guard/GuardMonitorGoal.java
@@ -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)
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperDecideNextActionGoal.java b/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperDecideNextActionGoal.java
index bd5710c..f94e981 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperDecideNextActionGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperDecideNextActionGoal.java
@@ -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)
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperWaitForBuyerGoal.java b/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperWaitForBuyerGoal.java
index 691890e..97f892e 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperWaitForBuyerGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/kidnapper/KidnapperWaitForBuyerGoal.java
@@ -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)
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/maid/MaidDeliverCaptiveGoal.java b/src/main/java/com/tiedup/remake/entities/ai/maid/MaidDeliverCaptiveGoal.java
index 8b8aabd..ea028be 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/maid/MaidDeliverCaptiveGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/maid/MaidDeliverCaptiveGoal.java
@@ -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)
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidAssignTaskGoal.java b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidAssignTaskGoal.java
index 15e6ae7..e245de4 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidAssignTaskGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidAssignTaskGoal.java
@@ -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
diff --git a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidExtractGoal.java b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidExtractGoal.java
index 43cd3ec..77ac763 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidExtractGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidExtractGoal.java
@@ -346,9 +346,9 @@ 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: " +
- task.getDescription()
+ net.minecraft.network.chat.Component.translatable(
+ "goal.tiedup.maid_extract.extracted",
+ task.getDescription()
).withStyle(net.minecraft.ChatFormatting.YELLOW)
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidIdleGoal.java b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidIdleGoal.java
index d85d8ab..2f7bb47 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidIdleGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidIdleGoal.java
@@ -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)
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidInitPrisonerGoal.java b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidInitPrisonerGoal.java
index d44fb1c..8a62220 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidInitPrisonerGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidInitPrisonerGoal.java
@@ -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.",
- totalRansom
- )
+ 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)
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidReturnGoal.java b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidReturnGoal.java
index 6128d5e..1feaa14 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidReturnGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/maid/goals/MaidReturnGoal.java
@@ -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
diff --git a/src/main/java/com/tiedup/remake/entities/ai/master/MasterInventoryInspectGoal.java b/src/main/java/com/tiedup/remake/entities/ai/master/MasterInventoryInspectGoal.java
index 4f8e6df..b2304d8 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterInventoryInspectGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterInventoryInspectGoal.java
@@ -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))
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java b/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java
index 33f6a91..351dd9b 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskAssignGoal.java
@@ -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))
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java b/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java
index 9931feb..239f48c 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/master/MasterTaskWatchGoal.java
@@ -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))
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/personality/NpcGuardCommandGoal.java b/src/main/java/com/tiedup/remake/entities/ai/personality/NpcGuardCommandGoal.java
index 1f1f632..9dd3acb 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/personality/NpcGuardCommandGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/personality/NpcGuardCommandGoal.java
@@ -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
);
diff --git a/src/main/java/com/tiedup/remake/entities/ai/trader/goals/TraderSellGoal.java b/src/main/java/com/tiedup/remake/entities/ai/trader/goals/TraderSellGoal.java
index 20dd780..dc0332a 100644
--- a/src/main/java/com/tiedup/remake/entities/ai/trader/goals/TraderSellGoal.java
+++ b/src/main/java/com/tiedup/remake/entities/ai/trader/goals/TraderSellGoal.java
@@ -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
)
);
diff --git a/src/main/java/com/tiedup/remake/entities/maid/components/MaidPrisonInteraction.java b/src/main/java/com/tiedup/remake/entities/maid/components/MaidPrisonInteraction.java
index 36a4ccb..3d0c94d 100644
--- a/src/main/java/com/tiedup/remake/entities/maid/components/MaidPrisonInteraction.java
+++ b/src/main/java/com/tiedup/remake/entities/maid/components/MaidPrisonInteraction.java
@@ -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)
);
}
diff --git a/src/main/java/com/tiedup/remake/entities/master/components/MasterPetManager.java b/src/main/java/com/tiedup/remake/entities/master/components/MasterPetManager.java
index 9fb7325..20859a0 100644
--- a/src/main/java/com/tiedup/remake/entities/master/components/MasterPetManager.java
+++ b/src/main/java/com/tiedup/remake/entities/master/components/MasterPetManager.java
@@ -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))
);
}
diff --git a/src/main/java/com/tiedup/remake/events/camp/CampChestHandler.java b/src/main/java/com/tiedup/remake/events/camp/CampChestHandler.java
index fd57829..0eb6082 100644
--- a/src/main/java/com/tiedup/remake/events/camp/CampChestHandler.java
+++ b/src/main/java/com/tiedup/remake/events/camp/CampChestHandler.java
@@ -89,8 +89,8 @@ public class CampChestHandler {
if (entity instanceof Player player) {
player.displayClientMessage(
- Component.literal(
- "This chest is locked by the camp!"
+ Component.translatable(
+ "msg.tiedup.event.chest_locked_by_camp"
).withStyle(ChatFormatting.RED),
true
);
diff --git a/src/main/java/com/tiedup/remake/events/camp/CampManagementHandler.java b/src/main/java/com/tiedup/remake/events/camp/CampManagementHandler.java
index b6f550b..b2560b2 100644
--- a/src/main/java/com/tiedup/remake/events/camp/CampManagementHandler.java
+++ b/src/main/java/com/tiedup/remake/events/camp/CampManagementHandler.java
@@ -286,10 +286,9 @@ public class CampManagementHandler {
.getPlayer(prisonerId);
if (player != null) {
player.sendSystemMessage(
- Component.literal(
- "A new maid, " +
- maidName +
- ", has arrived. Work resumes."
+ Component.translatable(
+ "msg.tiedup.event.new_maid_arrived",
+ maidName
).withStyle(ChatFormatting.GOLD)
);
}
diff --git a/src/main/java/com/tiedup/remake/events/camp/CampNpcProtectionHandler.java b/src/main/java/com/tiedup/remake/events/camp/CampNpcProtectionHandler.java
index 9162606..b498f87 100644
--- a/src/main/java/com/tiedup/remake/events/camp/CampNpcProtectionHandler.java
+++ b/src/main/java/com/tiedup/remake/events/camp/CampNpcProtectionHandler.java
@@ -75,10 +75,10 @@ public class CampNpcProtectionHandler {
// Send warning message to player
player.sendSystemMessage(
- Component.literal(
+ Component.translatable(
isTrader
- ? "The camp defends their leader! You are now under attack!"
- : "The camp defends their servant! You are now under attack!"
+ ? "msg.tiedup.event.camp_defends_trader"
+ : "msg.tiedup.event.camp_defends_maid"
).withStyle(ChatFormatting.RED, ChatFormatting.BOLD)
);
}
diff --git a/src/main/java/com/tiedup/remake/events/combat/GraceEventHandler.java b/src/main/java/com/tiedup/remake/events/combat/GraceEventHandler.java
index 4a9879f..09021e9 100644
--- a/src/main/java/com/tiedup/remake/events/combat/GraceEventHandler.java
+++ b/src/main/java/com/tiedup/remake/events/combat/GraceEventHandler.java
@@ -48,8 +48,8 @@ public class GraceEventHandler {
record.setProtectionExpiry(0);
player.displayClientMessage(
- Component.literal(
- "You attacked a kidnapper - protection lost!"
+ Component.translatable(
+ "msg.tiedup.event.grace_lost"
).withStyle(ChatFormatting.RED),
true
);
diff --git a/src/main/java/com/tiedup/remake/events/combat/LaborAttackPunishmentHandler.java b/src/main/java/com/tiedup/remake/events/combat/LaborAttackPunishmentHandler.java
index 9363db1..468932c 100644
--- a/src/main/java/com/tiedup/remake/events/combat/LaborAttackPunishmentHandler.java
+++ b/src/main/java/com/tiedup/remake/events/combat/LaborAttackPunishmentHandler.java
@@ -209,12 +209,10 @@ public class LaborAttackPunishmentHandler {
manager.increaseDebt(prisoner.getUUID(), DEBT_INCREASE_PER_ATTACK);
prisoner.sendSystemMessage(
- Component.literal(
- String.format(
- "Your debt has increased by %d emeralds for attacking %s!",
- DEBT_INCREASE_PER_ATTACK,
- targetName
- )
+ Component.translatable(
+ "msg.tiedup.event.debt_increased",
+ DEBT_INCREASE_PER_ATTACK,
+ targetName
).withStyle(ChatFormatting.RED, ChatFormatting.BOLD)
);
}
@@ -282,8 +280,8 @@ public class LaborAttackPunishmentHandler {
// 4. Warning message
prisoner.sendSystemMessage(
- Component.literal(
- "Your task has been marked as failed. You will not be paid for your work."
+ Component.translatable(
+ "msg.tiedup.event.task_failed"
).withStyle(ChatFormatting.DARK_RED)
);
@@ -315,8 +313,8 @@ public class LaborAttackPunishmentHandler {
laborRecord.setEscortMaidId(null);
prisoner.sendSystemMessage(
- Component.literal(
- "You have been returned to your cell for your insolence!"
+ Component.translatable(
+ "msg.tiedup.event.returned_to_cell"
).withStyle(ChatFormatting.RED, ChatFormatting.BOLD)
);
diff --git a/src/main/java/com/tiedup/remake/events/lifecycle/PlayerStateEventHandler.java b/src/main/java/com/tiedup/remake/events/lifecycle/PlayerStateEventHandler.java
index 8117699..66451ca 100644
--- a/src/main/java/com/tiedup/remake/events/lifecycle/PlayerStateEventHandler.java
+++ b/src/main/java/com/tiedup/remake/events/lifecycle/PlayerStateEventHandler.java
@@ -363,8 +363,8 @@ public class PlayerStateEventHandler {
// Send death escape message if applicable
if (pendingDeathEscapeMessage.remove(player.getUUID())) {
player.sendSystemMessage(
- net.minecraft.network.chat.Component.literal(
- "You died and escaped captivity. Your items remain in the camp chest."
+ net.minecraft.network.chat.Component.translatable(
+ "msg.tiedup.event.death_escape"
).withStyle(net.minecraft.ChatFormatting.YELLOW)
);
}
diff --git a/src/main/java/com/tiedup/remake/events/restriction/BondageItemRestrictionHandler.java b/src/main/java/com/tiedup/remake/events/restriction/BondageItemRestrictionHandler.java
index a4b404b..7e28925 100644
--- a/src/main/java/com/tiedup/remake/events/restriction/BondageItemRestrictionHandler.java
+++ b/src/main/java/com/tiedup/remake/events/restriction/BondageItemRestrictionHandler.java
@@ -473,7 +473,7 @@ public class BondageItemRestrictionHandler {
if (state != null && state.isGagged()) {
event.setCanceled(true);
player.displayClientMessage(
- Component.literal("You can't eat with a gag on.").withStyle(
+ Component.translatable("msg.tiedup.event.cant_eat_gagged").withStyle(
ChatFormatting.RED
),
true
diff --git a/src/main/java/com/tiedup/remake/events/restriction/LaborToolProtectionHandler.java b/src/main/java/com/tiedup/remake/events/restriction/LaborToolProtectionHandler.java
index baffc57..048d001 100644
--- a/src/main/java/com/tiedup/remake/events/restriction/LaborToolProtectionHandler.java
+++ b/src/main/java/com/tiedup/remake/events/restriction/LaborToolProtectionHandler.java
@@ -79,7 +79,7 @@ public class LaborToolProtectionHandler {
);
} else {
player.displayClientMessage(
- Component.literal("You cannot drop labor tools!"),
+ Component.translatable("msg.tiedup.event.cant_drop_labor_tools"),
true
);
}
@@ -124,7 +124,7 @@ public class LaborToolProtectionHandler {
);
} else {
player.displayClientMessage(
- Component.literal("You cannot store labor tools!"),
+ Component.translatable("msg.tiedup.event.cant_store_labor_tools"),
true
);
}
diff --git a/src/main/java/com/tiedup/remake/events/restriction/PetPlayRestrictionHandler.java b/src/main/java/com/tiedup/remake/events/restriction/PetPlayRestrictionHandler.java
index 6d38333..fab3189 100644
--- a/src/main/java/com/tiedup/remake/events/restriction/PetPlayRestrictionHandler.java
+++ b/src/main/java/com/tiedup/remake/events/restriction/PetPlayRestrictionHandler.java
@@ -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)
)
);
diff --git a/src/main/java/com/tiedup/remake/events/system/ChatEventHandler.java b/src/main/java/com/tiedup/remake/events/system/ChatEventHandler.java
index 411e808..b6c066d 100644
--- a/src/main/java/com/tiedup/remake/events/system/ChatEventHandler.java
+++ b/src/main/java/com/tiedup/remake/events/system/ChatEventHandler.java
@@ -63,7 +63,7 @@ public class ChatEventHandler {
if (!gagStack.isEmpty() && isGagItem) {
String originalMessage = event.getRawText();
- // V2: get material from component, V1 fallback: from ItemGag
+ // V2: get material from GaggingComponent
GagMaterial material = null;
if (gaggingComp != null) {
material = gaggingComp.getMaterial();
diff --git a/src/main/java/com/tiedup/remake/items/GenericKnife.java b/src/main/java/com/tiedup/remake/items/GenericKnife.java
index 6fc83fb..1012102 100644
--- a/src/main/java/com/tiedup/remake/items/GenericKnife.java
+++ b/src/main/java/com/tiedup/remake/items/GenericKnife.java
@@ -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)
);
}
diff --git a/src/main/java/com/tiedup/remake/items/ItemCellKey.java b/src/main/java/com/tiedup/remake/items/ItemCellKey.java
index 7e6157b..1e6f6a2 100644
--- a/src/main/java/com/tiedup/remake/items/ItemCellKey.java
+++ b/src/main/java/com/tiedup/remake/items/ItemCellKey.java
@@ -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
)
);
diff --git a/src/main/java/com/tiedup/remake/items/ItemGpsLocator.java b/src/main/java/com/tiedup/remake/items/ItemGpsLocator.java
index 85ef45a..ac885ba 100644
--- a/src/main/java/com/tiedup/remake/items/ItemGpsLocator.java
+++ b/src/main/java/com/tiedup/remake/items/ItemGpsLocator.java
@@ -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
- )
- )
);
}
}
diff --git a/src/main/java/com/tiedup/remake/items/ItemKey.java b/src/main/java/com/tiedup/remake/items/ItemKey.java
index bbebb14..aa49de3 100644
--- a/src/main/java/com/tiedup/remake/items/ItemKey.java
+++ b/src/main/java/com/tiedup/remake/items/ItemKey.java
@@ -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)
);
diff --git a/src/main/java/com/tiedup/remake/items/ItemLockpick.java b/src/main/java/com/tiedup/remake/items/ItemLockpick.java
index a3b44db..e7c7d62 100644
--- a/src/main/java/com/tiedup/remake/items/ItemLockpick.java
+++ b/src/main/java/com/tiedup/remake/items/ItemLockpick.java
@@ -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)
);
diff --git a/src/main/java/com/tiedup/remake/items/ItemRag.java b/src/main/java/com/tiedup/remake/items/ItemRag.java
index c419ef5..0ceb94b 100644
--- a/src/main/java/com/tiedup/remake/items/ItemRag.java
+++ b/src/main/java/com/tiedup/remake/items/ItemRag.java
@@ -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)
);
}
}
diff --git a/src/main/java/com/tiedup/remake/items/ItemShockerController.java b/src/main/java/com/tiedup/remake/items/ItemShockerController.java
index 9678ebd..b373cf6 100644
--- a/src/main/java/com/tiedup/remake/items/ItemShockerController.java
+++ b/src/main/java/com/tiedup/remake/items/ItemShockerController.java
@@ -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)
);
diff --git a/src/main/java/com/tiedup/remake/items/ItemTiedUpGuide.java b/src/main/java/com/tiedup/remake/items/ItemTiedUpGuide.java
index 245b920..e7c18c8 100644
--- a/src/main/java/com/tiedup/remake/items/ItemTiedUpGuide.java
+++ b/src/main/java/com/tiedup/remake/items/ItemTiedUpGuide.java
@@ -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
);
}
diff --git a/src/main/java/com/tiedup/remake/items/ItemToken.java b/src/main/java/com/tiedup/remake/items/ItemToken.java
index 2219cd0..eb55bff 100644
--- a/src/main/java/com/tiedup/remake/items/ItemToken.java
+++ b/src/main/java/com/tiedup/remake/items/ItemToken.java
@@ -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
)
diff --git a/src/main/java/com/tiedup/remake/items/base/ItemOwnerTarget.java b/src/main/java/com/tiedup/remake/items/base/ItemOwnerTarget.java
index b368982..7f4b508 100644
--- a/src/main/java/com/tiedup/remake/items/base/ItemOwnerTarget.java
+++ b/src/main/java/com/tiedup/remake/items/base/ItemOwnerTarget.java
@@ -157,7 +157,7 @@ public abstract class ItemOwnerTarget extends Item {
) {
if (hasOwner(stack)) {
tooltip.add(
- Component.literal("Owner: ")
+ Component.translatable("item.tiedup.owner_target.owner")
.withStyle(ChatFormatting.GOLD)
.append(
Component.literal(getOwnerName(stack)).withStyle(
@@ -167,8 +167,8 @@ public abstract class ItemOwnerTarget extends Item {
);
} else {
tooltip.add(
- Component.literal(
- "Unclaimed (" + unclaimedHint + ")"
+ Component.translatable(
+ "item.tiedup.owner_target.unclaimed", unclaimedHint
).withStyle(ChatFormatting.GRAY)
);
}
diff --git a/src/main/java/com/tiedup/remake/items/bondage3d/IHas3DModelConfig.java b/src/main/java/com/tiedup/remake/items/bondage3d/IHas3DModelConfig.java
deleted file mode 100644
index 2870d57..0000000
--- a/src/main/java/com/tiedup/remake/items/bondage3d/IHas3DModelConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.tiedup.remake.items.bondage3d;
-
-/**
- * Interface for items that have a 3D model configuration.
- * Implement this to provide custom position, scale, and rotation for 3D rendering.
- */
-public interface IHas3DModelConfig {
- /**
- * Get the 3D model configuration for rendering.
- * @return The Model3DConfig with position, scale, and rotation offsets
- */
- Model3DConfig getModelConfig();
-}
diff --git a/src/main/java/com/tiedup/remake/items/bondage3d/Model3DConfig.java b/src/main/java/com/tiedup/remake/items/bondage3d/Model3DConfig.java
deleted file mode 100644
index 791ed39..0000000
--- a/src/main/java/com/tiedup/remake/items/bondage3d/Model3DConfig.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.tiedup.remake.items.bondage3d;
-
-import java.util.Set;
-
-/**
- * Configuration immutable for a 3D item.
- * Contains all parameters necessary for rendering.
- */
-public record Model3DConfig(
- String objPath, // "tiedup:models/obj/ball_gag/model.obj"
- String texturePath, // "tiedup:models/obj/ball_gag/texture.png" (or null = use MTL)
- float posOffsetX, // Horizontal offset
- float posOffsetY, // Vertical offset (negative = lower)
- float posOffsetZ, // Depth offset (positive = forward)
- float scale, // Scale (1.0 = normal size)
- float rotOffsetX, // Additional X rotation
- float rotOffsetY, // Additional Y rotation
- float rotOffsetZ, // Additional Z rotation
- Set INTENTIONALLY bypasses V2EquipmentManager.tryEquip() because all callers
+ * (commands, NPC AI, NBT restore) are force-equip paths that should not be subject
+ * to V2 conflict resolution (SMELL-003 reviewed — bypass is by design).
+ * Basic safety (isRegionOccupied, canEquip) is still checked here. V2 items read from the data-driven definition's {@code pose_type} field.
- * V1 items fall back to {@code ItemBind.getPoseType()}. Reads from the data-driven definition's {@code pose_type} field,
+ * falling back to {@link PoseType#STANDARD} if absent. Extracted from {@code ItemBind.interactLivingEntity()} to support
- * the same tying task flow for data-driven items. Originally extracted from the former {@code ItemBind.interactLivingEntity()},
+ * now the canonical tying flow for all data-driven ARMS items. The winning item's {@link MovementModifier} (if present) overrides the style's
* default speed/jump values. Modifiers from lower-severity items are ignored. V1 items (ItemBind) stored in V2 capability
- * do not have data-driven definitions. This resolver provides a fallback that
- * maps V1 bind mode + pose type to a {@link MovementStyle} with speed values matching
- * the original V1 behavior, preventing double stacking between the legacy
- * {@code RestraintEffectUtils} attribute modifier and the V2 modifier. Checks V2 data-driven definitions first, then falls back to V1 {@link ItemBind}
- * introspection for items without data-driven definitions. Uses V2 data-driven definitions to determine movement style. Only items with legs bound produce a movement style. The mapping preserves
- * the original V1 speed values:V1 Compatibility (H6 fix)
- *
- *
- *
- * @param stack the ItemStack to inspect
- * @return fallback resolution, or null if the item is not a V1 bind or legs are not bound
- */
- @Nullable
- private static V1Fallback resolveV1Fallback(ItemStack stack) {
- if (!BindModeHelper.isBindItem(stack)) {
- return null;
- }
-
- if (!BindModeHelper.hasLegsBound(stack)) {
- return null;
- }
-
- PoseType poseType = PoseTypeHelper.getPoseType(stack);
-
- return switch (poseType) {
- case WRAP, LATEX_SACK -> new V1Fallback(
- MovementStyle.SHUFFLE,
- V1_IMMOBILIZED_SPEED,
- true
- );
- case DOG, HUMAN_CHAIR -> new V1Fallback(
- MovementStyle.CRAWL,
- V1_STANDARD_SPEED,
- true
- );
- default ->
- // STANDARD, STRAITJACKET: shuffle at V1 standard speed
- new V1Fallback(MovementStyle.SHUFFLE, V1_STANDARD_SPEED, true);
- };
- }
-
- /** Internal holder for V1 fallback resolution result. */
- private record V1Fallback(
- MovementStyle style,
- float speed,
- boolean jumpDisabled
- ) {}
}
diff --git a/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfLock.java b/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfLock.java
index c59ee11..b9cdfd7 100644
--- a/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfLock.java
+++ b/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfLock.java
@@ -41,9 +41,10 @@ public class PacketV2SelfLock {
if (player == null) return;
if (!PacketRateLimiter.allowPacket(player, "action")) return;
- // Arms must be free to self-lock
+ // Arms and hands must be free to self-lock (RISK-006: mittens bypass)
if (
- V2EquipmentHelper.isRegionOccupied(player, BodyRegionV2.ARMS)
+ V2EquipmentHelper.isRegionOccupied(player, BodyRegionV2.ARMS) ||
+ V2EquipmentHelper.isRegionOccupied(player, BodyRegionV2.HANDS)
) return;
ItemStack equipped = V2EquipmentHelper.getInRegion(
diff --git a/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfUnlock.java b/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfUnlock.java
index 79c5a0c..607ca69 100644
--- a/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfUnlock.java
+++ b/src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2SelfUnlock.java
@@ -42,9 +42,10 @@ public class PacketV2SelfUnlock {
if (player == null) return;
if (!PacketRateLimiter.allowPacket(player, "action")) return;
- // Arms must be free to self-unlock
+ // Arms and hands must be free to self-unlock (RISK-006: mittens bypass)
if (
- V2EquipmentHelper.isRegionOccupied(player, BodyRegionV2.ARMS)
+ V2EquipmentHelper.isRegionOccupied(player, BodyRegionV2.ARMS) ||
+ V2EquipmentHelper.isRegionOccupied(player, BodyRegionV2.HANDS)
) return;
ItemStack equipped = V2EquipmentHelper.getInRegion(
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index c521b8f..b615014 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -78,6 +78,9 @@ description='''${mod_description}'''
[[mixins]]
config="tiedup.mixins.json"
+[[mixins]]
+config="tiedup-compat.mixins.json"
+
# Features are specific properties of the game environment, that you may want to declare you require. This example declares
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
# stop your mod loading on the server for example.
diff --git a/src/main/resources/assets/tiedup/lang/en_us.json b/src/main/resources/assets/tiedup/lang/en_us.json
index 6c2e5a4..9b4d34e 100644
--- a/src/main/resources/assets/tiedup/lang/en_us.json
+++ b/src/main/resources/assets/tiedup/lang/en_us.json
@@ -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!",
@@ -963,5 +983,141 @@
"command.tiedup.debt.set": "Set %1$s's total debt to %2$s emeralds.",
"command.tiedup.debt.added": "Added %1$s emeralds to %2$s's debt. Remaining: %3$s",
"command.tiedup.debt.removed": "Removed %1$s emeralds from %2$s's debt. Remaining: %3$s",
- "command.tiedup.debt.removed_paid": "Removed %1$s emeralds from %2$s's debt. Remaining: %3$s (PAID OFF!)"
+ "command.tiedup.debt.removed_paid": "Removed %1$s emeralds from %2$s's debt. Remaining: %3$s (PAID OFF!)",
+
+ "item.tiedup.leather_mittens": "Leather Mittens",
+ "item.tiedup.ball_gag_3d": "Ball Gag",
+ "item.tiedup.taser": "Taser",
+ "item.tiedup.debug_wand": "Debug Wand",
+
+ "msg.tiedup.event.cant_drop_labor_tools": "You cannot drop labor tools!",
+ "msg.tiedup.event.cant_store_labor_tools": "You cannot store labor tools!",
+ "msg.tiedup.event.cant_eat_gagged": "You can't eat with a gag on.",
+ "msg.tiedup.event.death_escape": "You died and escaped captivity. Your items remain in the camp chest.",
+ "msg.tiedup.event.debt_increased": "Your debt has increased by %1$s emeralds for attacking %2$s!",
+ "msg.tiedup.event.task_failed": "Your task has been marked as failed. You will not be paid for your work.",
+ "msg.tiedup.event.returned_to_cell": "You have been returned to your cell for your insolence!",
+ "msg.tiedup.event.grace_lost": "You attacked a kidnapper - protection lost!",
+ "msg.tiedup.event.camp_defends_trader": "The camp defends their leader! You are now under attack!",
+ "msg.tiedup.event.camp_defends_maid": "The camp defends their servant! You are now under attack!",
+ "msg.tiedup.event.chest_locked_by_camp": "This chest is locked by the camp!",
+ "msg.tiedup.event.new_maid_arrived": "A new maid, %1$s, has arrived. Work resumes.",
+
+ "msg.tiedup.network.trader_not_found": "Trader not found.",
+ "msg.tiedup.network.need_token": "You need a token to trade.",
+ "msg.tiedup.network.trader_no_camp": "This trader has no camp.",
+ "msg.tiedup.network.camp_not_found": "Camp not found.",
+ "msg.tiedup.network.captive_not_in_camp": "Captive not found in camp.",
+ "msg.tiedup.network.captive_not_for_sale": "This captive is not for sale.",
+ "msg.tiedup.network.price_not_set": "Price not set for this captive.",
+ "msg.tiedup.network.not_enough_items": "You need %1$sx %2$s (have %3$s)",
+ "msg.tiedup.network.purchase_maid_delivery": "Purchase complete! The maid will deliver your captive.",
+ "msg.tiedup.network.lock_jammed": "The lock jammed! Only struggle can open it now.",
+ "msg.tiedup.network.warning_prefix": "[WARNING] ",
+ "msg.tiedup.network.is_trying_to_free": " is trying to free ",
+ "msg.tiedup.network.at_location": " at ",
+
+ "item.tiedup.owner_target.owner": "Owner: ",
+ "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 "
}
diff --git a/src/main/resources/assets/tiedup/models/item/debug_wand.json b/src/main/resources/assets/tiedup/models/item/debug_wand.json
new file mode 100644
index 0000000..0f00b5a
--- /dev/null
+++ b/src/main/resources/assets/tiedup/models/item/debug_wand.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "tiedup:item/debug_wand"
+ }
+}
diff --git a/src/main/resources/data/tiedup/tiedup_items/chain.json b/src/main/resources/data/tiedup/tiedup_items/chain.json
index 1b65798..9fa55c5 100644
--- a/src/main/resources/data/tiedup/tiedup_items/chain.json
+++ b/src/main/resources/data/tiedup/tiedup_items/chain.json
@@ -1,6 +1,6 @@
{
"type": "tiedup:bondage_item",
- "display_name": "Chains",
+ "display_name": "Chain",
"translation_key": "item.tiedup.chain",
"model": "tiedup:models/gltf/v2/binds/chain.glb",
"regions": [
diff --git a/src/main/resources/data/tiedup/tiedup_items/classic_earplugs.json b/src/main/resources/data/tiedup/tiedup_items/classic_earplugs.json
index a9944b7..9a2f4a1 100644
--- a/src/main/resources/data/tiedup/tiedup_items/classic_earplugs.json
+++ b/src/main/resources/data/tiedup/tiedup_items/classic_earplugs.json
@@ -17,7 +17,7 @@
"components": {
"lockable": {},
"resistance": {
- "id": "blindfold"
+ "id": "earplug"
}
}
}
\ No newline at end of file
diff --git a/src/main/resources/data/tiedup/tiedup_items/shock_collar_auto.json b/src/main/resources/data/tiedup/tiedup_items/shock_collar_auto.json
index e988804..6e8d48c 100644
--- a/src/main/resources/data/tiedup/tiedup_items/shock_collar_auto.json
+++ b/src/main/resources/data/tiedup/tiedup_items/shock_collar_auto.json
@@ -11,7 +11,7 @@
"body"
]
},
- "display_name": "Auto Shock Collar",
+ "display_name": "Automatic Shock Collar",
"translation_key": "item.tiedup.shock_collar_auto",
"model": "tiedup:models/gltf/v2/collars/shock_collar_auto.glb",
"components": {
diff --git a/src/main/resources/data/tiedup/tiedup_items/vine_seed.json b/src/main/resources/data/tiedup/tiedup_items/vine_seed.json
index b99d817..2954f1a 100644
--- a/src/main/resources/data/tiedup/tiedup_items/vine_seed.json
+++ b/src/main/resources/data/tiedup/tiedup_items/vine_seed.json
@@ -1,6 +1,6 @@
{
"type": "tiedup:bondage_item",
- "display_name": "Vine Bind",
+ "display_name": "Vine Seed",
"translation_key": "item.tiedup.vine_seed",
"model": "tiedup:models/gltf/v2/binds/vine_seed.glb",
"regions": [
diff --git a/src/main/resources/tiedup-compat.mixins.json b/src/main/resources/tiedup-compat.mixins.json
new file mode 100644
index 0000000..d709a1d
--- /dev/null
+++ b/src/main/resources/tiedup-compat.mixins.json
@@ -0,0 +1,22 @@
+{
+ "required": false,
+ "minVersion": "0.8",
+ "package": "com.tiedup.remake.mixin",
+ "compatibilityLevel": "JAVA_17",
+ "refmap": "tiedup.refmap.json",
+ "mixins": [
+ "MixinMCAVillagerInteraction",
+ "MixinMCAVillagerLeash",
+ "MixinMCAOpenAIChatAI",
+ "MixinMCAMessenger"
+ ],
+ "client": [
+ "client/MixinVillagerEntityBaseModelMCA",
+ "client/MixinVillagerEntityMCAAnimated",
+ "client/MixinMCASpeechManager",
+ "client/MixinMCAPlayerExtendedModel"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/src/main/resources/tiedup.mixins.json b/src/main/resources/tiedup.mixins.json
index 21db5d0..d974c48 100644
--- a/src/main/resources/tiedup.mixins.json
+++ b/src/main/resources/tiedup.mixins.json
@@ -6,22 +6,14 @@
"refmap": "tiedup.refmap.json",
"mixins": [
"MixinServerPlayer",
- "MixinMCAVillagerInteraction",
- "MixinMCAVillagerLeash",
- "MixinMCAOpenAIChatAI",
- "MixinMCAMessenger",
"MixinLivingEntityBodyRot"
],
"client": [
- "client/MixinVillagerEntityBaseModelMCA",
- "client/MixinVillagerEntityMCAAnimated",
- "client/MixinMCASpeechManager",
- "client/MixinMCAPlayerExtendedModel",
"client/MixinPlayerModel",
"client/MixinCamera",
"client/MixinLivingEntitySleeping"
],
"injectors": {
- "defaultRequire": 0
+ "defaultRequire": 1
}
}