Bug fix, title update and criticals more modes

DearJasker · Aug 26, 2021 · 8e55441 · 8e55441
1 parent 2fe79f4
commit 8e55441
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,6 +73,7 @@ dependencies {
     }
 
     implementation group: 'org.reflections', name: 'reflections', version: '0.9.12'
+
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.72'
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: '1.3.72'
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: '1.3.72'
@@ -84,6 +85,12 @@ dependencies {
 
     implementation group: 'com.github.UnlegitMC', name: 'KittehIRCClientLib', version: '8a02d160f8'
 
+//    implementation group: 'com.labymedia', name: 'ultralight-java-base', version: '0.4.6'
+//    implementation group: 'com.labymedia', name: 'ultralight-java-databind', version: '0.4.6'
+//    implementation project(":ui")
+//    GPUDriver need the GLFW windowId to run, but LWJGL2 dont support GLFW
+//    implementation group: 'com.labymedia', name: 'ultralight-java-gpu', version: '0.4.6'
+
     compile fileTree(include: ['*.jar'], dir: 'libs')
 }
 
@@ -133,6 +140,8 @@ shadowJar {
         // depend of reflections
         include(dependency('org.javassist:javassist'))
 
+        include(dependency('com.github.UnlegitMC:FuckPCL'))
+
         // irc
         include(dependency('com.github.UnlegitMC:KittehIRCClientLib'))
         include(dependency('net.engio:mbassador'))
@@ -150,13 +159,21 @@ shadowJar {
 //        include(dependency('org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable'))
 //        include(dependency('org.jetbrains.intellij.deps:trove4j'))
 //        include(dependency('org.jetbrains.kotlin:kotlin-scripting-common'))
+
+        // ultralight
+        include(dependency('com.labymedia:ultralight-java-base'))
+        include(dependency('com.labymedia:ultralight-java-databind'))
+        include(project(":ui"))
     }
 
     exclude 'dummyThing'
     exclude 'LICENSE.txt'
     exclude 'LICENSE'
     exclude 'NOTICE'
 
+    // Ultralight native files are going to be downloaded from CCBlueX's cloud
+    exclude "native-binaries/*"
+
     classifier = ''
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,3 @@
 rootProject.name = 'JaskerFDP'
+
+include 'ui'
diff --git a/src/main/java/net/ccbluex/liquidbounce/LiquidBounce.kt b/src/main/java/net/ccbluex/liquidbounce/LiquidBounce.kt
@@ -36,9 +36,10 @@ object LiquidBounce {
     // Client information
     const val CLIENT_NAME = "JaskerFDP"
     const val COLORED_NAME = "§c§lJasker§6§lFDP"
-    const val CLIENT_REAL_VERSION = "082421 Build1801A"
+    const val CLIENT_REAL_VERSION = "082621"
     const val CLIENT_CREATOR = "CCBlueX & UnlegitMC & DearJasker"
     const val MINECRAFT_VERSION = "1.8.9"
+    const val CLIENT_AUTHOR = "DearJasker"
 
     // 自动读取客户端版本
     @JvmField

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/AutoAdvertise.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/AutoAdvertise.kt
@@ -1,8 +1,3 @@
-/*
- * FDPClient Hacked Client
- * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce.
- * https://github.com/UnlegitMC/FDPClient/
- */
 package net.ccbluex.liquidbounce.features.module.modules.client
 
 import net.ccbluex.liquidbounce.LiquidBounce

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoWeapon.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoWeapon.kt
@@ -24,6 +24,7 @@ import net.minecraft.network.play.client.C09PacketHeldItemChange
 @ModuleInfo(name = "AutoWeapon", category = ModuleCategory.COMBAT)
 class AutoWeapon : Module() {
 
+    private val onlySwordValue = BoolValue("OnlySword",false)
     private val silentValue = BoolValue("SpoofItem", false)
     private val ticksValue = IntegerValue("SpoofTicks", 10, 1, 20)
     private var attackEnemy = false
@@ -44,7 +45,7 @@ class AutoWeapon : Module() {
             // Find best weapon in hotbar (#Kotlin Style)
             val (slot, _) = (0..8)
                     .map { Pair(it, mc.thePlayer.inventory.getStackInSlot(it)) }
-                    .filter { it.second != null && (it.second.item is ItemSword || it.second.item is ItemTool) }
+                .filter { it.second != null && (it.second.item is ItemSword || (it.second.item is ItemTool&&!onlySwordValue.get()))}
                     .maxBy {
                         (it.second.attributeModifiers["generic.attackDamage"].first()?.amount
                                 ?: 0.0) + 1.25 * ItemUtils.getEnchantment(it.second, Enchantment.sharpness)

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Criticals.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Criticals.kt
@@ -28,7 +28,7 @@ import net.minecraft.stats.StatList
 @ModuleInfo(name = "Criticals", category = ModuleCategory.COMBAT)
 class Criticals : Module() {
 
-    val modeValue = ListValue("Mode", arrayOf("Packet", "NCPPacket", "Hypixel", "Hypixel2","Hypixel3","Minis","AACPacket", "AAC4Hover1", "AAC4Hover2", "AAC4.3.11OldHYT", "NoGround", "Visual", "RedeSkySmartGround", "RedeSkyLowHop", "Hop", "TPHop", "FakeCollide", "TPCollide", "Jump", "LowJump", "Hover1", "Hover2", "Mineplex", "More", "TestMinemora"), "packet")
+    val modeValue = ListValue("Mode", arrayOf("Packet", "NCPPacket", "Hypixel", "Hypixel2","Hypixel3","Minis","AACPacket", "AAC4Hover1", "AAC4Hover2", "AAC4.3.11OldHYT", "NoGround", "Visual", "RedeSkySmartGround", "RedeSkyLowHop", "Hop", "TPHop", "FakeCollide", "TPCollide", "Jump", "LowJump", "Hover1", "Hover2", "Mineplex", "More", "TestMinemora", "Spartan", "Horizon", "Jigsaw"), "packet")
     val delayValue = IntegerValue("Delay", 0, 0, 500)
     private val hurtTimeValue = IntegerValue("HurtTime", 10, 0, 10)
     private val lookValue = BoolValue("UseC06Packet", false)
@@ -239,6 +239,35 @@ class Criticals : Module() {
                 "jump" -> mc.thePlayer.motionY = 0.42
                 "lowjump" -> mc.thePlayer.motionY = 0.3425
                 "redeskylowhop" -> mc.thePlayer.motionY = 0.35
+                "Spartan" -> {
+                    if(lookValue.get()){
+                        mc.thePlayer.sendQueue.addToSendQueue(C06PacketPlayerPosLook(x, y + 0.4, z, yaw, pitch, true))
+                        mc.thePlayer.sendQueue.addToSendQueue(C06PacketPlayerPosLook(x, y, z, yaw, pitch, false))
+                    }else{
+                        mc.thePlayer.sendQueue.addToSendQueue(C04PacketPlayerPosition(x, y + 0.4, z,true))
+                        mc.thePlayer.sendQueue.addToSendQueue(C04PacketPlayerPosition(x, y, z, false))
+                    }
+                }
+                "Horizon" -> {
+                    if(mc.thePlayer.motionX == 0.0 && mc.thePlayer.motionZ == 0.0) {
+                        if(lookValue.get()){
+                            mc.thePlayer.sendQueue.addToSendQueue(C06PacketPlayerPosLook(x, y + 0.00000000255, z, yaw, pitch, true))
+                            mc.thePlayer.sendQueue.addToSendQueue(C06PacketPlayerPosLook(x, y, z, yaw, pitch, false))
+                        }else{
+                            mc.thePlayer.sendQueue.addToSendQueue(C04PacketPlayerPosition(x, y + 0.00000000255, z,true))
+                            mc.thePlayer.sendQueue.addToSendQueue(C04PacketPlayerPosition(x, y, z, false))
+                        }
+                    }
+                }
+                "Jigsaw" -> {
+                    if(lookValue.get()){
+                        mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C06PacketPlayerPosLook(x, y + 0.0625, z, yaw, pitch, true))
+                        mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C06PacketPlayerPosLook(x, y, z, yaw, pitch, false))
+                    }else{
+                        mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(x, y + 0.0625, z, true))
+                        mc.thePlayer.sendQueue.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(x, y, z, false))
+                    }
+                }
             }
             mc.thePlayer.onCriticalHit(entity)
             msTimer.reset()

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/SuperKnockback.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/SuperKnockback.kt
@@ -1,8 +1,3 @@
-/*
- * FDPClient Hacked Client
- * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce.
- * https://github.com/UnlegitMC/FDPClient/
- */
 package net.ccbluex.liquidbounce.features.module.modules.combat
 
 import net.ccbluex.liquidbounce.event.AttackEvent
@@ -43,4 +38,4 @@ class SuperKnockback : Module() {
             timer.reset()
         }
     }
-}
+}
diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/ClientUtils.java b/src/main/java/net/ccbluex/liquidbounce/utils/ClientUtils.java
@@ -7,6 +7,7 @@
 
 import com.google.gson.JsonObject;
 import net.ccbluex.liquidbounce.LiquidBounce;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.util.IChatComponent;
 import org.apache.logging.log4j.LogManager;
