feat(D-01/D): V1 cleanup — delete 28 files, ~5400 lines removed
D1: ThreadLocal alert suppression moved from ItemCollar to CollarHelper.
onCollarRemoved() logic (kidnapper alert) moved to CollarHelper.
D2+D3: Deleted 17 V1 item classes + 4 V1-only interfaces:
ItemBind, ItemGag, ItemBlindfold, ItemCollar, ItemEarplugs, ItemMittens,
ItemColor, ItemClassicCollar, ItemShockCollar, ItemShockCollarAuto,
ItemGpsCollar, ItemChokeCollar, ItemHood, ItemMedicalGag,
IBondageItem, IHasGaggingEffect, IHasBlindingEffect, IAdjustable
D4: KidnapperTheme/KidnapperItemSelector/DispenserBehaviors migrated
from variant enums to string-based DataDrivenItemRegistry IDs.
D5: Deleted 11 variant enums + Generic* factories + ItemBallGag3D:
BindVariant, GagVariant, BlindfoldVariant, EarplugsVariant, MittensVariant,
GenericBind, GenericGag, GenericBlindfold, GenericEarplugs, GenericMittens
D6: ModItems cleaned — all V1 bondage registrations removed.
D7: ModCreativeTabs rewritten — iterates DataDrivenItemRegistry.
D8+D9: All V2 helpers cleaned (V1 fallbacks removed), orphan imports removed.
Zero V1 bondage code references remain (only Javadoc comments).
All bondage items are now data-driven via 47 JSON definitions.
This commit is contained in:
@@ -332,15 +332,12 @@ public class ItemLockpick extends Item {
|
||||
);
|
||||
if (collar.isEmpty()) return;
|
||||
|
||||
if (
|
||||
collar.getItem() instanceof
|
||||
com.tiedup.remake.items.ItemShockCollar shockCollar
|
||||
) {
|
||||
if (com.tiedup.remake.v2.bondage.CollarHelper.canShock(collar)) {
|
||||
// Shock the player
|
||||
state.shockKidnapped(" (Failed lockpick attempt)", 2.0f);
|
||||
|
||||
// Notify owners
|
||||
notifyOwnersLockpickAttempt(player, collar, shockCollar);
|
||||
notifyOwnersLockpickAttempt(player, collar);
|
||||
|
||||
TiedUpMod.LOGGER.info(
|
||||
"[LOCKPICK] {} was shocked for failed lockpick attempt",
|
||||
@@ -354,8 +351,7 @@ public class ItemLockpick extends Item {
|
||||
*/
|
||||
private static void notifyOwnersLockpickAttempt(
|
||||
Player player,
|
||||
ItemStack collar,
|
||||
com.tiedup.remake.items.ItemShockCollar shockCollar
|
||||
ItemStack collar
|
||||
) {
|
||||
if (player.getServer() == null) return;
|
||||
|
||||
@@ -367,7 +363,7 @@ public class ItemLockpick extends Item {
|
||||
).withStyle(ChatFormatting.GOLD)
|
||||
);
|
||||
|
||||
List<UUID> owners = shockCollar.getOwners(collar);
|
||||
List<UUID> owners = com.tiedup.remake.v2.bondage.CollarHelper.getOwners(collar);
|
||||
for (UUID ownerId : owners) {
|
||||
ServerPlayer owner = player
|
||||
.getServer()
|
||||
|
||||
Reference in New Issue
Block a user