v0.7.4

loginproxy/encryptor.py

@@ -1,8 +1,6 @@
 
 from typing import Protocol
 
-from Crypto.Cipher import AES
-
 __all__ = [
 	'IConnection', 'Encryptor', 'EncryptedConn',
 	'new_aes',
@@ -20,6 +18,8 @@ def close(self) -> None:
 
 class Encryptor:
 	def __init__(self, secret: bytes):
+		from Crypto.Cipher import AES
+
 		self._secret = secret
 		self._encryptor = AES.new(secret, AES.MODE_CFB, iv=secret, segment_size=8)
 

loginproxy/server.py

@@ -14,9 +14,6 @@
 from math import *
 from typing import final, Any, Self, Callable
 
-from Crypto.Cipher import PKCS1_v1_5
-from Crypto.PublicKey import RSA
-
 import mcdreforged.api.all as MCDR
 
 from kpi.config import Properties
@@ -264,8 +261,16 @@ def __init__(self, server: MCDR.ServerInterface, base: str, config: LPConfig, wh
 			log_warn(tr('message.warn.port_might_same', self.server_addr, self.config.proxy_addr))
 		self._modt = self._properties.get_str('motd', 'A Minecraft Server')
 		self._max_players = self._properties.get_int('max-players', 20)
-		self._private_key = RSA.generate(1024)
-		self._cipher = PKCS1_v1_5.new(self._private_key)
+
+		if self.config.enable_packet_proxy:		
+			from Crypto.Cipher import PKCS1_v1_5
+			from Crypto.PublicKey import RSA
+
+			self._private_key = RSA.generate(1024)
+			self._cipher = PKCS1_v1_5.new(self._private_key)
+		else:
+			self._private_key = None
+			self._cipher = None
 
 		self._on_login = [cls.default_onlogin]
 		self._on_ping = [cls.default_onping]

mcdreforged.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "loginproxy",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "name": "LoginProxy",
   "description": {
     "en_us": "A Minecraft login proxy Plugin",

test.sh

@@ -42,10 +42,6 @@ if ! [ -f config.yml ]; then
 	set_mcdr_config
 fi
 
-if ! [ -n "$SERVER_URL" ]; then
-	SERVER_URL=https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar
-fi
-
 SERVER_DIR=server
 SERVER_EXE_NAME=minecraft_server