- fixes to stat preview

Author: Smartin-b

Truly Modular 2.0.mov

@@ -2,23 +2,17 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.item.ItemStack;
 import smartin.miapi.Miapi;
-import smartin.miapi.client.gui.ParentHandledScreen;
 import smartin.miapi.modules.properties.util.DoubleOperationResolvable;
 import smartin.miapi.modules.properties.util.DoubleProperty;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.function.BiFunction;
 
@@ -46,37 +40,12 @@ public double getValue(ItemStack stack) {
         return property.getValue(stack).orElse(0.0);
     }
 
-    //@Override
-    public void renderHover2(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
-        List<Component> list = new ArrayList(getHoverLines(drawContext, mouseX, mouseY, delta));
-        if (this.isMouseOver(mouseX, mouseY)) {
-            if (ParentHandledScreen.hasShiftDown()) {
-                property.getData(compareTo == null ? original : compareTo).ifPresent(resolvable -> {
-                    resolvable.operations.forEach(operation -> {
-                        if (operation.solve() != 0) {
-                            list.add(Component.literal(stringForOperation(operation)).withStyle(ChatFormatting.GRAY));
-                            if (ParentHandledScreen.hasAltDown()) {
-                                list.add(Component.literal("  " + operation.value).withStyle(ChatFormatting.DARK_GRAY));
-                            }
-                        }
-                    });
-                });
-                list.add(Component.translatable("miapi.ui.stat_detail.shift_alt").withStyle(ChatFormatting.DARK_GRAY));
-            } else {
-                list.add(Component.translatable("miapi.ui.stat_detail.shift").withStyle(ChatFormatting.DARK_GRAY));
-            }
-        }
-        drawContext.renderComponentTooltip(
-                Minecraft.getInstance().font,
-                list, mouseX, mouseY);
-    }
-
     public DoubleOperationResolvable getResolvable(ItemStack stack) {
         return property.getData(stack).orElse(null);
     }
 
-    public static String stringForOperation(DoubleOperationResolvable.Operation resolvable) {
-        String number = "" + resolvable.solve();
+    public static String stringForOperation(DecimalFormat format, DoubleOperationResolvable.Operation resolvable) {
+        String number = "" + format.format(resolvable.solve());
         String operation = getStringName(resolvable.attributeOperation);
         if (operation.equals("+") && number.startsWith("-")) {
             return number + " " + resolvable.instance.getModuleName().getString();
@@ -103,6 +72,7 @@ public static class Builder {
         public String translationKey = "";
         public Object[] descriptionArgs = new Object[]{};
         public DecimalFormat modifierFormat;
+        public DecimalFormat hoverFormat;
         public double min = 0;
         public double max = 100;
         public boolean inverse = false;
@@ -169,6 +139,13 @@ public Builder setFormat(String format) {
             return this;
         }
 
+        public Builder setHoverFormat(String format) {
+            hoverFormat = Util.make(new DecimalFormat(format), (decimalFormat) -> {
+                decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT));
+            });
+            return this;
+        }
+
         public SinglePropertyStatDisplay build() {
             // Validate the required fields
             if (name == null) {
@@ -185,6 +162,10 @@ public SinglePropertyStatDisplay build() {
             display.modifierFormat = modifierFormat;
             display.inverse = inverse;
             display.condition = condition;
+            if (hoverFormat == null) {
+                hoverFormat = modifierFormat;
+            }
+            display.hoverFormat = hoverFormat;
             return display;
         }
     }

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/SinglePropertyStatDisplay.java

@@ -41,6 +41,7 @@ public abstract class SingleStatDisplayDouble extends InteractAbleWidget impleme
     public double maxValue = 100;
     public double minValue = 0;
     public DecimalFormat modifierFormat;
+    public DecimalFormat hoverFormat;
     public StatListWidget.TextGetter text;
     public StatListWidget.TextGetter hover;
     public Component postfix = Component.nullToEmpty("");
@@ -196,13 +197,20 @@ public DoubleOperationResolvable getResolvable(ItemStack stack) {
         return null;
     }
 
+    public DecimalFormat getHoverFormat() {
+        if (hoverFormat == null) {
+            return modifierFormat;
+        }
+        return hoverFormat;
+    }
+
     public List<Component> getLinesForDouble(@Nullable DoubleOperationResolvable resolvable) {
         List<Component> list = new ArrayList();
         if (ParentHandledScreen.hasShiftDown()) {
             if (resolvable != null) {
                 resolvable.operations.forEach(operation1 -> {
                     if (operation1.solve() != 0) {
-                        list.add(Component.literal(SinglePropertyStatDisplay.stringForOperation(operation1)).withStyle(ChatFormatting.GRAY));
+                        list.add(Component.literal(SinglePropertyStatDisplay.stringForOperation(getHoverFormat(), operation1)).withStyle(ChatFormatting.GRAY));
                         if (ParentHandledScreen.hasAltDown()) {
                             operation1.source.ifPresent(list::add);
                             list.add(Component.literal("  " + operation1.value).withStyle(ChatFormatting.DARK_GRAY));

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/SingleStatDisplayDouble.java

@@ -188,6 +188,7 @@ public static void onReload() {
                 .builder(DurabilityProperty.property)
                 .setMax(2000)
                 .setFormat("##")
+                .setHoverFormat("##.##")
                 .setCondition((old, current) -> old.isDamageableItem() &&
                                                 current.isDamageableItem())
                 .setTranslationKey(DurabilityProperty.KEY).build());

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatListWidget.java

@@ -84,10 +84,16 @@ public class AttributeProperty extends CodecProperty<Map<ResourceLocation, Map<A
                     }
                     doubleOperation.attributeOperation = operation;
 
-                    DoubleOperationResolvable resolvable = new DoubleOperationResolvable(List.of(doubleOperation));
                     map.computeIfAbsent(id, i -> new LinkedHashMap<>())
                             .computeIfAbsent(targetOperation, t -> new LinkedHashMap<>())
-                            .computeIfAbsent(Either.left(equipmentSlotGroup), e -> resolvable);
+                            .compute(Either.left(equipmentSlotGroup), (e, resolvable1) -> {
+                                if (resolvable1 == null) {
+                                    return new DoubleOperationResolvable(List.of(doubleOperation));
+                                }
+                                List<DoubleOperationResolvable.Operation> operations = new ArrayList<>(resolvable1.operations);
+                                operations.add(doubleOperation);
+                                return new DoubleOperationResolvable(operations);
+                            });
                 });
                 return map;
             }, map -> List.of()));