diff options
| author | Aizistral | 2023-01-17 22:43:26 +0100 |
|---|---|---|
| committer | Aizistral | 2023-01-17 22:43:26 +0100 |
| commit | d872aeb94721e3834a66cdfe571268331829d5b8 (patch) | |
| tree | 4cdc4616084cfdee44160092d31343ca58a9bf18 /src/main/java | |
| parent | de705b0959d3c8143c24e6bd829f66fa2191f86d (diff) | |
I did in fact commence the work on modularization
Diffstat (limited to 'src/main/java')
19 files changed, 98 insertions, 76 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java index 257835b..3e3e499 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java @@ -11,6 +11,8 @@ import com.google.common.base.Preconditions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.network.chat.LocalChatSession; +import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket; public class NCRCore { public static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java index 01c33fa..ccac9ad 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java @@ -6,6 +6,7 @@ import java.nio.file.Path; import java.util.function.Supplier; import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.modules.encryption.EncryptionConfig; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -14,7 +15,7 @@ public final class NCRConfig { private static NCRConfigCommon common = null; private static NCRConfigClient client = null; private static NCRServerPreferences serverPreferences = null; - private static NCRConfigEncryption encryption = null; + private static EncryptionConfig encryption = null; private NCRConfig() { throw new IllegalStateException("Can't touch this"); @@ -35,7 +36,7 @@ public final class NCRConfig { } @Environment(EnvType.CLIENT) - public static NCRConfigEncryption getEncryption() { + public static EncryptionConfig getEncryption() { return checkLoaded(() -> encryption); } @@ -53,7 +54,7 @@ public final class NCRConfig { if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME); - encryption = JSONConfig.loadConfig(NCRConfigEncryption.class, NCRConfigEncryption::new, NCRConfigEncryption.FILE_NAME); + encryption = JSONConfig.loadConfig(EncryptionConfig.class, EncryptionConfig::new, EncryptionConfig.FILE_NAME); } save(); diff --git a/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java index 842dc86..25cab68 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports.common.core; import java.util.Optional; import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.encryption.Encryptor; +import com.aizistral.nochatreports.common.modules.encryption.Encryptor; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentContents; diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java index c0cdb47..b13f6ce 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java @@ -3,8 +3,8 @@ package com.aizistral.nochatreports.common.gui; import java.util.Objects; import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.config.NCRConfigEncryption; -import com.aizistral.nochatreports.common.encryption.Encryption; +import com.aizistral.nochatreports.common.modules.encryption.Algorithm; +import com.aizistral.nochatreports.common.modules.encryption.EncryptionConfig; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -39,7 +39,7 @@ public class EncryptionConfigScreen extends Screen { private final Screen previous; private CustomEditBox keyField, passField; private ImageButton validationIcon; - private CycleButton<Encryption> algorithmButton; + private CycleButton<Algorithm> algorithmButton; private MultiLineLabel keyDesc = MultiLineLabel.EMPTY, passDesc = MultiLineLabel.EMPTY; protected Checkbox encryptPublicCheck; private boolean settingPassKey = false; @@ -49,7 +49,7 @@ public class EncryptionConfigScreen extends Screen { this.previous = previous; } - private NCRConfigEncryption getConfig() { + private EncryptionConfig getConfig() { return NCRConfig.getEncryption(); } @@ -126,10 +126,10 @@ public class EncryptionConfigScreen extends Screen { this.onClose(); }).pos(this.width / 2 + 4, this.passField.getY() + 48).size(219, 20).build()); - CycleButton<Encryption> cycle = CycleButton.<Encryption>builder(value -> { + CycleButton<Algorithm> cycle = CycleButton.<Algorithm>builder(value -> { return Component.translatable("gui.nochatreports.encryption_config.algorithm", Component.translatable("algorithm.nochatreports." + value.getID() + ".name")); - }).withValues(Encryption.getRegistered()).displayOnlyValue().withInitialValue(this.getConfig() + }).withValues(Algorithm.getRegistered()).displayOnlyValue().withInitialValue(this.getConfig() .getAlgorithm()).withTooltip(value -> new AdvancedTooltip(Component.translatable( "algorithm.nochatreports." + value.getID())).setMaxWidth(250)) .create(this.width / 2 - 4 - 218, this.passField.getY() + 48, 218, 20, CommonComponents.EMPTY, @@ -222,7 +222,7 @@ public class EncryptionConfigScreen extends Screen { } private void onPassphraseUpdate(String pass) { - Encryption encryption = this.algorithmButton.getValue(); + Algorithm encryption = this.algorithmButton.getValue(); this.settingPassKey = true; if (!StringUtil.isNullOrEmpty(pass)) { @@ -235,7 +235,7 @@ public class EncryptionConfigScreen extends Screen { this.settingPassKey = false; } - private void onAlgorithmUpdate(Encryption encryption) { + private void onAlgorithmUpdate(Algorithm encryption) { if (!encryption.supportsPassphrases()) { this.passField.setFocused(false); this.passField.setEditable(this.passField.active = false); diff --git a/src/main/java/com/aizistral/nochatreports/common/modules/NCRModule.java b/src/main/java/com/aizistral/nochatreports/common/modules/NCRModule.java new file mode 100644 index 0000000..eb321e5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/modules/NCRModule.java @@ -0,0 +1,7 @@ +package com.aizistral.nochatreports.common.modules; + +public interface NCRModule { + + public void init(); + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESAlgorithm.java index 91cd92a..388ffc4 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESAlgorithm.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -14,11 +14,11 @@ import javax.crypto.spec.SecretKeySpec; import net.minecraft.util.StringUtil; -public abstract class AESEncryption extends Encryption { +public abstract class AESAlgorithm extends Algorithm { private final String mode, padding; private final boolean requiresIV; - protected AESEncryption(String mode, String padding, boolean requiresIV) { + protected AESAlgorithm(String mode, String padding, boolean requiresIV) { super("aes_" + mode.toLowerCase() + "_base64", "AES/" + mode + "+Base64"); this.mode = mode; this.padding = padding; diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESCFB8Algorithm.java index 9908ec8..fb8aac1 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESCFB8Algorithm.java @@ -1,10 +1,10 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; -public class AESCFB8Encryption extends AESEncryption { +public class AESCFB8Algorithm extends AESAlgorithm { - protected AESCFB8Encryption() { + protected AESCFB8Algorithm() { super("CFB8", "NoPadding", true); } diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryptor.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESCFB8Encryptor.java index 682cb91..bd94842 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESCFB8Encryptor.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.nio.ByteBuffer; import java.security.InvalidKeyException; @@ -10,14 +10,14 @@ import javax.crypto.spec.IvParameterSpec; import net.minecraft.util.Tuple; -public class AESCFB8Encryptor extends AESEncryptor<AESCFB8Encryption> { +public class AESCFB8Encryptor extends AESEncryptor<AESCFB8Algorithm> { protected AESCFB8Encryptor(String key) throws InvalidKeyException { - super(key, Encryption.AES_CFB8); + super(key, Algorithm.AES_CFB8); } protected AESCFB8Encryptor(SecretKey key, String mode, String padding, boolean iv) throws InvalidKeyException { - super(key, Encryption.AES_CFB8); + super(key, Algorithm.AES_CFB8); } @Override diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESECBAlgorithm.java index 1c12c51..2194bf0 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESECBAlgorithm.java @@ -1,10 +1,10 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; -public class AESECBEncryption extends AESEncryption { +public class AESECBAlgorithm extends AESAlgorithm { - protected AESECBEncryption() { + protected AESECBAlgorithm() { super("ECB", "PKCS5Padding", false); } diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESECBEncryptor.java index aa1f864..370ee27 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESECBEncryptor.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; import java.security.spec.AlgorithmParameterSpec; @@ -7,14 +7,14 @@ import javax.crypto.SecretKey; import net.minecraft.util.Tuple; -public class AESECBEncryptor extends AESEncryptor<AESECBEncryption> { +public class AESECBEncryptor extends AESEncryptor<AESECBAlgorithm> { protected AESECBEncryptor(String key) throws InvalidKeyException { - super(key, Encryption.AES_ECB); + super(key, Algorithm.AES_ECB); } protected AESECBEncryptor(SecretKey key, String mode, String padding, boolean iv) throws InvalidKeyException { - super(key, Encryption.AES_ECB); + super(key, Algorithm.AES_ECB); } @Override diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESEncryptor.java index 7e71d91..0e38ef7 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESEncryptor.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import static javax.crypto.Cipher.DECRYPT_MODE; import static javax.crypto.Cipher.ENCRYPT_MODE; @@ -19,7 +19,7 @@ import javax.crypto.spec.SecretKeySpec; import net.minecraft.util.Tuple; -public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> { +public abstract class AESEncryptor<T extends AESAlgorithm> extends Encryptor<T> { private final T encryption; private final SecretKey key; private final Cipher encryptor, decryptor; diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESGCMAlgorithm.java index d94b6fc..31607a5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESGCMAlgorithm.java @@ -1,10 +1,10 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; -public class AESGCMEncryption extends AESEncryption { +public class AESGCMAlgorithm extends AESAlgorithm { - protected AESGCMEncryption() { + protected AESGCMAlgorithm() { super("GCM", "NoPadding", true); } diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESGCMEncryptor.java index f91a0ab..4465d7b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/AESGCMEncryptor.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.nio.ByteBuffer; import java.security.InvalidKeyException; @@ -9,14 +9,14 @@ import javax.crypto.spec.GCMParameterSpec; import net.minecraft.util.Tuple; -public class AESGCMEncryptor extends AESEncryptor<AESGCMEncryption> { +public class AESGCMEncryptor extends AESEncryptor<AESGCMAlgorithm> { protected AESGCMEncryptor(String key) throws InvalidKeyException { - super(key, Encryption.AES_GCM); + super(key, Algorithm.AES_GCM); } protected AESGCMEncryptor(SecretKey key) throws InvalidKeyException { - super(key, Encryption.AES_GCM); + super(key, Algorithm.AES_GCM); } @Override diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/Encryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/Algorithm.java index 259d89d..0c3943b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/Algorithm.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; import java.util.ArrayList; @@ -6,19 +6,19 @@ import java.util.Base64; import java.util.Collections; import java.util.List; -public abstract class Encryption { - private static final List<Encryption> REGISTERED = new ArrayList<>(); +public abstract class Algorithm { + private static final List<Algorithm> REGISTERED = new ArrayList<>(); protected static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder(); protected static final Base64.Decoder BASE64_DECODER = Base64.getDecoder(); - public static final AESCFB8Encryption AES_CFB8 = new AESCFB8Encryption(); - public static final AESGCMEncryption AES_GCM = new AESGCMEncryption(); - public static final AESECBEncryption AES_ECB = new AESECBEncryption(); - public static final CaesarEncryption CAESAR = new CaesarEncryption(); + public static final AESCFB8Algorithm AES_CFB8 = new AESCFB8Algorithm(); + public static final AESGCMAlgorithm AES_GCM = new AESGCMAlgorithm(); + public static final AESECBAlgorithm AES_ECB = new AESECBAlgorithm(); + public static final CaesarAlgorithm CAESAR = new CaesarAlgorithm(); private final String id, name; - protected Encryption(String id, String name) { + protected Algorithm(String id, String name) { this.id = id; this.name = name; @@ -52,7 +52,7 @@ public abstract class Encryption { public abstract Encryptor<?> getRandomProcessor(); - public static List<Encryption> getRegistered() { + public static List<Algorithm> getRegistered() { return Collections.unmodifiableList(REGISTERED); } diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/CaesarAlgorithm.java index 27a1261..6c04141 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/CaesarAlgorithm.java @@ -1,11 +1,11 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; import java.security.SecureRandom; -public class CaesarEncryption extends Encryption { +public class CaesarAlgorithm extends Algorithm { - protected CaesarEncryption() { + protected CaesarAlgorithm() { super("caesar", "Caesar"); } diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/CaesarEncryptor.java index 7eb8010..e567c40 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/CaesarEncryptor.java @@ -1,14 +1,14 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; -public class CaesarEncryptor extends Encryptor<CaesarEncryption> { +public class CaesarEncryptor extends Encryptor<CaesarAlgorithm> { private static final char PARAGRAPH = '\u00a7', PARAGRAPH_PLACEHOLDER = '\uffef', DELETE = '\u007f', DELETE_PLACEHOLDER = '\ufff0'; private final int shift; protected CaesarEncryptor(int shift) throws InvalidKeyException { - if (!Encryption.CAESAR.validateKey(String.valueOf(shift))) + if (!Algorithm.CAESAR.validateKey(String.valueOf(shift))) throw new InvalidKeyException(); this.shift = shift; } @@ -52,8 +52,8 @@ public class CaesarEncryptor extends Encryptor<CaesarEncryption> { } @Override - public CaesarEncryption getAlgorithm() { - return Encryption.CAESAR; + public CaesarAlgorithm getAlgorithm() { + return Algorithm.CAESAR; } @Override @@ -62,7 +62,7 @@ public class CaesarEncryptor extends Encryptor<CaesarEncryption> { } private static int fromString(String key) throws InvalidKeyException { - if (!Encryption.CAESAR.validateKey(key)) + if (!Algorithm.CAESAR.validateKey(key)) throw new InvalidKeyException(key); return Integer.valueOf(key); } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/EncryptionConfig.java index a876c91..40e337a 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/EncryptionConfig.java @@ -1,37 +1,36 @@ -package com.aizistral.nochatreports.common.config; +package com.aizistral.nochatreports.common.modules.encryption; import java.security.InvalidKeyException; import java.util.List; import java.util.Optional; -import com.aizistral.nochatreports.common.encryption.Encryption; -import com.aizistral.nochatreports.common.encryption.Encryptor; +import com.aizistral.nochatreports.common.config.JSONConfig; -public class NCRConfigEncryption extends JSONConfig { +public class EncryptionConfig extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json"; protected boolean skipWarning = false, enableEncryption = false, encryptPublic = true, showEncryptionButton = true, showEncryptionIndicators = true; - protected String encryptionKey = Encryption.AES_CFB8.getDefaultKey(), encryptionPassphrase = "", - algorithmName = Encryption.AES_CFB8.getName(); + protected String encryptionKey = Algorithm.AES_CFB8.getDefaultKey(), encryptionPassphrase = "", + algorithmName = Algorithm.AES_CFB8.getName(); protected List<String> encryptableCommands = List.of("msg:1", "w:1", "whisper:1", "tell:1", "r:0", "dm:1", "me:0", "m:1", "t:1", "pm:1", "emsg:1", "epm:1", "etell:1", "ewhisper:1"); - private transient Encryption algorithm; + private transient Algorithm algorithm; private transient boolean isValid = false; private transient String lastMessage = "???"; - protected NCRConfigEncryption() { + protected EncryptionConfig() { super(FILE_NAME); } @Override - public NCRConfigEncryption getDefault() { - return new NCRConfigEncryption(); + public EncryptionConfig getDefault() { + return new EncryptionConfig(); } @Override protected void uponLoad() { - this.algorithm = Encryption.getRegistered().stream().filter(e -> e.getName().equals(this.algorithmName)) - .findFirst().orElse(Encryption.AES_CFB8); + this.algorithm = Algorithm.getRegistered().stream().filter(e -> e.getName().equals(this.algorithmName)) + .findFirst().orElse(Algorithm.AES_CFB8); this.validate(); } @@ -44,7 +43,7 @@ public class NCRConfigEncryption extends JSONConfig { this.saveFile(); } - public void setAlgorithm(Encryption encryption) { + public void setAlgorithm(Algorithm encryption) { this.algorithm = encryption; this.algorithmName = encryption.getName(); this.validate(); @@ -103,7 +102,7 @@ public class NCRConfigEncryption extends JSONConfig { return this.isEnabled() && this.isValid(); } - public Encryption getAlgorithm() { + public Algorithm getAlgorithm() { return this.algorithm; } diff --git a/src/main/java/com/aizistral/nochatreports/common/modules/encryption/EncryptionModule.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/EncryptionModule.java new file mode 100644 index 0000000..fd0dcb1 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/EncryptionModule.java @@ -0,0 +1,13 @@ +package com.aizistral.nochatreports.common.modules.encryption; + +import com.aizistral.nochatreports.common.modules.NCRModule; + +public class EncryptionModule implements NCRModule { + + @Override + public void init() { + // NO-OP + + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/encryption/Encryptor.java b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/Encryptor.java index 61718a4..a4b5d79 100644 --- a/src/main/java/com/aizistral/nochatreports/common/encryption/Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/modules/encryption/Encryptor.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.common.encryption; +package com.aizistral.nochatreports.common.modules.encryption; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; @@ -9,7 +9,7 @@ import it.unimi.dsi.fastutil.chars.Char2CharArrayMap; import it.unimi.dsi.fastutil.chars.Char2CharMap; import it.unimi.dsi.fastutil.chars.Char2CharMaps; -public abstract class Encryptor<T extends Encryption> { +public abstract class Encryptor<T extends Algorithm> { protected static final SecureRandom RANDOM = new SecureRandom(); protected static final Char2CharMap BASE64R_SHIFTS = createBase64RShifts(); protected static final Char2CharMap BASE64R_SHIFTS_REVERSE = createBase64RShiftsReverse(); @@ -63,7 +63,7 @@ public abstract class Encryptor<T extends Encryption> { } protected static String encodeBase64R(byte[] bytes) { - return shiftBase64R(fromBytes(Encryption.BASE64_ENCODER.encode(bytes))); + return shiftBase64R(fromBytes(Algorithm.BASE64_ENCODER.encode(bytes))); } protected static byte[] encodeBase64RBytes(String string) { @@ -75,16 +75,16 @@ public abstract class Encryptor<T extends Encryption> { } protected static byte[] decodeBase64RBytes(String string) { - return Encryption.BASE64_DECODER.decode(toBytes(unshiftBase64R(string))); + return Algorithm.BASE64_DECODER.decode(toBytes(unshiftBase64R(string))); } protected static String encodeBinaryKey(byte[] key) { - return fromBytes(Encryption.BASE64_ENCODER.encode(key)); + return fromBytes(Algorithm.BASE64_ENCODER.encode(key)); } protected static byte[] decodeBinaryKey(String key) throws InvalidKeyException { try { - return Encryption.BASE64_DECODER.decode(toBytes(key)); + return Algorithm.BASE64_DECODER.decode(toBytes(key)); } catch (Exception ex) { throw new InvalidKeyException(ex); } |
