-module priority for gui sorting

Author: Smartin-b

common/src/main/java/smartin/miapi/client/gui/crafting/crafter/replace/ReplaceView.java

@@ -15,9 +15,11 @@
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.properties.AllowedSlots;
 import smartin.miapi.modules.properties.CraftingConditionProperty;
+import smartin.miapi.modules.properties.PriorityProperty;
 import smartin.miapi.modules.properties.SlotProperty;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -39,14 +41,16 @@ public ReplaceView(int x, int y, int width, int height, SlotProperty.ModuleSlot
         addChild(headerHolder);
 
 
-        ScrollingTextWidget header = new ScrollingTextWidget((int) ((this.getX() + 5) / headerScale), (int) (this.getY() / headerScale)+3, (int) ((this.width - 10) / headerScale), Text.translatable(Miapi.MOD_ID + ".ui.replace.header"), ColorHelper.Argb.getArgb(255, 255, 255, 255));
+        ScrollingTextWidget header = new ScrollingTextWidget((int) ((this.getX() + 5) / headerScale), (int) (this.getY() / headerScale) + 3, (int) ((this.width - 10) / headerScale), Text.translatable(Miapi.MOD_ID + ".ui.replace.header"), ColorHelper.Argb.getArgb(255, 255, 255, 255));
         headerHolder.addChild(header);
         ScrollList list = new ScrollList(x, y + 14, width, height - 16, new ArrayList<>());
         addChild(list);
         list.children().clear();
         ArrayList<InteractAbleWidget> toList = new ArrayList<>();
         toList.add(new SlotButton(0, 0, this.width, 15, null));
-        AllowedSlots.allowedIn(slot).forEach(module -> {
+        AllowedSlots.allowedIn(slot).stream()
+                .sorted(Comparator.comparingDouble(PriorityProperty::getFor))
+                .forEach(module -> {
             if (CraftingConditionProperty.isVisible(slot, module, MinecraftClient.getInstance().player, null)) {
                 toList.add(new SlotButton(0, 0, this.width, 15, module));
             }
@@ -95,10 +99,10 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
             if (isMouseOver(mouseX, mouseY)) {
                 hoverOffset = 14;
             }
-            if(!isAllowed){
+            if (!isAllowed) {
                 hoverOffset = 28;
             }
-            drawTextureWithEdge(drawContext, CraftingScreen.BACKGROUND_TEXTURE, getX(), getY(), 404, 54+hoverOffset, 108, 14, getWidth(), getHeight(), 512, 512, 3);
+            drawTextureWithEdge(drawContext, CraftingScreen.BACKGROUND_TEXTURE, getX(), getY(), 404, 54 + hoverOffset, 108, 14, getWidth(), getHeight(), 512, 512, 3);
             textWidget.setX(this.getX() + 2);
             textWidget.setY(this.getY() + 3);
 

common/src/main/java/smartin/miapi/modules/properties/PriorityProperty.java

@@ -0,0 +1,30 @@
+package smartin.miapi.modules.properties;
+
+import net.minecraft.item.ItemStack;
+import smartin.miapi.modules.ItemModule;
+import smartin.miapi.modules.properties.util.DoubleProperty;
+
+public class PriorityProperty extends DoubleProperty {
+    public static final String KEY = "priority";
+    public static PriorityProperty property;
+
+
+    public PriorityProperty() {
+        super(KEY);
+        property = this;
+    }
+
+    @Override
+    public Double getValue(ItemStack stack) {
+        return getValueRaw(stack);
+    }
+
+    public static double getFor(ItemModule module) {
+        return property.getValueForModule(new ItemModule.ModuleInstance(module));
+    }
+
+    @Override
+    public double getValueSafe(ItemStack stack) {
+        return getValueSafeRaw(stack);
+    }
+}

common/src/main/java/smartin/miapi/modules/properties/RepairPriority.java

@@ -40,14 +40,14 @@ private List<Material> getRepairMaterialsPrivate(ItemStack itemStack) {
         double lowest = Double.MAX_VALUE;
         List<Material> materials = new ArrayList<>();
         for (ItemModule.ModuleInstance moduleInstance : ItemModule.getModules(itemStack).allSubModules()) {
-            Double value = getValueForModule(itemStack, this, moduleInstance);
+            Double value = getValueForModule(moduleInstance);
             Material material = MaterialProperty.getMaterial(moduleInstance);
             if (value != null && material != null && lowest > value) {
                 lowest = value;
             }
         }
         for (ItemModule.ModuleInstance moduleInstance : ItemModule.getModules(itemStack).allSubModules()) {
-            Double value = getValueForModule(itemStack, this, moduleInstance);
+            Double value = getValueForModule(moduleInstance);
             Material material = MaterialProperty.getMaterial(moduleInstance);
             if (value != null && material != null && Math.abs(lowest - value) < 0.001) {
                 materials.add(material);

common/src/main/java/smartin/miapi/modules/properties/util/DoubleProperty.java

@@ -102,13 +102,13 @@ private static Double createValue(ItemStack itemStack, ModuleProperty property)
         }
     }
 
-    public Double getValueForModule(ItemStack itemStack, ModuleProperty property, ItemModule.ModuleInstance moduleInstance) {
+    public Double getValueForModule(ItemModule.ModuleInstance moduleInstance) {
         double value = 0;
         boolean hasValue = false;
         List<Double> addition = new ArrayList<>();
         List<Double> multiplyBase = new ArrayList<>();
         List<Double> multiplyTotal = new ArrayList<>();
-        JsonElement element = moduleInstance.getProperties().get(property);
+        JsonElement element = moduleInstance.getProperties().get(this);
         if (element != null) {
             if (element.isJsonArray()) {
                 for (JsonElement innerElement : element.getAsJsonArray()) {

common/src/main/java/smartin/miapi/registries/RegistryInventory.java

@@ -430,6 +430,7 @@ public static void setup() {
             registerMiapi(moduleProperties, CanWalkOnSnow.KEY, new CanWalkOnSnow());
             registerMiapi(moduleProperties, FireProof.KEY, new FireProof());
             registerMiapi(moduleProperties, RepairPriority.KEY, new RepairPriority());
+            registerMiapi(moduleProperties, PriorityProperty.KEY, new PriorityProperty());
 
             //compat
             registerMiapi(moduleProperties, BetterCombatProperty.KEY, new BetterCombatProperty());

common/src/main/resources/data/miapi/modules/armor/boots/boot_left.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/boots/boot_right.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/boots/wing_boot_left.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/boots/wing_boot_right.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/arm_left.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/arm_right.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/back_chestplate.json

@@ -23,6 +23,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/elytra_backplate.json

@@ -51,6 +51,7 @@
             }
         }
     },
+    "priority": 1,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/front_chestplate.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/wing_arm_left.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/chest/wing_arm_right.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/helmet/helmet_plate.json

@@ -25,6 +25,7 @@
         "armor",
         "helmet"
     ],
+    "priority": 0,
     "repairPriority": 0,
     "tag": [
         "background_icon",

common/src/main/resources/data/miapi/modules/armor/pants/belt.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/pants/leg_left.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/pants/leg_right.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 0,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/pants/wing_leg_left.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/armor/pants/wing_leg_right.json

@@ -44,6 +44,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": 0,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/arrow/head/arrow_custom_head.json

@@ -6,6 +6,7 @@
     "tag":  [
         "arrow_head"
     ],
+    "priority": 1,
     "attributes": [
         {
             "attribute": "miapi:generic.projectile_damage",

common/src/main/resources/data/miapi/modules/arrow/head/arrow_head.json

@@ -24,6 +24,7 @@
         "default",
         "arrow"
     ],
+    "priority": 0,
     "allowedInSlots": [
         "arrow_head"
     ],

common/src/main/resources/data/miapi/modules/bow/arm/long_bow_arms.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 3,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/bow/arm/normal_bow_arms.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 1,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/bow/arm/recurve_bow_arms.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 2,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/bow/arm/short_bow_arms.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 0,
     "repairPriority": 1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_dagger.json

@@ -33,6 +33,7 @@
         "blade",
         "polearm_spear"
     ],
+    "priority": 5,
     "repairPriority": -1,
     "allowedInSlots": [
         "sword_blade_small"

common/src/main/resources/data/miapi/modules/sword/blade/blade_greatsword.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 4,
     "materialProperty": [
         "default",
         "handheld",

common/src/main/resources/data/miapi/modules/sword/blade/blade_katana.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 2,
     "materialProperty": [
         "default",
         "handheld",

common/src/main/resources/data/miapi/modules/sword/blade/blade_longsword.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 1,
     "materialProperty": [
         "default",
         "handheld",

common/src/main/resources/data/miapi/modules/sword/blade/blade_rapier.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 3,
     "repairPriority": -1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_scythe.json

@@ -23,6 +23,7 @@
             }
         }
     ],
+    "priority": 3,
     "repairPriority": -1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_sickle.json

@@ -23,6 +23,7 @@
             }
         }
     ],
+    "priority": 6,
     "repairPriority": -1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_spear.json

@@ -23,6 +23,7 @@
             }
         }
     ],
+    "priority": 1,
     "repairPriority": -1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_sword.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 0,
     "repairPriority": -1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_throwing_knife.json

@@ -20,6 +20,7 @@
             }
         }
     },
+    "priority": 7,
     "repairPriority": -1,
     "materialProperty": [
         "default",

common/src/main/resources/data/miapi/modules/sword/blade/blade_trident.json

@@ -23,6 +23,7 @@
             }
         }
     ],
+    "priority": 2,
     "repairPriority": -1,
     "enchantments": {
         "allowed": [

common/src/main/resources/data/miapi/modules/sword/guard/guard_katana.json

@@ -17,6 +17,7 @@
         "default",
         "handheld"
     ],
+    "priority": 2,
     "repairPriority": 0,
     "durability": "[material.durability]* 0.25",
     "allowedMaterial": {