Restore background function.

Author: toxicity188

bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/compatibility/oraxen/OraxenCompatibility.kt

@@ -45,6 +45,9 @@ class OraxenCompatibility : Compatibility {
             }
             else -> warn("Unknown Oraxen Version.")
         }
-        info("Successfully handle Oraxen $version.")
+        info(
+            "BetterHud hooks Oraxen $version.",
+            "Be sure to set 'pack-type' to 'none' in your config."
+        )
     }
 }

bootstrap/fabric/src/main/kotlin/kr/toxicity/hud/bootstrap/fabric/compatibility/PolymerResourcePackCompatibility.kt

@@ -49,5 +49,9 @@ class PolymerResourcePackCompatibility : Compatibility {
                 is OnReload -> warn("This mod is still on reload!")
             }
         }
+        info(
+            "BetterHud hooks Polymer resource pack.",
+            "Be sure to set 'pack-type' to 'none' in your config."
+        )
     }
 }

bootstrap/fabric/src/main/kotlin/kr/toxicity/hud/bootstrap/fabric/module/fabric/FabricStandardModule.kt

@@ -13,6 +13,7 @@ import kr.toxicity.hud.bootstrap.fabric.module.Module
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.attributes.Attributes
+import net.minecraft.world.item.ItemStack
 import java.util.function.Function
 
 class FabricStandardModule : Module {
@@ -206,8 +207,17 @@ class FabricStandardModule : Module {
                         it.fabricPlayer.hasPermission(args[0])
                     }
                 }
-
                 override fun getRequiredArgsLength(): Int = 1
-            }
+            },
+            "has_main_hand" to HudPlaceholder.of { _, _ ->
+                Function { p ->
+                    !p.fabricPlayer.mainHandItem.`is`(ItemStack.EMPTY.item)
+                }
+            },
+            "has_off_hand" to HudPlaceholder.of { _, _ ->
+                Function { p ->
+                    !p.fabricPlayer.offhandItem.`is`(ItemStack.EMPTY.item)
+                }
+            },
         )
 }

build.gradle.kts

@@ -31,7 +31,7 @@ val platform = "4.3.4"
 val targetJavaVersion = 21
 val velocity = "3.4.0"
 val bStats = "3.1.0"
