Implement improved modifier display name logic

SlimeKnights · Apr 17, 2022 · 7e9b450 · 7e9b450
1 parent 0cf2a01
commit 7e9b450
Show file tree

Hide file tree

Showing 47 changed files with 317 additions and 229 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@ forge_range=[40.0.41,)
 parchment_version=2022.03.13
 
 # Build Dependencies
-mantle_version=1.9.14
-mantle_range=1.9.14,)
+mantle_version=1.9.17
+mantle_range=1.9.17,)
 
 # Optional compat
 jei_version=9.5.3.153

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/diamond.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/diamond.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:single_level",
   "rarity": "uncommon",
   "stats": [
     {

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/draconic.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/draconic.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:single_level",
+  "always_show": false,
   "slots": {
     "abilities": 1
-  },
-  "single_level": true,
-  "always_show": false
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/ductile.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/ductile.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "stats": [
     {
       "stat": "tconstruct:durability",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/emerald.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/emerald.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:single_level",
   "rarity": "uncommon",
   "stats": [
     {

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/enhanced.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/enhanced.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:default",
+  "always_show": true,
   "slots": {
     "upgrades": 1
-  },
-  "single_level": false,
-  "always_show": true
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/fortune.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/fortune.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:loot",
+  "level_display": "tconstruct:default",
   "enchantment": {
     "name": "minecraft:fortune",
     "level": 1
-  },
-  "single_level": false
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/gilded.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/gilded.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:default",
+  "always_show": false,
   "slots": {
     "upgrades": 2
-  },
-  "single_level": false,
-  "always_show": false
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/golden.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/golden.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:no_levels",
   "flags": [
     "tconstruct:piglin_neutral"
   ]

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/harmonious.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/harmonious.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:single_level",
+  "always_show": false,
   "slots": {
     "upgrades": 1
-  },
-  "single_level": true,
-  "always_show": false
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/heavy.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/heavy.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "stats": [
     {
       "stat": "tconstruct:attack_damage",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/knockback_armor.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/knockback_armor.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "attributes": [
     {
       "unique": "tconstruct.modifier.armor_knockback",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/knockback_resistance.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/knockback_resistance.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "stats": [
     {
       "stat": "tconstruct:knockback_resistance",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/lightweight.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/lightweight.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "stats": [
     {
       "stat": "tconstruct:attack_speed",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/looting.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/looting.json
@@ -1,5 +1,5 @@
 {
   "type": "tconstruct:loot",
-  "looting": 1,
-  "single_level": false
+  "level_display": "tconstruct:default",
+  "looting": 1
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/luck.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/luck.json
@@ -0,0 +1,12 @@
+{
+  "type": "tconstruct:loot",
+  "level_display": {
+    "type": "tconstruct:unique",
+    "unique_until": 3
+  },
+  "enchantment": {
+    "name": "minecraft:fortune",
+    "level": 1
+  },
+  "looting": 1
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/netherite.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/netherite.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:single_level",
   "rarity": "rare",
   "stats": [
     {

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/reach.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/reach.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "attributes": [
     {
       "unique": "tconstruct.modifier.reach",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/recapitated.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/recapitated.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:single_level",
+  "always_show": false,
   "slots": {
     "upgrades": 1
-  },
-  "single_level": true,
-  "always_show": false
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/resurrected.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/resurrected.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:single_level",
+  "always_show": false,
   "slots": {
     "upgrades": 1
-  },
-  "single_level": true,
-  "always_show": false
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/revitalizing.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/revitalizing.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "attributes": [
     {
       "unique": "tconstruct.modifier.revitalizing",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/sharpness.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/sharpness.json
@@ -0,0 +1,14 @@
+{
+  "type": "tconstruct:stat_boost",
+  "level_display": {
+    "type": "tconstruct:unique",
+    "unique_until": 5
+  },
+  "stats": [
+    {
+      "stat": "tconstruct:attack_damage",
+      "type": "add",
+      "value": 0.75
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/sharpweight.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/sharpweight.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "stats": [
     {
       "stat": "tconstruct:mining_speed",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/shiny.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/shiny.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:no_levels",
   "rarity": "epic",
   "flags": [
     "tconstruct:shiny"

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/silky.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/silky.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:loot",
+  "level_display": "tconstruct:no_levels",
   "enchantment": {
     "name": "minecraft:silk_touch",
     "level": 1
-  },
-  "single_level": true
+  }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/speedy.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/speedy.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "attributes": [
     {
       "unique": "tconstruct.modifier.speedy",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/strength.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/strength.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "attributes": [
     {
       "unique": "tconstruct.modifier.strength",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/sturdy.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/sturdy.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "stats": [
     {
       "stat": "tconstruct:durability",

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/swiftstrike.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/swiftstrike.json
@@ -0,0 +1,14 @@
+{
+  "type": "tconstruct:stat_boost",
+  "level_display": {
+    "type": "tconstruct:unique",
+    "unique_until": 5
+  },
+  "stats": [
+    {
+      "stat": "tconstruct:attack_speed",
+      "type": "multiply_base",
+      "value": 0.05
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/wings.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/wings.json
@@ -1,5 +1,6 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:default",
   "flags": [
     "tconstruct:elyta"
   ]

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/worldbound.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/worldbound.json
@@ -1,5 +1,7 @@
 {
   "type": "tconstruct:stat_boost",
+  "level_display": "tconstruct:no_levels",
+  "rarity": "uncommon",
   "flags": [
     "tconstruct:indestructible"
   ]

diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/writable.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/writable.json
@@ -1,8 +1,8 @@
 {
   "type": "tconstruct:extra_slot",
+  "level_display": "tconstruct:single_level",
+  "always_show": false,
   "slots": {
     "upgrades": 1
-  },
-  "single_level": true,
-  "always_show": false
+  }
 }
diff --git a/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java b/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java
@@ -231,7 +231,7 @@ protected void generate() {
 
       // general
       with.accept(ModifierIds.gilded);
-      withL.accept(TinkerModifiers.luck);
+      with.accept(ModifierIds.luck);
       with.accept(ModifierIds.reach);
       withL.accept(TinkerModifiers.unbreakable);
       // armor

diff --git a/src/main/java/slimeknights/tconstruct/library/data/tinkering/AbstractModifierProvider.java b/src/main/java/slimeknights/tconstruct/library/data/tinkering/AbstractModifierProvider.java
@@ -61,7 +61,7 @@ public void run(HashCache cache) throws IOException {
 
   /** Converts the given object to json */
   private static JsonObject convert(Result result) {
-    JsonObject json = ModifierManager.MODIFIER_LOADERS.serialize(result.modifier());
+    JsonObject json = ModifierManager.MODIFIER_LOADERS.serialize(result.modifier()).getAsJsonObject();
     if (result.condition != null) {
       json.add("condition", CraftingHelper.serialize(result.condition));
     }

diff --git a/src/main/java/slimeknights/tconstruct/library/modifiers/Modifier.java b/src/main/java/slimeknights/tconstruct/library/modifiers/Modifier.java
@@ -39,6 +39,7 @@
 import slimeknights.tconstruct.common.TinkerTags;
 import slimeknights.tconstruct.library.client.ResourceColorManager;
 import slimeknights.tconstruct.library.modifiers.ModifierManager.ModifierRegistrationEvent;
+import slimeknights.tconstruct.library.modifiers.util.ModifierLevelDisplay;
 import slimeknights.tconstruct.library.recipe.tinkerstation.ValidatedResult;
 import slimeknights.tconstruct.library.tools.context.EquipmentChangeContext;
 import slimeknights.tconstruct.library.tools.context.EquipmentContext;
@@ -53,7 +54,6 @@
 import slimeknights.tconstruct.library.tools.stat.ModifierStatsBuilder;
 import slimeknights.tconstruct.library.tools.stat.ToolStats;
 import slimeknights.tconstruct.library.utils.RestrictedCompoundTag;
-import slimeknights.tconstruct.library.utils.RomanNumeralHelper;
 import slimeknights.tconstruct.library.utils.TooltipKey;
 import slimeknights.tconstruct.library.utils.Util;
 
@@ -225,9 +225,7 @@ public final Component getDisplayName() {
    * @return  Display name
    */
   public Component getDisplayName(int level) {
-    return applyStyle(new TranslatableComponent(getTranslationKey())
-                        .append(" ")
-                        .append(RomanNumeralHelper.getNumeral(level)));
+    return ModifierLevelDisplay.DEFAULT.nameForLevel(this, level);
   }
 
   /**