From 0110ec95c6b66502c1bcbf2ceb19e013601c8c3b Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Thu, 16 Feb 2017 20:35:50 +0100
Subject: [PATCH] Move sea lantern and prismarine stuff to mcl_ocean
---
mods/CORE/mcl_core/crafting.lua | 35 ------
mods/CORE/mcl_core/craftitems.lua | 14 ---
mods/CORE/mcl_core/nodes.lua | 49 ---------
mods/CORE/mcl_ocean/depends.txt | 2 +
mods/CORE/mcl_ocean/description.txt | 1 +
mods/CORE/mcl_ocean/init.lua | 101 ++++++++++++++++++
mods/CORE/mcl_ocean/mod.conf | 1 +
.../textures/mcl_ocean_prismarine_anim.png} | Bin
.../textures/mcl_ocean_prismarine_bricks.png} | Bin
.../mcl_ocean_prismarine_crystals.png} | Bin
.../textures/mcl_ocean_prismarine_dark.png} | Bin
.../textures/mcl_ocean_prismarine_shard.png} | Bin
.../textures/mcl_ocean_sea_lantern.png} | Bin
mods/MISC/mcl_temp_helper_recipes/init.lua | 6 +-
14 files changed, 108 insertions(+), 101 deletions(-)
create mode 100644 mods/CORE/mcl_ocean/depends.txt
create mode 100644 mods/CORE/mcl_ocean/description.txt
create mode 100644 mods/CORE/mcl_ocean/init.lua
create mode 100644 mods/CORE/mcl_ocean/mod.conf
rename mods/CORE/{mcl_core/textures/default_prismarine_anim.png => mcl_ocean/textures/mcl_ocean_prismarine_anim.png} (100%)
rename mods/CORE/{mcl_core/textures/default_prismarine_bricks.png => mcl_ocean/textures/mcl_ocean_prismarine_bricks.png} (100%)
rename mods/CORE/{mcl_core/textures/default_prismarine_crystals.png => mcl_ocean/textures/mcl_ocean_prismarine_crystals.png} (100%)
rename mods/CORE/{mcl_core/textures/default_prismarine_dark.png => mcl_ocean/textures/mcl_ocean_prismarine_dark.png} (100%)
rename mods/CORE/{mcl_core/textures/default_prismarine_shard.png => mcl_ocean/textures/mcl_ocean_prismarine_shard.png} (100%)
rename mods/CORE/{mcl_core/textures/default_sea_lantern.png => mcl_ocean/textures/mcl_ocean_sea_lantern.png} (100%)
diff --git a/mods/CORE/mcl_core/crafting.lua b/mods/CORE/mcl_core/crafting.lua
index d5be94c2..49c464cc 100644
--- a/mods/CORE/mcl_core/crafting.lua
+++ b/mods/CORE/mcl_core/crafting.lua
@@ -424,41 +424,6 @@ minetest.register_craft({
}
})
-minetest.register_craft({
- output = 'mcl_core:sea_lantern',
- recipe = {
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_crystals', 'mcl_core:prismarine_shard'},
- {'mcl_core:prismarine_crystals', 'mcl_core:prismarine_crystals', 'mcl_core:prismarine_crystals'},
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_crystals', 'mcl_core:prismarine_shard'},
- }
-})
-
-minetest.register_craft({
- output = 'mcl_core:prismarine',
- recipe = {
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- }
-})
-
-minetest.register_craft({
- output = 'mcl_core:prismarine_brick',
- recipe = {
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- }
-})
-
-minetest.register_craft({
- output = 'mcl_core:prismarine_dark',
- recipe = {
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- {'mcl_core:prismarine_shard', 'mcl_dye:black', 'mcl_core:prismarine_shard'},
- {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'},
- }
-})
-
minetest.register_craft({
output = 'mcl_core:coalblock',
recipe = {
diff --git a/mods/CORE/mcl_core/craftitems.lua b/mods/CORE/mcl_core/craftitems.lua
index 4392859c..5483e8b1 100644
--- a/mods/CORE/mcl_core/craftitems.lua
+++ b/mods/CORE/mcl_core/craftitems.lua
@@ -119,20 +119,6 @@ minetest.register_craftitem("mcl_core:bowl",{
groups = { craftitem = 1 },
})
-minetest.register_craftitem("mcl_core:prismarine_crystals", {
- description = "Prismarine Crystals",
- inventory_image = "default_prismarine_crystals.png",
- stack_max = 64,
- groups = { craftitem = 1 },
-})
-
-minetest.register_craftitem("mcl_core:prismarine_shard", {
- description = "Prismarine Shard",
- inventory_image = "default_prismarine_shard.png",
- stack_max = 64,
- groups = { craftitem = 1 },
-})
-
minetest.register_craftitem("mcl_core:apple", {
description = "Apple",
wield_image = "default_apple.png",
diff --git a/mods/CORE/mcl_core/nodes.lua b/mods/CORE/mcl_core/nodes.lua
index 20a5eeb8..c2d6bf6c 100644
--- a/mods/CORE/mcl_core/nodes.lua
+++ b/mods/CORE/mcl_core/nodes.lua
@@ -463,55 +463,6 @@ minetest.register_node("mcl_core:bone_block", {
sounds = mcl_sounds.node_sound_stone_defaults(),
})
-minetest.register_node("mcl_core:sea_lantern", {
- description = "Sea Lantern",
- paramtype2 = "facedir",
- is_ground_content = false,
- stack_max = 64,
- -- Real light level: 15 (but Minetest caps at 14)
- light_source = 14,
- drop = {
- max_items = 1,
- items = {
- { items = {'mcl_core:prismarine_cry 3'}, rarity = 2 },
- { items = {'mcl_core:prismarine_cry 2'}}
- }
- },
- tiles = {{name="default_sea_lantern.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.25}}},
- groups = {oddly_breakable_by_hand=3, building_block=1},
- sounds = mcl_sounds.node_sound_glass_defaults(),
-})
-
--- TODO: Move to own mod
-minetest.register_node("mcl_core:prismarine", {
- description = "Prismarine",
- stack_max = 64,
- is_ground_content = false,
- tiles = {{name="default_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}},
- groups = {cracky=3, building_block=1},
- sounds = mcl_sounds.node_sound_stone_defaults(),
-})
-
--- TODO: Move to own mod
-minetest.register_node("mcl_core:prismarine_brick", {
- description = "Prismarine Bricks",
- stack_max = 64,
- is_ground_content = false,
- tiles = {"default_prismarine_bricks.png"},
- groups = {cracky=2, building_block=1},
- sounds = mcl_sounds.node_sound_stone_defaults(),
-})
-
--- TODO: Move to own mod
-minetest.register_node("mcl_core:prismarine_dark", {
- description = "Dark Prismarine",
- stack_max = 64,
- is_ground_content = false,
- tiles = {"default_prismarine_dark.png"},
- groups = {cracky=2, building_block=1},
- sounds = mcl_sounds.node_sound_stone_defaults(),
-})
-
diff --git a/mods/CORE/mcl_ocean/depends.txt b/mods/CORE/mcl_ocean/depends.txt
new file mode 100644
index 00000000..bc061e07
--- /dev/null
+++ b/mods/CORE/mcl_ocean/depends.txt
@@ -0,0 +1,2 @@
+mcl_sounds
+mcl_dye
diff --git a/mods/CORE/mcl_ocean/description.txt b/mods/CORE/mcl_ocean/description.txt
new file mode 100644
index 00000000..bff01f61
--- /dev/null
+++ b/mods/CORE/mcl_ocean/description.txt
@@ -0,0 +1 @@
+Ocean-related blocks and items (for the ocean temple).
diff --git a/mods/CORE/mcl_ocean/init.lua b/mods/CORE/mcl_ocean/init.lua
new file mode 100644
index 00000000..7bef5698
--- /dev/null
+++ b/mods/CORE/mcl_ocean/init.lua
@@ -0,0 +1,101 @@
+-- Nodes
+
+minetest.register_node("mcl_ocean:sea_lantern", {
+ description = "Sea Lantern",
+ paramtype2 = "facedir",
+ is_ground_content = false,
+ stack_max = 64,
+ -- Real light level: 15 (but Minetest caps at 14)
+ light_source = 14,
+ drop = {
+ max_items = 1,
+ items = {
+ { items = {'mcl_ocean:prismarine_crystals 3'}, rarity = 2 },
+ { items = {'mcl_ocean:prismarine_crystals 2'}}
+ }
+ },
+ tiles = {{name="mcl_ocean_sea_lantern.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.25}}},
+ groups = {oddly_breakable_by_hand=3, building_block=1},
+ sounds = mcl_sounds.node_sound_glass_defaults(),
+})
+
+minetest.register_node("mcl_ocean:prismarine", {
+ description = "Prismarine",
+ stack_max = 64,
+ is_ground_content = false,
+ tiles = {{name="mcl_ocean_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}},
+ groups = {cracky=3, building_block=1},
+ sounds = mcl_sounds.node_sound_stone_defaults(),
+})
+
+minetest.register_node("mcl_ocean:prismarine_brick", {
+ description = "Prismarine Bricks",
+ stack_max = 64,
+ is_ground_content = false,
+ tiles = {"mcl_ocean_prismarine_bricks.png"},
+ groups = {cracky=2, building_block=1},
+ sounds = mcl_sounds.node_sound_stone_defaults(),
+})
+
+minetest.register_node("mcl_ocean:prismarine_dark", {
+ description = "Dark Prismarine",
+ stack_max = 64,
+ is_ground_content = false,
+ tiles = {"mcl_ocean_prismarine_dark.png"},
+ groups = {cracky=2, building_block=1},
+ sounds = mcl_sounds.node_sound_stone_defaults(),
+})
+
+-- Craftitems
+
+minetest.register_craftitem("mcl_ocean:prismarine_crystals", {
+ description = "Prismarine Crystals",
+ inventory_image = "mcl_ocean_prismarine_crystals.png",
+ stack_max = 64,
+ groups = { craftitem = 1 },
+})
+
+minetest.register_craftitem("mcl_ocean:prismarine_shard", {
+ description = "Prismarine Shard",
+ inventory_image = "mcl_ocean_prismarine_shard.png",
+ stack_max = 64,
+ groups = { craftitem = 1 },
+})
+
+-- Crafting
+
+minetest.register_craft({
+ output = 'mcl_ocean:sea_lantern',
+ recipe = {
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_crystals', 'mcl_ocean:prismarine_shard'},
+ {'mcl_ocean:prismarine_crystals', 'mcl_ocean:prismarine_crystals', 'mcl_ocean:prismarine_crystals'},
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_crystals', 'mcl_ocean:prismarine_shard'},
+ }
+})
+
+minetest.register_craft({
+ output = 'mcl_ocean:prismarine',
+ recipe = {
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ }
+})
+
+minetest.register_craft({
+ output = 'mcl_ocean:prismarine_brick',
+ recipe = {
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ }
+})
+
+minetest.register_craft({
+ output = 'mcl_ocean:prismarine_dark',
+ recipe = {
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ {'mcl_ocean:prismarine_shard', 'mcl_dye:black', 'mcl_ocean:prismarine_shard'},
+ {'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard', 'mcl_ocean:prismarine_shard'},
+ }
+})
+
diff --git a/mods/CORE/mcl_ocean/mod.conf b/mods/CORE/mcl_ocean/mod.conf
new file mode 100644
index 00000000..81edf016
--- /dev/null
+++ b/mods/CORE/mcl_ocean/mod.conf
@@ -0,0 +1 @@
+name = mcl_ocean
diff --git a/mods/CORE/mcl_core/textures/default_prismarine_anim.png b/mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_anim.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_prismarine_anim.png
rename to mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_anim.png
diff --git a/mods/CORE/mcl_core/textures/default_prismarine_bricks.png b/mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_bricks.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_prismarine_bricks.png
rename to mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_bricks.png
diff --git a/mods/CORE/mcl_core/textures/default_prismarine_crystals.png b/mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_crystals.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_prismarine_crystals.png
rename to mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_crystals.png
diff --git a/mods/CORE/mcl_core/textures/default_prismarine_dark.png b/mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_dark.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_prismarine_dark.png
rename to mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_dark.png
diff --git a/mods/CORE/mcl_core/textures/default_prismarine_shard.png b/mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_shard.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_prismarine_shard.png
rename to mods/CORE/mcl_ocean/textures/mcl_ocean_prismarine_shard.png
diff --git a/mods/CORE/mcl_core/textures/default_sea_lantern.png b/mods/CORE/mcl_ocean/textures/mcl_ocean_sea_lantern.png
similarity index 100%
rename from mods/CORE/mcl_core/textures/default_sea_lantern.png
rename to mods/CORE/mcl_ocean/textures/mcl_ocean_sea_lantern.png
diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua
index 117a36a1..407b2197 100644
--- a/mods/MISC/mcl_temp_helper_recipes/init.lua
+++ b/mods/MISC/mcl_temp_helper_recipes/init.lua
@@ -30,7 +30,7 @@ minetest.register_craft({
})
minetest.register_craft({
- output = "mcl_core:prismarine_shard",
+ output = "mcl_ocean:prismarine_shard",
recipe = {
{ "mcl_core:glass_cyan", },
}
@@ -38,8 +38,8 @@ minetest.register_craft({
minetest.register_craft({
type = "shapeless",
- output = "mcl_core:prismarine_crystals",
- recipe = { "mcl_core:prismarine_shard", "mcl_core:prismarine_shard", "mcl_core:prismarine_shard", "mcl_core:emerald" },
+ output = "mcl_ocean:prismarine_crystals",
+ recipe = { "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_ocean:prismarine_shard", "mcl_core:emerald" },
})
minetest.register_craft({