-val betterCommand = "1.1"
+val betterCommand = "1.2"
 
 val supportedMinecraftVersions = listOf(
     //1.17
@@ -95,7 +95,7 @@ allprojects {
     apply(plugin = "org.jetbrains.dokka")
 
     group = "kr.toxicity.hud"
-    version = "1.8" + (System.getenv("BUILD_NUMBER")?.let { ".DEV-$it" } ?: "")
+    version = "1.9" + (System.getenv("BUILD_NUMBER")?.let { ".DEV-$it" } ?: "")
 
     repositories {
         mavenCentral()

changelog/1.9.md

@@ -14,18 +14,55 @@
 - If your server uses Oraxen, you have to use '/oraxen reload all' instead of '/hud reload'.
 
 ## Text layout
+![1](https://github.com/user-attachments/assets/2201c5ee-093f-4790-ab55-e0c40bf6a32f)
+```yaml
+test_text:
+  texts:
+    1:
+      name: unifont
+      pattern: Minecraft is a 3D sandbox adventure game developed by Mojang Studios where players can interact with a fully customizable three-dimensional world made of blocks and entities. Its diverse gameplay options allow players to choose the way they play, creating countless possibilities.
+      align: center
+      line-align: left
+      scale: 0.5
+      line: 5
+      split-width: 300
+      y: 32
+```
+![2](https://github.com/user-attachments/assets/ff220742-ecf0-4239-bc2b-be172ac2cc24)
+```yaml
+test_text:
+  texts:
+    1:
+      name: unifont
+      pattern: |
+        <image:star> Background test <image:star>
+        <image:star> Background test2 3 34 23423 <image:star>
+      background: test
+      align: center
+      line-align: center
+      scale: 0.5
+      line: 5
+      split-width: 300
+      y: 32
+```
 - Add 'line' to use multiple line text.
 - Add 'line-width' to define the y location of each line.
 - Add 'split-width' to define max length of each line.
 - Add 'line-align' to sort each line.
+- BetterHud uses '\n' to split text line.
 
-## Placeholder
+## Placeholder (Bukkit)
 These placeholders are added:
 - has_main_hand
 - has_off_hand
 - entity_health_percentage
 - entity_vehicle_health_percentage
 
+## Placeholder (Fabric)
+These placeholders are added:
+- has_main_hand
+- has_off_hand
+
 ## Placeholder (MythicMobs)
 These placeholders are added:
 - mythicmobs_aura_duration_reversed:arg
@@ -37,15 +74,23 @@ These placeholders are added:
 - mythicmobs_entity_has_aura:arg
 
 ## Fix
-- Fix inappropriate space.
+- Fix inappropriate text space.
 - Fix self-host to stop when switch to other pack type.
 - Fix command load problem.
-- Fix inappropriate compass location fix.
+- Fix inappropriate compass location.
+- Fix no mysql connector library found in Fabric and Velocity.
+
+## Improve
+- Improve compass movement.
 
 ## Config
 - Add 'remove-default-hotbar' to disable vanilla hotbar.
 - Add 'pack-type: none' to use other resource pack extension.
 
+## Library
+- Now BetterHud uses BetterCommand 1.2.
+- Clean jar file to use runtime library injector.
+
 ## Contribute
 These languages are included:
 - ja_JP

dist/src/main/kotlin/kr/toxicity/hud/BetterHudImpl.kt

@@ -49,7 +49,7 @@ class BetterHudImpl(val bootstrap: BetterHudBootstrap): BetterHud {
             PlaceholderManagerImpl,
             TriggerManagerImpl,
 
-            //BackgroundManager, //TODO Fix this
+            BackgroundManager,
             ImageManager,
             TextManagerImpl,
             PlayerHeadManager,

dist/src/main/kotlin/kr/toxicity/hud/background/BackgroundImage.kt

@@ -1,114 +1,17 @@
 package kr.toxicity.hud.background
 
-import kr.toxicity.hud.api.component.WidthComponent
-import kr.toxicity.hud.api.yaml.YamlObject
 import kr.toxicity.hud.configuration.HudConfiguration
-import kr.toxicity.hud.hud.HudImpl
-import kr.toxicity.hud.image.NamedLoadedImage
 import kr.toxicity.hud.location.PixelLocation
-import kr.toxicity.hud.pack.PackGenerator
-import kr.toxicity.hud.renderer.BackgroundRenderer
-import kr.toxicity.hud.resource.GlobalResource
-import kr.toxicity.hud.shader.HudShader
-import kr.toxicity.hud.util.*
-import net.kyori.adventure.text.Component
-import java.io.File
-import kotlin.math.roundToInt
+import kr.toxicity.hud.image.LoadedImage
 
-//TODO Fix this
+//TODO replace it to proper background in the future.
 class HudBackground(
     override val path: String,
-    private val id: String,
-    private val yamlObject: YamlObject
-) : HudConfiguration {
+    val name: String,
 
-    private val lineMap = HashMap<Int, List<ImageTriple>>()
+    val left: LoadedImage,
+    val right: LoadedImage,
+    val body: LoadedImage,
 
-    private val location = PixelLocation(yamlObject)
-    private val imageBuilder = BackgroundType.valueOf(yamlObject.getAsString("type", "auto").uppercase())
-
-    fun generateImage(resource: GlobalResource, line: Int, index: Int): ImageTriple {
-        val triple = lineMap.computeIfAbsent(line) {
-            val image = imageBuilder.parse(id, line, yamlObject)
-            val leftX = image.maxOf {
-                it.first.xOffset
-            }
-            val nameMap = run {
-                val list = ArrayList<ImageTriple>()
-                var i = 0
-                image.forEach {
-                    list.add(ImageTriple(
-                        leftX,
-                        it.first.toNamed("background_${id}_${line}_${++i}"),
-                        it.second.toNamed("background_${id}_${line}_${++i}"),
-                        it.third.toNamed("background_${id}_${line}_${++i}")
-                    ))
-                }
-                list
-            }
-            nameMap.forEach {
-                it.forEach { image ->
-                    PackGenerator.addTask(resource.textures + image.name) {
-                        image.image.image.toByteArray()
-                    }
-                }
-            }
-            nameMap
-        }
-        return if (index == 0) triple.first() else if (index == triple.lastIndex) triple.last() else triple[1.coerceAtMost(triple.lastIndex)]
-    }
-
-    inner class ImageTriple(
-        private val max: Int,
-        private val first: NamedLoadedImage,
-        private val second: NamedLoadedImage,
-        private val third: NamedLoadedImage
-    ) : Iterable<NamedLoadedImage> {
-        override fun iterator(): Iterator<NamedLoadedImage> = listOf(first, second, third).iterator()
-//        fun toBackground(shaders: HudShader, y: Int, scale: Double): BackgroundRenderer {
-//            var char = start
-//            fun NamedLoadedImage.toWidth(): WidthComponent {
-//                val c = (++char).parseChar()
-//                val height = (image.image.height.toDouble() * scale).roundToInt()
-//                val div = height.toDouble() / image.image.height.toDouble()
-//                HudImpl.createBit(shaders, y + location.y) {
-//                    json.add(jsonObjectOf(
-//                        "type" to "bitmap",
-//                        "file" to "$NAME_SPACE_ENCODED:$name",
-//                        "ascent" to it,
-//                        "height" to height,
-//                        "chars" to jsonArrayOf(c)
-//                    ))
-//                }
-//                return WidthComponent(Component.text().content(c), (image.image.width * div).roundToInt())
-//            }
-//            return BackgroundRenderer(
-//                location.x,
-//                BackgroundRenderer.BackgroundComponent(
-//                    max,
-//                    first.toWidth(),
-//                    second.toWidth(),
-//                    third.toWidth()
-//                )
-//            )
-//        }
-    }
-
-    enum class BackgroundType {
-        AUTO {
-            override fun parse(id: String, line: Int, yamlObject: YamlObject): List<BackgroundImage> {
-                val image = File(DATA_FOLDER.subFolder("assets"), yamlObject.get("file")
-                    .ifNull("value 'file' not set in $id")
-                    .asString()
-                    .replace('/', File.separatorChar))
-                    .ifNotExist {
-                        "This file doesn't exist: $id in $name"
-                    }
-                    .toImage()
-                return BackgroundImage.splitOf(line, image)
-            }
-        }
-        ;
-        abstract fun parse(id: String, line: Int, yamlObject: YamlObject): List<BackgroundImage>
-    }
-}
+    val location: PixelLocation,
+) : HudConfiguration

dist/src/main/kotlin/kr/toxicity/hud/background/HudBackground.kt

@@ -1,6 +1,7 @@
 package kr.toxicity.hud.compass
 
 import kr.toxicity.hud.api.yaml.YamlObject
+import kr.toxicity.hud.compass.type.CircleCompass
 import kr.toxicity.hud.resource.GlobalResource
 import java.io.File
 

dist/src/main/kotlin/kr/toxicity/hud/compass/CompassType.kt

@@ -1,11 +1,12 @@
-package kr.toxicity.hud.compass
+package kr.toxicity.hud.compass.type
 
 import com.google.gson.JsonArray
 import kr.toxicity.hud.api.component.WidthComponent
 import kr.toxicity.hud.api.configuration.HudObjectType
 import kr.toxicity.hud.api.player.HudPlayer
 import kr.toxicity.hud.api.update.UpdateEvent
 import kr.toxicity.hud.api.yaml.YamlObject
+import kr.toxicity.hud.compass.CompassImpl
 import kr.toxicity.hud.equation.TEquation
 import kr.toxicity.hud.hud.HudImpl
 import kr.toxicity.hud.location.PixelLocation

dist/src/main/kotlin/kr/toxicity/hud/compass/CircleCompass.kt dist/src/main/kotlin/kr/toxicity/hud/compass/type/CircleCompass.kt

@@ -2,8 +2,8 @@ package kr.toxicity.hud.component
 
 import kr.toxicity.hud.api.component.PixelComponent
 import kr.toxicity.hud.api.component.WidthComponent
-import kr.toxicity.hud.layout.LayoutAlign
-import kr.toxicity.hud.layout.LayoutOffset
+import kr.toxicity.hud.layout.enums.LayoutAlign
+import kr.toxicity.hud.layout.enums.LayoutOffset
 import kr.toxicity.hud.util.EMPTY_WIDTH_COMPONENT
 import kr.toxicity.hud.util.toSpaceComponent
 

dist/src/main/kotlin/kr/toxicity/hud/component/LayoutComponentContainer.kt

@@ -2,7 +2,7 @@ package kr.toxicity.hud.equation
 
 import kr.toxicity.hud.api.yaml.YamlObject
 import kr.toxicity.hud.location.PixelLocation
-import kr.toxicity.hud.image.LocationGroup
+import kr.toxicity.hud.location.LocationGroup
 import kr.toxicity.hud.location.GuiLocation
 
 class EquationPairLocation(

dist/src/main/kotlin/kr/toxicity/hud/equation/EquationPairLocation.kt

@@ -9,7 +9,7 @@ import kr.toxicity.hud.api.update.UpdateEvent
 import kr.toxicity.hud.api.yaml.YamlObject
 import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.location.PixelLocation
-import kr.toxicity.hud.location.AnimationType
+import kr.toxicity.hud.location.animation.AnimationType
 import kr.toxicity.hud.manager.ConfigManagerImpl
 import kr.toxicity.hud.manager.LayoutManager
 import kr.toxicity.hud.manager.ShaderManagerImpl