@@ -52,7 +53,7 @@ public static void logDebug(String msg){
     }
 
     public static void setTitle(){
-        Display.setTitle(LiquidBounce.CLIENT_NAME + " " + LiquidBounce.CLIENT_VERSION + " | Mc " + LiquidBounce.MINECRAFT_VERSION);
+        Display.setTitle(LiquidBounce.CLIENT_NAME + " " + LiquidBounce.CLIENT_VERSION + " Chinese | Minecraft " + LiquidBounce.MINECRAFT_VERSION + " | Hello " + Minecraft.getMinecraft().getSession().getUsername() + "! | By " + LiquidBounce.CLIENT_AUTHOR);
     }
 
     public static void disableFastRender() {

diff --git a/src/main/resources/assets/minecraft/fdpclient/locale/en_us.lang b/src/main/resources/assets/minecraft/fdpclient/locale/en_us.lang
@@ -265,6 +265,7 @@ module.AutoTool.description=Automatically selects the best tool in your inventor
 
 module.AutoWeapon.name=AutoWeapon
 module.AutoWeapon.description=Automatically selects the best weapon in your hotbar
+module.AutoWeapon.value.OnlySword=OnlySword
 module.AutoWeapon.value.SpoofItem.name=SpoofItem
 module.AutoWeapon.value.SpoofTicks.name=SpoofTicks