move layout style system completly to StyleEntries

Author: DeDiamondPro

elementa/src/main/kotlin/dev/dediamondpro/minemark/elementa/elements/MarkdownListElementComponent.kt

@@ -40,24 +40,24 @@ class MarkdownListElementComponent(
     }
 
     override fun drawMarker(x: Float, y: Float, matrixStack: UMatrixStack) {
-        val scale = layoutStyle.fontSize
+        val scale = layoutStyle.get(LayoutStyle.FONT_SIZE)
         matrixStack.push()
         matrixStack.scale(scale, scale, 1f)
         fontProvider.drawString(
             matrixStack,
             markerStr,
-            layoutStyle.textColor,
+            layoutStyle.get(LayoutStyle.TEXT_COLOR),
             x / scale, y / scale,
             1f, 1f
         )
         matrixStack.pop()
     }
 
     override fun getListMarkerWidth(layoutData: LayoutData?, matrixStack: UMatrixStack): Float {
-        return fontProvider.getStringWidth(markerStr, 1f) * layoutStyle.fontSize
+        return fontProvider.getStringWidth(markerStr, 1f) * layoutStyle.get(LayoutStyle.FONT_SIZE)
     }
 
     override fun getMarkerHeight(layoutData: LayoutData?, matrixStack: UMatrixStack): Float {
-        return (fontProvider.getBaseLineHeight() + fontProvider.getShadowHeight()) * layoutStyle.fontSize
+        return (fontProvider.getBaseLineHeight() + fontProvider.getShadowHeight()) * layoutStyle.get(LayoutStyle.FONT_SIZE)
     }
 }

elementa/src/main/kotlin/dev/dediamondpro/minemark/elementa/elements/MarkdownTextComponent.kt

@@ -37,17 +37,17 @@ class MarkdownTextComponent(
     qName: String, attributes: Attributes?
 ) : TextElement<MarkdownStyle, UMatrixStack>(text, style, layoutStyle, parent, qName, attributes) {
     private val font = style.textStyle.font
-    private var scale = layoutStyle.fontSize
+    private var scale = layoutStyle.get(LayoutStyle.FONT_SIZE)
     private var prefix = buildString {
-        if (layoutStyle.isBold) append("§l")
-        if (layoutStyle.isItalic) append("§o")
-        if (layoutStyle.isUnderlined) append("§n")
-        if (layoutStyle.isStrikethrough) append("§m")
+        if (layoutStyle.get(LayoutStyle.BOLD)) append("§l")
+        if (layoutStyle.get(LayoutStyle.ITALIC)) append("§o")
+        if (layoutStyle.get(LayoutStyle.UNDERLINED)) append("§n")
+        if (layoutStyle.get(LayoutStyle.STRIKETHROUGH)) append("§m")
     }
 
     override fun generateLayout(layoutData: LayoutData?, matrixStack: UMatrixStack) {
         val mcScale = UResolution.scaleFactor.toFloat()
-        scale = round(layoutStyle.fontSize * mcScale) / mcScale
+        scale = round(layoutStyle.get(LayoutStyle.FONT_SIZE) * mcScale) / mcScale
         super.generateLayout(layoutData, matrixStack)
     }
 
@@ -62,18 +62,18 @@ class MarkdownTextComponent(
         matrixStack: UMatrixStack
     ) {
         prefix = buildString {
-            if (layoutStyle.isBold) append("§l")
-            if (layoutStyle.isItalic) append("§o")
-            if (layoutStyle.isStrikethrough) append("§m")
-            if (layoutStyle.isUnderlined || layoutStyle.isPartOfLink && hovered) append("§n")
+            if (layoutStyle.get(LayoutStyle.BOLD)) append("§l")
+            if (layoutStyle.get(LayoutStyle.ITALIC)) append("§o")
+            if (layoutStyle.get(LayoutStyle.STRIKETHROUGH)) append("§m")
+            if (layoutStyle.get(LayoutStyle.UNDERLINED) || layoutStyle.get(LayoutStyle.PART_OF_LINK) && hovered) append("§n")
         }
 
         matrixStack.push()
         matrixStack.scale(scale, scale, 1f)
         font.drawString(
             matrixStack,
             prefix + text,
-            layoutStyle.textColor,
+            layoutStyle.get(LayoutStyle.TEXT_COLOR),
             x / scale, y / scale,
             1f, 1f
         )

minecraft/src/main/java/dev/dediamondpro/minemark/minecraft/elements/MarkdownListElement.java

@@ -45,16 +45,16 @@ public MarkdownListElement(@NotNull MarkdownStyle style, @NotNull LayoutStyle la
 
     @Override
     protected void drawMarker(float x, float y, MarkdownRenderer renderer) {
-        renderer.drawText(markerStr, (int) x, (int) y, layoutStyle.getFontSize(), layoutStyle.getTextColor().getRGB(), style.getTextStyle().hasShadow());
+        renderer.drawText(markerStr, (int) x, (int) y, layoutStyle.get(LayoutStyle.FONT_SIZE), layoutStyle.get(LayoutStyle.TEXT_COLOR).getRGB(), style.getTextStyle().hasShadow());
     }
 
     @Override
     protected float getListMarkerWidth(LayoutData layoutData, MarkdownRenderer renderer) {
-        return renderer.getTextWidth(markerStr, layoutStyle.getFontSize());
+        return renderer.getTextWidth(markerStr, layoutStyle.get(LayoutStyle.FONT_SIZE));
     }
 
     @Override
     protected float getMarkerHeight(LayoutData layoutData, MarkdownRenderer renderData) {
-        return 8f * layoutStyle.getFontSize();
+        return 8f * layoutStyle.get(LayoutStyle.FONT_SIZE);
     }
 }

minecraft/src/main/java/dev/dediamondpro/minemark/minecraft/elements/MarkdownTextElement.java

@@ -51,10 +51,10 @@ protected float getTextWidth(@NotNull String text, float fontSize, MarkdownRende
 
     private String getPrefix(boolean hovered) {
         StringBuilder prefixBuilder = new StringBuilder();
-        if (layoutStyle.isBold()) prefixBuilder.append("§l");
-        if (layoutStyle.isItalic()) prefixBuilder.append("§o");
-        if (layoutStyle.isStrikethrough()) prefixBuilder.append("§m");
-        if (layoutStyle.isUnderlined() || layoutStyle.isPartOfLink() && hovered) prefixBuilder.append("§n");
+        if (layoutStyle.get(LayoutStyle.BOLD)) prefixBuilder.append("§l");
+        if (layoutStyle.get(LayoutStyle.ITALIC)) prefixBuilder.append("§o");
+        if (layoutStyle.get(LayoutStyle.STRIKETHROUGH)) prefixBuilder.append("§m");
+        if (layoutStyle.get(LayoutStyle.UNDERLINED) || layoutStyle.get(LayoutStyle.PART_OF_LINK) && hovered) prefixBuilder.append("§n");
         return prefixBuilder.toString();
     }