Very More

UnlegitMinecraft · Jul 9, 2024 · c1abea8 · c1abea8
1 parent 5780aeb
commit c1abea8
Show file tree

Hide file tree

Showing 241 changed files with 3,739 additions and 3,724 deletions.
diff --git a/src/main/java/cn/hanabi/gui/cloudmusic/MusicManager.java b/src/main/java/cn/hanabi/gui/cloudmusic/MusicManager.java
@@ -5,7 +5,7 @@
 import cn.hanabi.gui.cloudmusic.impl.Track;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
-import net.ccbluex.liquidbounce.LiquidBounce;
+import net.ccbluex.liquidbounce.FDPClientChina;
 import net.ccbluex.liquidbounce.event.EventTarget;
 import net.ccbluex.liquidbounce.event.TickEvent;
 import net.ccbluex.liquidbounce.utils.ClientUtils;
@@ -94,7 +94,7 @@ public MusicManager() {
         if (!musicFolder.exists())
             musicFolder.mkdirs(); // 文件夹不存在时创建
 
-        circleImage = new File(Minecraft.getMinecraft().mcDataDir.toString() + File.separator + LiquidBounce.CLIENT_NAME + File.separator + "circleImage");
+        circleImage = new File(Minecraft.getMinecraft().mcDataDir.toString() + File.separator + FDPClientChina.CLIENT_NAME + File.separator + "circleImage");
         if (!circleImage.exists()) {
             circleImage.mkdirs();
         }

diff --git a/.../net/ccbluex/liquidbounce/LiquidBounce.kt → ...et/ccbluex/liquidbounce/FDPClientChina.kt b/.../net/ccbluex/liquidbounce/LiquidBounce.kt → ...et/ccbluex/liquidbounce/FDPClientChina.kt
@@ -38,13 +38,10 @@ import net.ccbluex.liquidbounce.utils.timer.MSTimer
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.util.ResourceLocation
-import java.awt.SystemTray
-import java.awt.TrayIcon
 import java.util.*
-import javax.imageio.ImageIO
 import kotlin.concurrent.thread
 
-object LiquidBounce {
+object FDPClientChina {
 
 
     // Client information
@@ -65,7 +62,7 @@ object LiquidBounce {
 
     @JvmField
     val gitInfo = Properties().also {
-        val inputStream = LiquidBounce::class.java.classLoader.getResourceAsStream("git.properties")
+        val inputStream = FDPClientChina::class.java.classLoader.getResourceAsStream("git.properties")
         if (inputStream != null) {
             it.load(inputStream)
         } else {

diff --git a/src/main/java/net/ccbluex/liquidbounce/event/Events.kt b/src/main/java/net/ccbluex/liquidbounce/event/Events.kt
@@ -58,12 +58,8 @@ class ClientShutdownEvent : Event()
  *
  * @param motion jump motion (y motion)
  */
-class JumpEvent(var motion: Float) : CancellableEvent()
+data class JumpEvent(var motion: Float, var yaw: Float) : CancellableEvent()
 
-/**
- * Called when an entity receives damage
- */
-class EntityDamageEvent(val damagedEntity: Entity): Event()
 /**
  * Called when user press a key once
  *

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/Command.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/Command.kt
@@ -5,7 +5,7 @@
  */
 package net.ccbluex.liquidbounce.features.command
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.utils.ClientUtils
 import net.ccbluex.liquidbounce.utils.MinecraftInstance
 import net.minecraft.client.audio.PositionedSoundRecord
@@ -42,7 +42,7 @@ abstract class Command(val command: String, val alias: Array<String>) : Minecraf
     /**
      * Print [syntax] of command to chat
      */
-    protected fun chatSyntax(syntax: String) = ClientUtils.displayAlert("Syntax: §7${LiquidBounce.commandManager.prefix}$syntax")
+    protected fun chatSyntax(syntax: String) = ClientUtils.displayAlert("Syntax: §7${FDPClientChina.commandManager.prefix}$syntax")
 
     /**
      * Print [syntaxes] of command to chat
@@ -51,7 +51,7 @@ abstract class Command(val command: String, val alias: Array<String>) : Minecraf
         ClientUtils.displayAlert("Syntax:")
 
         for (syntax in syntaxes)
-            ClientUtils.displayChatMessage("§8> §7${LiquidBounce.commandManager.prefix}$command ${syntax.lowercase()}")
+            ClientUtils.displayChatMessage("§8> §7${FDPClientChina.commandManager.prefix}$command ${syntax.lowercase()}")
     }
 
     /**

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/commands/AutoDisableCommand.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/commands/AutoDisableCommand.kt
@@ -1,6 +1,6 @@
 package net.ccbluex.liquidbounce.features.command.commands
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.features.command.Command
 import net.ccbluex.liquidbounce.features.module.EnumAutoDisableType
 import net.ccbluex.liquidbounce.utils.misc.StringUtils
@@ -10,7 +10,7 @@ class AutoDisableCommand : Command("autodisable", arrayOf("ad")) {
 
     override fun execute(args: Array<String>) {
         if (args.size > 2) {
-            val module = LiquidBounce.moduleManager.getModule(args[1])
+            val module = FDPClientChina.moduleManager.getModule(args[1])
 
             if (module == null) {
                 alert("Module '${args[1]}' not found.")
@@ -36,7 +36,7 @@ class AutoDisableCommand : Command("autodisable", arrayOf("ad")) {
         if (args.isEmpty()) return emptyList()
 
         return when (args.size) {
-            1 -> LiquidBounce.moduleManager.modules
+            1 -> FDPClientChina.moduleManager.modules
                 .map { it.name }
                 .filter { it.startsWith(args[0], true) }
                 .toList()

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/commands/BindCommand.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/commands/BindCommand.kt
@@ -5,7 +5,7 @@
  */
 package net.ccbluex.liquidbounce.features.command.commands
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.features.command.Command
 import net.ccbluex.liquidbounce.ui.client.hud.element.elements.Notification
 import net.ccbluex.liquidbounce.ui.client.hud.element.elements.NotifyType
@@ -18,7 +18,7 @@ class BindCommand : Command("bind", emptyArray()) {
     override fun execute(args: Array<String>) {
         if (args.size > 1) {
             // Get module by name
-            val module = LiquidBounce.moduleManager.getModule(args[1])
+            val module = FDPClientChina.moduleManager.getModule(args[1])
 
             if (module == null) {
                 alert("Module §a§l" + args[1] + "§3 not found.")
@@ -32,12 +32,12 @@ class BindCommand : Command("bind", emptyArray()) {
 
                 // Response to user
                 alert("Bound module §a§l${module.name}§3 to key §a§l${Keyboard.getKeyName(key)}§3.")
-                LiquidBounce.hud.addNotification(
+                FDPClientChina.hud.addNotification(
                     Notification("KeyBind", "Bound ${module.name} to ${Keyboard.getKeyName(key)}.", NotifyType.INFO)
                 )
                 playEdit()
             } else {
-                LiquidBounce.moduleManager.pendingBindModule = module
+                FDPClientChina.moduleManager.pendingBindModule = module
                 alert("Press any key to bind module ${module.name}")
             }
             return
@@ -52,7 +52,7 @@ class BindCommand : Command("bind", emptyArray()) {
         val moduleName = args[0]
 
         return when (args.size) {
-            1 -> LiquidBounce.moduleManager.modules
+            1 -> FDPClientChina.moduleManager.modules
                     .map { it.name }
                     .filter { it.startsWith(moduleName, true) }
                     .toList()

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/commands/BindsCommand.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/commands/BindsCommand.kt
@@ -5,7 +5,7 @@
  */
 package net.ccbluex.liquidbounce.features.command.commands
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.features.command.Command
 import net.ccbluex.liquidbounce.utils.ClientUtils
 import org.lwjgl.input.Keyboard
@@ -17,7 +17,7 @@ class BindsCommand : Command("binds", emptyArray()) {
     override fun execute(args: Array<String>) {
         if (args.size > 1) {
             if (args[1].equals("clear", true)) {
-                for (module in LiquidBounce.moduleManager.modules)
+                for (module in FDPClientChina.moduleManager.modules)
                     module.keyBind = Keyboard.KEY_NONE
 
                 alert("Removed all binds.")
@@ -26,7 +26,7 @@ class BindsCommand : Command("binds", emptyArray()) {
         }
 
         alert("§c§lBinds")
-        LiquidBounce.moduleManager.modules.filter { it.keyBind != Keyboard.KEY_NONE }.forEach {
+        FDPClientChina.moduleManager.modules.filter { it.keyBind != Keyboard.KEY_NONE }.forEach {
             ClientUtils.displayChatMessage("§6> §c${it.name}: §a§l${Keyboard.getKeyName(it.keyBind)}")
         }
         chatSyntax("binds clear")

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/commands/ConfigCommand.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/commands/ConfigCommand.kt
@@ -1,6 +1,6 @@
 package net.ccbluex.liquidbounce.features.command.commands
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.features.command.Command
 import java.io.File
 import java.nio.file.Files
@@ -11,9 +11,9 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
             when (args[1].lowercase()) {
                 "create" -> {
                     if (args.size> 2) {
-                        val file = File(LiquidBounce.fileManager.configsDir, "${args[2]}.json")
+                        val file = File(FDPClientChina.fileManager.configsDir, "${args[2]}.json")
                         if (!file.exists()) {
-                            LiquidBounce.configManager.load(args[2], true)
+                            FDPClientChina.configManager.load(args[2], true)
                             alert("Created config ${args[2]}")
                         } else {
                             alert("Config ${args[2]} already exists")
@@ -25,9 +25,9 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
 
                 "load", "forceload" -> {
                     if (args.size> 2) {
-                        val file = File(LiquidBounce.fileManager.configsDir, "${args[2]}.json")
+                        val file = File(FDPClientChina.fileManager.configsDir, "${args[2]}.json")
                         if (file.exists()) {
-                            LiquidBounce.configManager.load(args[2], args[1].equals("load", true))
+                            FDPClientChina.configManager.load(args[2], args[1].equals("load", true))
                             alert("Loaded config ${args[2]}")
                         } else {
                             alert("Config ${args[2]} does not exist")
@@ -39,7 +39,7 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
 
                 "delete" -> {
                     if (args.size> 2) {
-                        val file = File(LiquidBounce.fileManager.configsDir, "${args[2]}.json")
+                        val file = File(FDPClientChina.fileManager.configsDir, "${args[2]}.json")
                         if (file.exists()) {
                             file.delete()
                             alert("Successfully deleted config ${args[2]}")
@@ -52,7 +52,7 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
                 }
 
                 "list" -> {
-                    val list = (LiquidBounce.fileManager.configsDir.listFiles() ?: return)
+                    val list = (FDPClientChina.fileManager.configsDir.listFiles() ?: return)
                         .filter { it.isFile }
                         .map {
                             val name = it.name
@@ -66,7 +66,7 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
                     alert("Configs(${list.size}):")
 
                     for (file in list) {
-                        if (file.equals(LiquidBounce.configManager.nowConfig)) {
+                        if (file.equals(FDPClientChina.configManager.nowConfig)) {
                             alert("-> §a§l$file")
                         } else {
                             alert("> $file")
@@ -75,19 +75,19 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
                 }
 
                 "save" -> {
-                    LiquidBounce.configManager.save(true, true)
-                    alert("Saved config ${LiquidBounce.configManager.nowConfig}")
+                    FDPClientChina.configManager.save(true, true)
+                    alert("Saved config ${FDPClientChina.configManager.nowConfig}")
                 }
 
                 "reload" -> {
-                    LiquidBounce.configManager.load(LiquidBounce.configManager.nowConfig, false)
-                    alert("Reloaded config ${LiquidBounce.configManager.nowConfig}")
+                    FDPClientChina.configManager.load(FDPClientChina.configManager.nowConfig, false)
+                    alert("Reloaded config ${FDPClientChina.configManager.nowConfig}")
                 }
 
                 "rename" -> {
                     if (args.size> 3) {
-                        val file = File(LiquidBounce.fileManager.configsDir, "${args[2]}.json")
-                        val newFile = File(LiquidBounce.fileManager.configsDir, "${args[3]}.json")
+                        val file = File(FDPClientChina.fileManager.configsDir, "${args[2]}.json")
+                        val newFile = File(FDPClientChina.fileManager.configsDir, "${args[3]}.json")
                         if (file.exists() && !newFile.exists()) {
                             file.renameTo(newFile)
                             alert("Renamed config ${args[2]} to ${args[3]}")
@@ -96,23 +96,23 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
                         } else if (newFile.exists()) {
                             alert("Config ${args[3]} already exists")
                         }
-                        if (LiquidBounce.configManager.nowConfig.equals(args[2], true)) {
-                            LiquidBounce.configManager.load(args[3], false)
-                            LiquidBounce.configManager.saveConfigSet()
+                        if (FDPClientChina.configManager.nowConfig.equals(args[2], true)) {
+                            FDPClientChina.configManager.load(args[3], false)
+                            FDPClientChina.configManager.saveConfigSet()
                         }
                     } else {
                         chatSyntax("${args[1]} <configName> <newName>")
                     }
                 }
 
                 "current" -> {
-                    alert("Current config is ${LiquidBounce.configManager.nowConfig}")
+                    alert("Current config is ${FDPClientChina.configManager.nowConfig}")
                 }
 
                 "copy" -> {
                     if (args.size> 3) {
-                        val file = File(LiquidBounce.fileManager.configsDir, "${args[2]}.json")
-                        val newFile = File(LiquidBounce.fileManager.configsDir, "${args[3]}.json")
+                        val file = File(FDPClientChina.fileManager.configsDir, "${args[2]}.json")
+                        val newFile = File(FDPClientChina.fileManager.configsDir, "${args[3]}.json")
                         if (file.exists() && !newFile.exists()) {
                             Files.copy(file.toPath(), newFile.toPath())
                             alert("Copied config ${args[2]} to ${args[3]}")
@@ -165,7 +165,7 @@ class ConfigCommand : Command("config", arrayOf("cfg")) {
             1 -> listOf("current", "copy", "create", "load", "forceload", "delete", "rename", "reload", "list", "save"/*, "toLegacy"*/).filter { it.startsWith(args[0], true) }
             2 -> when (args[0].lowercase()) {
                     "delete", "load", "forceload", "rename", "copy" -> {
-                        (LiquidBounce.fileManager.configsDir.listFiles() ?: return emptyList())
+                        (FDPClientChina.fileManager.configsDir.listFiles() ?: return emptyList())
                             .filter { it.isFile }
                             .map {
                                 val name = it.name

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/commands/FocusCommand.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/commands/FocusCommand.kt
@@ -5,7 +5,7 @@
  */
 package net.ccbluex.liquidbounce.features.command.commands
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.features.command.Command
 
 class FocusCommand : Command("focus", emptyArray()) {
@@ -26,13 +26,13 @@ class FocusCommand : Command("focus", emptyArray()) {
 
             when (focused.lowercase()) {
                 "add" -> {
-                    LiquidBounce.combatManager.focusedPlayerList.add(entity)
+                    FDPClientChina.combatManager.focusedPlayerList.add(entity)
                     alert("Successfully added §a${target.lowercase()}§3 into the focus list.")
                     return
                 }
                 "remove" -> {
-                    if (LiquidBounce.combatManager.focusedPlayerList.contains(entity)) {
-                        LiquidBounce.combatManager.focusedPlayerList.remove(entity)
+                    if (FDPClientChina.combatManager.focusedPlayerList.contains(entity)) {
+                        FDPClientChina.combatManager.focusedPlayerList.remove(entity)
                         alert("Successfully removed §a${target.lowercase()}§3 from the focus list.")
                         return
                     } else {
@@ -42,7 +42,7 @@ class FocusCommand : Command("focus", emptyArray()) {
                 }
             }
         } else if (args.size == 2 && args[1].equals("clear", true)) {
-            LiquidBounce.combatManager.focusedPlayerList.clear()
+            FDPClientChina.combatManager.focusedPlayerList.clear()
             alert("Successfully cleared the focus list.")
             return
         }

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/command/commands/FriendCommand.kt b/src/main/java/net/ccbluex/liquidbounce/features/command/commands/FriendCommand.kt
@@ -5,7 +5,7 @@
  */
 package net.ccbluex.liquidbounce.features.command.commands
 
-import net.ccbluex.liquidbounce.LiquidBounce
+import net.ccbluex.liquidbounce.FDPClientChina
 import net.ccbluex.liquidbounce.features.command.Command
 import net.ccbluex.liquidbounce.features.module.modules.misc.AntiBot
 import net.ccbluex.liquidbounce.utils.misc.StringUtils
@@ -17,7 +17,7 @@ class FriendCommand : Command("friend", arrayOf("friends")) {
      */
     override fun execute(args: Array<String>) {
         if (args.size > 1) {
-            val friendsConfig = LiquidBounce.fileManager.friendsConfig
+            val friendsConfig = FDPClientChina.fileManager.friendsConfig
 
             when {
                 args[1].equals("add", ignoreCase = true) -> {
@@ -30,7 +30,7 @@ class FriendCommand : Command("friend", arrayOf("friends")) {
                         }
 
                         if (if (args.size > 3) friendsConfig.addFriend(name, StringUtils.toCompleteString(args, 3)) else friendsConfig.addFriend(name)) {
-                            LiquidBounce.fileManager.saveConfig(friendsConfig)
+                            FDPClientChina.fileManager.saveConfig(friendsConfig)
                             alert("§a§l$name§3 was added to your friend list.")
                             playEdit()
                         } else {
@@ -93,7 +93,7 @@ class FriendCommand : Command("friend", arrayOf("friends")) {
                         val name = args[2]
 
                         if (friendsConfig.removeFriend(name)) {
-                            LiquidBounce.fileManager.saveConfig(friendsConfig)
+                            FDPClientChina.fileManager.saveConfig(friendsConfig)
                             alert("§a§l$name§3 was removed from your friend list.")
                             playEdit()
                         } else {
@@ -108,7 +108,7 @@ class FriendCommand : Command("friend", arrayOf("friends")) {
                 args[1].equals("clear", ignoreCase = true) -> {
                     val friends = friendsConfig.friends.size
                     friendsConfig.clearFriends()
-                    LiquidBounce.fileManager.saveConfig(friendsConfig)
+                    FDPClientChina.fileManager.saveConfig(friendsConfig)
                     alert("Removed $friends friend(s).")
                     return
                 }
@@ -141,7 +141,7 @@ class FriendCommand : Command("friend", arrayOf("friends")) {
                             .filter { it.startsWith(args[1], true) }
                     }
                     "remove" -> {
-                        return LiquidBounce.fileManager.friendsConfig.friends
+                        return FDPClientChina.fileManager.friendsConfig.friends
                                 .map { it.playerName }
                                 .filter { it.startsWith(args[1], true) }
                     }