diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..cce7753 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 EvergreenTree + +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. diff --git a/README.txt b/README.txt index 8e6fd5d..1efd697 100644 --- a/README.txt +++ b/README.txt @@ -1,12 +1,20 @@ - ___ _ __ __ _ + ___ _ __ __ _ / _ \ _ _ __ _ _ __| |_ ____ | \/ | ___ __| | | | | | | | |/ _` | '__| __|_ / | |\/| |/ _ \ / _` | | |_| | |_| | (_| | | | |_ / / | | | | (_) | (_| | \__\_\\__,_|\__,_|_| \__/___| |_| |_|\___/ \__,_| - This mod adds quartz ore and some decorative blocks to minetest. - + +Version: 1.0 +License: MIT (see LICENSE.txt) + +Dependencies: +stairs (found in minetest_game) +moreblocks (optional, for stairsplus support) + +Please report bugs at the github issue tracker: +https://github.com/4Evergreen4/quartz/issues/ Crafting: @@ -71,12 +79,3 @@ x|x|x x|c|x ----- x|x|x - - -License: - -CC BY-SA 3.0 - -More info at http://creativecommons.org/licenses/by-sa/3.0/ - - diff --git a/depends.txt b/depends.txt index 40c22ed..37e3e76 100644 --- a/depends.txt +++ b/depends.txt @@ -1,3 +1,2 @@ -default, -stairs, +stairs moreblocks? diff --git a/description.txt b/description.txt new file mode 100644 index 0000000..adc7fc2 --- /dev/null +++ b/description.txt @@ -0,0 +1 @@ +Adds quartz ore and some decorative quartz blocks diff --git a/init.lua b/init.lua index 6b1f7e8..6b0a41b 100644 --- a/init.lua +++ b/init.lua @@ -1,8 +1,10 @@ dofile(minetest.get_modpath("quartz").."/settings.txt") ---Node Registration +-- +-- Item Registration +-- ---Quartz Crystal +-- Quartz Crystal minetest.register_craftitem("quartz:quartz_crystal", { description = "Quartz Crystal", inventory_image = "quartz_crystal_full.png", @@ -12,27 +14,31 @@ minetest.register_craftitem("quartz:quartz_crystal_piece", { inventory_image = "quartz_crystal_piece.png", }) ---Ore +-- +-- Node Registration +-- + +-- Ore minetest.register_node("quartz:quartz_ore", { - description = "Quartz Ore", - tiles = {"default_stone.png^quartz_ore.png"}, - groups = {cracky=3, stone=1}, - drop = 'quartz:quartz_crystal', - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "quartz:quartz_ore", - wherein = "default:stone", - clust_scarcity = 10*10*10, - clust_num_ores = 6, - clust_size = 5, - y_min = -31000, - y_max = -5, + description = "Quartz Ore", + tiles = {"default_stone.png^quartz_ore.png"}, + groups = {cracky=3, stone=1}, + drop = 'quartz:quartz_crystal', + sounds = default.node_sound_stone_defaults(), }) ---Quartz Block +minetest.register_ore({ + ore_type = "scatter", + ore = "quartz:quartz_ore", + wherein = "default:stone", + clust_scarcity = 10*10*10, + clust_num_ores = 6, + clust_size = 5, + y_min = -31000, + y_max = -5, +}) + +-- Quartz Block minetest.register_node("quartz:block", { description = "Quartz Block", tiles = {"quartz_block.png"}, @@ -40,7 +46,7 @@ minetest.register_node("quartz:block", { sounds = default.node_sound_glass_defaults(), }) ---Chiseled Quartz +-- Chiseled Quartz minetest.register_node("quartz:chiseled", { description = "Chiseled Quartz", tiles = {"quartz_chiseled.png"}, @@ -48,7 +54,7 @@ minetest.register_node("quartz:chiseled", { sounds = default.node_sound_glass_defaults(), }) ---Quartz Pillar +-- Quartz Pillar minetest.register_node("quartz:pillar", { description = "Quartz Pillar", paramtype2 = "facedir", @@ -58,8 +64,7 @@ minetest.register_node("quartz:pillar", { on_place = minetest.rotate_node }) - ---Stairs & Slabs +-- Stairs & Slabs stairs.register_stair_and_slab("quartzblock", "quartz:block", {cracky=3, oddly_breakable_by_hand=1}, {"quartz_block.png"}, @@ -72,17 +77,13 @@ stairs.register_slab("quartzstair", "quartz:pillar", {"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"}, "Quartz Pillar stair", "Quartz Pillar slab", - default.node_sound_glass_defaults()) + default.node_sound_glass_defaults()) - - - - - - ---Crafting +-- +-- Crafting +-- ---Quartz Crystal Piece +-- Quartz Crystal Piece minetest.register_craft({ output = '"quartz:quartz_crystal_piece" 3', recipe = { @@ -90,7 +91,7 @@ minetest.register_craft({ } }) ---Quartz Block +-- Quartz Block minetest.register_craft({ output = '"quartz:block" 4', recipe = { @@ -99,8 +100,8 @@ minetest.register_craft({ {'', '', ''} } }) - ---Chiseled Quartz + +-- Chiseled Quartz minetest.register_craft({ output = 'quartz:chiseled 2', recipe = { @@ -110,7 +111,7 @@ minetest.register_craft({ } }) ---Chiseled Quartz(for stairsplus) +-- Chiseled Quartz (for stairsplus) minetest.register_craft({ output = 'quartz:chiseled 2', recipe = { @@ -120,7 +121,7 @@ minetest.register_craft({ } }) ---Quartz Pillar +-- Quartz Pillar minetest.register_craft({ output = 'quartz:pillar 2', recipe = { @@ -130,11 +131,15 @@ minetest.register_craft({ } }) ---abms -local dirs2 = { 12, 9, 18, 7, 12 } +-- +-- ABMS +-- +local dirs2 = {12, 9, 18, 7, 12} + +-- Replace all instances of the horizontal quartz pillar with the minetest.register_abm({ - nodenames = { "quartz:pillar_horizontal" }, + nodenames = {"quartz:pillar_horizontal"}, interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -144,10 +149,46 @@ minetest.register_abm({ end, }) ---These are deprecated, don't use them +-- +-- Compatibility with stairsplus +-- + +if minetest.get_modpath("moreblocks") and enable_stairsplus then + register_stair_slab_panel_micro("quartz", "block", "quartz:block", + {cracky=3}, + {"quartz_block.png"}, + "Quartz Block", + "block", + 0 + ) + + register_stair_slab_panel_micro("quartz", "chiseled", "quartz:chiseled", + {cracky=3}, + {"quartz_chiseled.png"}, + "Chiseled Quartz", + "chiseled", + 0 + ) + + register_stair_slab_panel_micro("quartz", "pillar", "quartz:pillar", + {cracky=3}, + {"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"}, + "Quartz Pillar", + "pillar", + 0 + ) + + table.insert(circular_saw.known_stairs, "quartz:block") + table.insert(circular_saw.known_stairs, "quartz:chiseled") + table.insert(circular_saw.known_stairs, "quartz:pillar") +end + +-- +-- Deprecated +-- if enable_horizontal_pillar then - --Quartz Pillar (horizontal) + -- Quartz Pillar (horizontal) minetest.register_node("quartz:pillar_horizontal", { description = "Quartz Pillar Horizontal", tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png", "quartz_pillar_side.png^[transformR90", @@ -158,33 +199,3 @@ if enable_horizontal_pillar then sounds = default.node_sound_glass_defaults(), }) end - - ---Compatibility with stairsplus - -if minetest.get_modpath("moreblocks") and enable_stairsplus then - register_stair_slab_panel_micro("quartz", "block", "quartz:block", - {cracky=3}, - {"quartz_block.png"}, - "Quartz Block", - "block", - 0) - - register_stair_slab_panel_micro("quartz", "chiseled", "quartz:chiseled", - {cracky=3}, - {"quartz_chiseled.png"}, - "Chiseled Quartz", - "chiseled", - 0) - - register_stair_slab_panel_micro("quartz", "pillar", "quartz:pillar", - {cracky=3}, - {"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"}, - "Quartz Pillar", - "pillar", - 0) - - table.insert(circular_saw.known_stairs, "quartz:block") - table.insert(circular_saw.known_stairs, "quartz:chiseled") - table.insert(circular_saw.known_stairs, "quartz:pillar") -end diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..3d3cba9 Binary files /dev/null and b/screenshot.png differ diff --git a/textures/quartz_ore.png b/textures/quartz_ore.png index 805666a..69d5ec4 100644 Binary files a/textures/quartz_ore.png and b/textures/quartz_ore.png differ