diff --git a/gradle.properties b/gradle.properties index 144a0bc265..46630be30b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3g -mod_version=b3 +mod_version=b4 maven_group=net.ccbluex archives_base_name=FDPClient diff --git a/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt b/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt index e10fdeaf83..c55d46aa29 100644 --- a/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt +++ b/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt @@ -60,7 +60,7 @@ object FDPClient { const val CLIENT_AUTHOR = "Zywl 1zuna" const val CLIENT_CLOUD = "https://cloud.liquidbounce.net/LiquidBounce" const val CLIENT_WEBSITE = "fdpinfo.github.io" - const val CLIENT_VERSION = "b3" + const val CLIENT_VERSION = "b4" val clientVersionText = gitInfo["git.build.version"]?.toString() ?: "unknown" val clientVersionNumber = clientVersionText.substring(1).toIntOrNull() ?: 0 // version format: "b" on legacy @@ -71,7 +71,7 @@ object FDPClient { * Defines if the client is in development mode. * This will enable update checking on commit time instead of regular legacy versioning. */ - const val IN_DEV = true + const val IN_DEV = false val clientTitle = CLIENT_NAME + " " + clientVersionText + " " + clientCommit + " | " + if (IN_DEV) " | DEVELOPMENT BUILD" else "" diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/CustomModel.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/CustomModel.kt index 194dee8a27..66406976e7 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/CustomModel.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/CustomModel.kt @@ -11,11 +11,8 @@ import net.ccbluex.liquidbounce.value.BoolValue import net.ccbluex.liquidbounce.value.ListValue object CustomModel : Module("CustomModel", Category.VISUAL, hideModule = false) { - val mode by ListValue("Mode", arrayOf("Imposter", "Rabbit", "Freddy"), "Imposter") + val mode by ListValue("Mode", arrayOf("Imposter", "Rabbit", "Freddy", "None"), "Imposter") - val onlyMe by BoolValue("OnlyMe", true) - val onlyOther by BoolValue("OnlyOther", true) - val baby by BoolValue("Baby", true) val rotatePlayer by BoolValue("RotatePlayer", false) override val tag: String diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/render/MixinRendererLivingEntity.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/render/MixinRendererLivingEntity.java index 93c08860ea..21b9263062 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/render/MixinRendererLivingEntity.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/render/MixinRendererLivingEntity.java @@ -144,7 +144,7 @@ public void doRender(T entity, double x, double y, d disableCull(); this.mainModel.swingProgress = this.getSwingProgress(entity, partialTicks); this.mainModel.isRiding = entity.isRiding(); - this.mainModel.isChild = customModel.getBaby() && (customModel.getOnlyMe() && entity == mc.thePlayer || customModel.getOnlyOther() && entity != mc.thePlayer) && customModel.handleEvents() || entity.isChild(); + this.mainModel.isChild = entity.isChild(); try { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Armor.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Armor.kt index 0dae772f42..fa30f8a235 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Armor.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Armor.kt @@ -40,7 +40,6 @@ class Armor(x: Double = -8.0, y: Double = 57.0, scale: Float = 1F, private val percentageY by IntegerValue("PositionY", -19, -50..50) private val percentageX by IntegerValue("PositionX", 21, -50..50) var borderThickness by IntegerValue("Border", 0, 0..255) - var borderRadius by FloatValue("Radius", 4.5f, 0.1f..8.0f) private val red by IntegerValue("Red", 255, 0..255) private val green by IntegerValue("Green", 255, 0..255) private val blue by IntegerValue("Blue", 255, 0..255)