Add material categories (unused) (#267)

SilentChaos512 · Nov 28, 2020 · f11c100 · f11c100
1 parent c3a319c
commit f11c100
Show file tree

Hide file tree

Showing 76 changed files with 397 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+- Material categories. These are unused currently, but will be used for synergy calculations in the future. Categories can be any string and may be defined by mods or data packs. [#267]
 - Individual traits can now supply extra wiki lines in their JSON. _This is not synced with the client on dedicated servers._ Useful for adding more information to frequently confused traits, like Lucky.
 ### Changed
 - Materials will no longer inherit stats and traits from their parent of they provide any of their own [related to #266]

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/aluminum.json b/src/generated/resources/data/silentgear/silentgear_materials/aluminum.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/aluminum_steel.json b/src/generated/resources/data/silentgear/silentgear_materials/aluminum_steel.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/azure_electrum.json b/src/generated/resources/data/silentgear/silentgear_materials/azure_electrum.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 4,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/azure_silver.json b/src/generated/resources/data/silentgear/silentgear_materials/azure_silver.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/barrier.json b/src/generated/resources/data/silentgear/silentgear_materials/barrier.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 5,
+    "categories": [
+      "intangible"
+    ],
     "visible": false,
     "gear_blacklist": [],
     "can_salvage": false

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/basalt.json b/src/generated/resources/data/silentgear/silentgear_materials/basalt.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "rock"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/bismuth.json b/src/generated/resources/data/silentgear/silentgear_materials/bismuth.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/bismuth_brass.json b/src/generated/resources/data/silentgear/silentgear_materials/bismuth_brass.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/bismuth_steel.json b/src/generated/resources/data/silentgear/silentgear_materials/bismuth_steel.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/blackstone.json b/src/generated/resources/data/silentgear/silentgear_materials/blackstone.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "rock"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/blaze_gold.json b/src/generated/resources/data/silentgear/silentgear_materials/blaze_gold.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/bone.json b/src/generated/resources/data/silentgear/silentgear_materials/bone.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/brass.json b/src/generated/resources/data/silentgear/silentgear_materials/brass.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/bronze.json b/src/generated/resources/data/silentgear/silentgear_materials/bronze.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/compressed_iron.json b/src/generated/resources/data/silentgear/silentgear_materials/compressed_iron.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/copper.json b/src/generated/resources/data/silentgear/silentgear_materials/copper.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 1,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/crimson_iron.json b/src/generated/resources/data/silentgear/silentgear_materials/crimson_iron.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/crimson_steel.json b/src/generated/resources/data/silentgear/silentgear_materials/crimson_steel.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 4,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/diamond.json b/src/generated/resources/data/silentgear/silentgear_materials/diamond.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 3,
+    "categories": [
+      "gem"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/electrum.json b/src/generated/resources/data/silentgear/silentgear_materials/electrum.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/emerald.json b/src/generated/resources/data/silentgear/silentgear_materials/emerald.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 3,
+    "categories": [
+      "gem"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/end_stone.json b/src/generated/resources/data/silentgear/silentgear_materials/end_stone.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "rock"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/enderium.json b/src/generated/resources/data/silentgear/silentgear_materials/enderium.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 4,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/example.json b/src/generated/resources/data/silentgear/silentgear_materials/example.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 0,
+    "categories": [
+      "intangible"
+    ],
     "visible": false,
     "gear_blacklist": [
       "all"

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/feather.json b/src/generated/resources/data/silentgear/silentgear_materials/feather.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/flax.json b/src/generated/resources/data/silentgear/silentgear_materials/flax.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/flint.json b/src/generated/resources/data/silentgear/silentgear_materials/flint.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "rock"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/glowstone.json b/src/generated/resources/data/silentgear/silentgear_materials/glowstone.json
@@ -1,6 +1,10 @@
 {
   "availability": {
     "tier": 2,
+    "categories": [
+      "rock",
+      "gem"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/gold.json b/src/generated/resources/data/silentgear/silentgear_materials/gold.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/invar.json b/src/generated/resources/data/silentgear/silentgear_materials/invar.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/iron.json b/src/generated/resources/data/silentgear/silentgear_materials/iron.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/lapis_lazuli.json b/src/generated/resources/data/silentgear/silentgear_materials/lapis_lazuli.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 2,
+    "categories": [
+      "gem"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/lead.json b/src/generated/resources/data/silentgear/silentgear_materials/lead.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 2,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/leather.json b/src/generated/resources/data/silentgear/silentgear_materials/leather.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 0,
+    "categories": [
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/leaves.json b/src/generated/resources/data/silentgear/silentgear_materials/leaves.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/lumium.json b/src/generated/resources/data/silentgear/silentgear_materials/lumium.json
@@ -10,6 +10,9 @@
   ],
   "availability": {
     "tier": 3,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/netherite.json b/src/generated/resources/data/silentgear/silentgear_materials/netherite.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 4,
+    "categories": [
+      "metal"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/netherrack.json b/src/generated/resources/data/silentgear/silentgear_materials/netherrack.json
@@ -1,6 +1,10 @@
 {
   "availability": {
     "tier": 1,
+    "categories": [
+      "rock",
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true

diff --git a/src/generated/resources/data/silentgear/silentgear_materials/netherwood.json b/src/generated/resources/data/silentgear/silentgear_materials/netherwood.json
@@ -1,6 +1,9 @@
 {
   "availability": {
     "tier": 0,
+    "categories": [
+      "organic"
+    ],
     "visible": true,
     "gear_blacklist": [],
     "can_salvage": true