From 065ff74d195a701ec357657cf3e18fc8aa41c9c3 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 26 Jan 2025 22:33:34 +0100 Subject: [PATCH] Moved octo code back to no2all-nostr --- .../nostr/model/NoStrIdentityPrivateKey.java | 7 +++---- .../nostr/model/NoStrIdentityPublicKey.java | 9 ++++----- .../no2all/nostr/model/event/NoStrEventId.java | 3 +-- .../nostr/model/event/NoStrEventSignature.java | 9 ++++----- .../nostr/model/share/NoStrShareB32LinkBare.java | 4 ++-- .../nostr/model/share/NoStrShareB32LinkTLV.java | 11 +++++------ .../model/share/NoStrShareBitChainTapeDeck.java | 9 ++++----- .../share/NoStrShareBitChainTapeStudio.java | 7 +++---- .../nostr/model/share/NoStrShareLinkEvent.java | 2 +- .../share/NoStrShareLinkEventReference.java | 5 ++--- .../nostr/model/share/NoStrShareLinkNote.java | 2 +- .../model/share/NoStrShareLinkPrivateKey.java | 2 +- .../share/NoStrShareLinkPrivateKeySecure.java | 2 +- .../nostr/model/share/NoStrShareLinkProfile.java | 2 +- .../model/share/NoStrShareLinkPublicKey.java | 2 +- .../nostr/model/share/NoStrShareLinkRelay.java | 5 ++--- .../no2all/nostr/nip/NoStrImplBinHexAdapter.java | 2 +- .../no2all/nostr/nip/NoStrImplShareLink.java | 4 ++-- .../nx01/no2all/nostr/nip/NoStrImplShareTLV.java | 2 +- .../no2all/nostr}/octo/OctoBitConverter.java | 2 +- .../nx01/no2all/nostr}/octo/OctoBitFormat.java | 16 ++++++++-------- .../nostr}/octo/conv/OctoConvSIntBigIndian.java | 4 ++-- .../nostr}/octo/conv/OctoConvSLongBigIndian.java | 4 ++-- .../nostr}/octo/conv/OctoConvStringCharset.java | 4 ++-- .../nostr}/octo/conv/OctoConvStringHex.java | 4 ++-- .../nostr}/octo/conv/OctoConvStringHexUtf8.java | 4 ++-- .../nostr}/octo/conv/OctoConvStringIDN.java | 4 ++-- .../nostr}/octo/conv/OctoConvUIntBigIndian.java | 4 ++-- .../no2all/nostr}/octo/conv/package-info.java | 2 +- .../nx01/no2all/nostr}/octo/package-info.java | 2 +- .../nostr/octo}/tlv/AbstractTLVChainAtom.java | 2 +- .../no2all/nostr/octo}/tlv/TLVChainAtom.java | 2 +- .../nostr/octo}/tlv/TLVChainAtomFrame.java | 2 +- .../nostr/octo}/tlv/TLVChainAtomFrameType.java | 2 +- .../octo}/tlv/TLVChainAtomSerializable.java | 2 +- .../no2all/nostr/octo}/tlv/TLVChainOctalSex.java | 2 +- .../nostr/octo}/tlv/TLVChainOctalSexFrame.java | 2 +- .../octo}/tlv/TLVChainOctalSexFrameType.java | 2 +- .../no2all/nostr/octo}/tlv/TLVChainOctoBit.java | 4 ++-- .../nostr/octo}/tlv/TLVChainOctoBitFrame.java | 4 ++-- .../octo}/tlv/TLVChainOctoBitFrameType.java | 2 +- .../nostr/octo}/tlv/TLVChainSexTeenBit.java | 2 +- .../nostr/octo}/tlv/TLVChainSexTeenBitFrame.java | 2 +- .../octo}/tlv/TLVChainSexTeenBitFrameType.java | 2 +- .../no2all/nostr/octo}/tlv/package-info.java | 2 +- .../nostr/{ => octo}/trust/OctoBech32.java | 2 +- .../nostr/{ => octo}/trust/OctoBech32Bucket.java | 2 +- .../nostr/{ => octo}/trust/OctoBech32String.java | 2 +- .../{ => octo}/trust/OctoBech32Variant.java | 2 +- .../no2all/nostr/{ => octo}/trust/OctoTrust.java | 2 +- .../nostr/{ => octo}/trust/OctoTrustAES.java | 2 +- .../{ => octo}/trust/OctoTrustAESCurve.java | 2 +- .../{ => octo}/trust/OctoTrustAESCurveX9EC.java | 2 +- .../{ => octo}/trust/OctoTrustChaChaPx.java | 2 +- .../{ => octo}/trust/OctoTrustException.java | 2 +- .../nostr/{ => octo}/trust/OctoTrustHash.java | 2 +- .../nostr/{ => octo}/trust/OctoTrustSchnorr.java | 2 +- .../{ => octo}/trust/OctoTrustSchnorrPoint.java | 2 +- .../model/event/NoStrEventSignatureTest.java | 6 +++--- .../model/share/NoStrShareLinkProfileTest.java | 2 +- nx01-warp-manifestor/pom.xml | 4 ++++ .../warp/manifestor/WarpManifestorDriver.java | 4 ++-- .../iomf3/ScopicManifest3ContentReader.java | 5 ++--- .../iomf3/ScopicManifest3ContentWriter.java | 5 ++--- .../scopic/iomf3/ScopicManifest3FrameTLV.java | 2 +- .../iomf4/ScopicManifest4ContentReader.java | 4 ++-- .../iomf4/ScopicManifest4ContentWriter.java | 4 ++-- .../scopic/iomf4/ScopicManifest4FrameTLV.java | 4 ++-- 68 files changed, 116 insertions(+), 123 deletions(-) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/OctoBitConverter.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/OctoBitFormat.java (86%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvSIntBigIndian.java (94%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvSLongBigIndian.java (95%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvStringCharset.java (94%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvStringHex.java (95%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvStringHexUtf8.java (96%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvStringIDN.java (94%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/OctoConvUIntBigIndian.java (94%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/conv/package-info.java (95%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr}/octo/package-info.java (96%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/AbstractTLVChainAtom.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainAtom.java (98%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainAtomFrame.java (96%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainAtomFrameType.java (96%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainAtomSerializable.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainOctalSex.java (98%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainOctalSexFrame.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainOctalSexFrameType.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainOctoBit.java (96%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainOctoBitFrame.java (95%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainOctoBitFrameType.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainSexTeenBit.java (98%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainSexTeenBitFrame.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/TLVChainSexTeenBitFrameType.java (97%) rename {nx01-x4o-o2o/src/main/java/org/x4o/o2o/io => nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo}/tlv/package-info.java (95%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoBech32.java (99%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoBech32Bucket.java (97%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoBech32String.java (97%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoBech32Variant.java (97%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrust.java (98%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustAES.java (98%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustAESCurve.java (98%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustAESCurveX9EC.java (97%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustChaChaPx.java (98%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustException.java (97%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustHash.java (97%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustSchnorr.java (99%) rename nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/{ => octo}/trust/OctoTrustSchnorrPoint.java (99%) diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java index 1f8aaf7..abab51b 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java @@ -27,11 +27,10 @@ package love.distributedrebirth.nx01.no2all.nostr.model; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrustException; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrust; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrustException; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java index f3535a4..00e2d05 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java @@ -27,12 +27,11 @@ package love.distributedrebirth.nx01.no2all.nostr.model; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrustException; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrustSchnorr; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrust; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrustException; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrustSchnorr; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java index fe4ff6e..9d20679 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java @@ -27,9 +27,8 @@ package love.distributedrebirth.nx01.no2all.nostr.model.event; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java index 5baf5df..8f2d50d 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java @@ -30,16 +30,15 @@ package love.distributedrebirth.nx01.no2all.nostr.model.event; import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import org.x4o.o2o.octo.OctoBitFormat; - import jakarta.json.Json; import jakarta.json.JsonArray; import jakarta.json.JsonWriter; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPrivateKey; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrustHash; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrustSchnorr; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrust; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrustHash; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrustSchnorr; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkBare.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkBare.java index 29fed0e..b25a66b 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkBare.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkBare.java @@ -30,8 +30,8 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import java.util.Objects; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java index eab5554..dbc3824 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java @@ -30,14 +30,13 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import java.util.Optional; import java.util.function.Consumer; -import org.x4o.o2o.io.tlv.TLVChainOctoBit; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareTLV; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32Bucket; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctoBit; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32Bucket; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java index ea0c054..fd6163d 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java @@ -33,14 +33,13 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import org.x4o.o2o.io.tlv.TLVChainOctoBit; -import org.x4o.o2o.io.tlv.TLVChainOctoBitFrame; -import org.x4o.o2o.octo.OctoBitConverter; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareTLV; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctoBit; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctoBitFrame; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java index b2f72e6..da5ef37 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java @@ -31,13 +31,12 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import org.x4o.o2o.io.tlv.TLVChainOctoBit; -import org.x4o.o2o.octo.OctoBitConverter; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareTLV; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctoBit; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEvent.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEvent.java index 64b5132..c6864e0 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEvent.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEvent.java @@ -34,7 +34,7 @@ import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventId; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java index 5f5c057..0027130 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java @@ -30,12 +30,11 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import java.util.List; import java.util.Objects; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkNote.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkNote.java index 51cfae6..aa022d5 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkNote.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkNote.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventId; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKey.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKey.java index 6bc8780..e395cd6 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKey.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKey.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPrivateKey; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKeySecure.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKeySecure.java index e403d16..01561a0 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKeySecure.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPrivateKeySecure.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareTLV; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfile.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfile.java index 31e5118..97b19f8 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfile.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfile.java @@ -31,7 +31,7 @@ import java.util.List; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPublicKey.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPublicKey.java index be3a121..3f2e683 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPublicKey.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkPublicKey.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java index 285963b..100148d 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java @@ -27,10 +27,9 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; -import org.x4o.o2o.octo.OctoBitFormat; - import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java index b20ebbd..2a7df26 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.nip; import java.util.Objects; -import org.x4o.o2o.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareLink.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareLink.java index 5486c16..403a72f 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareLink.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareLink.java @@ -29,8 +29,8 @@ package love.distributedrebirth.nx01.no2all.nostr.nip; import java.util.Objects; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoBech32String; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java index b675108..0e03b94 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.no2all.nostr.nip; -import org.x4o.o2o.io.tlv.TLVChainOctoBitFrameType; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctoBitFrameType; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitConverter.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/OctoBitConverter.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitConverter.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/OctoBitConverter.java index a112440..d6e0f05 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitConverter.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/OctoBitConverter.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo; +package love.distributedrebirth.nx01.no2all.nostr.octo; /// October bit converter. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitFormat.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/OctoBitFormat.java similarity index 86% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitFormat.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/OctoBitFormat.java index 579d6a5..1e2f840 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitFormat.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/OctoBitFormat.java @@ -25,17 +25,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo; +package love.distributedrebirth.nx01.no2all.nostr.octo; import java.nio.charset.StandardCharsets; -import org.x4o.o2o.octo.conv.OctoConvSIntBigIndian; -import org.x4o.o2o.octo.conv.OctoConvSLongBigIndian; -import org.x4o.o2o.octo.conv.OctoConvStringCharset; -import org.x4o.o2o.octo.conv.OctoConvStringHex; -import org.x4o.o2o.octo.conv.OctoConvStringHexUtf8; -import org.x4o.o2o.octo.conv.OctoConvStringIDN; -import org.x4o.o2o.octo.conv.OctoConvUIntBigIndian; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvSIntBigIndian; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvSLongBigIndian; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvStringCharset; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvStringHex; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvStringHexUtf8; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvStringIDN; +import love.distributedrebirth.nx01.no2all.nostr.octo.conv.OctoConvUIntBigIndian; /// October bits codec converters. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSIntBigIndian.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvSIntBigIndian.java similarity index 94% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSIntBigIndian.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvSIntBigIndian.java index 33c4496..ad494c6 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSIntBigIndian.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvSIntBigIndian.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSLongBigIndian.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvSLongBigIndian.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSLongBigIndian.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvSLongBigIndian.java index c4cfbd9..09ab0d0 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSLongBigIndian.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvSLongBigIndian.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringCharset.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringCharset.java similarity index 94% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringCharset.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringCharset.java index 2275a17..1e01a62 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringCharset.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringCharset.java @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; import java.nio.charset.Charset; import java.util.Objects; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHex.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringHex.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHex.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringHex.java index 079abbb..8d0243f 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHex.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringHex.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHexUtf8.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringHexUtf8.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHexUtf8.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringHexUtf8.java index b52728c..1d215d0 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHexUtf8.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringHexUtf8.java @@ -25,14 +25,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; import java.io.ByteArrayOutputStream; import java.util.HashMap; import java.util.Map; import java.util.PrimitiveIterator.OfInt; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringIDN.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringIDN.java similarity index 94% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringIDN.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringIDN.java index 37c4432..fc71aa1 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringIDN.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvStringIDN.java @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; import java.net.IDN; import java.nio.charset.StandardCharsets; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvUIntBigIndian.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvUIntBigIndian.java similarity index 94% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvUIntBigIndian.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvUIntBigIndian.java index 2201023..40153fe 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvUIntBigIndian.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/OctoConvUIntBigIndian.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/package-info.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/package-info.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/package-info.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/package-info.java index 933913b..5c69349 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/package-info.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/conv/package-info.java @@ -27,4 +27,4 @@ * @since 1.0 */ -package org.x4o.o2o.octo.conv; +package love.distributedrebirth.nx01.no2all.nostr.octo.conv; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/package-info.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/package-info.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/package-info.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/package-info.java index ca6b1cc..28b9abe 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/package-info.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/package-info.java @@ -27,4 +27,4 @@ * @since 1.0 */ -package org.x4o.o2o.octo; +package love.distributedrebirth.nx01.no2all.nostr.octo; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/AbstractTLVChainAtom.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/AbstractTLVChainAtom.java index 5fc7420..b04d14d 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/AbstractTLVChainAtom.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.util.ArrayList; import java.util.Iterator; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtom.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtom.java index 5eb8704..3f376a1 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtom.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.util.ArrayList; import java.util.Iterator; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomFrame.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomFrame.java index 2ba707a..bc454bc 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomFrame.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomFrameType.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomFrameType.java index a2ea578..ded522a 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomSerializable.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomSerializable.java index 43f6ecb..f1d7dcc 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainAtomSerializable.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java index 8c13ec3..663f342 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.io.IOException; import java.io.InputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java index f0f1e68..4fced80 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.util.Objects; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrameType.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrameType.java index 17fd229..6d7c3ac 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBit.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBit.java index e95f420..96ea85a 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBit.java @@ -25,14 +25,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBitFrame.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBitFrame.java index 4f40970..9232cd7 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBitFrame.java @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.util.Arrays; import java.util.Objects; -import org.x4o.o2o.octo.OctoBitConverter; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBitFrameType.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBitFrameType.java index 4cef711..65234bf 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctoBitFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBit.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBit.java index 0af9552..1a8b596 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBit.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.io.IOException; import java.io.InputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrame.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBitFrame.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrame.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBitFrame.java index 092e94d..ce339ce 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrame.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBitFrame.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.util.Arrays; import java.util.Objects; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrameType.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBitFrameType.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrameType.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBitFrameType.java index 0b89969..f592e02 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrameType.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainSexTeenBitFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/package-info.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/package-info.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/package-info.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/package-info.java index bc253d7..511f776 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/package-info.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/package-info.java @@ -27,4 +27,4 @@ * * @since 1.0 */ -package org.x4o.o2o.io.tlv; +package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32.java similarity index 99% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32.java index 078dbe1..b08c469 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.util.ArrayList; import java.util.Arrays; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32Bucket.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32Bucket.java similarity index 97% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32Bucket.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32Bucket.java index 65fc046..0cee84c 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32Bucket.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32Bucket.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.util.Objects; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32String.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32String.java similarity index 97% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32String.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32String.java index d0362c0..881ecbd 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32String.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32String.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.util.Objects; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32Variant.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32Variant.java similarity index 97% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32Variant.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32Variant.java index 36dfa1f..03462a3 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoBech32Variant.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoBech32Variant.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrust.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrust.java similarity index 98% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrust.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrust.java index 168ed8a..ff2eaf1 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrust.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrust.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.math.BigInteger; import java.security.NoSuchAlgorithmException; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAES.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAES.java similarity index 98% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAES.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAES.java index 97c1c3e..91aaad6 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAES.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAES.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAESCurve.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAESCurve.java similarity index 98% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAESCurve.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAESCurve.java index a52ddcf..8bf3717 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAESCurve.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAESCurve.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import org.bouncycastle.crypto.agreement.ECDHBasicAgreement; import org.bouncycastle.crypto.params.ECDomainParameters; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAESCurveX9EC.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAESCurveX9EC.java similarity index 97% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAESCurveX9EC.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAESCurveX9EC.java index f830b56..db203f7 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustAESCurveX9EC.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustAESCurveX9EC.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import org.bouncycastle.asn1.sec.SECNamedCurves; import org.bouncycastle.asn1.x9.X9ECParameters; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustChaChaPx.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustChaChaPx.java similarity index 98% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustChaChaPx.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustChaChaPx.java index c17cf68..f70890f 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustChaChaPx.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustChaChaPx.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.nio.ByteBuffer; import java.security.InvalidAlgorithmParameterException; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustException.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustException.java similarity index 97% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustException.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustException.java index 9627939..eedca57 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustException.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustException.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustHash.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustHash.java similarity index 97% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustHash.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustHash.java index 067acf2..e8a7fab 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustHash.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustHash.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustSchnorr.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustSchnorr.java similarity index 99% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustSchnorr.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustSchnorr.java index 1537fcb..ba435c7 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustSchnorr.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustSchnorr.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.math.BigInteger; import java.util.Arrays; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustSchnorrPoint.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustSchnorrPoint.java similarity index 99% rename from nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustSchnorrPoint.java rename to nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustSchnorrPoint.java index 2f0a2e6..24e02ec 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/trust/OctoTrustSchnorrPoint.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/trust/OctoTrustSchnorrPoint.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package love.distributedrebirth.nx01.no2all.nostr.trust; +package love.distributedrebirth.nx01.no2all.nostr.octo.trust; import java.math.BigInteger; diff --git a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java index 49f6ed4..6755f8b 100644 --- a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java +++ b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java @@ -36,7 +36,6 @@ import java.util.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.o2o.octo.OctoBitFormat; import jakarta.json.Json; import jakarta.json.JsonReader; @@ -49,8 +48,9 @@ import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventTag; import love.distributedrebirth.nx01.no2all.nostr.model.tag.NoStrTagNonce; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplEventTag; import love.distributedrebirth.nx01.no2all.nostr.nip.tag.NoStrImplTagNonce; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust; -import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrustHash; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrust; +import love.distributedrebirth.nx01.no2all.nostr.octo.trust.OctoTrustHash; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java index c5d405e..1a17f73 100644 --- a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java +++ b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java @@ -32,10 +32,10 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.share.NoStrShareLinkProfile; +import love.distributedrebirth.nx01.no2all.nostr.octo.OctoBitFormat; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-warp-manifestor/pom.xml b/nx01-warp-manifestor/pom.xml index 6d10768..b2da0fc 100644 --- a/nx01-warp-manifestor/pom.xml +++ b/nx01-warp-manifestor/pom.xml @@ -12,6 +12,10 @@ love.distributedrebirth.nx01 nx01-x4o-driver + + love.distributedrebirth.nx01 + nx01-no2all-nostr + org.junit.jupiter junit-jupiter diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java index fd11093..d882af4 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java @@ -38,13 +38,13 @@ import java.io.Writer; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import org.x4o.o2o.io.tlv.TLVChainOctalSex; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBit; import org.x4o.sax3.io.xdbx.XDBXReaderXml; import org.x4o.sax3.io.xdbx.XDBXWriterXml; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX8; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX18; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSex; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBit; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX0TheMimeType; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX0TheVersion; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContentPulser; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java index 658fc82..081c387 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java @@ -31,9 +31,8 @@ import java.util.Iterator; import java.util.Objects; import java.util.Optional; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBit; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrame; - +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBit; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBitFrame; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX0TheVersion; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestException; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java index ea49f45..700895c 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java @@ -27,9 +27,8 @@ w * Copyright ©Δ∞ 仙上主天 package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBit; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType; - +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBit; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBitFrameType; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicatePart; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java index bd04abe..b324dd6 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBitFrameType; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java index 09cad40..09c43bc 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java @@ -30,10 +30,10 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; import java.util.Iterator; import java.util.Objects; -import org.x4o.o2o.io.tlv.TLVChainOctalSex; -import org.x4o.o2o.io.tlv.TLVChainOctalSexFrame; import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSex; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSexFrame; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX0TheVersion; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestException; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java index 9af178a..23f553c 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java @@ -27,10 +27,10 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; -import org.x4o.o2o.io.tlv.TLVChainOctalSex; -import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType; import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSex; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSexFrameType; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicatePart; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java index bc458f6..b3cd926 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java @@ -27,11 +27,11 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; -import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType; -import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType; import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSexFrameType; +import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainSexTeenBitFrameType; import love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3.ScopicManifest3FrameTLV; /// @author للَّٰهِilLצسُو