MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix for not finding name

Browse Source
This commit is contained in:
kepler155c
2018-02-21 04:21:49 -05:00
parent 3e8b01be93
commit ade176e977
2 changed files with 6 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apis/itemDB.lua
View File

@@ -146,7 +146,11 @@ function itemDB:getName(item)
end end
-- fallback to nameDB -- 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 end
function itemDB:getMaxCount(item) function itemDB:getMaxCount(item)

44
etc/recipes/minecraft.db
View File

@@ -1320,34 +1320,6 @@
[ 6 ] = "minecraft:snowball:0", [ 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" ] = { [ "minecraft:stained_glass:0" ] = {
count = 8, count = 8,
ingredients = { ingredients = {
@@ -1433,20 +1405,6 @@
[ 7 ] = "minecraft:hardened_clay:0", [ 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" ] = { [ "minecraft:cobblestone_wall:0" ] = {
count = 6, count = 6,
ingredients = { ingredients = {
@@ -1712,7 +1670,7 @@
}, },
[ "minecraft:sticky_piston:0" ] = { [ "minecraft:sticky_piston:0" ] = {
ingredients = { ingredients = {
"minefactoryreloaded:rubber_raw:0", "minecraft:slime_ball:0",
[ 5 ] = "minecraft:piston:0", [ 5 ] = "minecraft:piston:0",
}, },
count = 1, count = 1,