From 602fd7d6e462cf756005f5a213e4f2684506c625 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 11 Aug 2017 00:34:41 +0200 Subject: [PATCH] Rename some schematic files --- mods/MAPGEN/mcl_structures/build/README.txt | 1 - mods/MAPGEN/mcl_structures/init.lua | 14 ++++---------- mods/MAPGEN/mcl_structures/schematics/README.txt | 1 + .../mcl_structures_boulder.mts | Bin .../mcl_structures_desert_temple.we} | 0 .../mcl_structures_desert_well.mts} | Bin .../mcl_structures_fossil_skull_1.mts | Bin .../mcl_structures_fossil_skull_2.mts | Bin .../mcl_structures_fossil_skull_3.mts | Bin .../mcl_structures_fossil_skull_4.mts | Bin .../mcl_structures_fossil_spine_1.mts | Bin .../mcl_structures_fossil_spine_2.mts | Bin .../mcl_structures_fossil_spine_3.mts | Bin .../mcl_structures_fossil_spine_4.mts | Bin .../mcl_structures_ice_spike_small.mts | Bin .../mcl_structures_igloo_basement.mts} | Bin .../mcl_structures_igloo_top.mts} | Bin .../mcl_structures_witch_hut.mts | Bin .../{build => schematics}/pnj_field_1.we | 0 .../{build => schematics}/pnj_house_1.we | 0 .../{build => schematics}/pnj_house_2.we | 0 .../{build => schematics}/pnj_house_3.we | 0 .../{build => schematics}/pnj_light.we | 0 .../{build => schematics}/pnj_town_1.we | 0 .../{build => schematics}/pnj_town_withway_1.we | 0 .../{build => schematics}/pnj_watersource.we | 0 26 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 mods/MAPGEN/mcl_structures/build/README.txt create mode 100644 mods/MAPGEN/mcl_structures/schematics/README.txt rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_boulder.mts (100%) rename mods/MAPGEN/mcl_structures/{build/desert_temple.we => schematics/mcl_structures_desert_temple.we} (100%) rename mods/MAPGEN/mcl_structures/{build/desert_well.mts => schematics/mcl_structures_desert_well.mts} (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_skull_1.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_skull_2.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_skull_3.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_skull_4.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_spine_1.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_spine_2.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_spine_3.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_fossil_spine_4.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_ice_spike_small.mts (100%) rename mods/MAPGEN/mcl_structures/{build/igloo_basement.mts => schematics/mcl_structures_igloo_basement.mts} (100%) rename mods/MAPGEN/mcl_structures/{build/igloo_top.mts => schematics/mcl_structures_igloo_top.mts} (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/mcl_structures_witch_hut.mts (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_field_1.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_house_1.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_house_2.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_house_3.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_light.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_town_1.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_town_withway_1.we (100%) rename mods/MAPGEN/mcl_structures/{build => schematics}/pnj_watersource.we (100%) diff --git a/mods/MAPGEN/mcl_structures/build/README.txt b/mods/MAPGEN/mcl_structures/build/README.txt deleted file mode 100644 index 93bb30b540..0000000000 --- a/mods/MAPGEN/mcl_structures/build/README.txt +++ /dev/null @@ -1 +0,0 @@ -IMPORTANT: Only WorldEdit files, version 4 are supported at the moment diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua index a1a6213331..55f30e5eb6 100644 --- a/mods/MAPGEN/mcl_structures/init.lua +++ b/mods/MAPGEN/mcl_structures/init.lua @@ -172,7 +172,7 @@ end mcl_structures.generate_desert_well = function(pos) local newpos = {x=pos.x,y=pos.y-2,z=pos.z} - local path = minetest.get_modpath("mcl_structures").."/build/desert_well.mts" + local path = minetest.get_modpath("mcl_structures").."/build/mcl_structures_desert_well.mts" minetest.place_schematic(newpos, path, "0", nil, true) end @@ -180,13 +180,13 @@ mcl_structures.generate_igloo_top = function(pos) -- FIXME: This spawns bookshelf instead of furnace. Fix this! -- Furnace does ot work atm because apparently meta is not set. :-( local newpos = {x=pos.x,y=pos.y-1,z=pos.z} - local path = minetest.get_modpath("mcl_structures").."/build/igloo_top.mts" + local path = minetest.get_modpath("mcl_structures").."/build/mcl_structures_igloo_top.mts" minetest.place_schematic(newpos, path, "random", nil, true) end mcl_structures.generate_igloo_basement = function(pos, orientation) -- TODO: Add brewing stand - local path = minetest.get_modpath("mcl_structures").."/build/igloo_basement.mts" + local path = minetest.get_modpath("mcl_structures").."/build/mcl_structures_igloo_basement.mts" minetest.place_schematic(pos, path, orientation, nil, true) end @@ -223,15 +223,9 @@ mcl_structures.generate_fossil = function(pos) minetest.place_schematic(newpos, path, "random", nil, false) end -mcl_structures.generate_igloo_basement = function(pos, orientation) - -- TODO: Add brewing stand - local path = minetest.get_modpath("mcl_structures").."/build/igloo_basement.mts" - minetest.place_schematic(pos, path, orientation, nil, true) -end - mcl_structures.generate_desert_temple = function(pos) -- No Generating for the temple ... Why using it ? No Change - local temple = mcl_structures.get_struct("desert_temple.we") + local temple = mcl_structures.get_struct("mcl_structures_desert_temple.we") local newpos = {x=pos.x,y=pos.y-12,z=pos.z} if newpos == nil then return diff --git a/mods/MAPGEN/mcl_structures/schematics/README.txt b/mods/MAPGEN/mcl_structures/schematics/README.txt new file mode 100644 index 0000000000..346ffbb651 --- /dev/null +++ b/mods/MAPGEN/mcl_structures/schematics/README.txt @@ -0,0 +1 @@ +IMPORTANT: Only schematics (*.mts) and WorldEdit files (*.we) version 4 are supported at the moment. diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_boulder.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_boulder.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_boulder.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_boulder.mts diff --git a/mods/MAPGEN/mcl_structures/build/desert_temple.we b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_desert_temple.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/desert_temple.we rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_desert_temple.we diff --git a/mods/MAPGEN/mcl_structures/build/desert_well.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_desert_well.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/desert_well.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_desert_well.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_1.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_1.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_1.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_1.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_2.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_2.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_2.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_2.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_3.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_3.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_3.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_3.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_4.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_4.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_skull_4.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_skull_4.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_1.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_1.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_1.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_1.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_2.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_2.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_2.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_2.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_3.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_3.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_3.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_3.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_4.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_4.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_fossil_spine_4.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_fossil_spine_4.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_ice_spike_small.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ice_spike_small.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_ice_spike_small.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_ice_spike_small.mts diff --git a/mods/MAPGEN/mcl_structures/build/igloo_basement.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_igloo_basement.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/igloo_basement.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_igloo_basement.mts diff --git a/mods/MAPGEN/mcl_structures/build/igloo_top.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_igloo_top.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/igloo_top.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_igloo_top.mts diff --git a/mods/MAPGEN/mcl_structures/build/mcl_structures_witch_hut.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_witch_hut.mts similarity index 100% rename from mods/MAPGEN/mcl_structures/build/mcl_structures_witch_hut.mts rename to mods/MAPGEN/mcl_structures/schematics/mcl_structures_witch_hut.mts diff --git a/mods/MAPGEN/mcl_structures/build/pnj_field_1.we b/mods/MAPGEN/mcl_structures/schematics/pnj_field_1.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_field_1.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_field_1.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_house_1.we b/mods/MAPGEN/mcl_structures/schematics/pnj_house_1.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_house_1.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_house_1.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_house_2.we b/mods/MAPGEN/mcl_structures/schematics/pnj_house_2.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_house_2.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_house_2.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_house_3.we b/mods/MAPGEN/mcl_structures/schematics/pnj_house_3.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_house_3.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_house_3.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_light.we b/mods/MAPGEN/mcl_structures/schematics/pnj_light.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_light.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_light.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_town_1.we b/mods/MAPGEN/mcl_structures/schematics/pnj_town_1.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_town_1.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_town_1.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_town_withway_1.we b/mods/MAPGEN/mcl_structures/schematics/pnj_town_withway_1.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_town_withway_1.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_town_withway_1.we diff --git a/mods/MAPGEN/mcl_structures/build/pnj_watersource.we b/mods/MAPGEN/mcl_structures/schematics/pnj_watersource.we similarity index 100% rename from mods/MAPGEN/mcl_structures/build/pnj_watersource.we rename to mods/MAPGEN/mcl_structures/schematics/pnj_watersource.we