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:
@@ -46,8 +46,8 @@ public class StruggleSessionManager {
|
||||
> continuousSessions = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* Mapping from legacy V1 slot indices to V2 BodyRegionV2.
|
||||
* Used to convert V1 session targetSlot ordinals to V2 regions.
|
||||
* Mapping from legacy slot indices to V2 BodyRegionV2.
|
||||
* Used to convert legacy session targetSlot ordinals to V2 regions.
|
||||
* Index: 0=ARMS, 1=MOUTH, 2=EYES, 3=EARS, 4=NECK, 5=TORSO, 6=HANDS.
|
||||
*/
|
||||
private static final BodyRegionV2[] SLOT_TO_REGION = {
|
||||
@@ -611,7 +611,7 @@ public class StruggleSessionManager {
|
||||
}
|
||||
|
||||
if (session.isAccessoryStruggle()) {
|
||||
// Handle accessory resistance update (V1 path -- slot index is legacy ordinal)
|
||||
// Handle accessory resistance update (legacy slot-index path)
|
||||
Integer slotIndex = session.getTargetSlot();
|
||||
if (
|
||||
slotIndex == null ||
|
||||
@@ -680,7 +680,7 @@ public class StruggleSessionManager {
|
||||
if (session.isV2Struggle()) {
|
||||
com.tiedup.remake.v2.BodyRegionV2 region =
|
||||
session.getTargetRegion();
|
||||
// BUG-001 fix: break lock before unequip (consistent with V1 accessory escape)
|
||||
// BUG-001 fix: break lock before unequip (consistent with legacy accessory escape)
|
||||
ItemStack stackInRegion =
|
||||
com.tiedup.remake.v2.bondage.capability.V2EquipmentHelper.getInRegion(
|
||||
player,
|
||||
@@ -718,7 +718,7 @@ public class StruggleSessionManager {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Handle accessory escape (V1 path -- slot index is legacy ordinal)
|
||||
// Handle accessory escape (legacy slot-index path)
|
||||
Integer slotIndex = session.getTargetSlot();
|
||||
if (
|
||||
slotIndex != null &&
|
||||
|
||||
Reference in New Issue
Block a user