experimental/curios-ui-fork #22

Merged

NotEvil merged 35 commits from experimental/curios-ui-fork into develop 2026-07-06 20:05:30 +00:00

Conversation 0 Commits 35 Files changed 133 +7498 -6583

NotEvil commented 2026-07-06 20:05:18 +00:00

Owner

Copy link

No description provided.

NotEvil added 35 commits 2026-07-06 20:05:18 +00:00

FEAT : clothes finally render on the RIG pipeline (players + NPCs) ... d5c1b7a9bf

The pre-rig clothes overlay (ClothesRenderHelper) was never mounted — its
host layer never existed — so GenericClothes had zero visual effect since
the patched-renderer switch. New PatchedClothesLayer re-draws the biped
mesh (BIPED/ALEX, CPU-posed for per-part hidden flags) with the item's
downloaded texture, legacy applyLayerVisibility semantics preserved
(keepHead, 6-part bitfield, smallArms). Config is read straight from the
equipped stack NBT, which already reaches every client (capability packet
for players, SynchedEntityData for NPCs) — no dedicated sync needed.

REFACTOR : drop the dead pre-rig clothes render/sync chain ... be2f9b1ee5

ClothesRenderHelper (613L, zero callers since the patched-renderer switch)
and ClothesModelCache go away with the PatchedClothesLayer port. The
dedicated clothes sync channel (PacketSyncClothesConfig + ClothesClientCache
+ SyncManager.syncClothesConfig + IPlayerBindStateHost.syncClothesConfig)
was a second pipe for data the equipment sync already carries in the stack
NBT — every call site fired right after an equipment sync on the same
change. Network protocol 6 -> 7 (packet removed).

FEAT : bondage inventory container screen (Curios UI fork) — region slots + drag & drop ... bad3c28ff7

Fork of Curios 5.14.1 GUI machinery (LGPL-3 -> GPLv3, attribution headers)
rewired onto the bondage equipment capability. The player gets a small button
in the inventory (and the existing keybind) that opens a vanilla-inventory
look-alike with a left panel of one slot per BodyRegion:

- BondageRegionItemHandler: IItemHandler VIEW over IBondageEquipmentStore,
  same rules as the packet paths (region occupancy/blocking on place;
  locked / self-ARMS / InteractionGuard FREE on take). Locked items refuse
  the drag-out at the slot level.
- BondageInventoryMenu/-Screen: crafting 2x2 + recipe book + armor/offhand
  kept, so it feels like the vanilla inventory; fixed 2x7 region panel.
- Open/close via PacketOpenBondageInventory (doCloseContainer on the way
  back, protocol 7 -> 8). MASTER mode keeps UnifiedBondageScreen for now.
- Panel/button textures copied from Curios (see file headers).

Build + tests + quality gate green. Not yet validated in-game.

FEAT : bondage inventory slot polish — status overlays, region glyphs, creative button ... 42dc0d64e7

- padlock overlay (8x8, from a pixel-art icon) on locked items + red
  tooltip line ; slider glyph on items with an adjustable position
  (MOUTH/EYES, same rule as the ActionPanel) + gray tooltip line
- empty slots show their region as a monochrome silhouette glyph
  (vanilla empty-armor-slot style, 14 hand-drawn 16x16 sprites on one
  sheet) — deliberately NOT a ghost item, which could be mistaken for
  real content
- region blocked by another item (e.g. hood -> mouth/ears) = translucent
  red cell + 'Blocked by <item>' tooltip
- bondage button on the creative inventory tab (10px sprite, hidden on
  other tabs)

Build + tests + quality gate green.

FEAT : body regions rework — +CROTCH/PUSSY/PLUG/COSTUME, -TAIL/WINGS (16 regions) ... 4add33f9ab

- PLUG absorbs the former TAIL (tail items are plug-mounted), WINGS was
  never used. BodyRegion.fromName already null-skips stale names, so old
  save NBT with TAIL/WINGS entries is dropped silently.
- COSTUME lands the dedicated cosmetic region decided in the worn-
  cosmetics scoping (non-restraining overlay slot).
