more lore, drop fabric loader req

JustAHuman-xD · Jul 11, 2024 · d220630 · d220630
1 parent 9206340
commit d220630
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx1G
 
 minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
-loader_version=0.16.0
+loader_version=0.15.11
 
-mod_version = 0.1.0
+mod_version = 0.1.1
 maven_group = me.justahuman
 archives_base_name = DystorianTweaks
 

diff --git a/src/main/java/me/justahuman/dystoriantweaks/mixins/ItemStackMixin.java b/src/main/java/me/justahuman/dystoriantweaks/mixins/ItemStackMixin.java
@@ -1,6 +1,7 @@
 package me.justahuman.dystoriantweaks.mixins;
 
 import me.justahuman.dystoriantweaks.Utils;
+import net.fabricmc.loader.impl.util.StringUtil;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
@@ -46,7 +47,7 @@ public void changeTooltip(PlayerEntity player, TooltipContext context, CallbackI
                 Text name = lore.get(0);
                 final boolean shiny = Utils.get(customData, "Shiny", false);
                 if (shiny) {
-                    name = name.copy().append(Text.literal(" ★").formatted(YELLOW, BOLD));
+                    name = Text.literal("").formatted(GOLD).append(name.copy().append(Text.literal(" ★").formatted(YELLOW, BOLD)));
                 }
                 final String gender = Utils.get(customData, "Gender", "NONE");
                 if (gender.equals("MALE") || gender.equals("FEMALE")) {
@@ -61,18 +62,43 @@ public void changeTooltip(PlayerEntity player, TooltipContext context, CallbackI
                 final List<Text> additionalLore = new ArrayList<>();
                 boolean spacer = false;
 
-                if (shiny) {
-                    additionalLore.add(Text.literal("Shiny").formatted(GOLD));
-                    spacer = true;
-                }
                 if (cycles != -1) {
                     additionalLore.add(Text.literal("Egg Cycles Remaining: ").formatted(GREEN)
                             .append(Text.literal(String.valueOf(cycles)).formatted(WHITE)));
                     spacer = true;
                 }
                 if (steps != -1) {
                     additionalLore.add(Text.literal("Steps Left: ").formatted(AQUA)
-                            .append(Text.literal(String.valueOf(steps)).formatted(WHITE)));
+                            .append(Text.literal(String.valueOf(Math.round(steps))).formatted(WHITE)));
+                    spacer = true;
+                }
+
+                String nature = Utils.get(customData, "Nature", "");
+                String ability = Utils.get(customData, "AbilityName", "");
+                String form = Utils.get(customData, "FormId", "");
+                if ((!nature.isBlank() || !ability.isBlank() || !form.isBlank()) && spacer) {
+                    additionalLore.add(Text.literal(" "));
+                    spacer = false;
+                }
+
+                if (!nature.isBlank()) {
+                    if (nature.contains(":")) {
+                        nature = StringUtil.capitalize(nature.substring(nature.indexOf(':') + 1));
+                    }
+                    additionalLore.add(Text.literal("Nature: ").formatted(YELLOW)
+                            .append(Text.literal(nature).formatted(WHITE)));
+                    spacer = true;
+                }
+
+                if (!ability.isBlank()) {
+                    additionalLore.add(Text.literal("Ability: ").formatted(GOLD)
+                            .append(Text.literal(StringUtil.capitalize(ability)).formatted(WHITE)));
+                    spacer = true;
+                }
+
+                if (!form.isBlank()) {
+                    additionalLore.add(Text.literal("Form: ").formatted(WHITE)
+                            .append(Text.literal(StringUtil.capitalize(form))));
                     spacer = true;
                 }