Skip to content

Commit

Permalink
更改动画的默认值,正在Recode Step，添加内存修复，更新IntaveVelocity，重命名HUD的文件名,更新FDPCN&&丑飞…
Browse files Browse the repository at this point in the history 
…的NeverLose水印
  • Loading branch information
@XeContrast
XeContrast committed Aug 17, 2024
1 parent a17ed77 commit 557501c
Show file tree
Hide file tree
Showing 33 changed files with 906 additions and 328 deletions.
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ object FDPClient {
const val CLIENT_NAME = "FDPClientX-Reborn"
const val COLORED_NAME = "§7[§b§lFDPClient§7] "
const val CLIENT_CREATOR = "CCBlueX,Xebook1, Zywl && SkidderMC TEAM"
const val CLIENT_WEBSITE = "fdpinfo.github.io"
const val CLIENT_WEBSITE = ""
const val CLIENT_VERSION = "v5.6.0"
const val VERSIONTYPE = "Xe Preview"

// Flags
var isStarting = true
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/ccbluex/liquidbounce/features/module/Module.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package net.ccbluex.liquidbounce.features.module

import net.ccbluex.liquidbounce.FDPClient
import net.ccbluex.liquidbounce.event.Listenable
import net.ccbluex.liquidbounce.features.module.modules.client.HUD
import net.ccbluex.liquidbounce.features.module.modules.client.HUDModule
import net.ccbluex.liquidbounce.features.module.modules.client.SoundModule
import net.ccbluex.liquidbounce.ui.client.hud.element.elements.Notification
import net.ccbluex.liquidbounce.ui.client.hud.element.elements.NotifyType
Expand Down Expand Up @@ -148,7 +148,7 @@ open class Module : MinecraftInstance(), Listenable {
}
set(value) {
if (slideAnimation == null || (slideAnimation != null && slideAnimation!!.to != value.toDouble())) {
slideAnimation = Animation(EaseUtils.EnumEasingType.valueOf(HUD.arraylistXAxisAnimTypeValue.get()), EaseUtils.EnumEasingOrder.valueOf(HUD.arraylistXAxisAnimOrderValue.get()), field.toDouble(), value.toDouble(), HUD.arraylistXAxisAnimSpeedValue.get() * 30L).start()
slideAnimation = Animation(EaseUtils.EnumEasingType.valueOf(HUDModule.arraylistXAxisAnimTypeValue.get()), EaseUtils.EnumEasingOrder.valueOf(HUDModule.arraylistXAxisAnimOrderValue.get()), field.toDouble(), value.toDouble(), HUDModule.arraylistXAxisAnimSpeedValue.get() * 30L).start()
}
}
var yPosAnimation: Animation? = null
Expand All @@ -164,7 +164,7 @@ open class Module : MinecraftInstance(), Listenable {
}
set(value) {
if (yPosAnimation == null || (yPosAnimation != null && yPosAnimation!!.to != value.toDouble())) {
yPosAnimation = Animation(EaseUtils.EnumEasingType.valueOf(HUD.arraylistYAxisAnimTypeValue.get()), EaseUtils.EnumEasingOrder.valueOf(HUD.arraylistYAxisAnimOrderValue.get()), field.toDouble(), value.toDouble(), HUD.arraylistYAxisAnimSpeedValue.get() * 30L).start()
yPosAnimation = Animation(EaseUtils.EnumEasingType.valueOf(HUDModule.arraylistYAxisAnimTypeValue.get()), EaseUtils.EnumEasingOrder.valueOf(HUDModule.arraylistYAxisAnimOrderValue.get()), field.toDouble(), value.toDouble(), HUDModule.arraylistYAxisAnimSpeedValue.get() * 30L).start()
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Animations.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ object Animations : Module() {
val rotateXValue = FloatValue("RotateX", 0.0f, -180f, 180f)
val rotateYValue = FloatValue("RotateY", 0.0f, -180f, 180f)
val rotateZValue = FloatValue("RotateZ", 0.0f, -180f, 180f)
val itemPosXValue = FloatValue("ItemPosX", 0.66F, -1.0F, 1.0F)
val itemPosYValue = FloatValue("ItemPosY", -0.37F, -1.0F, 1.0F)
val itemPosZValue = FloatValue("ItemPosZ", -1.00F, -1.0F, 1.0F)
val itemScaleValue = FloatValue("ItemScale", 0.26f, 0.0f, 2.0f)
val itemPosXValue = FloatValue("ItemPosX", 0.56F, -1.0F, 1.0F)
val itemPosYValue = FloatValue("ItemPosY", -0.52F, -1.0F, 1.0F)
val itemPosZValue = FloatValue("ItemPosZ", -0.72F, -1.0F, 1.0F)
val itemScaleValue = FloatValue("ItemScale", 0.4f, 0.0f, 2.0f)
val swingAnimValue = BoolValue("SwingAnim", false)
val swingSpeedValue = FloatValue("SwingSpeed", 1f, 0.5f, 5.0f)
val anythingBlockValue = BoolValue("AnythingBlock", false)
Expand Down
69 changes: 65 additions & 4 deletions ...nce/features/module/modules/client/HUD.kt → ...atures/module/modules/client/HUDModule.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,24 @@ import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule.colorBlueValue
import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule.colorGreenValue
import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule.colorRedValue
import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner
import net.ccbluex.liquidbounce.ui.font.Fonts
import net.ccbluex.liquidbounce.utils.render.ColorUtils
import net.ccbluex.liquidbounce.utils.render.ColorUtils.fade
import net.ccbluex.liquidbounce.utils.render.ColorUtils.rainbow
import net.ccbluex.liquidbounce.utils.render.EaseUtils
import net.ccbluex.liquidbounce.utils.render.RenderUtils
import net.ccbluex.liquidbounce.utils.render.RoundedUtil
import net.minecraft.client.Minecraft
import net.minecraft.client.gui.GuiChat
import net.minecraft.client.renderer.GlStateManager
import net.minecraft.util.EnumChatFormatting
import net.minecraft.util.MathHelper
import net.minecraft.util.ResourceLocation
import java.awt.Color
import java.util.*

@ModuleInfo(name = "HUD", category = ModuleCategory.CLIENT, array = false, defaultOn = true)
object HUD : Module() {
object HUDModule : Module() {
val tabHead = BoolValue("Tab-HeadOverlay", true)
val shadowValue = ListValue("TextShadowMode", arrayOf("LiquidBounce", "Outline", "Default", "Autumn"), "Default")
private val clolormode = ListValue("ColorMode", arrayOf("Rainbow", "Light Rainbow", "Static", "Double Color", "Default"), "Light Rainbow")
Expand All @@ -40,7 +46,7 @@ object HUD : Module() {
val inventoryParticle = BoolValue("InventoryParticle", false)
private val blurValue = BoolValue("Blur", false)
private val HealthValue = BoolValue("Health", true)
private val mark = ListValue("Mark", arrayOf("FDPCN","FDP","None"),"FDP")
private val mark = ListValue("Mark", arrayOf("FDPCN","FDP","NeverLose", "None"),"FDP")
val rainbowStartValue = FloatValue("RainbowStart", 0.55f, 0f, 1f)
val rainbowStopValue = FloatValue("RainbowStop", 0.85f, 0f, 1f)
val rainbowSaturationValue = FloatValue("RainbowSaturation", 0.45f, 0f, 1f)
Expand All @@ -64,8 +70,12 @@ object HUD : Module() {
if (MusicDisplay.get()) MusicOverlayRenderer.INSTANCE.renderOverlay()
if (mc.currentScreen is GuiHudDesigner) return
FDPClient.hud.render(false, event.partialTicks)
if (mark.equals("FDP")) renderWatermark()
if (mark.equals("FDPCN")) renderfdpcn()
when (mark.get().lowercase()) {
"fdp" -> renderWatermark()
"fdpcn" -> renderfdpcn()
"neverlose" -> neverlose()
else -> {}
}
if (HealthValue.get()) mc.fontRendererObj.drawStringWithShadow(
MathHelper.ceiling_float_int(mc.thePlayer.health).toString(),
(width / 2 - 4).toFloat(), (height / 2 - 13).toFloat(), if (mc.thePlayer.health <= 15) Color(255, 0, 0).rgb else Color(0, 255, 0).rgb)
Expand Down Expand Up @@ -100,6 +110,57 @@ object HUD : Module() {

getClientName(0,3), 5.0f, 0.0f,Color(255,255,255,220).rgb
)
FontLoaders.C16.drawString(
"Xe", 5F + FontLoaders.F40.getStringWidth("FDP"), 13.0f,Color(255,255,255,220).rgb
)
RenderUtils.drawRect(5f,22.5f,70f,22.8f,Color(200,200,200,220).rgb)
FontLoaders.C14.drawString(
FDPClient.CLIENT_VERSION + " | "+ FDPClient.VERSIONTYPE, 5.0f, 27.0f,Color(255,255,255,220).rgb
)
FontLoaders.C14.drawString(
"CN 240817 | Reborn!", 5.0f, 37.0f,Color(255,255,255,220).rgb
)
}
private fun neverlose() {
val str =
EnumChatFormatting.DARK_GRAY.toString() + " | " + EnumChatFormatting.WHITE + mc.session.username + EnumChatFormatting.DARK_GRAY + " | " + EnumChatFormatting.WHITE + Minecraft.getDebugFPS() + "fps" + EnumChatFormatting.DARK_GRAY + " | " + EnumChatFormatting.WHITE + (if (mc.isSingleplayer) "SinglePlayer" else mc.currentServerData.serverIP)
RoundedUtil.drawRound(
6.0f, 6.0f,
(Fonts.font35.getStringWidth(str) + 8 + Fonts.font40.getStringWidth(
CLIENT_NAME.uppercase(
Locale.getDefault()
)
)).toFloat(), 15.0f, 0.0f, Color(19, 19, 19, 230)
)
RoundedUtil.drawRound(
6.0f, 6.0f,
(Fonts.font35.getStringWidth(str) + 8 + Fonts.font40.getStringWidth(
CLIENT_NAME.uppercase(
Locale.getDefault()
)
)).toFloat(), 1.0f, 1.0f, color(8)
)
Fonts.font35.drawString(
str,
(11 + Fonts.font40.getStringWidth(CLIENT_NAME.uppercase(Locale.getDefault()))).toFloat(), 11.5f, Color.WHITE.rgb
)
Fonts.font40.drawString(
EnumChatFormatting.BOLD.toString() + CLIENT_NAME.uppercase(
Locale.getDefault()
), 9.5f, 11.5f, color(8).rgb
)
Fonts.font40.drawString(
EnumChatFormatting.BOLD.toString() + CLIENT_NAME.uppercase(
Locale.getDefault()
), 10.0f, 12f, Color.WHITE.rgb
)
}

fun color(tick: Int): Color {
var textColor = Color(-1)
textColor =
fade(5, tick * 20, rainbow(), 1.0f)
return textColor
}

@EventTarget
Expand Down
Loading

0 comments on commit 557501c

Please sign in to comment.