- bondage inventory panel goes 2x7 -> 2x8 (texture already carries 8
  cells per column) ; region tab bar regroups LOWER and SPECIAL.
- region glyph sheet regenerated: briefs (CROTCH), venus (PUSSY), plug
  silhouette (PLUG), hanger (COSTUME).

Build + tests + quality gate green.

FEAT : split cosmetics — SKIN region for clothes re-skin, COSTUME for real outfit items ... d6523be0c0

Clothes (GenericClothes) are a pure skin swap, not a garment: they now live
in a dedicated SKIN region instead of squatting TORSO, so a re-skinned
player can still wear torso bondage. COSTUME stays the slot for actual
outfit items — data-driven like every other restraint (bunny_suit.json
pilot, occupies COSTUME, blocks nothing, renders through the worn-GLB
path once its asset lands). Neither cosmetic region blocks anything.
Legacy NPC NBT 'Clothes' migrates to SKIN; old saves with clothes still
in TORSO keep rendering via the layer's instanceof scan.

FEAT : data-driven texture overrides + animated sprite-frames for GLB meshes (worn + furniture) ... b02321f884

New optional keys on item and furniture definitions:
  "texture": "..."              static override
  "texture_frames": [...]        one PNG per frame, cycled on the carrier's tickCount
  "texture_frame_ticks": 2       frame duration
Shared TextureConfig record (parse + per-tick resolve); RenderTypes are
already cached per ResourceLocation so cycling costs nothing. Worn items
finally have a working texture path — the broken embedded base-color stays
disabled, an explicit override bypasses it. Furniture keeps its embedded
texture as fallback. Furniture sync codec extended (items re-sync raw JSON,
no codec change needed).

FEAT : self-animated worn objects — model_animation block, rigid bone mount (C1-a) ... 5377ae5841

A worn GLB can now play its OWN internal clip (pumping piston, spinning
gears) while riding one biped bone rigidly, instead of being skinned onto
the wearer's armature:

  "model_animation": {
    "clip": "Pump",          // default: the GLB's first clip
    "mount_joint": "Chest",  // required
    "speed": 1.0              // frames per tick, like furniture
  }

- ModelAnimation record + lenient fromJson (mount_joint required, speed
  clamped, parser warns on malformed blocks instead of silently eating
  them) ; IBondageItem.getModelAnimation hook
- PatchedBondageLayer: animated branch reuses the furniture time model
  (wearer tickCount, frame-space loop) + RenderMathUtils.mulStack on the
  mount bone ; named clip falls back to first clip, no clip = static
  rigid mount (free props) ; unknown joint = warn-once + skip
- previewer: setItemModelAnimation — the item clip follows play/scrub so
  artists can validate without launching the game
