Damagable and ore melting recipe improvement

Ore melting recipes can now set a rate per byproduct Damagable recipes now can specify a unit, which scales fluid down to a minimum of that unit (#4671)
SlimeKnights · May 21, 2022 · c287dd7 · c287dd7
1 parent ed2ccf8
commit c287dd7
Show file tree

Hide file tree

Showing 42 changed files with 240 additions and 101 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_boots.json b/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_boots.json
@@ -11,7 +11,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_clay",
-    "amount": 1000
+    "amount": 1000,
+    "unit_size": 50
   },
   "temperature": 450,
   "time": 96

diff --git a/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_chestplate.json b/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_chestplate.json
@@ -11,7 +11,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_clay",
-    "amount": 2000
+    "amount": 2000,
+    "unit_size": 50
   },
   "temperature": 450,
   "time": 144

diff --git a/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_helmet.json b/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_helmet.json
@@ -11,7 +11,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_clay",
-    "amount": 1250
+    "amount": 1250,
+    "unit_size": 50
   },
   "temperature": 450,
   "time": 108

diff --git a/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_leggings.json b/src/generated/resources/data/tconstruct/recipes/compat/ceramics/clay/clay_leggings.json
@@ -11,7 +11,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_clay",
-    "amount": 1750
+    "amount": 1750,
+    "unit_size": 50
   },
   "temperature": 450,
   "time": 132

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/axes.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/axes.json
@@ -10,7 +10,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 300
+    "amount": 300,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 144

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/boots.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/boots.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 400
+    "amount": 400,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 166

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/chestplate.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/chestplate.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 800
+    "amount": 800,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 235

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/helmet.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/helmet.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 500
+    "amount": 500,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 186

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/leggings.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/leggings.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 700
+    "amount": 700,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 220

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/shovel.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/shovel.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 100
+    "amount": 100,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 83

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/weapon.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/diamond/weapon.json
@@ -10,7 +10,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_diamond",
-    "amount": 200
+    "amount": 200,
+    "unit_size": 25
   },
   "temperature": 1450,
   "time": 118

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/axes.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/axes.json
@@ -10,7 +10,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 270
+    "amount": 270,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 99

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/boots.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/boots.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 360
+    "amount": 360,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 114

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/chestplate.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/chestplate.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 720
+    "amount": 720,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 161

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/helmet.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/helmet.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 450
+    "amount": 450,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 127

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/leggings.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/leggings.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 630
+    "amount": 630,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 151

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/shovel.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/shovel.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 57

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/weapon.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/gold/weapon.json
@@ -10,7 +10,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_gold",
-    "amount": 180
+    "amount": 180,
+    "unit_size": 10
   },
   "temperature": 700,
   "time": 80

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/axes.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/axes.json
@@ -10,7 +10,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 270
+    "amount": 270,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 104

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/boots.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/boots.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 360
+    "amount": 360,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 120

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/chestplate.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/chestplate.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 720
+    "amount": 720,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 170

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/crossbow.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/crossbow.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 130
+    "amount": 130,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 72

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/helmet.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/helmet.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 450
+    "amount": 450,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 134

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/leggings.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/leggings.json
@@ -5,7 +5,8 @@
   },
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 630
+    "amount": 630,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 159

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/small.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/small.json
@@ -13,7 +13,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 60

diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/weapon.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/iron/weapon.json
@@ -13,7 +13,8 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_iron",
-    "amount": 180
+    "amount": 180,
+    "unit_size": 10
   },
   "temperature": 800,
   "time": 85

diff --git a/...generated/resources/data/tconstruct/recipes/smeltery/melting/metal/molten_debris/ore.json b/...generated/resources/data/tconstruct/recipes/smeltery/melting/metal/molten_debris/ore.json
@@ -13,11 +13,13 @@
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 300
+      "amount": 100,
+      "rate": "gem"
     },
     {
       "fluid": "tconstruct:molten_gold",
-      "amount": 270
+      "amount": 270,
+      "rate": "metal"
     }
   ]
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/axes.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/axes.json
@@ -10,14 +10,16 @@
   ],
   "result": {
     "fluid": "tconstruct:molten_netherite",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 1250,
   "time": 74,
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 300
+      "amount": 300,
+      "unit_size": 25
     }
   ]
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/boots.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/boots.json
@@ -5,14 +5,16 @@
   },
   "result": {
     "fluid": "tconstruct:molten_netherite",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 1250,
   "time": 74,
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 400
+      "amount": 400,
+      "unit_size": 25
     }
   ]
 }
diff --git a/...erated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/chestplate.json b/...erated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/chestplate.json
@@ -5,14 +5,16 @@
   },
   "result": {
     "fluid": "tconstruct:molten_netherite",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 1250,
   "time": 74,
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 800
+      "amount": 800,
+      "unit_size": 25
     }
   ]
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/helmet.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/helmet.json
@@ -5,14 +5,16 @@
   },
   "result": {
     "fluid": "tconstruct:molten_netherite",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 1250,
   "time": 74,
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 500
+      "amount": 500,
+      "unit_size": 25
     }
   ]
 }
diff --git a/...enerated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/leggings.json b/...enerated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/leggings.json
@@ -5,14 +5,16 @@
   },
   "result": {
     "fluid": "tconstruct:molten_netherite",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 1250,
   "time": 74,
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 700
+      "amount": 700,
+      "unit_size": 25
     }
   ]
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/shovel.json b/src/generated/resources/data/tconstruct/recipes/smeltery/melting/metal/netherite/shovel.json
@@ -5,14 +5,16 @@
   },
   "result": {
     "fluid": "tconstruct:molten_netherite",
-    "amount": 90
+    "amount": 90,
+    "unit_size": 10
   },
   "temperature": 1250,
   "time": 74,
   "byproducts": [
     {
       "fluid": "tconstruct:molten_diamond",
-      "amount": 100
+      "amount": 100,
+      "unit_size": 25
     }
   ]
 }