fix scope render, increment version

gradle.properties

@@ -2,15 +2,15 @@ org.gradle.jvmargs  = -Xmx1G
 
 # https://fabricmc.net/develop/
 
-# the minimum version of Fabric Loader required by recode. update only as needed
-loaderVersion = 0.14.21
-
 # the mod version, without metadata
-modVersion = 0.1.0-beta.8
+modVersion = 0.1.0-beta.9
 
 # the current supported Minecraft version
 minecraftVersion = 1.20.2
 
+# the minimum version of Fabric Loader required by recode. update only as needed
+loaderVersion = 0.14.21
+
 # every version below this should be changed every Minecraft update
 # ideally, pick versions without bugs but not versions with unused features (for compatibility)
 

src/main/java/io/github/homchom/recode/game/ItemExtensions.kt

@@ -6,6 +6,7 @@ import io.github.homchom.recode.mixin.game.ItemStackAccessor
 import io.github.homchom.recode.ui.text.mergeStyle
 import io.github.homchom.recode.ui.text.toAdventure
 import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.format.Style
 import net.kyori.adventure.text.serializer.json.JSONComponentSerializer
 import net.minecraft.nbt.Tag
 import net.minecraft.world.item.ItemStack
@@ -23,7 +24,7 @@ fun ItemStack.lore(): List<Component> {
         for (index in 0..<loreTag.size) {
             val text = JSONComponentSerializer.json().deserializeOrNull(loreTag.getString(index)) ?: continue
             val style = ItemStackAccessor.getLoreVanillaStyle().toAdventure()
-            add(text.mergeStyle(style))
+            add(text.mergeStyle(style, strategy = Style.Merge.Strategy.IF_ABSENT_ON_TARGET))
         }
     }
 }

src/main/java/io/github/homchom/recode/mod/mixin/inventory/MHeldItemTooltip.java

@@ -22,7 +22,7 @@ public class MHeldItemTooltip {
     @Shadow
     private ItemStack lastToolHighlight;
 
-    // TODO: remove redundant code and improve performance (e.g. don't highlight every iteration)
+    // TODO: remove redundant code and improve performance
     @Inject(method = "renderSelectedItemName", at = @At("HEAD"), cancellable = true)
     public void renderSelectedItemName(GuiGraphics guiGraphics, CallbackInfo callbackInfo) {
         var renderVarScope = Config.getBoolean("variableScopeView");
@@ -68,6 +68,7 @@ public void renderSelectedItemName(GuiGraphics guiGraphics, CallbackInfo callbac
             }
 
             // render highlighting
+            // TODO: re-evaluate
             /*if (highlightVarSyntax) {
                 var formatted = VarSyntaxHighlighter.highlight(name.getAsString());