- 12 unit tests ; authoring convention documented (GLB modeled in the
  mount bone's local frame, origin = attach point)

Build + tests + quality gate green. Needs a pilot GLB with a named clip
for in-game validation (previewtest pack).

FIX : final review pass — drop FINGERS region, panel/icon overflow, slot UX, perf ... f9b76a0c83

Adverse review of the whole branch (8 finder angles + verification) found
the 17th region (SKIN) overflowing everything sized for 16, plus a batch
of smaller issues:

- FINGERS region removed (never used by any item) — SKIN takes its slot,
  back to 16 regions ; PANEL_ROWS is now DERIVED from the region count so
  a future region cannot fall off the drawn backplate again, and the
  region-glyph blit is bounds-guarded against the sheet capacity
- region_icons.png rebuilt: FINGERS ring dropped, paintbrush glyph for
  SKIN, ordinals re-aligned
- silent-refusal UX: the padlock overlay now covers EVERYTHING the
  extract gate refuses (locked or self-ARMS) with a distinct
  'Struggle to remove' tooltip line for the non-locked case
- PatchedClothesLayer: two O(1) getInRegion reads (SKIN, legacy TORSO)
  instead of getAllEquipped()'s 3 map allocations per wearer per frame,
  and ClothesProperties parsed once per stack instance instead of per
  frame (identity cache, safe client-side)
- bondage screen: blocked regions computed once per frame instead of one
  full store scan per empty slot
- BondageRegionItemHandler: insertItem funnels through setStackInSlot
  (single write path) and the no-validation contract of setStackInSlot
  is documented
- TextureConfig: frame-count cap enforced in the constructor — the
  furniture sync encoder wrote the count verbatim while the decoder
  clamped, a latent packet-desync if any non-fromJson source appeared
- previewer C1-a branch reverted (no caller; needs pack-editor fields)

Deliberately NOT fixed (user call): legacy TORSO->SKIN clothes NBT and
removed-region item loss on old saves.

Build + tests + quality gate green.

TWEAK : SKIN region reads 'Clothes' in-game ... 23a01b0797

Player-facing, the two cosmetic regions are 'Clothes' (skin swap) and
'Costume' (3D outfit) — 'Skin' was the internal mechanic name leaking
into the UI. Enum stays SKIN.

FEAT : set clothes texture URL from a shift-right-click screen ... 1243f1c90d

Shift-right-click a clothes item (in the air) opens a small dialog with an
EditBox pre-filled with the current URL + Save/Reset/Cancel, instead of
having to type /tiedup clothes url set <url>.

Permission keeps the command's security rationale (an arbitrary URL is
fetched by every other client that sees the wearer, host-whitelisted
client-side): the screen opens for everyone but the server only accepts
the set from operators UNLESS the new server config allowPlayerClothesUrl
is true (default false). The server re-validates https + length; the
client screen is convenience only, never the boundary.

- ModConfig.SERVER.allowPlayerClothesUrl (default false)
- PacketSetClothesUrl (C2S set/reset, permission + https/length gate,
  writes the held stack — vanilla inventory sync + the equip path carry
  the NBT to trackers)
- ClothesUrlScreen + ClientClothesActions (client-only, referenced from
  GenericClothes.use only behind isClientSide)
- protocol 8 -> 9

Build + tests + quality gate green.

FIX : command bugs — /norp now bypasses earplugs (safety), untie earplugs guard, takecollar reports locked collars, drop lying gagtalk reload 492d69f896

CLEAN : remove dead commands — /key tree (NBT schema never read), /testanim (stub packet), /adjust cmd, debug repair, clothes url cmd (superseded by dialog), putclothes, masterchair (subset of mastertask) + orphan lang keys, proto 10 4f460c0f61

REWORK : consolidated restrain/release <target> [region|all|captivity] — replaces 12 flat verbs + npc tie/gag path, player & NPC targets unified via KidnappedHelper; collar node entity-capable; kidnapset->kit, kidnapreload->reload, debug validate->dump aa38a88014

WIRE : dormant systems — collar setcell routes through the packet path (PersonalityState + sync), ransom config live (enableRansom gates maid economy, ransomAmount base, ransomItem sealed per record, timeout key dropped), AdjustY/Scale read by PatchedBondageLayer + adjustable badge follows the item component 2de10227e7

POLISH : commands cleanup — NPCCommand->NpcAdminCommand (name clash with npc AI), npc spawn maid/merchant via shared node, syncPlayerState dead param, resetspawns reports skipped chunks, i18n hardcoded strings (returnstuff/npc debug/validate/collar info), stale javadoc roots 3f76af0a37

FIX : collar NBT writes now go through the persist+sync path — rename via CollarOwnership.mutate, cell assignment pushes NPC equipment entity-data (packet + command were server-side only for NPC wearers) 08214c5ac2

CLEAN : remove /tiedup norp — server-wide broadcast with no stored state, consent handled by server rules; drops the RAM cooldown map + disconnect cleanup + lang keys ff7d400a8f

CLEAN : drop the social chat system + /reload — me/pm bypassed gags, block-list had zero consumers (never wired to interactions), talkarea only served /me; reload rebuilt compiled-in data (no files read); KidnapSetCommand -> KitCommand 57898c8ab7

