diff --git a/.gitmodules b/.gitmodules index f7d32774..caa0f70f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,51 @@ [submodule "mods/mapfix"] path = mods/mapfix url = https://github.com/minetest-mods/mapfix.git +[submodule "mods/technic"] + path = mods/technic + url = https://github.com/minetest-technic/technic.git +[submodule "mods/digilines"] + path = mods/digilines + url = https://github.com/minetest-mods/digilines.git +[submodule "mods/maidroid"] + path = mods/maidroid + url = https://github.com/tacigar/maidroid.git +[submodule "mods/pdisc"] + path = mods/pdisc + url = https://github.com/HybridDog/pdisc.git +[submodule "mods/enchanting"] + path = mods/enchanting + url = https://github.com/minetest-mods/enchanting.git +[submodule "mods/bonemeal"] + path = mods/bonemeal + url = https://github.com/tenplus1/bonemeal.git +[submodule "mods/meshnode"] + path = mods/meshnode + url = https://github.com/stujones11/meshnode.git +[submodule "mods/playeranim"] + path = mods/playeranim + url = https://github.com/minetest-mods/playeranim.git +[submodule "mods/playereffects"] + path = mods/playereffects + url = git://repo.or.cz/minetest_playereffects.git +[submodule "mods/witchcraft"] + path = mods/witchcraft + url = https://github.com/D00Med/witchcraft.git +[submodule "mods/moreplants"] + path = mods/moreplants + url = https://github.com/D00Med/moreplants.git +[submodule "mods/moreflowers"] + path = mods/moreflowers + url = https://github.com/sys4-fr/moreflowers.git +[submodule "mods/morefarming"] + path = mods/morefarming + url = https://github.com/sys4-fr/morefarming.git +[submodule "mods/bakedclay"] + path = mods/bakedclay + url = https://github.com/tenplus1/bakedclay.git +[submodule "mods/lightning"] + path = mods/lightning + url = https://github.com/minetest-mods/lightning.git +[submodule "mods/weather_pack"] + path = mods/weather_pack + url = https://github.com/xeranas/weather_pack.git diff --git a/minetest.conf b/minetest.conf index 1d3558b4..223cd1a0 100755 --- a/minetest.conf +++ b/minetest.conf @@ -1,6 +1,6 @@ ### GENERAL SETTINGS SERVER ### ############################### -name = Darcidride +name = sys4 # Logs parameters - 0 = none, 1 = warning, 2 = action, 3 = info, 4 = verbose debug_log_level = action # Profiling (mod needed because the minetest cmdline sucks) @@ -16,13 +16,15 @@ server_dedicated = true # 1 day-night cycle lasts 24 minutes instead of 20. time_speed = 60 # Slightly higher player limit by default. -max_users = 25 +max_users = 5 # Give basics privileges to new players. default_privs = home, spawn, faction_user # If true, actions are recorded for rollback enable_rollback_recording = true -# Desactivate fire -disable_fire = true +# Activate fire +disable_fire = false +# Enable TNT +enable_tnt = true # Si false, les pseudos des joueurs sont cachés à partir d'une distance de 50 blocs unlimited_player_transfer_distance = false # Activated the minimap usage if true @@ -44,14 +46,14 @@ sqlite_synchronous = 0 ### SERVER AND PUBLIC INFORMATIONS ### ###################################### -server_name = MinetestForFun (Survival & PVP) [FR/EN] -server_description = Classic server hosted by XorHub community. This server have a class system(Warrior, Hunter, Wizard) and is highly modded, content-rich, good luck to survive and have fun! [Visit "xorhub.com" for more informations] -motd = Welcome to "MinetestForFun (Survival & PVP) [EN/FR]" server! / Bienvenue sur le serveur "MinetestForFun (Survie & PVP) [FR/EN]" ! +server_name = NotreAmiLeCube (Survival & PVP) [FR/EN] +server_description = Server hosted by sys4. This server have a class system(Warrior, Hunter, Wizard) and is highly modded, content-rich, good luck to survive and have fun! [This server is a fork from MinetestForFun Classic] +motd = Welcome to "NotreAmiLeCube (Survival & PVP) [EN/FR]" server! / Bienvenue sur le serveur "NotreAmiLeCube (Survie & PVP) [FR/EN]" ! serverlist_url = servers.minetest.net -server_url = http://xorhub.com/ -server_announce = true -server_address = 158.69.114.146 -port = 30001 +server_url = http://mff.sys4.fr/ +server_announce = false +server_address = 78.210.252.189 +port = 30002 # curl default 5sec but timeout, fix to 15sec curl_timeout = 15000 @@ -82,7 +84,7 @@ movement_gravity = 9.5 # Jump height slightly reduced. movement_speed_jump = 6.5 # Emplacement du static spawn point -static_spawnpoint = 24,97,-1 +static_spawnpoint = 144, 25, 261 # Emplacment du static spawn pour le nether nether_static_spawnpoint = 43, -20020, -12 # Désactivation de l'anti-cheat qui fait ce téléporter en arrière si l'on va trop vite @@ -91,7 +93,8 @@ disable_anticheat = true ### WORLD MODIFICATIONS ### ########################### # A chosen map seed for a new map, leave empty for random -fixed_map_seed = 13107546752813893513 +#fixed_map_seed = 13107546752813893513 +fixed_map_seed = 5841458415838469071 # Enable dungeons on new worlds. mg_flags = trees, caves, dungeons # Enable jungles on new worlds, disable biome blend and mud flow (faster, looks better). @@ -99,8 +102,10 @@ mgv6_spflags = jungles, nobiomeblend, nomudflow # Less deserts, more beaches. mgv6_freq_desert = 0.6 mgv6_freq_beach = -0.15 -# Needed for the LUA mapgen "Watershed" -mg_name = singlenode +# Tweeked "valleys" mapgen +mg_biome_np_heat = 50, 50, (350,350,350), 5349, 3, 0.5 +mg_biome_np_humidity = 50, 50, (350,350,350), 842, 0.5 +mg_name = valleys ### MODS PARAMETERS ### ####################### @@ -137,19 +142,22 @@ hudbars_tick = 0.4 hudbars_start_offset_left_y = -100 hudbars_start_offset_right_y = -100 # Mysql Auth, config file path -mysql_auth.cfgfile = /home/quentinbd/mysql_auth/mff-classic_config +#mysql_auth.cfgfile = /home/quentinbd/mysql_auth/mff-classic_config # CHRISTMAS_CRAFT, active snow when winter(december/january) -is_winter = true +is_winter = false ### IRC CHAT ### ################ -irc.server = irc.inchra.chat -irc.channel = #minetestforfun -irc.interval = 2.0 -irc.nick = MFF-Bot +#irc.server = irc.inchra.chat +#irc.channel = #minetestforfun +#irc.interval = 2.0 +#irc.nick = MFF-Bot #irc.password = #vide car aucun mdp pour le channel secure.trusted_mods = irc, snow, stacktraceplus -irc.debug = false -irc.disable_auto_connect = false -irc.disable_auto_join = false -irc.send_join_part = true +#irc.debug = false +#irc.disable_auto_connect = false +#irc.disable_auto_join = false +#irc.send_join_part = true + +## Player Anim ## +player_model_version = default_character_v1 diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index 05924117..b84eb4a7 100755 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -1162,11 +1162,12 @@ minetest.register_craft({ recipe = "default:clay_lump", }) -minetest.register_craft({ +--[[minetest.register_craft({ type = "cooking", output = "default:clay_burned", recipe = "default:clay", }) +--]] -- -- Fuels diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua index 5c12d5b0..7e5ac55f 100755 --- a/minetestforfun_game/mods/default/mapgen.lua +++ b/minetestforfun_game/mods/default/mapgen.lua @@ -1825,14 +1825,14 @@ end -- -- Detect mapgen to select functions -- -local mg_params = minetest.get_mapgen_params() --(1) MFF IMPORTANT for mt <= 0.14.4 stable -if mg_params.mgname == "v6" then --(1) ---local mg_name = minetest.get_mapgen_setting("mg_name") --(2) for mt > 0.14.4 stable ---if mg_name == "v6" then--(2) +--local mg_params = minetest.get_mapgen_params() --(1) MFF IMPORTANT for mt <= 0.14.4 stable +--if mg_params.mgname == "v6" then --(1) +local mg_name = minetest.get_mapgen_setting("mg_name") --(2) for mt > 0.14.4 stable +if mg_name == "v6" then--(2) default.register_ores() default.register_mgv6_decorations() else - --default.register_biomes() -- MFF + default.register_biomes() default.register_ores() - --default.register_decorations() MFF: Causes extremely dense forests everywhere (since biomes are not used, decorations are generated everywhere). + default.register_decorations() end diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 030cbd60..f1a1c750 100755 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -511,7 +511,7 @@ minetest.register_node("default:clay", { sounds = default.node_sound_dirt_defaults(), }) -minetest.register_node("default:clay_burned", { +--[[minetest.register_node("default:clay_burned", { description = "Burned Clay", tiles = {"default_clay_burned.png"}, is_ground_content = true, @@ -519,7 +519,7 @@ minetest.register_node("default:clay_burned", { drop = 'default:clay_lump 4', sounds = default.node_sound_dirt_defaults(), }) - +--]] minetest.register_node("default:snow", { description = "Snow", diff --git a/minetestforfun_game/mods/fire/init.lua b/minetestforfun_game/mods/fire/init.lua index 2f07b524..41d41caf 100755 --- a/minetestforfun_game/mods/fire/init.lua +++ b/minetestforfun_game/mods/fire/init.lua @@ -209,7 +209,7 @@ function fire.update_sounds_around(pos) end ---[[ Extinguish all flames quickly with water, snow, ice +-- Extinguish all flames quickly with water, snow, ice minetest.register_abm({ label = "Extinguish flame", @@ -299,7 +299,7 @@ else -- Fire enabled end --- Rarely ignite things from far +--[[ Rarely ignite things from far -- Currently disabled to reduce the chance of uncontrollable spreading fires that disrupt servers. Also for less lua processing load. diff --git a/minetestforfun_game/mods/tnt/README.txt b/minetestforfun_game/mods/tnt/README.txt new file mode 100644 index 00000000..c1ca88d5 --- /dev/null +++ b/minetestforfun_game/mods/tnt/README.txt @@ -0,0 +1,41 @@ +Minetest Game mod: tnt +====================== +See license.txt for license information. + +Authors of source code +---------------------- +PilzAdam (MIT) +ShadowNinja (MIT) +sofar (sofar@foo-projects.org) (MIT) +Various Minetest developers and contributors (MIT) + +Authors of media (textures) +--------------------------- +BlockMen (CC BY-SA 3.0): +All textures not mentioned below. + +ShadowNinja (CC BY-SA 3.0): +tnt_smoke.png + +Wuzzy (CC BY-SA 3.0): +All gunpowder textures except tnt_gunpowder_inventory.png. + +sofar (sofar@foo-projects.org) (CC BY-SA 3.0): +tnt_blast.png + +Introduction +------------ +This mod adds TNT to Minetest. TNT is a tool to help the player +in mining. + +How to use the mod: +Craft gunpowder by placing coal and gravel in the crafting area. +The gunpowder can be used to craft TNT or as fuse for TNT. +To craft TNT surround gunpowder with 4 wood in a + shape. + +There are different ways to blow up TNT: + 1. Hit it with a torch. + 2. Hit a gunpowder fuse that leads to a TNT block with a torch or flint-and-steel. + 3. Activate it with mesecons (fastest way). + +Be aware of the damage radius of 6 blocks! diff --git a/minetestforfun_game/mods/tnt/depends.txt b/minetestforfun_game/mods/tnt/depends.txt new file mode 100644 index 00000000..5ff216f7 --- /dev/null +++ b/minetestforfun_game/mods/tnt/depends.txt @@ -0,0 +1,3 @@ +default +fire + diff --git a/minetestforfun_game/mods/tnt/init.lua b/minetestforfun_game/mods/tnt/init.lua new file mode 100644 index 00000000..5d1de604 --- /dev/null +++ b/minetestforfun_game/mods/tnt/init.lua @@ -0,0 +1,618 @@ +tnt = {} + +-- Default to enabled when in singleplayer +local enable_tnt = minetest.setting_getbool("enable_tnt") +if enable_tnt == nil then + enable_tnt = minetest.is_singleplayer() +end + +-- loss probabilities array (one in X will be lost) +local loss_prob = {} + +loss_prob["default:cobble"] = 3 +loss_prob["default:dirt"] = 4 + +local tnt_radius = tonumber(minetest.setting_get("tnt_radius") or 3) + +-- Fill a list with data for content IDs, after all nodes are registered +local cid_data = {} +minetest.after(0, function() + for name, def in pairs(minetest.registered_nodes) do + cid_data[minetest.get_content_id(name)] = { + name = name, + drops = def.drops, + flammable = def.groups.flammable, + on_blast = def.on_blast, + } + end +end) + +local function rand_pos(center, pos, radius) + local def + local reg_nodes = minetest.registered_nodes + local i = 0 + repeat + -- Give up and use the center if this takes too long + if i > 4 then + pos.x, pos.z = center.x, center.z + break + end + pos.x = center.x + math.random(-radius, radius) + pos.z = center.z + math.random(-radius, radius) + def = reg_nodes[minetest.get_node(pos).name] + i = i + 1 + until def and not def.walkable +end + +local function eject_drops(drops, pos, radius) + local drop_pos = vector.new(pos) + for _, item in pairs(drops) do + local count = math.min(item:get_count(), item:get_stack_max()) + while count > 0 do + local take = math.max(1,math.min(radius * radius, + count, + item:get_stack_max())) + rand_pos(pos, drop_pos, radius) + local dropitem = ItemStack(item) + dropitem:set_count(take) + local obj = minetest.add_item(drop_pos, dropitem) + if obj then + obj:get_luaentity().collect = true + obj:setacceleration({x = 0, y = -10, z = 0}) + obj:setvelocity({x = math.random(-3, 3), + y = math.random(0, 10), + z = math.random(-3, 3)}) + end + count = count - take + end + end +end + +local function add_drop(drops, item) + item = ItemStack(item) + local name = item:get_name() + if loss_prob[name] ~= nil and math.random(1, loss_prob[name]) == 1 then + return + end + + local drop = drops[name] + if drop == nil then + drops[name] = item + else + drop:set_count(drop:get_count() + item:get_count()) + end +end + +local function destroy(drops, npos, cid, c_air, c_fire, on_blast_queue, ignore_protection, ignore_on_blast) + if not ignore_protection and minetest.is_protected(npos, "") then + return cid + end + + local def = cid_data[cid] + + if not def then + return c_air + elseif not ignore_on_blast and def.on_blast then + on_blast_queue[#on_blast_queue + 1] = {pos = vector.new(npos), on_blast = def.on_blast} + return cid + elseif def.flammable then + return c_fire + else + local node_drops = minetest.get_node_drops(def.name, "") + for _, item in pairs(node_drops) do + add_drop(drops, item) + end + return c_air + end +end + +local function calc_velocity(pos1, pos2, old_vel, power) + -- Avoid errors caused by a vector of zero length + if vector.equals(pos1, pos2) then + return old_vel + end + + local vel = vector.direction(pos1, pos2) + vel = vector.normalize(vel) + vel = vector.multiply(vel, power) + + -- Divide by distance + local dist = vector.distance(pos1, pos2) + dist = math.max(dist, 1) + vel = vector.divide(vel, dist) + + -- Add old velocity + vel = vector.add(vel, old_vel) + + -- randomize it a bit + vel = vector.add(vel, { + x = math.random() - 0.5, + y = math.random() - 0.5, + z = math.random() - 0.5, + }) + + -- Limit to terminal velocity + dist = vector.length(vel) + if dist > 250 then + vel = vector.divide(vel, dist / 250) + end + return vel +end + +local function entity_physics(pos, radius, drops) + local objs = minetest.get_objects_inside_radius(pos, radius) + for _, obj in pairs(objs) do + local obj_pos = obj:getpos() + local dist = math.max(1, vector.distance(pos, obj_pos)) + + local damage = (4 / dist) * radius + if obj:is_player() then + -- currently the engine has no method to set + -- player velocity. See #2960 + -- instead, we knock the player back 1.0 node, and slightly upwards + local dir = vector.normalize(vector.subtract(obj_pos, pos)) + local moveoff = vector.multiply(dir, dist + 1.0) + local newpos = vector.add(pos, moveoff) + newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0}) + obj:setpos(newpos) + + obj:set_hp(obj:get_hp() - damage) + else + local do_damage = true + local do_knockback = true + local entity_drops = {} + local luaobj = obj:get_luaentity() + local objdef = minetest.registered_entities[luaobj.name] + + if objdef and objdef.on_blast then + do_damage, do_knockback, entity_drops = objdef.on_blast(luaobj, damage) + end + + if do_knockback then + local obj_vel = obj:getvelocity() + obj:setvelocity(calc_velocity(pos, obj_pos, + obj_vel, radius * 10)) + end + if do_damage then + if not obj:get_armor_groups().immortal then + obj:punch(obj, 1.0, { + full_punch_interval = 1.0, + damage_groups = {fleshy = damage}, + }, nil) + end + end + for _, item in pairs(entity_drops) do + add_drop(drops, item) + end + end + end +end + +local function add_effects(pos, radius, drops) + minetest.add_particle({ + pos = pos, + velocity = vector.new(), + acceleration = vector.new(), + expirationtime = 0.4, + size = radius * 10, + collisiondetection = false, + vertical = false, + texture = "tnt_boom.png", + }) + minetest.add_particlespawner({ + amount = 64, + time = 0.5, + minpos = vector.subtract(pos, radius / 2), + maxpos = vector.add(pos, radius / 2), + minvel = {x = -10, y = -10, z = -10}, + maxvel = {x = 10, y = 10, z = 10}, + minacc = vector.new(), + maxacc = vector.new(), + minexptime = 1, + maxexptime = 2.5, + minsize = radius * 3, + maxsize = radius * 5, + texture = "tnt_smoke.png", + }) + + -- we just dropped some items. Look at the items entities and pick + -- one of them to use as texture + local texture = "tnt_blast.png" --fallback texture + local most = 0 + for name, stack in pairs(drops) do + local count = stack:get_count() + if count > most then + most = count + local def = minetest.registered_nodes[name] + if def and def.tiles and def.tiles[1] then + texture = def.tiles[1] + end + end + end + + minetest.add_particlespawner({ + amount = 64, + time = 0.1, + minpos = vector.subtract(pos, radius / 2), + maxpos = vector.add(pos, radius / 2), + minvel = {x = -3, y = 0, z = -3}, + maxvel = {x = 3, y = 5, z = 3}, + minacc = {x = 0, y = -10, z = 0}, + maxacc = {x = 0, y = -10, z = 0}, + minexptime = 0.8, + maxexptime = 2.0, + minsize = radius * 0.66, + maxsize = radius * 2, + texture = texture, + collisiondetection = true, + }) +end + +function tnt.burn(pos, nodename) + local name = nodename or minetest.get_node(pos).name + local group = minetest.get_item_group(name, "tnt") + if group > 0 then + minetest.sound_play("tnt_ignite", {pos = pos}) + minetest.set_node(pos, {name = name .. "_burning"}) + minetest.get_node_timer(pos):start(1) + elseif name == "tnt:gunpowder" then + minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) + end +end + +local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast) + pos = vector.round(pos) + -- scan for adjacent TNT nodes first, and enlarge the explosion + local vm1 = VoxelManip() + local p1 = vector.subtract(pos, 2) + local p2 = vector.add(pos, 2) + local minp, maxp = vm1:read_from_map(p1, p2) + local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) + local data = vm1:get_data() + local count = 0 + local c_tnt = minetest.get_content_id("tnt:tnt") + local c_tnt_burning = minetest.get_content_id("tnt:tnt_burning") + local c_tnt_boom = minetest.get_content_id("tnt:boom") + local c_air = minetest.get_content_id("air") + + for z = pos.z - 2, pos.z + 2 do + for y = pos.y - 2, pos.y + 2 do + local vi = a:index(pos.x - 2, y, z) + for x = pos.x - 2, pos.x + 2 do + local cid = data[vi] + if cid == c_tnt or cid == c_tnt_boom or cid == c_tnt_burning then + count = count + 1 + data[vi] = c_air + end + vi = vi + 1 + end + end + end + + vm1:set_data(data) + vm1:write_to_map() + + -- recalculate new radius + radius = math.floor(radius * math.pow(count, 1/3)) + + -- perform the explosion + local vm = VoxelManip() + local pr = PseudoRandom(os.time()) + p1 = vector.subtract(pos, radius) + p2 = vector.add(pos, radius) + minp, maxp = vm:read_from_map(p1, p2) + a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) + data = vm:get_data() + + local drops = {} + local on_blast_queue = {} + + local c_fire = minetest.get_content_id("fire:basic_flame") + for z = -radius, radius do + for y = -radius, radius do + local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z) + for x = -radius, radius do + local r = vector.length(vector.new(x, y, z)) + if (radius * radius) / (r * r) >= (pr:next(80, 125) / 100) then + local cid = data[vi] + local p = {x = pos.x + x, y = pos.y + y, z = pos.z + z} + if cid ~= c_air then + data[vi] = destroy(drops, p, cid, c_air, c_fire, + on_blast_queue, ignore_protection, + ignore_on_blast) + end + end + vi = vi + 1 + end + end + end + + vm:set_data(data) + vm:write_to_map() + vm:update_map() + vm:update_liquids() + + -- call check_single_for_falling for everything within 1.5x blast radius + for y = -radius * 1.5, radius * 1.5 do + for z = -radius * 1.5, radius * 1.5 do + for x = -radius * 1.5, radius * 1.5 do + local rad = {x = x, y = y, z = z} + local s = vector.add(pos, rad) + local r = vector.length(rad) + if r / radius < 1.4 then + minetest.check_single_for_falling(s) + end + end + end + end + + for _, queued_data in pairs(on_blast_queue) do + local dist = math.max(1, vector.distance(queued_data.pos, pos)) + local intensity = (radius * radius) / (dist * dist) + local node_drops = queued_data.on_blast(queued_data.pos, intensity) + if node_drops then + for _, item in pairs(node_drops) do + add_drop(drops, item) + end + end + end + + return drops, radius +end + +function tnt.boom(pos, def) + minetest.sound_play("tnt_explode", {pos = pos, gain = 1.5, max_hear_distance = 2*64}) + minetest.set_node(pos, {name = "tnt:boom"}) + local drops, radius = tnt_explode(pos, def.radius, def.ignore_protection, + def.ignore_on_blast) + -- append entity drops + local damage_radius = (radius / def.radius) * def.damage_radius + entity_physics(pos, damage_radius, drops) + if not def.disable_drops then + eject_drops(drops, pos, radius) + end + add_effects(pos, radius, drops) + minetest.log("action", "A TNT explosion occurred at " .. minetest.pos_to_string(pos) .. + " with radius " .. radius) +end + +minetest.register_node("tnt:boom", { + drawtype = "airlike", + light_source = default.LIGHT_MAX, + walkable = false, + drop = "", + groups = {dig_immediate = 3}, + on_construct = function(pos) + minetest.get_node_timer(pos):start(0.4) + end, + on_timer = function(pos, elapsed) + minetest.remove_node(pos) + end, + -- unaffected by explosions + on_blast = function() end, +}) + +minetest.register_node("tnt:gunpowder", { + description = "Gun Powder", + drawtype = "raillike", + paramtype = "light", + is_ground_content = false, + sunlight_propagates = true, + walkable = false, + tiles = {"tnt_gunpowder_straight.png", "tnt_gunpowder_curved.png", "tnt_gunpowder_t_junction.png", "tnt_gunpowder_crossing.png"}, + inventory_image = "tnt_gunpowder_inventory.png", + wield_image = "tnt_gunpowder_inventory.png", + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + groups = {dig_immediate = 2, attached_node = 1, flammable = 5, + connect_to_raillike = minetest.raillike_group("gunpowder")}, + sounds = default.node_sound_leaves_defaults(), + + on_punch = function(pos, node, puncher) + if puncher:get_wielded_item():get_name() == "default:torch" then + minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) + minetest.log("action", puncher:get_player_name() .. + " ignites tnt:gunpowder at " .. + minetest.pos_to_string(pos)) + end + end, + on_blast = function(pos, intensity) + minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) + end, + on_burn = function(pos) + minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) + end, + on_ignite = function(pos, igniter) + minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) + end, +}) + +minetest.register_node("tnt:gunpowder_burning", { + drawtype = "raillike", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + light_source = 5, + tiles = {{ + name = "tnt_gunpowder_burning_straight_animated.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 1, + } + }, + { + name = "tnt_gunpowder_burning_curved_animated.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 1, + } + }, + { + name = "tnt_gunpowder_burning_t_junction_animated.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 1, + } + }, + { + name = "tnt_gunpowder_burning_crossing_animated.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 1, + } + }}, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + drop = "", + groups = {dig_immediate = 2, attached_node = 1, connect_to_raillike = minetest.raillike_group("gunpowder")}, + sounds = default.node_sound_leaves_defaults(), + on_timer = function(pos, elapsed) + for dx = -1, 1 do + for dz = -1, 1 do + for dy = -1, 1 do + if not (dx == 0 and dz == 0) then + tnt.burn({ + x = pos.x + dx, + y = pos.y + dy, + z = pos.z + dz, + }) + end + end + end + end + minetest.remove_node(pos) + end, + -- unaffected by explosions + on_blast = function() end, + on_construct = function(pos) + minetest.sound_play("tnt_gunpowder_burning", {pos = pos, gain = 2}) + minetest.get_node_timer(pos):start(1) + end, +}) + +minetest.register_craft({ + output = "tnt:gunpowder 5", + type = "shapeless", + recipe = {"default:coal_lump", "default:gravel"} +}) + +if enable_tnt then + minetest.register_craft({ + output = "tnt:tnt", + recipe = { + {"group:wood", "tnt:gunpowder", "group:wood"}, + {"tnt:gunpowder", "tnt:gunpowder", "tnt:gunpowder"}, + {"group:wood", "tnt:gunpowder", "group:wood"} + } + }) + + minetest.register_abm({ + label = "TNT ignition", + nodenames = {"group:tnt", "tnt:gunpowder"}, + neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"}, + interval = 4, + chance = 1, + action = function(pos, node) + tnt.burn(pos, node.name) + end, + }) +end + +function tnt.register_tnt(def) + local name + if not def.name:find(':') then + name = "tnt:" .. def.name + else + name = def.name + def.name = def.name:match(":([%w_]+)") + end + if not def.tiles then def.tiles = {} end + local tnt_top = def.tiles.top or def.name .. "_top.png" + local tnt_bottom = def.tiles.bottom or def.name .. "_bottom.png" + local tnt_side = def.tiles.side or def.name .. "_side.png" + local tnt_burning = def.tiles.burning or def.name .. "_top_burning_animated.png" + if not def.damage_radius then def.damage_radius = def.radius * 2 end + + if enable_tnt then + minetest.register_node(":" .. name, { + description = def.description, + tiles = {tnt_top, tnt_bottom, tnt_side}, + is_ground_content = false, + groups = {dig_immediate = 2, mesecon = 2, tnt = 1, flammable = 5}, + sounds = default.node_sound_wood_defaults(), + on_punch = function(pos, node, puncher) + if puncher:get_wielded_item():get_name() == "default:torch" then + minetest.set_node(pos, {name = name .. "_burning"}) + minetest.log("action", puncher:get_player_name() .. + " ignites " .. node.name .. " at " .. + minetest.pos_to_string(pos)) + end + end, + on_blast = function(pos, intensity) + minetest.after(0.1, function() + tnt.boom(pos, def) + end) + end, + mesecons = {effector = + {action_on = + function(pos) + tnt.boom(pos, def) + end + } + }, + on_burn = function(pos) + minetest.set_node(pos, {name = name .. "_burning"}) + end, + on_ignite = function(pos, igniter) + minetest.set_node(pos, {name = name .. "_burning"}) + end, + }) + end + + minetest.register_node(":" .. name .. "_burning", { + tiles = { + { + name = tnt_burning, + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 1, + } + }, + tnt_bottom, tnt_side + }, + light_source = 5, + drop = "", + sounds = default.node_sound_wood_defaults(), + groups = {falling_node = 1}, + on_timer = function(pos, elapsed) + tnt.boom(pos, def) + end, + -- unaffected by explosions + on_blast = function() end, + on_construct = function(pos) + minetest.sound_play("tnt_ignite", {pos = pos}) + minetest.get_node_timer(pos):start(4) + minetest.check_for_falling(pos) + end, + }) +end + +tnt.register_tnt({ + name = "tnt:tnt", + description = "TNT", + radius = tnt_radius, +}) diff --git a/minetestforfun_game/mods/tnt/license.txt b/minetestforfun_game/mods/tnt/license.txt new file mode 100644 index 00000000..210f2bdc --- /dev/null +++ b/minetestforfun_game/mods/tnt/license.txt @@ -0,0 +1,65 @@ +License of source code +---------------------- + +The MIT License (MIT) +Copyright (C) 2014-2016 PilzAdam +Copyright (C) 2014-2016 ShadowNinja +Copyright (C) 2016 sofar (sofar@foo-projects.org) +Copyright (C) 2014-2016 Various Minetest developers and contributors + +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. + +For more details: +https://opensource.org/licenses/MIT + + +Licenses of media (textures) +---------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2014-2016 BlockMen +Copyright (C) 2014-2016 ShadowNinja +Copyright (C) 2015-2016 Wuzzy +Copyright (C) 2016 sofar (sofar@foo-projects.org) + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/minetestforfun_game/mods/tnt/sounds/tnt_explode.ogg b/minetestforfun_game/mods/tnt/sounds/tnt_explode.ogg new file mode 100644 index 00000000..a414ea04 Binary files /dev/null and b/minetestforfun_game/mods/tnt/sounds/tnt_explode.ogg differ diff --git a/minetestforfun_game/mods/tnt/sounds/tnt_gunpowder_burning.ogg b/minetestforfun_game/mods/tnt/sounds/tnt_gunpowder_burning.ogg new file mode 100644 index 00000000..5c5bfaf2 Binary files /dev/null and b/minetestforfun_game/mods/tnt/sounds/tnt_gunpowder_burning.ogg differ diff --git a/minetestforfun_game/mods/tnt/sounds/tnt_ignite.ogg b/minetestforfun_game/mods/tnt/sounds/tnt_ignite.ogg new file mode 100644 index 00000000..199f2067 Binary files /dev/null and b/minetestforfun_game/mods/tnt/sounds/tnt_ignite.ogg differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_blast.png b/minetestforfun_game/mods/tnt/textures/tnt_blast.png new file mode 100644 index 00000000..bbb1096f Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_blast.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_boom.png b/minetestforfun_game/mods/tnt/textures/tnt_boom.png new file mode 100644 index 00000000..c848bfcd Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_boom.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_bottom.png b/minetestforfun_game/mods/tnt/textures/tnt_bottom.png new file mode 100644 index 00000000..95f66cb9 Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_bottom.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png new file mode 100644 index 00000000..a901f7bd Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png new file mode 100644 index 00000000..bc018065 Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png new file mode 100644 index 00000000..c860acef Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png new file mode 100644 index 00000000..a556072c Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_crossing.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_crossing.png new file mode 100644 index 00000000..916c84ee Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_crossing.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_curved.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_curved.png new file mode 100644 index 00000000..cb8b4eac Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_curved.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_inventory.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_inventory.png new file mode 100644 index 00000000..105a2d25 Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_inventory.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_straight.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_straight.png new file mode 100644 index 00000000..8ab0e3c8 Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_straight.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_t_junction.png b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_t_junction.png new file mode 100644 index 00000000..ac997a7a Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_gunpowder_t_junction.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_side.png b/minetestforfun_game/mods/tnt/textures/tnt_side.png new file mode 100644 index 00000000..d3034732 Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_side.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_smoke.png b/minetestforfun_game/mods/tnt/textures/tnt_smoke.png new file mode 100644 index 00000000..488b50fe Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_smoke.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_top.png b/minetestforfun_game/mods/tnt/textures/tnt_top.png new file mode 100644 index 00000000..31b807cb Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_top.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_top_burning.png b/minetestforfun_game/mods/tnt/textures/tnt_top_burning.png new file mode 100644 index 00000000..fc0d4905 Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_top_burning.png differ diff --git a/minetestforfun_game/mods/tnt/textures/tnt_top_burning_animated.png b/minetestforfun_game/mods/tnt/textures/tnt_top_burning_animated.png new file mode 100644 index 00000000..18a270fb Binary files /dev/null and b/minetestforfun_game/mods/tnt/textures/tnt_top_burning_animated.png differ diff --git a/mods/3d_armor/technic_armor/LICENSE.txt b/mods/3d_armor/technic_armor/LICENSE.txt new file mode 100644 index 00000000..2402dac9 --- /dev/null +++ b/mods/3d_armor/technic_armor/LICENSE.txt @@ -0,0 +1,7 @@ +[mod] Technic Armor [technic_armor] +=================================== + +License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1 + +License Textures: poet.nohit and numberZero - 2015-2017 WTFPL + diff --git a/mods/3d_armor/technic_armor/README.txt b/mods/3d_armor/technic_armor/README.txt new file mode 100644 index 00000000..76a88eb3 --- /dev/null +++ b/mods/3d_armor/technic_armor/README.txt @@ -0,0 +1,9 @@ +[mod] Technic Armor [technic_armor] +=================================== + +Adds tin, silver and technic materials to 3d_armor. +Requires technic (technic_worldgen at least) mod. + +Depends: 3d_armor, technic_worldgen + +Textures by poet.nohit and numberZero diff --git a/mods/3d_armor/technic_armor/depends.txt b/mods/3d_armor/technic_armor/depends.txt new file mode 100644 index 00000000..2546a84b --- /dev/null +++ b/mods/3d_armor/technic_armor/depends.txt @@ -0,0 +1,3 @@ +3d_armor +technic_worldgen +moreores? diff --git a/mods/3d_armor/technic_armor/description.txt b/mods/3d_armor/technic_armor/description.txt new file mode 100644 index 00000000..5738c4fa --- /dev/null +++ b/mods/3d_armor/technic_armor/description.txt @@ -0,0 +1 @@ +Adds tin, silver and technic materials to 3d_armor. diff --git a/mods/3d_armor/technic_armor/init.lua b/mods/3d_armor/technic_armor/init.lua new file mode 100644 index 00000000..e1a663d0 --- /dev/null +++ b/mods/3d_armor/technic_armor/init.lua @@ -0,0 +1,56 @@ +local stats = { + lead = { name="Lead", material="technic:lead_ingot", armor=1.6, heal=0, use=500, radiation=80*1.1 }, + brass = { name="Brass", material="technic:brass_ingot", armor=1.8, heal=0, use=650, radiation=43 }, + cast = { name="Cast Iron", material="technic:cast_iron_ingot", armor=2.5, heal=8, use=200, radiation=40 }, + carbon = { name="Carbon Steel", material="technic:carbon_steel_ingot", armor=2.7, heal=10, use=100, radiation=40 }, + stainless = { name="Stainless Steel", material="technic:stainless_steel_ingot", armor=2.7, heal=10, use=75, radiation=40 }, +} +if minetest.get_modpath("moreores") then + stats.tin = { name="Tin", material="moreores:tin_ingot", armor=1.6, heal=0, use=750, radiation=37 } + stats.silver = { name="Silver", material="moreores:silver_ingot", armor=1.8, heal=6, use=650, radiation=53 } +end + +local parts = { + helmet = { place="head", name="Helmet", level=5, radlevel = 0.10, craft={{1,1,1},{1,0,1}} }, + chestplate = { place="torso", name="Chestplate", level=8, radlevel = 0.35, craft={{1,0,1},{1,1,1},{1,1,1}} }, + leggings = { place="legs", name="Leggings", level=7, radlevel = 0.15, craft={{1,1,1},{1,0,1},{1,0,1}} }, + boots = { place="feet", name="Boots", level=4, radlevel = 0.10, craft={{1,0,1},{1,0,1}} }, +} +if minetest.get_modpath("shields") then + parts.shield = { place="shield", name="Shield", level=5, radlevel=0.00, craft={{1,1,1},{1,1,1},{0,1,0}} } +end + +-- Makes a craft recipe based on a template +-- template is a recipe-like table but indices are used instead of actual item names: +-- 0 means nothing, everything else is treated as an index in the materials table +local function make_recipe(template, materials) + local recipe = {} + for j, trow in ipairs(template) do + local rrow = {} + for i, tcell in ipairs(trow) do + if tcell == 0 then + rrow[i] = "" + else + rrow[i] = materials[tcell] + end + end + recipe[j] = rrow + end + return recipe +end + +for key, armor in pairs(stats) do + for partkey, part in pairs(parts) do + local partname = "technic_armor:"..partkey.."_"..key + minetest.register_tool(partname, { + description = armor.name.." "..part.name, + inventory_image = "technic_armor_inv_"..partkey.."_"..key..".png", + groups = {["armor_"..part.place]=math.floor(part.level*armor.armor), armor_heal=armor.heal, armor_use=armor.use, armor_radiation=math.floor(part.radlevel*armor.radiation)}, + wear = 0, + }) + minetest.register_craft({ + output = partname, + recipe = make_recipe(part.craft, {armor.material}), + }) + end +end diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png new file mode 100644 index 00000000..a54b9701 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png new file mode 100644 index 00000000..b054d4f0 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png new file mode 100644 index 00000000..379cc8ec Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png new file mode 100644 index 00000000..8d7e480d Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png new file mode 100644 index 00000000..5aa0aaa6 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png new file mode 100644 index 00000000..22699f23 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead.png new file mode 100644 index 00000000..a809e623 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead_preview.png new file mode 100644 index 00000000..a6e7690e Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_lead_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png new file mode 100644 index 00000000..1af5ccca Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png new file mode 100644 index 00000000..01e0caf6 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png new file mode 100644 index 00000000..eaa86c42 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png new file mode 100644 index 00000000..53cc9e78 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png new file mode 100644 index 00000000..11c740a4 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png new file mode 100644 index 00000000..b1085af2 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png new file mode 100644 index 00000000..d123aff3 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png new file mode 100644 index 00000000..94c2a47a Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png new file mode 100644 index 00000000..7f2b9f12 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png new file mode 100644 index 00000000..da747e5e Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png new file mode 100644 index 00000000..6fa06286 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png new file mode 100644 index 00000000..bfbd4ec3 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead.png new file mode 100644 index 00000000..8b91c7e9 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead_preview.png new file mode 100644 index 00000000..8429cbce Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_lead_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png new file mode 100644 index 00000000..67900492 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png new file mode 100644 index 00000000..abf63b63 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png new file mode 100644 index 00000000..c2db5f62 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png new file mode 100644 index 00000000..1266e6e1 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png new file mode 100644 index 00000000..562354e9 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png new file mode 100644 index 00000000..362a4ad1 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png new file mode 100644 index 00000000..9107a10b Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png new file mode 100644 index 00000000..cd625f46 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png new file mode 100644 index 00000000..2a6eb6f9 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png new file mode 100644 index 00000000..02a67b86 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png new file mode 100644 index 00000000..87ec50b8 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png new file mode 100644 index 00000000..c8d30c56 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead.png new file mode 100644 index 00000000..251a95ed Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead_preview.png new file mode 100644 index 00000000..ebc64547 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_lead_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png new file mode 100644 index 00000000..413625e0 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png new file mode 100644 index 00000000..a1d33d7d Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png new file mode 100644 index 00000000..b37bfcb7 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png new file mode 100644 index 00000000..d08cc693 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png new file mode 100644 index 00000000..4e0dae27 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png new file mode 100644 index 00000000..efb95be5 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png new file mode 100644 index 00000000..145d6c30 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png new file mode 100644 index 00000000..dbf043f6 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png new file mode 100644 index 00000000..ba33d073 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_lead.png new file mode 100644 index 00000000..5fb7067a Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png new file mode 100644 index 00000000..7af90038 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png new file mode 100644 index 00000000..6d114e7a Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png new file mode 100644 index 00000000..6fbc5b39 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png new file mode 100644 index 00000000..4984954c Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png new file mode 100644 index 00000000..b9217995 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png new file mode 100644 index 00000000..5e6749e8 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_lead.png new file mode 100644 index 00000000..b2ca61da Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png new file mode 100644 index 00000000..442caa27 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png new file mode 100644 index 00000000..5462100b Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png new file mode 100644 index 00000000..eeb73287 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png new file mode 100644 index 00000000..e56ec306 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png new file mode 100644 index 00000000..fc2a5920 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png new file mode 100644 index 00000000..15092c10 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_lead.png new file mode 100644 index 00000000..5e54cd66 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png new file mode 100644 index 00000000..4a170034 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png new file mode 100644 index 00000000..1cc480e3 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png new file mode 100644 index 00000000..c37cb75e Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png new file mode 100644 index 00000000..876bf7ca Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png new file mode 100644 index 00000000..e4673a95 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png new file mode 100644 index 00000000..df61ca62 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_lead.png new file mode 100644 index 00000000..6e456a3e Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png new file mode 100644 index 00000000..ad8c91b2 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png new file mode 100644 index 00000000..7e4feaf1 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png new file mode 100644 index 00000000..bbaeb6a6 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png new file mode 100644 index 00000000..dbb63cd9 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png new file mode 100644 index 00000000..c6ae42a7 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png new file mode 100644 index 00000000..f1bcfb98 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_lead.png new file mode 100644 index 00000000..751e050e Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png new file mode 100644 index 00000000..39dd7f4c Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png new file mode 100644 index 00000000..24557263 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png new file mode 100644 index 00000000..e6fb9d8c Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png new file mode 100644 index 00000000..f9c84fdb Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png new file mode 100644 index 00000000..05048e32 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png new file mode 100644 index 00000000..2c83e23c Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png new file mode 100644 index 00000000..9fb6391f Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png new file mode 100644 index 00000000..e7ca67f6 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png new file mode 100644 index 00000000..67dd9330 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead.png new file mode 100644 index 00000000..75be6c9f Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead_preview.png new file mode 100644 index 00000000..2777c6d7 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_lead_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png new file mode 100644 index 00000000..6ae30f32 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png new file mode 100644 index 00000000..0f6ecd2a Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png new file mode 100644 index 00000000..5eab543a Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png new file mode 100644 index 00000000..6504d9d8 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png new file mode 100644 index 00000000..59731350 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png new file mode 100644 index 00000000..a6d105f9 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png new file mode 100644 index 00000000..7ffdb639 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png new file mode 100644 index 00000000..83d65c4b Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png new file mode 100644 index 00000000..f78e1a9a Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png new file mode 100644 index 00000000..2b275cff Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png new file mode 100644 index 00000000..09112776 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png new file mode 100644 index 00000000..2d0aea62 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead.png new file mode 100644 index 00000000..96a82b56 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead_preview.png new file mode 100644 index 00000000..8f29f6b4 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_lead_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png new file mode 100644 index 00000000..8573eec9 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png new file mode 100644 index 00000000..1b046819 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png new file mode 100644 index 00000000..6d6adb37 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png new file mode 100644 index 00000000..8bdcbb45 Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png new file mode 100644 index 00000000..048927cd Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png differ diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png new file mode 100644 index 00000000..25fa7a0b Binary files /dev/null and b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png differ diff --git a/mods/bakedclay b/mods/bakedclay new file mode 160000 index 00000000..8cdd0f7b --- /dev/null +++ b/mods/bakedclay @@ -0,0 +1 @@ +Subproject commit 8cdd0f7b8ea4c5550c9ea615593c4c88098e18b8 diff --git a/mods/bonemeal b/mods/bonemeal new file mode 160000 index 00000000..87763ca2 --- /dev/null +++ b/mods/bonemeal @@ -0,0 +1 @@ +Subproject commit 87763ca2c815285d0d9c05c6a39ccd2e4622196f diff --git a/mods/digilines b/mods/digilines new file mode 160000 index 00000000..54b1b3fe --- /dev/null +++ b/mods/digilines @@ -0,0 +1 @@ +Subproject commit 54b1b3fe91f2e7e774f305d4b57bb4367aca1cd6 diff --git a/mods/enchanting b/mods/enchanting new file mode 160000 index 00000000..13ea31ce --- /dev/null +++ b/mods/enchanting @@ -0,0 +1 @@ +Subproject commit 13ea31ce121d1bf002b355f5acd8cca4a1c52072 diff --git a/mods/experience/init.lua b/mods/experience/init.lua new file mode 100644 index 00000000..f28cc1aa --- /dev/null +++ b/mods/experience/init.lua @@ -0,0 +1,198 @@ +level1 = 100 +level1_drop = "default:steelblock 10" + +level2 = 200 +level2_drop = "default:steelblock 99" + +level3 = 300 +level3_drop = "default:mese 1" + +level4 = 400 +level4_drop = "default:mese 2" + +level5 = 500 +level5_drop = "default:mese 10" + +level6 = 700 +level6_drop = "default:mese 20" + +level7 = 1000 +level7_drop = "default:mese 30" + +level8 = 1400 +level8_drop = "default:mese 50" + +level9 = 1800 +level9_drop = "default:mese 70" + +level10 = 2500 +level10_drop = "default:mese 99" + + + +--add an experience orb if player digs node from xp group +minetest.register_on_dignode(function(pos, oldnode, digger) + namer = oldnode.name + see_if_mineral = minetest.get_item_group(namer, "xp") + if see_if_mineral > 0 then + minetest.env:add_entity(pos, "experience:orb") + end +end) +--give a new player some xp +minetest.register_on_newplayer(function(player) + file = io.open(minetest.get_worldpath().."/"..player:get_player_name().."_experience", "w") + file:write("0") + file:close() +end) +--set player's xp level to 0 if they die +minetest.register_on_dieplayer(function(player) + file = io.open(minetest.get_worldpath().."/"..player:get_player_name().."_experience", "w") + file:write("0") + file:close() +end) + +--Allow people to collect orbs +minetest.register_globalstep(function(dtime) + for _,player in ipairs(minetest.get_connected_players()) do + local pos = player:getpos() + pos.y = pos.y+0.5 + for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do + if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "experience:orb" then + --RIGHT HERE ADD IN THE CODE TO UPGRADE PLAYERS + object:setvelocity({x=0,y=0,z=0}) + object:get_luaentity().name = "STOP" + minetest.sound_play("orb", { + to_player = player:get_player_name(), + }) + xp = io.open(minetest.get_worldpath().."/"..player:get_player_name().."_experience", "r") + experience = xp:read("*l") + xp:close() + if experience ~= nil then + new_xp = experience + 1 + xp_write = io.open(minetest.get_worldpath().."/"..player:get_player_name().."_experience", "w") + xp_write:write(new_xp) + xp_write:close() + if new_xp == level1 then + minetest.env:add_item(pos, level1_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level2 then + minetest.env:add_item(pos, level2_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level3 then + minetest.env:add_item(pos, level3_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level4 then + minetest.env:add_item(pos, level4_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level5 then + minetest.env:add_item(pos, level5_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level6 then + minetest.env:add_item(pos, level6_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level7 then + minetest.env:add_item(pos, level7_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level8 then + minetest.env:add_item(pos, level8_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level9 then + minetest.env:add_item(pos, level9_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + if new_xp == level10 then + minetest.env:add_item(pos, level10_drop) + minetest.sound_play("level_up", { + to_player = player:get_player_name(), + }) + end + end + object:remove() + end + end + for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 3)) do + if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "experience:orb" then + if object:get_luaentity().collect then + local pos1 = pos + pos1.y = pos1.y+0.2 + local pos2 = object:getpos() + local vec = {x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z} + vec.x = vec.x*3 + vec.y = vec.y*3 + vec.z = vec.z*3 + object:setvelocity(vec) + end + end + end + end +end) + +minetest.register_entity("experience:orb", { + physical = true, + timer = 0, + textures = {"orb.png"}, + visual_size = {x=0.3, y=0.3}, + collisionbox = {-0.17,-0.17,-0.17,0.17,0.17,0.17}, + on_activate = function(self, staticdata) + self.object:set_armor_groups({immortal=1}) + self.object:setvelocity({x=0, y=1, z=0}) + self.object:setacceleration({x=0, y=-10, z=0}) + end, + collect = true, + on_step = function(self, dtime) + self.timer = self.timer + dtime + if (self.timer > 300) then + self.object:remove() + end + local p = self.object:getpos() + local nn = minetest.env:get_node(p).name + noder = minetest.env:get_node(p).name + p.y = p.y - 0.3 + local nn = minetest.env:get_node(p).name + if not minetest.registered_nodes[nn] or minetest.registered_nodes[nn].walkable then + if self.physical_state then + self.object:setvelocity({x=0, y=0, z=0}) + self.object:setacceleration({x=0, y=0, z=0}) + self.physical_state = false + self.object:set_properties({ + physical = false + }) + end + else + if not self.physical_state then + self.object:setvelocity({x=0,y=0,z=0}) + self.object:setacceleration({x=0, y=-10, z=0}) + self.physical_state = true + self.object:set_properties({ + physical = true + }) + end + end + end, +}) diff --git a/mods/experience/sounds/attributes.txt b/mods/experience/sounds/attributes.txt new file mode 100644 index 00000000..e9fc4455 --- /dev/null +++ b/mods/experience/sounds/attributes.txt @@ -0,0 +1 @@ +http://www.freesound.org/people/partymix/sounds/24102/ diff --git a/mods/experience/sounds/level_up.ogg b/mods/experience/sounds/level_up.ogg new file mode 100644 index 00000000..c6eeb6e4 Binary files /dev/null and b/mods/experience/sounds/level_up.ogg differ diff --git a/mods/experience/sounds/orb.1.ogg b/mods/experience/sounds/orb.1.ogg new file mode 100644 index 00000000..48b32a1a Binary files /dev/null and b/mods/experience/sounds/orb.1.ogg differ diff --git a/mods/experience/sounds/orb.2.ogg b/mods/experience/sounds/orb.2.ogg new file mode 100644 index 00000000..6f6c2bd2 Binary files /dev/null and b/mods/experience/sounds/orb.2.ogg differ diff --git a/mods/experience/sounds/orb.3.ogg b/mods/experience/sounds/orb.3.ogg new file mode 100644 index 00000000..3a9d69a2 Binary files /dev/null and b/mods/experience/sounds/orb.3.ogg differ diff --git a/mods/experience/sounds/orb.4.ogg b/mods/experience/sounds/orb.4.ogg new file mode 100644 index 00000000..2a953a19 Binary files /dev/null and b/mods/experience/sounds/orb.4.ogg differ diff --git a/mods/experience/textures/orb.png b/mods/experience/textures/orb.png new file mode 100644 index 00000000..5a97cc8c Binary files /dev/null and b/mods/experience/textures/orb.png differ diff --git a/mods/lightning b/mods/lightning new file mode 160000 index 00000000..39bd36cc --- /dev/null +++ b/mods/lightning @@ -0,0 +1 @@ +Subproject commit 39bd36cc1794c1401c0ba0cb4aad49e409b10e88 diff --git a/mods/maidroid b/mods/maidroid new file mode 160000 index 00000000..d2899c86 --- /dev/null +++ b/mods/maidroid @@ -0,0 +1 @@ +Subproject commit d2899c867210723629416c3bfb675c3d000d9348 diff --git a/mods/meshnode b/mods/meshnode new file mode 160000 index 00000000..ab462908 --- /dev/null +++ b/mods/meshnode @@ -0,0 +1 @@ +Subproject commit ab4629087b1263ba483e90363b38e77ac8432a3c diff --git a/mods/morefarming b/mods/morefarming new file mode 160000 index 00000000..7f248777 --- /dev/null +++ b/mods/morefarming @@ -0,0 +1 @@ +Subproject commit 7f2487779d705f997d278821628a1793ac9e3037 diff --git a/mods/moreflowers b/mods/moreflowers new file mode 160000 index 00000000..0604f176 --- /dev/null +++ b/mods/moreflowers @@ -0,0 +1 @@ +Subproject commit 0604f176197ec5a4ffb3c1ba752a8c1edc083ad9 diff --git a/mods/moreplants b/mods/moreplants new file mode 160000 index 00000000..c0ffbe93 --- /dev/null +++ b/mods/moreplants @@ -0,0 +1 @@ +Subproject commit c0ffbe938cd92c54807f40f7e73a8d29af0c15aa diff --git a/mods/pdisc b/mods/pdisc new file mode 160000 index 00000000..c821cafc --- /dev/null +++ b/mods/pdisc @@ -0,0 +1 @@ +Subproject commit c821cafc1413d3b22e16831226880d13148794dd diff --git a/mods/playeranim b/mods/playeranim new file mode 160000 index 00000000..0ca8e5a3 --- /dev/null +++ b/mods/playeranim @@ -0,0 +1 @@ +Subproject commit 0ca8e5a3aad630657d17ba801eede61cb1ff7065 diff --git a/mods/playereffects b/mods/playereffects new file mode 160000 index 00000000..0f02d5e5 --- /dev/null +++ b/mods/playereffects @@ -0,0 +1 @@ +Subproject commit 0f02d5e54b54b5738f2a9927681377423a5691fa diff --git a/mods/technic b/mods/technic new file mode 160000 index 00000000..3ba5354f --- /dev/null +++ b/mods/technic @@ -0,0 +1 @@ +Subproject commit 3ba5354f8310770c7574402b0cf6661e1d59bd7a diff --git a/mods/u_skins/u_skins/textures/mff_character_8.png b/mods/u_skins/u_skins/textures/mff_character_8.png index 3b43b0fd..3eb1dd46 100755 Binary files a/mods/u_skins/u_skins/textures/mff_character_8.png and b/mods/u_skins/u_skins/textures/mff_character_8.png differ diff --git a/mods/weather_pack b/mods/weather_pack new file mode 160000 index 00000000..dcde7bdd --- /dev/null +++ b/mods/weather_pack @@ -0,0 +1 @@ +Subproject commit dcde7bdd2dbc85c00891ad5fe24e7ebf8fed69ad diff --git a/mods/witchcraft b/mods/witchcraft new file mode 160000 index 00000000..0baf0cb5 --- /dev/null +++ b/mods/witchcraft @@ -0,0 +1 @@ +Subproject commit 0baf0cb53b89e34809e372abf4d8540242f0c450 diff --git a/other_things/scripts/Server-side/script/start-mff.sh b/other_things/scripts/Server-side/script/start-mff.sh index 9d715304..a9c8e37a 100755 --- a/other_things/scripts/Server-side/script/start-mff.sh +++ b/other_things/scripts/Server-side/script/start-mff.sh @@ -1,9 +1,9 @@ #!/bin/bash -DEBUG='/home/quentinbd/script/debug-mff.txt' -MOREDEBUG='/home/quentinbd/script/moredebug-mff.txt' +DEBUG='/home/vincent/mff/log/debug-mff.txt' +MOREDEBUG='/home/vincent/mff/log/moredebug-mff.txt' -cd /home/quentinbd/mff +cd /home/vincent/jeux/mff while true do @@ -15,11 +15,11 @@ while true echo "0" >/tmp/players_c.txt - /home/quentinbd/mff/bin/minetestserver \ - --world /home/quentinbd/mff/worlds/minetestforfun/ \ - --config /home/quentinbd/mff/minetest.conf \ + /home/vincent/jeux/mff/bin/minetestserver \ + --world /home/vincent/jeux/mff/worlds/minetestforfun/ \ + --config /home/vincent/jeux/mff/minetest.conf \ --gameid minetestforfun_game \ - --port 30001 \ + --port 30002 \ # --logfile $DEBUG sleep 25 diff --git a/other_things/scripts/Server-side/upgrade-mff/upgrade-part-mff.sh b/other_things/scripts/Server-side/upgrade-mff/upgrade-part-mff.sh index 80dfe2bb..58d39b67 100755 --- a/other_things/scripts/Server-side/upgrade-mff/upgrade-part-mff.sh +++ b/other_things/scripts/Server-side/upgrade-mff/upgrade-part-mff.sh @@ -1,40 +1,40 @@ # On récupère la dernière version du jeu -cd /home/quentinbd/ -git clone https://github.com/MinetestForFun/server-minetestforfun.git +cd /home/vincent/jeux +git clone -b sys4 https://github.com/sys4-fr/server-minetestforfun.git echo "Clone de server-minetestforfun réussit." -cd /home/quentinbd/server-minetestforfun/ +cd /home/vincent/jeux/server-minetestforfun/ git submodule update --init --recursive # On sauvegarde les anciens ../games et ../mods -rm -R /home/quentinbd/upgrade-mff/olds-part/games/ -rm -R /home/quentinbd/upgrade-mff/olds-part/mods/ +rm -R /home/vincent/mff/upgrade-mff/olds-part/games/ +rm -R /home/vincent/mff/upgrade-mff/olds-part/mods/ echo "Ancienne sauvegarde de /mods et /games correctement supprimée." -cp -R /home/quentinbd/mff/mods/ /home/quentinbd/upgrade-mff/olds-part/ -cp -R /home/quentinbd/mff/games/ /home/quentinbd/upgrade-mff/olds-part/ +cp -R /home/vincent/jeux/mff/mods/ /home/vincent/mff/upgrade-mff/olds-part/ +cp -R /home/vincent/jeux/mff/games/ /home/vincent/mff/upgrade-mff/olds-part/ echo "Sauvegarde de /mods et /games correctement effectuée." # On MAJ les nouveaux minetest/games et minetest/mods -rm -R /home/quentinbd/mff/games/ -rm -R /home/quentinbd/mff/mods/ -mkdir -p /home/quentinbd/mff/games/ -cp -R /home/quentinbd/server-minetestforfun/minetestforfun_game/ /home/quentinbd/mff/games/ -cp -R /home/quentinbd/server-minetestforfun/mods/ /home/quentinbd/mff/ +rm -R /home/vincent/jeux/mff/games/ +rm -R /home/vincent/jeux/mff/mods/ +mkdir -p /home/vincent/jeux/mff/games/ +cp -R /home/vincent/jeux/server-minetestforfun/minetestforfun_game/ /home/vincent/jeux/mff/games/ +cp -R /home/vincent/jeux/server-minetestforfun/mods/ /home/vincent/jeux/mff/ echo "Nouveaux /mods et /games correctement déplacés" # On MAJ le minetest.conf, world.mt, random_messages, forbidden_names, et le news.txt -mkdir -p /home/quentinbd/mff/worlds/minetestforfun/ -rm /home/quentinbd/mff/minetest.conf -rm /home/quentinbd/mff/worlds/minetestforfun/world.mt -rm /home/quentinbd/mff/worlds/minetestforfun/random_messages -rm /home/quentinbd/mff/worlds/minetestforfun/news.txt -rm /home/quentinbd/mff/worlds/minetestforfun/forbidden_names.txt +mkdir -p /home/vincent/jeux/mff/worlds/minetestforfun/ +rm /home/vincent/jeux/mff/minetest.conf +rm /home/vincent/jeux/mff/worlds/minetestforfun/world.mt +rm /home/vincent/jeux/mff/worlds/minetestforfun/random_messages +rm /home/vincent/jeux/mff/worlds/minetestforfun/news.txt +rm /home/vincent/jeux/mff/worlds/minetestforfun/forbidden_names.txt # On les remet -cp /home/quentinbd/server-minetestforfun/minetest.conf /home/quentinbd/mff/ -cp /home/quentinbd/server-minetestforfun/worlds/minetestforfun/world.mt /home/quentinbd/mff/worlds/minetestforfun/ -cp /home/quentinbd/server-minetestforfun/worlds/minetestforfun/random_messages /home/quentinbd/mff/worlds/minetestforfun/ -cp /home/quentinbd/server-minetestforfun/worlds/minetestforfun/news.txt /home/quentinbd/mff/worlds/minetestforfun/ -cp /home/quentinbd/server-minetestforfun/worlds/minetestforfun/forbidden_names.txt /home/quentinbd/mff/worlds/minetestforfun/ +cp /home/vincent/jeux/server-minetestforfun/minetest.conf /home/vincent/jeux/mff/ +cp /home/vincent/jeux/server-minetestforfun/worlds/minetestforfun/world.mt /home/vincent/jeux/mff/worlds/minetestforfun/ +cp /home/vincent/jeux/server-minetestforfun/worlds/minetestforfun/random_messages /home/vincent/jeux/mff/worlds/minetestforfun/ +cp /home/vincent/jeux/server-minetestforfun/worlds/minetestforfun/news.txt /home/vincent/jeux/mff/worlds/minetestforfun/ +cp /home/vincent/jeux/server-minetestforfun/worlds/minetestforfun/forbidden_names.txt /home/vincent/jeux/mff/worlds/minetestforfun/ echo "Nouvelles news.txt, world.mt et random_messages correctement déplacé" # TEMPORAIRE - ré-ajout de l'ancien mod irc @@ -44,10 +44,10 @@ echo "Nouvelles news.txt, world.mt et random_messages correctement déplacé" #echo "TEMPORAIRE - ré-ajout de l'ancien mod irc" # Suppression du dossier cloné -rm -Rf /home/quentinbd/server-minetestforfun/ +rm -Rf /home/vincent/jeux/server-minetestforfun/ echo "Bravo ! mff/mods et mff/games maintenant à jour" # On ré-attribut les droits à quentinbd et en 755 -chown -R quentinbd:quentinbd /home/quentinbd/mff/ -chmod -R 755 /home/quentinbd/mff/ -echo "ré-attribution des droits à quentinbd:quentinbd" +#chown -R quentinbd:quentinbd /home/quentinbd/mff/ +#chmod -R 755 /home/quentinbd/mff/ +#echo "ré-attribution des droits à quentinbd:quentinbd" diff --git a/other_things/scripts/Server-side/upgrade-mff/w-upgrade-mff.sh b/other_things/scripts/Server-side/upgrade-mff/w-upgrade-mff.sh index 47f79661..3e88bea1 100755 --- a/other_things/scripts/Server-side/upgrade-mff/w-upgrade-mff.sh +++ b/other_things/scripts/Server-side/upgrade-mff/w-upgrade-mff.sh @@ -1,44 +1,44 @@ # passer sur branche master ou stable github -cd /home/quentinbd/mff/ +cd /home/vincent/mff/ # Suppression des anciens fichiers -rm -Rv /home/quentinbd/upgrade-mff/olds -rm -Rv /home/quentinbd/upgrade-mff/mff.tar.gz +rm -Rv /home/vincent/mff/upgrade-mff/olds +rm -Rv /home/vincent/mff/upgrade-mff/mff.tar.gz # Sauvegarde des fichiers critiques -cp -Rv /home/quentinbd/mff/games/minetestforfun_game/ /home/quentinbd/upgrade-mff/olds/ -cp -Rv /home/quentinbd/mff/mods/ /home/quentinbd/upgrade-mff/olds/ -cp -Rv /home/quentinbd/mff/worlds/ /home/quentinbd/upgrade-mff/olds/ -cp /home/quentinbd/mff/minetest.conf /home/quentinbd/upgrade-mff/olds/ +cp -Rv /home/vincent/jeux/mff/games/minetestforfun_game/ /home/vincent/mff/upgrade-mff/olds/ +cp -Rv /home/vincent/jeux/mff/mods/ /home/vincent/mff/upgrade-mff/olds/ +cp -Rv /home/vincent/jeux/mff/worlds/ /home/vincent/mff/upgrade-mff/olds/ +cp /home/vincent/jeux/mff/minetest.conf /home/vincent/mff/upgrade-mff/olds/ # Sauvegarde et compression du dossier minetest (au cas ou) -cd /home/quentinbd/upgrade-mff/ -tar -cf mff.tar.gz /home/quentinbd/mff/ +cd /home/vincent/mff/upgrade-mff/ +tar -cf mff.tar.gz /home/vincent/jeux/mff/ # Suppression de minetest -rm -Rv /home/quentinbd/mff/ +rm -Rv /home/vincent/jeux/mff/ # Réinstallaton de minetest -cd /home/quentinbd/ +cd /home/vincent/jeux/ # DEBUT - Utilisation de la dernière version 0.4 stable wget https://codeload.github.com/minetest/minetest/zip/stable-0.4 -unzip /home/quentinbd/stable-0.4 -mv /home/quentinbd/minetest-stable-0.4/ /home/quentinbd/mff/ -rm -v /home/quentinbd/stable-0.4 +unzip /home/vincent/jeux/stable-0.4 +mv /home/vincent/jeux/minetest-stable-0.4/ /home/vincent/jeux/mff/ +rm -v /home/vincent/jeux/stable-0.4 # FIN - Utilisation de la version 0.4 stable # Compilation -cd /home/quentinbd/mff/ +cd /home/vincent/jeux/mff/ # Build REDIS + IRC -cmake . -DBUILD_CLIENT=0 -DBUILD_SERVER=1 -DENABLE_REDIS=1 -DRUN_IN_PLACE=1 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LUAJIT=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr -DENABLE_CURL=1 +cmake . -DBUILD_CLIENT=0 -DBUILD_SERVER=1 -DENABLE_SOUND=0 -DENABLE_SYSTEM_GMP=1 -DIRRLICHT_SOURCE_DIR=/home/vincent/jeux/lib/irrlicht-1.8.4 -DENABLE_LEVELDB=0 -DENABLE_REDIS=1 -DRUN_IN_PLACE=1 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LUAJIT=1 -DENABLE_CURL=1 make -j$(grep -c processor /proc/cpuinfo) # Ajout des fichiers critiques au nouveau dossier minetest -cp -Rv /home/quentinbd/upgrade-mff/olds/minetestforfun_game/ /home/quentinbd/mff/games/ -cp -Rv /home/quentinbd/upgrade-mff/olds/mods/ /home/quentinbd/mff/ -cp -Rv /home/quentinbd/upgrade-mff/olds/worlds/ /home/quentinbd/mff/ -cp /home/quentinbd/upgrade-mff/olds/minetest.conf /home/quentinbd/mff/ +cp -Rv /home/vincent/mff/upgrade-mff/olds/minetestforfun_game/ /home/vincent/jeux/mff/games/ +cp -Rv /home/vincent/mff/upgrade-mff/olds/mods/ /home/vincent/jeux/mff/ +cp -Rv /home/vincent/mff/upgrade-mff/olds/worlds/ /home/vincent/jeux/mff/ +cp /home/vincent/mff/upgrade-mff/olds/minetest.conf /home/vincent/jeux/mff/ -# Donne les droits à quentinbd -chmod -R 755 /home/quentinbd/mff/ -chown -R quentinbd:quentinbd /home/quentinbd/ +## Donne les droits à quentinbd +#chmod -R 755 /home/quentinbd/mff/ +#chown -R quentinbd:quentinbd /home/quentinbd/ diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt index 9dc4f008..8b958a9a 100755 --- a/worlds/minetestforfun/world.mt +++ b/worlds/minetestforfun/world.mt @@ -1,9 +1,9 @@ gameid = minetestforfun_game backend = redis -redis_hash = IGNORED +redis_hash = mff_sys4 redis_address = localhost -load_mod_mysql_auth = true +load_mod_mysql_auth = false load_mod_darkage = true load_mod_quartz = true @@ -29,7 +29,7 @@ load_mod_soccer = true load_mod_serverguide = true load_mod_meru = true -load_mod_watershed = true +load_mod_watershed = false load_mod_bushes_classic = true load_mod_flowers_plus = true load_mod_junglegrass = true @@ -178,7 +178,7 @@ load_mod_3d_armor_stand = true load_mod_reinforcedleather = true load_mod_hardenedleather = true load_mod_blackmithril = true -load_mod_technic_armor = false +load_mod_technic_armor = true load_mod_magicmithril = false load_mod_obsidian = false load_mod_shields = true @@ -201,8 +201,8 @@ load_mod_news = true load_mod_random_messages = true load_mod_death_messages = true load_mod_shutdown = true -load_mod_irc = true -load_mod_irc_commands = true +load_mod_irc = false +load_mod_irc_commands = false load_mod_time_regulation = true load_mod_soundset = true @@ -227,3 +227,35 @@ load_mod_snow = true load_mod_profilerdumper = false load_mod_stacktraceplus = true load_mod_profnsched = false + +load_mod_maidroid = true +load_mod_maidroid_core = true +load_mod_maidroid_tool = true +load_mod_pdisc = true + +load_mod_digilines = true + +load_mod_concrete = true +load_mod_extranodes = true +load_mod_technic = true +load_mod_technic_chests = true +load_mod_technic_worldgen = true +load_mod_wrench = true + +load_mod_enchanting = true + +load_mod_witchcraft = true +load_mod_playereffects = true +load_mod_meshnode = true +load_mod_experience = true +load_mod_bonemeal = true +load_mod_tnt = true +load_mod_playeranim = true + +load_mod_lightning = true +load_mod_weather_pack = true + +load_mod_bakedclay = true + +load_mod_moreflowers = true +load_mod_morefarming = true