Take advantage of loadables to reduce code for modifier module loader…

…s, variables, and predicates IdParser is now a loadable for the relevant resource location variant IntRange is now a loadable for IntRange, it had a weird loading more of itself behavior going already In addition to those two, added loadables for: SlotType, LevelingValue, RandomLevelingValue, ModifierEntry, SlotType, IToolStat, INumericToolStat, TagKey<Modifier>, MaterialVariantId, plus various enums As part of this change, variable formulas now store "percent" as a field inside as it made it made it require less context shenanigans for parsing. Since we always want it for the tooltip anyways, does not hurt to place in that interface. They also are far simplier in other ways, notably all the loading logic was moved to a loadable.
SlimeKnights · Mar 22, 2024 · 63fa801 · 63fa801
1 parent d63ad00
commit 63fa801
Show file tree

Hide file tree

Showing 129 changed files with 1,034 additions and 2,350 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@ forge_range=[43.3.0,)
 parchment_version=2022.11.27
 
 # Build Dependencies
-mantle_version=1.10.13
-mantle_range=[1.10.13,)
+mantle_version=1.10.16
+mantle_range=[1.10,)
 
 # Optional compat
 jei_version=11.6.+

diff --git a/src/generated/resources/data/tconstruct/advancements/world/slimeskull.json b/src/generated/resources/data/tconstruct/advancements/world/slimeskull.json
@@ -18,6 +18,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:blazing_bone"
                 }
               ]
@@ -44,6 +45,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:bone"
                 }
               ]
@@ -70,6 +72,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:copper"
                 }
               ]
@@ -96,6 +99,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:darkthread"
                 }
               ]
@@ -122,6 +126,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:ender_pearl"
                 }
               ]
@@ -148,6 +153,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:glass"
                 }
               ]
@@ -174,6 +180,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:gold"
                 }
               ]
@@ -200,6 +207,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:iron"
                 }
               ]
@@ -226,6 +234,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:necrotic_bone"
                 }
               ]
@@ -252,6 +261,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:pig_iron"
                 }
               ]
@@ -278,6 +288,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:rose_gold"
                 }
               ]
@@ -304,6 +315,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:rotten_flesh"
                 }
               ]
@@ -330,6 +342,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:string"
                 }
               ]
@@ -356,6 +369,7 @@
                 },
                 {
                   "type": "tconstruct:has_material",
+                  "index": 0,
                   "material": "tconstruct:venombone"
                 }
               ]

diff --git a/src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_lingering_water.json b/src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_lingering_water.json
@@ -1,8 +1,11 @@
 {
   "type": "mantle:fill_item",
   "filled": {
+    "count": 1,
     "item": "minecraft:lingering_potion",
-    "nbt": "{Potion:\"minecraft:water\"}"
+    "nbt": {
+      "Potion": "minecraft:water"
+    }
   },
   "fluid": {
     "amount": 500,

diff --git a/src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_splash_water.json b/src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_splash_water.json
@@ -1,8 +1,11 @@
 {
   "type": "mantle:fill_item",
   "filled": {
+    "count": 1,
     "item": "minecraft:splash_potion",
-    "nbt": "{Potion:\"minecraft:water\"}"
+    "nbt": {
+      "Potion": "minecraft:water"
+    }
   },
   "fluid": {
     "amount": 500,

diff --git a/src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_water.json b/src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_water.json
@@ -1,8 +1,11 @@
 {
   "type": "mantle:fill_item",
   "filled": {
+    "count": 1,
     "item": "minecraft:potion",
-    "nbt": "{Potion:\"minecraft:water\"}"
+    "nbt": {
+      "Potion": "minecraft:water"
+    }
   },
   "fluid": {
     "amount": 500,

diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/blazing_bone.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/blazing_bone.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:blazing_bone\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:blazing_bone"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/bone.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/bone.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:bone\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:bone"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/copper.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/copper.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:copper\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:copper"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/darkthread.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/darkthread.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:darkthread\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:darkthread"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/ender_pearl.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/ender_pearl.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:ender_pearl\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:ender_pearl"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/glass.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/glass.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:glass\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:glass"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/gold.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/gold.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:gold\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:gold"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/iron.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/iron.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:iron\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:iron"
+      ]
+    }
   }
 }
diff --git a/...generated/resources/data/tconstruct/recipes/armor/building/slime_skull/necrotic_bone.json b/...generated/resources/data/tconstruct/recipes/armor/building/slime_skull/necrotic_bone.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:necrotic_bone\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:necrotic_bone"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/pig_iron.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/pig_iron.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:pig_iron\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:pig_iron"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rose_gold.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rose_gold.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:rose_gold\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:rose_gold"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rotten_flesh.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rotten_flesh.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:rotten_flesh\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:rotten_flesh"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/string.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/string.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:string\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:string"
+      ]
+    }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/venombone.json b/src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/venombone.json
@@ -10,7 +10,14 @@
     "tag": "tconstruct:ender_slime"
   },
   "result": {
+    "count": 1,
     "item": "tconstruct:slime_helmet",
-    "nbt": "{Damage:0,tic_broken:0b,tic_materials:[\"tconstruct:venombone\"]}"
+    "nbt": {
+      "Damage": 0,
+      "tic_broken": 0,
+      "tic_materials": [
+        "tconstruct:venombone"
+      ]
+    }
   }
 }