FIX : deep-review findings — npc kill via die() path (discard skipped collar-key/pet/prison cleanup), enslave uses real capture (getCapturedBy), admin release suppresses kidnapper alert + reconciles PrisonerManager, returnstuff refuses captives, debt bootstraps records and releases when paid, ransom ghost-records + already-paid msg, cell delete releases prisoners, tocell uses wearer dimension, collar info lists owners, claim/unclaim unified with addowner, setcell none, clothes toggles work on worn item ddd905ea04

WIRE : config safe fixes — enableMasterSpawn actually gates Master spawning (was buyer-logic only), confiscateInventory + messageCooldown consumed, tier prices share ConfigDefaults constants, stale gamerule javadocs/count, unreachable SERVER==null guards dropped 183c0b5a04

CLEAN : purge dead config surface — 25 dormant/lying server keys (Lairs/Cells/MasterNPC-distraction/Timeout/lockpick-RNG...), 4 no-effect gamerules (2 orphans + 2 null-only Tier-1), 5 dead accessors, orphaned defaults + gamerule lang entries cca42a638a

REWORK : minigame is THE struggle — drop legacy RNG path (PacketStruggle, StruggleState template, collar RNG unlock), /gamerule struggle now gates the minigame packets + keybind, purge 4 tuning gamerules/keys + struggleMiniGameEnabled, proto 11 6c221ed87d

WIRE : config choke-point + server sensory/host authority — deviouschest/predator/allowPlayerClothesUrl routed through SettingsAccessor (14 sites, 9 new accessors), enforceHardcoreSensory server key overrides client blindfold/earplug settings, allowedTextureHosts validated server-side before URL broadcast 1de5bdbddc

FIX : armature-less GLB props render correctly — skinVertex early-returns rigid vertices instead of indexing the empty joints array (AIOOBE crash via FurnitureEntityRenderer on any mesh-only GLB), the mesh-only parse bakes the node's global TRS into the vertices (Blender Z-up export writes +90°X on the node; the pillory rendered lying flat, half below floor) via new GlbParserUtils.computeGlobalNodeTransform, and drops the worn-pipeline X/Y negation (the furniture pose stack is world-oriented — props rendered upside down once stood up); regression tests for both 6459ec20ff

FIX : glTF UV convention — drop the 1-v V flip in GltfMeshRenderer.emitVertex (OBJ convention copied onto the glTF path; glTF, PNG rows and MC dynamic textures are all top-left origin). Flipped V sampled the transparent regions of atlas textures and ENTITY_CUTOUT discarded them — root cause of the parked 'baked GLB texture invisible' issue (worn items forced white) and the pillory's exploded texture; verified 92% vs 25% triangle discard on the real asset 8950c0f5f4

