From ade176e97702606991965197afbe708c544c3057 Mon Sep 17 00:00:00 2001 From: kepler155c Date: Wed, 21 Feb 2018 04:21:49 -0500 Subject: [PATCH] fix for not finding name --- apis/itemDB.lua | 6 +++++- etc/recipes/minecraft.db | 44 +--------------------------------------- 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/apis/itemDB.lua b/apis/itemDB.lua index 7a4ec95..c7b5050 100644 --- a/apis/itemDB.lua +++ b/apis/itemDB.lua @@ -146,7 +146,11 @@ function itemDB:getName(item) end -- fallback to nameDB - return nameDB:getName(item.name .. ':' .. (item.damage or '*')) + local name = nameDB:getName(item.name .. ':' .. (item.damage or '*')) + if not name and not item.damage then + return self:getName({ name = item.name, damage = 0, nbtHash = item.nbtHash }) + end + return name end function itemDB:getMaxCount(item) diff --git a/etc/recipes/minecraft.db b/etc/recipes/minecraft.db index 882a580..241889e 100644 --- a/etc/recipes/minecraft.db +++ b/etc/recipes/minecraft.db @@ -1320,34 +1320,6 @@ [ 6 ] = "minecraft:snowball:0", }, }, - [ "mysticalagriculture:tier1_inferium_seeds:0" ] = { - count = 1, - ingredients = { - "mysticalagriculture:inferium_essence:0", - "mysticalagriculture:inferium_essence:0", - "mysticalagriculture:inferium_essence:0", - [ 9 ] = "mysticalagriculture:inferium_essence:0", - [ 10 ] = "mysticalagriculture:inferium_essence:0", - [ 11 ] = "mysticalagriculture:inferium_essence:0", - [ 5 ] = "mysticalagriculture:inferium_essence:0", - [ 6 ] = "minecraft:wheat_seeds:0", - [ 7 ] = "mysticalagriculture:inferium_essence:0", - }, - }, - [ "mysticalagriculture:tier2_inferium_seeds:0" ] = { - count = 1, - ingredients = { - "mysticalagriculture:prudentium_essence:0", - "mysticalagriculture:prudentium_essence:0", - "mysticalagriculture:prudentium_essence:0", - [ 9 ] = "mysticalagriculture:prudentium_essence:0", - [ 10 ] = "mysticalagriculture:prudentium_essence:0", - [ 11 ] = "mysticalagriculture:prudentium_essence:0", - [ 5 ] = "mysticalagriculture:prudentium_essence:0", - [ 6 ] = "mysticalagriculture:tier1_inferium_seeds:0", - [ 7 ] = "mysticalagriculture:prudentium_essence:0", - }, - }, [ "minecraft:stained_glass:0" ] = { count = 8, ingredients = { @@ -1433,20 +1405,6 @@ [ 7 ] = "minecraft:hardened_clay:0", }, }, - [ "mysticalagriculture:tier3_inferium_seeds:0" ] = { - count = 1, - ingredients = { - "mysticalagriculture:intermedium_essence:0", - "mysticalagriculture:intermedium_essence:0", - "mysticalagriculture:intermedium_essence:0", - [ 9 ] = "mysticalagriculture:intermedium_essence:0", - [ 10 ] = "mysticalagriculture:intermedium_essence:0", - [ 11 ] = "mysticalagriculture:intermedium_essence:0", - [ 5 ] = "mysticalagriculture:intermedium_essence:0", - [ 6 ] = "mysticalagriculture:tier2_inferium_seeds:0", - [ 7 ] = "mysticalagriculture:intermedium_essence:0", - }, - }, [ "minecraft:cobblestone_wall:0" ] = { count = 6, ingredients = { @@ -1712,7 +1670,7 @@ }, [ "minecraft:sticky_piston:0" ] = { ingredients = { - "minefactoryreloaded:rubber_raw:0", + "minecraft:slime_ball:0", [ 5 ] = "minecraft:piston:0", }, count = 1,