curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 20:14:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

crafting recipe is at least successfully read and parsed by the modloader

Browse Source
This commit is contained in:
minjaesong
2022-06-25 22:40:23 +09:00
parent 4569546bdd
commit 8c07b03213
12 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/itemproperties/CraftingCodex.kt
View File

@@ -10,9 +10,9 @@ import net.torvald.terrarum.utils.forEachSiblingsIndexed
*/
class CraftingCodex {
@Transient private val props = HashMap<ItemID, ArrayList<CraftingRecipe>>()
@Transient internal val props = HashMap<ItemID, ArrayList<CraftingRecipe>>()
fun addFromJson(json: JsonValue, moduleName: String) {
fun addFromJson(json: JsonValue, moduleName: String, fileName:String) {
if (moduleName.filter { it.code in 33..127 } .length < 5)
throw IllegalStateException("Invalid module name: ${moduleName}")
@@ -38,8 +38,8 @@ class CraftingCodex {
}
// sanity check
if (moq < 1)
throw IllegalStateException("Recipe #${ingredientIndex+1} for item '$itemName' has moq of ${moq}")
if (moq !in 1..1000)
throw IllegalStateException("Recipe #${ingredientIndex+1} for item '$itemName' has invalid moq of ${moq}")
else if (qtys.size != itemsStr.size)
throw IllegalStateException("Mismatched item name and count for recipe #${ingredientIndex+1} for item '$itemName'")
@@ -59,7 +59,7 @@ class CraftingCodex {
qtys[i]
))
}
recipes.add(CraftingRecipe(workbenchStr, ingredients.toTypedArray(), moq, moduleName))
recipes.add(CraftingRecipe(workbenchStr, ingredients.toTypedArray(), moq, "$moduleName/$fileName"))
}
// register to the main props