FIX : furniture rider facing + ground level — FurnitureEntityRenderer applies 180-yaw like living entities (was -yaw: the mesh faced opposite its riders, the seated player showed their back to the pillory board), and the fallback rider Y is the furniture base (hardcoded +0.5 bench height floated standing poses; seat clips carry the body's own height — artist convention keeps the armature origin on the floor at the furniture origin) 00f49c6668

TEST : MATRIX clip pose reconstruction sentinel — loads the first far-from-rest MATRIX clip (pillory artist pose) through the real JsonAssetLoader + procedural biped and pins joint world positions against independently derived Blender coordinates; the near-rest builtin MATRIX clips (idle/sit/kneel) cannot catch a pose-collapsing defect. The on-screen MATRIX rendering bug (Pose level proven correct, garbled at render) stays open — ATTRIBUTES with raw quaternions is the working pack format a3f7223b3a

ASSET : TiedUp_Rig_Template.blend replaces the stale rig blends — the artist control rig (82 bones, IK/FK, widgets, preview mesh) with its skeleton realigned to the mod biped rest: 16/20 bone families deviated (clavicles 2.8cm short, arm bones tilted 6.4°, wrist heads 4.5cm off, knees 1.7cm forward), biasing every raised-arm export ~6-7° including Antikythera ones; worst residual now 0.0003° / 0.001cm across all 68 realigned bones, actions/NLA stripped, pose reset 90743ada66

FIX : rig template rebuilt with drivers intact — the v1 cleanup used animation_data_clear() which strips DRIVERS along with the action/NLA (Blender lumps them in animation_data), killing the 15 IK/FK-switch influence drivers (legs stuck in IK, switches dead). v2 removes actions/NLA individually and keeps ad.drivers; verified: 15 drivers live, IK/FK switch toggles influence 0->1, IK leg bend follows the target, FK chains respond, skeleton still aligned to the mod rest (0.0003 deg / 0.001 cm over the 68 realigned bones) f32570e433

FIX : rig template v3 — keep the artist's IK pre-bends, align only the export chain. v2 straightened the IK_* chains along with everything else, putting the solver in a singular (colinear) configuration: knees stopped bending — the artist's rest tilts were load-bearing for IK, as he pointed out. v3 realigns only the deform/export interface (plain+DEF+FK, 46 bones) onto the mod runtime rest (residual 0.0003 deg / 0.001 cm) and leaves the IK_* chains, targets and poles at the artist's geometry. Verified: IK crouch bends the knee forward identically to the artist's master (delta +0.30y/+0.18z, export chain follows), IK/FK switches toggle influence 0->1, 15 drivers intact 3bea03916c

REWORK : the runtime skeleton IS the artist master rig — 1:1 Blender<->Minecraft by construction. biped_local_transforms.json regenerated from the artist rest (biped parenting, orthonormalized, recomposition verified 1.2e-07); every clip is now a pose delta replayed on its own authoring rest, so nothing compensates anything anywhere. The gitignored EF MATRIX clips (idle/run/sit/...) were rebased on-disk to ATTRIBUTES vs the new rest with world poses preserved to 0.0003cm (MATRIX replays full local chains = rest-agnostic; pristine originals recoverable from any pre-swap jar); the 8 tracked artist ATTRIBUTES clips are untouched — their old ~3cm/6 deg replay bias disappears with the swap. New tools/ef_attributes_export.py = the one-step blend->clip exporter under the 1:1 contract (raw quats, pose-basis vs the authoring rest, evaluated seam joints). Old rest backed up in docs/plans for rollback; plan in docs/plans/skeleton-adoption-2026-07-05.md 784d5c3e3e

ASSET : rig template rebuilt for the 1:1 era — the artist master rig untouched (skeleton == the runtime rest exactly, 0.0000 residual by construction since the runtime adopted it), stripped of actions/NLA with all 15 drivers preserved, pose reset, junk removed. No bone edits of any kind — the previous realigned templates are obsolete under the 1:1 contract. Verified: IK/FK switches toggle, IK knee bends forward, 82 bones, clean scene (frame 0-60) ce42b760b9

ASSET : rig template — conservative cleanup only. Keep every object of the artist master (Helper included, no orphan purge): strictly strip the actions/NLA (drivers preserved) and reset the pose. Verified again: 15 drivers, IK/FK switches toggle, IK knee bends forward, skeleton untouched (== runtime rest) 5b75ee4d95

FEAT : Wildfire gender mod compat on the RIG — the vanilla GenderLayer never fires on patched players (render canceled), so a new PatchedGenderLayer re-renders the exact same breast cubes (same 64x64 skin texels, jacket overlay, verbatim transform chain: bounce, cleavage, -35deg tilt, breathing) mounted on the Chest joint's pose-vs-rest delta — identity at rest = vanilla-exact placement, RIG clips contribute only the spine bend. State read through WildfireGenderBridge, a reflective fail-soft bridge to com.wildfire.* (works with upstream and fork alike, no compile dependency; physics stays live since the mod integrates on PlayerTickEvent, not render). Not ported yet: armor breast cups. Verified in game: placement, jump/turn/walk physics df2ad9d99e

NotEvil merged commit 32d282a57c into develop 2026-07-06 20:05:30 +00:00

NotEvil referenced this pull request from a commit 2026-07-06 20:05:33 +00:00

Merge pull request 'experimental/curios-ui-fork' (#22) from experimental/curios-ui-fork into develop

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Bug

  

Suggestion

No labels

Bug

Suggestion

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

NotEvil/TiedUp-!22

No description provided.