chore(P2): V1 zombie comments cleanup + i18n events/network/items
Zombie comments (14 files): - Replace references to deleted V1 classes (ItemBind, ItemCollar, IBondageItem, BindVariant, etc.) with V2 equivalents or past-tense historical notes - "V1 path" → "legacy slot-index path" for still-active legacy codepaths - Clean misleading javadoc that implied V1 code was still present i18n (13 files, 31 new keys): - Events: 12 Component.literal() → translatable (labor tools, gag eat, death escape, debt, punishment, grace, camp protection, chest, maid) - Network: 12 Component.literal() → translatable (trader messages, lockpick jam, slave freedom warnings) - Items: 2 Component.literal() → translatable (ItemOwnerTarget tooltips)
This commit is contained in:
@@ -345,8 +345,8 @@ public class PacketLockpickAttempt {
|
||||
jammed = true;
|
||||
|
||||
player.sendSystemMessage(
|
||||
Component.literal(
|
||||
"The lock jammed! Only struggle can open it now."
|
||||
Component.translatable(
|
||||
"msg.tiedup.network.lock_jammed"
|
||||
).withStyle(ChatFormatting.RED)
|
||||
);
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ public class PacketSlaveBeingFreed {
|
||||
// Build alert message
|
||||
Component message = Component.literal("")
|
||||
.append(
|
||||
Component.literal("[WARNING] ").withStyle(
|
||||
Component.translatable("msg.tiedup.network.warning_prefix").withStyle(
|
||||
ChatFormatting.RED,
|
||||
ChatFormatting.BOLD
|
||||
)
|
||||
@@ -96,14 +96,18 @@ public class PacketSlaveBeingFreed {
|
||||
)
|
||||
)
|
||||
.append(
|
||||
Component.literal(" is trying to free ").withStyle(
|
||||
Component.translatable("msg.tiedup.network.is_trying_to_free").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
)
|
||||
.append(
|
||||
Component.literal(slaveName).withStyle(ChatFormatting.YELLOW)
|
||||
)
|
||||
.append(Component.literal(" at ").withStyle(ChatFormatting.RED))
|
||||
.append(
|
||||
Component.translatable("msg.tiedup.network.at_location").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
)
|
||||
.append(
|
||||
Component.literal(
|
||||
"[" + x + ", " + y + ", " + z + "]"
|
||||
|
||||
@@ -77,7 +77,7 @@ public class PacketBuyCaptive {
|
||||
Entity traderEntity = level.getEntity(traderEntityId);
|
||||
if (!(traderEntity instanceof EntitySlaveTrader trader)) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("Trader not found.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.trader_not_found").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -92,7 +92,7 @@ public class PacketBuyCaptive {
|
||||
// Verify player has token
|
||||
if (!EntityKidnapper.hasTokenInInventory(buyer)) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("You need a token to trade.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.need_token").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -103,7 +103,7 @@ public class PacketBuyCaptive {
|
||||
UUID campId = trader.getCampUUID();
|
||||
if (campId == null) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("This trader has no camp.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.trader_no_camp").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -114,7 +114,7 @@ public class PacketBuyCaptive {
|
||||
CampOwnership.CampData campData = ownership.getCamp(campId);
|
||||
if (campData == null) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("Camp not found.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.camp_not_found").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -137,7 +137,7 @@ public class PacketBuyCaptive {
|
||||
|
||||
if (targetCell == null) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("Captive not found in camp.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.captive_not_in_camp").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -170,7 +170,7 @@ public class PacketBuyCaptive {
|
||||
|
||||
if (kidnappedState == null || !kidnappedState.isForSell()) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("This captive is not for sale.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.captive_not_for_sale").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -181,7 +181,7 @@ public class PacketBuyCaptive {
|
||||
ItemTask price = kidnappedState.getSalePrice();
|
||||
if (price == null) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal("Price not set for this captive.").withStyle(
|
||||
Component.translatable("msg.tiedup.network.price_not_set").withStyle(
|
||||
ChatFormatting.RED
|
||||
)
|
||||
);
|
||||
@@ -194,14 +194,11 @@ public class PacketBuyCaptive {
|
||||
|
||||
if (available < required) {
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal(
|
||||
"You need " +
|
||||
required +
|
||||
"x " +
|
||||
price.getItem().getDescription().getString() +
|
||||
" (have " +
|
||||
available +
|
||||
")"
|
||||
Component.translatable(
|
||||
"msg.tiedup.network.not_enough_items",
|
||||
required,
|
||||
price.getItem().getDescription().getString(),
|
||||
available
|
||||
).withStyle(ChatFormatting.RED)
|
||||
);
|
||||
return;
|
||||
@@ -229,8 +226,8 @@ public class PacketBuyCaptive {
|
||||
);
|
||||
|
||||
buyer.sendSystemMessage(
|
||||
Component.literal(
|
||||
"Purchase complete! The maid will deliver your captive."
|
||||
Component.translatable(
|
||||
"msg.tiedup.network.purchase_maid_delivery"
|
||||
).withStyle(ChatFormatting.GREEN)
|
||||
);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user