Fix some overrides
Jordan Irwin
parent
72025aad53
commit
f98eee15a0
|
|
@ -16,8 +16,6 @@ gems_encrustable?
|
||||||
gems_tools?
|
gems_tools?
|
||||||
helicopter?
|
helicopter?
|
||||||
invisibility?
|
invisibility?
|
||||||
mob_sheep?
|
|
||||||
mobs?
|
|
||||||
moreblocks?
|
moreblocks?
|
||||||
simple_protection?
|
simple_protection?
|
||||||
stairsplus?
|
stairsplus?
|
||||||
|
|
@ -29,3 +27,7 @@ wool?
|
||||||
craftguide?
|
craftguide?
|
||||||
craft_guide?
|
craft_guide?
|
||||||
biofuel?
|
biofuel?
|
||||||
|
|
||||||
|
creatures?
|
||||||
|
mobs?
|
||||||
|
sheep?
|
||||||
|
|
|
||||||
|
|
@ -25,14 +25,18 @@
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
|
|
||||||
local modoverrides = {
|
local function replace_item(old, new)
|
||||||
'cooking',
|
if core.registered_items[old] and core.registered_items[new] then
|
||||||
'mobs',
|
core.log("action", "Replacing " .. old .. " with " .. new)
|
||||||
}
|
core.unregister_item(old)
|
||||||
|
core.register_alias(old, new)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
for I in pairs(modoverrides) do
|
replace_item("creatures:flesh", "mobs:meat_raw")
|
||||||
local modname = modoverrides[I]
|
replace_item("creatures:meat", "mobs:meat")
|
||||||
if core.get_modpath(modname) then
|
replace_item("creatures:chicken_flesh", "mobs:chicken_raw")
|
||||||
antum.loadScript('items/' .. modname)
|
replace_item("creatures:chicken_meat", "mobs:chicken_cooked")
|
||||||
end
|
replace_item("creatures:egg", "mobs:egg")
|
||||||
end
|
replace_item("creatures:fried_egg", "mobs:chicken_egg_fried")
|
||||||
|
replace_item("creatures:shears", "mobs:shears")
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
--[[ LICENSE HEADER
|
|
||||||
|
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright © 2017 Jordan Irwin
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
|
||||||
the Software without restriction, including without limitation the rights to
|
|
||||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
--]]
|
|
||||||
|
|
||||||
|
|
||||||
core.register_craftitem(':cooking:fish_bluewhite_cooked', {
|
|
||||||
description = 'Cooked Bluewhite Fish',
|
|
||||||
image = 'fish_cooked.png',
|
|
||||||
on_use = core.item_eat(6),
|
|
||||||
groups = { meat=1 , eatable=1},
|
|
||||||
stack_max = 25
|
|
||||||
})
|
|
||||||
|
|
||||||
core.register_alias('fish_bluewhite_cooked', 'cooking:fish_bluewhite_cooked')
|
|
||||||
|
|
||||||
core.register_craftitem(':cooking:fish_clownfish_cooked', {
|
|
||||||
description = 'Cooked Clownfish',
|
|
||||||
image = 'fish_cooked.png',
|
|
||||||
on_use = core.item_eat(6),
|
|
||||||
groups = { meat=1 , eatable=1},
|
|
||||||
stack_max = 25
|
|
||||||
})
|
|
||||||
|
|
||||||
core.register_alias('clownfish_cooked', 'cooking:fish_clownfish_cooked')
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
--[[ LICENSE HEADER
|
|
||||||
|
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright © 2017 Jordan Irwin
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
|
||||||
the Software without restriction, including without limitation the rights to
|
|
||||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
--]]
|
|
||||||
|
|
||||||
|
|
||||||
-- Boilerplate to support localized strings if intllib mod is installed.
|
|
||||||
local S
|
|
||||||
if core.global_exists("intllib") then
|
|
||||||
dofile(core.get_modpath("intllib").."/intllib.lua")
|
|
||||||
if intllib.make_gettext_pair then
|
|
||||||
S = intllib.make_gettext_pair("mobs")
|
|
||||||
else
|
|
||||||
S = intllib.Getter("mobs")
|
|
||||||
end
|
|
||||||
else
|
|
||||||
S = function ( s ) return s end
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
-- OVERRIDING CRAFT ITEMS
|
|
||||||
|
|
||||||
|
|
||||||
-- Fur group
|
|
||||||
|
|
||||||
core.register_craftitem(":mobs:leather", {
|
|
||||||
description = S("Leather"),
|
|
||||||
inventory_image = "mobs_leather.png",
|
|
||||||
groups = {fur = 1},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
-- Shears
|
|
||||||
if antum.dependsSatisfied({'mob_sheep', 'mobs',}) or antum.dependsSatisfied({'sheep', 'mobs',}) then
|
|
||||||
override.overrideItems(':creatures:shears', {
|
|
||||||
overrides = {'creatures:shears', 'mobs:shears'},
|
|
||||||
description = 'Shears',
|
|
||||||
inventory_image = 'mobs_shears.png',
|
|
||||||
stack_max = 1,
|
|
||||||
})
|
|
||||||
core.clear_craft({
|
|
||||||
output = 'mobs:shears',
|
|
||||||
})
|
|
||||||
|
|
||||||
-- FIXME: Not being registered in overrideItems
|
|
||||||
core.register_alias('mobs:shears', 'creatures:shears')
|
|
||||||
end
|
|
||||||
Loading…
Reference in New Issue