|
|
@ -40,7 +40,16 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/coderfood/unified_fo |
|
|
|
Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/coderfood/unified_foods: textures |
|
|
|
diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua
|
|
|
|
--- Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua 2021-11-15 13:20:43.119691199 -0500
|
|
|
|
+++ Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua 2021-11-19 07:08:41.543832456 -0500
|
|
|
|
+++ Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua 2021-11-19 09:05:04.916008321 -0500
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
|
S = function ( s ) return s end |
|
|
|
end |
|
|
|
|
|
|
|
-core.log("action","MOD: animal_materials loading ...")
|
|
|
|
+core.log("action","MOD: codermobs integrated animal_materials loading ...")
|
|
|
|
local version = "0.1.3" |
|
|
|
|
|
|
|
animal_materialsdata = {} |
|
|
|
@@ -103,49 +103,95 @@
|
|
|
|
-- =================================================================== |
|
|
|
-- meat |
|
|
@ -52,7 +61,13 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ |
|
|
|
- groups = { meat=1, eatable=1 },
|
|
|
|
- stack_max=25
|
|
|
|
-})
|
|
|
|
-
|
|
|
|
+local dep_meat_raw = nil
|
|
|
|
+if minetest.registered_items["mobs:meat"] then
|
|
|
|
+ dep_meat_raw = "mobs:meat"
|
|
|
|
+elseif minetest.registered_items["animalmaterials:meat"] then
|
|
|
|
+ dep_meat_raw = "animalmaterials:meat"
|
|
|
|
+end
|
|
|
|
|
|
|
|
-minetest.register_craftitem(":animal_materials:meat_pork", {
|
|
|
|
- description = S("Pork (raw)"),
|
|
|
|
- image = "animal_materials_meat_raw.png",
|
|
|
@ -60,13 +75,6 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ |
|
|
|
- groups = { meat=1, eatable=1 },
|
|
|
|
- stack_max=25
|
|
|
|
-})
|
|
|
|
+local dep_meat_raw = nil
|
|
|
|
+if minetest.registered_items["mobs:meat"] then
|
|
|
|
+ dep_meat_raw = "mobs:meat"
|
|
|
|
+elseif minetest.registered_items["animalmaterials:meat"] then
|
|
|
|
+ dep_meat_raw = "animalmaterials:meat"
|
|
|
|
+end
|
|
|
|
+
|
|
|
|
+if not dep_meat_raw then
|
|
|
|
+ minetest.register_craftitem(":animal_materials:meat_raw", {
|
|
|
|
+ description = S("Raw Meat"),
|
|
|
@ -118,7 +126,11 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ |
|
|
|
- groups = { meat=1, eatable=1 },
|
|
|
|
- stack_max=25
|
|
|
|
-})
|
|
|
|
-
|
|
|
|
+local dep_chicken_raw = nil
|
|
|
|
+if minetest.registered_items["animalmaterials:meat_chicken"] then
|
|
|
|
+ dep_chicken_raw = "animalmaterials:meat_chicken"
|
|
|
|
+end
|
|
|
|
|
|
|
|
-minetest.register_craftitem(":animal_materials:meat_lamb", {
|
|
|
|
- description = S("Lamb (raw)"),
|
|
|
|
- image = "animal_materials_meat_raw.png",
|
|
|
@ -126,11 +138,6 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ |
|
|
|
- groups = { meat=1, eatable=1 },
|
|
|
|
- stack_max=25
|
|
|
|
-})
|
|
|
|
+local dep_chicken_raw = nil
|
|
|
|
+if minetest.registered_items["animalmaterials:meat_chicken"] then
|
|
|
|
+ dep_chicken_raw = "animalmaterials:meat_chicken"
|
|
|
|
+end
|
|
|
|
+
|
|
|
|
+if not dep_chicken_raw then
|
|
|
|
+ minetest.register_craftitem(":animal_materials:meat_chicken", {
|
|
|
|
+ description = S("Raw Chicken"),
|
|
|
@ -199,7 +206,11 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ |
|
|
|
- groups = { meat=1, eatable=1 },
|
|
|
|
- stack_max=25
|
|
|
|
-})
|
|
|
|
-
|
|
|
|
+local dep_bluewhite_raw = nil
|
|
|
|
+if minetest.registered_items["animalmaterials:fish_bluewhite"] then
|
|
|
|
+ dep_bluewhite_raw = "animalmaterials:fish_bluewhite"
|
|
|
|
+end
|
|
|
|
|
|
|
|
-minetest.register_craftitem(":animal_materials:fish_clownfish", {
|
|
|
|
- description = S("Fish (clownfish)"),
|
|
|
|
- image = "animal_materials_meat_raw.png",
|
|
|
@ -207,11 +218,6 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ |
|
|
|
- groups = { meat=1, eatable=1 },
|
|
|
|
- stack_max=25
|
|
|
|
-})
|
|
|
|
+local dep_bluewhite_raw = nil
|
|
|
|
+if minetest.registered_items["animalmaterials:fish_bluewhite"] then
|
|
|
|
+ dep_bluewhite_raw = "animalmaterials:fish_bluewhite"
|
|
|
|
+end
|
|
|
|
+
|
|
|
|
+if not dep_bluewhite_raw then
|
|
|
|
+ minetest.register_craftitem(":animal_materials:fish_bluewhite", {
|
|
|
|
+ description = S("Raw Fish (cichlid)"),
|
|
|
|