diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/modpack.txt b/modpack.txt old mode 100644 new mode 100755 diff --git "a/nether/\n/Nicht Leere Datei.lua" "b/nether/\n/Nicht Leere Datei.lua" deleted file mode 100644 index ed3353f..0000000 --- "a/nether/\n/Nicht Leere Datei.lua" +++ /dev/null @@ -1,365 +0,0 @@ ---[[ Nether leaves -minetest.register_node("nether:leaves", { - description = "Nether Leaves", - drawtype = "allfaces_optional", --- visual_scale = 1.189, --scale^2=sqrt(2) - tiles = {"nether_leaves.png"}, - paramtype = "light", - groups = {snappy=3, leafdecay=2}, - sounds = default.node_sound_leaves_defaults(), -})]] - ---[[ Nether Lava -minetest.register_node("nether:lava_flowing", { - description = "Nether Lava (flowing)", - inventory_image = minetest.inventorycube("default_lava.png"), - drawtype = "flowingliquid", - tiles = {"default_lava.png"}, - paramtype = "light", - light_source = LIGHT_MAX - 1, - walkable = false, - pointable = false, - diggable = false, - buildable_to = true, - liquidtype = "flowing", - liquid_alternative_flowing = "nether:lava_flowing", - liquid_alternative_source = "default:lava_source", - liquid_viscosity = LAVA_VISC, - damage_per_second = 4*2, - post_effect_color = {a=192, r=255, g=64, b=0}, - special_materials = { - {image="default_lava.png", backface_culling=false}, - {image="default_lava.png", backface_culling=true}, - }, - groups = {lava=3, liquid=2, hot=3}, -}) - -minetest.register_node("nether:lava_source", { - description = "Nether Lava", - inventory_image = minetest.inventorycube("default_lava.png"), - drawtype = "liquid", - tiles = {"default_lava.png"}, - paramtype = "light", - light_source = LIGHT_MAX - 1, - walkable = false, - pointable = false, - diggable = false, - buildable_to = true, - liquidtype = "source", - liquid_alternative_flowing = "nether:lava_flowing", - liquid_alternative_source = "default:lava_source", - liquid_viscosity = LAVA_VISC, - damage_per_second = 4*2, - post_effect_color = {a=192, r=255, g=64, b=0}, - special_materials = { - -- New-style lava source material (mostly unused) - {image="default_lava.png", backface_culling=false}, - }, - groups = {lava=3, liquid=2, hot=3}, -})]] - --- Throne of Hades -HADES_THRONE = { - -- Lava Moat - {pos={x=-1,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=0}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=1}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=2}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=3}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=4}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=5}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=6}, block="default:lava_source"}, - {pos={x=-1,y=-1,z=7}, block="default:lava_source"}, - {pos={x=0,y=-1,z=7}, block="default:lava_source"}, - {pos={x=1,y=-1,z=7}, block="default:lava_source"}, - {pos={x=2,y=-1,z=7}, block="default:lava_source"}, - {pos={x=3,y=-1,z=7}, block="default:lava_source"}, - {pos={x=4,y=-1,z=7}, block="default:lava_source"}, - {pos={x=5,y=-1,z=7}, block="default:lava_source"}, - {pos={x=6,y=-1,z=7}, block="default:lava_source"}, - {pos={x=6,y=-1,z=6}, block="default:lava_source"}, - {pos={x=6,y=-1,z=5}, block="default:lava_source"}, - {pos={x=6,y=-1,z=4}, block="default:lava_source"}, - {pos={x=6,y=-1,z=3}, block="default:lava_source"}, - {pos={x=6,y=-1,z=2}, block="default:lava_source"}, - {pos={x=6,y=-1,z=1}, block="default:lava_source"}, - {pos={x=6,y=-1,z=0}, block="default:lava_source"}, - {pos={x=6,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=5,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=4,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=3,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=2,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=1,y=-1,z=-1}, block="default:lava_source"}, - {pos={x=0,y=-1,z=-1}, block="default:lava_source"}, - -- Floor 1 - {pos={x=0,y=0,z=0}, block="nether:netherrack"}, - {pos={x=0,y=0,z=1}, block="nether:netherrack"}, - {pos={x=0,y=0,z=2}, block="nether:netherrack"}, - {pos={x=0,y=0,z=3}, block="nether:netherrack"}, - {pos={x=0,y=0,z=4}, block="nether:netherrack"}, - {pos={x=0,y=0,z=5}, block="nether:netherrack"}, - {pos={x=1,y=0,z=5}, block="nether:netherrack"}, - {pos={x=2,y=0,z=5}, block="nether:netherrack"}, - {pos={x=3,y=0,z=5}, block="nether:netherrack"}, - {pos={x=4,y=0,z=5}, block="nether:netherrack"}, - {pos={x=5,y=0,z=5}, block="nether:netherrack"}, - {pos={x=0,y=0,z=6}, block="nether:netherrack"}, - {pos={x=1,y=0,z=6}, block="nether:netherrack"}, - {pos={x=2,y=0,z=6}, block="nether:netherrack"}, - {pos={x=3,y=0,z=6}, block="nether:netherrack"}, - {pos={x=4,y=0,z=6}, block="nether:netherrack"}, - {pos={x=5,y=0,z=6}, block="nether:netherrack"}, - {pos={x=5,y=0,z=4}, block="nether:netherrack"}, - {pos={x=5,y=0,z=3}, block="nether:netherrack"}, - {pos={x=5,y=0,z=2}, block="nether:netherrack"}, - {pos={x=5,y=0,z=1}, block="nether:netherrack"}, - {pos={x=5,y=0,z=0}, block="nether:netherrack"}, - {pos={x=4,y=0,z=0}, block="nether:netherrack"}, - {pos={x=3,y=0,z=0}, block="nether:netherrack"}, - {pos={x=2,y=0,z=0}, block="nether:netherrack"}, - {pos={x=1,y=0,z=0}, block="nether:netherrack"}, - -- Floor 2 - {pos={x=0,y=1,z=0}, block="nether:netherrack"}, - {pos={x=0,y=1,z=1}, block="nether:netherrack"}, - {pos={x=0,y=1,z=2}, block="nether:netherrack"}, - {pos={x=0,y=1,z=3}, block="nether:netherrack"}, - {pos={x=0,y=1,z=4}, block="nether:netherrack"}, - {pos={x=0,y=1,z=5}, block="nether:netherrack"}, - {pos={x=1,y=1,z=5}, block="nether:netherrack"}, - {pos={x=2,y=1,z=5}, block="nether:netherrack"}, - {pos={x=3,y=1,z=5}, block="nether:netherrack"}, - {pos={x=4,y=1,z=5}, block="nether:netherrack"}, - {pos={x=5,y=1,z=5}, block="nether:netherrack"}, - {pos={x=0,y=1,z=6}, block="nether:netherrack"}, - {pos={x=1,y=1,z=6}, block="nether:netherrack"}, - {pos={x=2,y=1,z=6}, block="nether:netherrack"}, - {pos={x=3,y=1,z=6}, block="nether:netherrack"}, - {pos={x=4,y=1,z=6}, block="nether:netherrack"}, - {pos={x=5,y=1,z=6}, block="nether:netherrack"}, - {pos={x=5,y=1,z=4}, block="nether:netherrack"}, - {pos={x=5,y=1,z=3}, block="nether:netherrack"}, - {pos={x=5,y=1,z=2}, block="nether:netherrack"}, - {pos={x=5,y=1,z=1}, block="nether:netherrack"}, - {pos={x=5,y=1,z=0}, block="nether:netherrack"}, - {pos={x=4,y=1,z=0}, block="nether:netherrack"}, - {pos={x=3,y=1,z=1}, block="nether:netherrack"}, - {pos={x=2,y=1,z=1}, block="nether:netherrack"}, - {pos={x=1,y=1,z=0}, block="nether:netherrack"}, - {pos={x=1,y=1,z=1}, block="nether:netherrack"}, - {pos={x=4,y=1,z=1}, block="nether:netherrack"}, - -- Floor 3 - {pos={x=0,y=2,z=0}, block="nether:netherrack"}, - {pos={x=0,y=2,z=1}, block="nether:netherrack"}, - {pos={x=0,y=2,z=2}, block="nether:netherrack"}, - {pos={x=0,y=2,z=3}, block="nether:netherrack"}, - {pos={x=0,y=2,z=4}, block="nether:netherrack"}, - {pos={x=0,y=2,z=5}, block="nether:netherrack"}, - {pos={x=1,y=2,z=5}, block="nether:netherrack"}, - {pos={x=2,y=2,z=5}, block="nether:netherrack"}, - {pos={x=3,y=2,z=5}, block="nether:netherrack"}, - {pos={x=4,y=2,z=5}, block="nether:netherrack"}, - {pos={x=5,y=2,z=5}, block="nether:netherrack"}, - {pos={x=0,y=2,z=6}, block="nether:netherrack"}, - {pos={x=1,y=2,z=6}, block="nether:netherrack"}, - {pos={x=2,y=2,z=6}, block="nether:netherrack"}, - {pos={x=3,y=2,z=6}, block="nether:netherrack"}, - {pos={x=4,y=2,z=6}, block="nether:netherrack"}, - {pos={x=5,y=2,z=6}, block="nether:netherrack"}, - {pos={x=5,y=2,z=4}, block="nether:netherrack"}, - {pos={x=5,y=2,z=3}, block="nether:netherrack"}, - {pos={x=5,y=2,z=2}, block="nether:netherrack"}, - {pos={x=5,y=2,z=1}, block="nether:netherrack"}, - {pos={x=5,y=2,z=0}, block="nether:netherrack"}, - {pos={x=4,y=2,z=0}, block="nether:netherrack"}, - {pos={x=3,y=2,z=2}, block="nether:netherrack"}, - {pos={x=2,y=2,z=2}, block="nether:netherrack"}, - {pos={x=1,y=2,z=0}, block="nether:netherrack"}, - {pos={x=1,y=2,z=1}, block="nether:netherrack"}, - {pos={x=4,y=2,z=1}, block="nether:netherrack"}, - {pos={x=1,y=2,z=2}, block="nether:netherrack"}, - {pos={x=4,y=2,z=2}, block="nether:netherrack"}, - -- Floor 4 - {pos={x=0,y=3,z=0}, block="nether:netherrack"}, - {pos={x=0,y=3,z=1}, block="nether:netherrack"}, - {pos={x=0,y=3,z=2}, block="nether:netherrack"}, - {pos={x=0,y=3,z=3}, block="nether:netherrack"}, - {pos={x=0,y=3,z=4}, block="nether:netherrack"}, - {pos={x=0,y=3,z=5}, block="nether:netherrack"}, - {pos={x=1,y=3,z=5}, block="nether:netherrack"}, - {pos={x=2,y=3,z=5}, block="nether:netherrack"}, - {pos={x=3,y=3,z=5}, block="nether:netherrack"}, - {pos={x=4,y=3,z=5}, block="nether:netherrack"}, - {pos={x=5,y=3,z=5}, block="nether:netherrack"}, - {pos={x=0,y=3,z=6}, block="nether:netherrack"}, - {pos={x=1,y=3,z=6}, block="nether:netherrack"}, - {pos={x=2,y=3,z=6}, block="nether:netherrack"}, - {pos={x=3,y=3,z=6}, block="nether:netherrack"}, - {pos={x=4,y=3,z=6}, block="nether:netherrack"}, - {pos={x=5,y=3,z=6}, block="nether:netherrack"}, - {pos={x=5,y=3,z=4}, block="nether:netherrack"}, - {pos={x=5,y=3,z=3}, block="nether:netherrack"}, - {pos={x=5,y=3,z=2}, block="nether:netherrack"}, - {pos={x=5,y=3,z=1}, block="nether:netherrack"}, - {pos={x=5,y=3,z=0}, block="nether:netherrack"}, - {pos={x=4,y=3,z=0}, block="nether:netherrack"}, - {pos={x=3,y=3,z=3}, block="nether:netherrack"}, - {pos={x=2,y=3,z=3}, block="nether:netherrack"}, - {pos={x=1,y=3,z=0}, block="nether:netherrack"}, - {pos={x=1,y=3,z=1}, block="nether:netherrack"}, - {pos={x=4,y=3,z=1}, block="nether:netherrack"}, - {pos={x=1,y=3,z=2}, block="nether:netherrack"}, - {pos={x=4,y=3,z=2}, block="nether:netherrack"}, - {pos={x=1,y=3,z=3}, block="nether:netherrack"}, - {pos={x=4,y=3,z=3}, block="nether:netherrack"}, - {pos={x=1,y=3,z=4}, block="nether:netherrack"}, - {pos={x=4,y=3,z=4}, block="nether:netherrack"}, - {pos={x=2,y=3,z=4}, block="nether:netherrack"}, - {pos={x=2,y=3,z=5}, block="nether:netherrack"}, - {pos={x=3,y=3,z=4}, block="nether:netherrack"}, - {pos={x=3,y=3,z=5}, block="nether:netherrack"}, - -- Floor 5 - {pos={x=2,y=4,z=4}, block="nether:netherrack"}, - {pos={x=2,y=4,z=5}, block="nether:netherrack"}, - {pos={x=3,y=4,z=4}, block="nether:netherrack"}, - {pos={x=3,y=4,z=5}, block="nether:netherrack"}, - {pos={x=2,y=4,z=6}, block="nether:netherrack"}, - {pos={x=3,y=4,z=6}, block="nether:netherrack"}, - -- Torches on floor 5 - {pos={x=0,y=4,z=4}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=4}, block="nether:torch_bottom"}, - {pos={x=0,y=4,z=5}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=5}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=4}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=4}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=5}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=5}, block="nether:torch_bottom"}, - {pos={x=0,y=4,z=0}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=0}, block="nether:torch_bottom"}, - {pos={x=0,y=4,z=1}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=1}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=0}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=0}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=1}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=1}, block="nether:torch_bottom"}, - {pos={x=0,y=4,z=2}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=2}, block="nether:torch_bottom"}, - {pos={x=0,y=4,z=3}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=3}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=2}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=2}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=3}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=3}, block="nether:torch_bottom"}, - {pos={x=4,y=4,z=6}, block="nether:torch_bottom"}, - {pos={x=5,y=4,z=6}, block="nether:torch_bottom"}, - {pos={x=0,y=4,z=6}, block="nether:torch_bottom"}, - {pos={x=1,y=4,z=6}, block="nether:torch_bottom"}, - -- Nether Portal - {pos={x=1,y=5,z=6}, portalblock=true}, -} - - -minetest.register_on_generated(function(minp, maxp, seed) - if minp.y <= 99 then - return - end - local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") - local data = vm:get_data() - local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax} - - local perlin1 = minetest.get_perlin(13,3, 0.5, 50) --Get map specific perlin - local perlin2 = minetest.get_perlin(133,3, 0.5, 10) - for x=minp.x, maxp.x, 1 do - for z=minp.z, maxp.z, 1 do - local test = perlin1:get2d({x=x, y=z})+1 - local test2 = perlin2:get2d({x=x, y=z}) --- print(test) - if test2 < 0 then - h = 200+math.floor(test2*3+0.5) - else - h = 203+math.floor(test*3+0.5) - end - for y=minp.y, maxp.y, 1 do - p_addpos = area:index(x, y, z) - if y <= h then - data[p_addpos] = c_netherrack - elseif y <= 201 then - data[p_addpos] = c_lava - end - end - end - end - - vm:set_data(data) - --vm:set_lighting({day=0, night=0}) - vm:calc_lighting() - vm:update_liquids() - vm:write_to_map() -end) - - -We don't want the Throne of Hades to get regenerated (especially since it will screw up portals) - if (minp.x <= HADES_THRONE_STARTPOS_ABS.x) - and (maxp.x >= HADES_THRONE_STARTPOS_ABS.x) - and (minp.y <= HADES_THRONE_STARTPOS_ABS.y) - and (maxp.y >= HADES_THRONE_STARTPOS_ABS.y) - and (minp.z <= HADES_THRONE_STARTPOS_ABS.z) - and (maxp.z >= HADES_THRONE_STARTPOS_ABS.z) - and (nether:fileexists(HADES_THRONE_GENERATED) == false) then - -- Pass 3: Make way for the Throne of Hades! - for x=(HADES_THRONE_STARTPOS_ABS.x - 1), (HADES_THRONE_ENDPOS_ABS.x + 1), 1 do - for z=(HADES_THRONE_STARTPOS_ABS.z - 1), (HADES_THRONE_ENDPOS_ABS.z + 1), 1 do - -- Notice I did not put a -1 for the beginning. This is because we don't want the throne to float - for y=HADES_THRONE_STARTPOS_ABS.y, (HADES_THRONE_ENDPOS_ABS.y + 1), 1 do - addpos = {x=x, y=y, z=z} - minetest.add_node(addpos, {name="air"}) - end - end - end - -- Pass 4: Throne of Hades - for i,v in ipairs(HADES_THRONE_ABS) do - if v.portalblock == true then - NETHER_PORTALS_FROM_NETHER[table.getn(NETHER_PORTALS_FROM_NETHER)+1] = v.pos - nether:save_portal_from_nether(v.pos) - nether:createportal(v.pos) - else - minetest.add_node(v.pos, {name=v.block}) - end - end - nether:touch(HADES_THRONE_GENERATED) - end - ---[[ Create a nether tree -function nether:grow_nethertree(pos) - --TRUNK - pos.y=pos.y+1 - local trunkpos={x=pos.x, z=pos.z} - for y=pos.y, pos.y+4+math.random(2) do - trunkpos.y=y - minetest.add_node(trunkpos, {name="nether:tree"}) - end - --LEAVES - local leafpos={} - for x=(trunkpos.x-NETHER_TREESIZE), (trunkpos.x+NETHER_TREESIZE), 1 do - for y=(trunkpos.y-NETHER_TREESIZE), (trunkpos.y+NETHER_TREESIZE), 1 do - for z=(trunkpos.z-NETHER_TREESIZE), (trunkpos.z+NETHER_TREESIZE), 1 do - if (x-trunkpos.x)*(x-trunkpos.x) - +(y-trunkpos.y)*(y-trunkpos.y) - +(z-trunkpos.z)*(z-trunkpos.z) - <= NETHER_TREESIZE*NETHER_TREESIZE + NETHER_TREESIZE then - leafpos={x=x, y=y, z=z} - if minetest.get_node(leafpos).name=="air" then - if math.random(NETHER_APPLE_FREQ) == 1 then - if math.random(NETHER_HEAL_APPLE_FREQ) == 1 then - minetest.add_node(leafpos, {name="default:apple"}) - else - minetest.add_node(leafpos, {name="nether:apple"}) - end - else - minetest.add_node(leafpos, {name="nether:leaves"}) - end - end - end - end - end - end -end]] diff --git "a/nether/\n/nether_fruit_leaves.png" "b/nether/\n/nether_fruit_leaves.png" deleted file mode 100644 index c230ae5..0000000 Binary files "a/nether/\n/nether_fruit_leaves.png" and /dev/null differ diff --git "a/nether/\n/nether_glowstone.png" "b/nether/\n/nether_glowstone.png" deleted file mode 100644 index 6a6a7a4..0000000 Binary files "a/nether/\n/nether_glowstone.png" and /dev/null differ diff --git "a/nether/\n/nether_leaves.png" "b/nether/\n/nether_leaves.png" deleted file mode 100644 index b6d304d..0000000 Binary files "a/nether/\n/nether_leaves.png" and /dev/null differ diff --git "a/nether/\n/nether_leaves_decision/nether_leaves.png" "b/nether/\n/nether_leaves_decision/nether_leaves.png" deleted file mode 100644 index bed6162..0000000 Binary files "a/nether/\n/nether_leaves_decision/nether_leaves.png" and /dev/null differ diff --git "a/nether/\n/nether_leaves_decision/nether_leaves_high_cont.png" "b/nether/\n/nether_leaves_decision/nether_leaves_high_cont.png" deleted file mode 100644 index 7ad8059..0000000 Binary files "a/nether/\n/nether_leaves_decision/nether_leaves_high_cont.png" and /dev/null differ diff --git "a/nether/\n/nether_netherrack.png1" "b/nether/\n/nether_netherrack.png1" deleted file mode 100644 index 66cccbe..0000000 Binary files "a/nether/\n/nether_netherrack.png1" and /dev/null differ diff --git "a/nether/\n/nether_portal_creator.png" "b/nether/\n/nether_portal_creator.png" deleted file mode 100644 index e3f8e80..0000000 Binary files "a/nether/\n/nether_portal_creator.png" and /dev/null differ diff --git "a/nether/\n/nether_tree.png" "b/nether/\n/nether_tree.png" deleted file mode 100644 index 0c4cd89..0000000 Binary files "a/nether/\n/nether_tree.png" and /dev/null differ diff --git "a/nether/\n/nether_tree_top.png" "b/nether/\n/nether_tree_top.png" deleted file mode 100644 index eb82f06..0000000 Binary files "a/nether/\n/nether_tree_top.png" and /dev/null differ diff --git "a/nether/\n/temp.txt" "b/nether/\n/temp.txt" deleted file mode 100644 index feafa5a..0000000 --- "a/nether/\n/temp.txt" +++ /dev/null @@ -1,166 +0,0 @@ - -- Floor 1 - {pos={x=0,y=0,z=0}, block="nether:netherrack"}, - {pos={x=0,y=0,z=1}, block="nether:netherrack"}, - {pos={x=0,y=0,z=2}, block="nether:netherrack"}, - {pos={x=0,y=0,z=3}, block="nether:netherrack"}, - {pos={x=0,y=0,z=4}, block="nether:netherrack"}, - {pos={x=0,y=0,z=5}, block="nether:netherrack"}, - {pos={x=1,y=0,z=5}, block="nether:netherrack"}, - {pos={x=2,y=0,z=5}, block="nether:netherrack"}, - {pos={x=3,y=0,z=5}, block="nether:netherrack"}, - {pos={x=4,y=0,z=5}, block="nether:netherrack"}, - {pos={x=5,y=0,z=5}, block="nether:netherrack"}, - {pos={x=0,y=0,z=6}, block="nether:netherrack"}, - {pos={x=1,y=0,z=6}, block="nether:netherrack"}, - {pos={x=2,y=0,z=6}, block="nether:netherrack"}, - {pos={x=3,y=0,z=6}, block="nether:netherrack"}, - {pos={x=4,y=0,z=6}, block="nether:netherrack"}, - {pos={x=5,y=0,z=6}, block="nether:netherrack"}, - {pos={x=5,y=0,z=4}, block="nether:netherrack"}, - {pos={x=5,y=0,z=3}, block="nether:netherrack"}, - {pos={x=5,y=0,z=2}, block="nether:netherrack"}, - {pos={x=5,y=0,z=1}, block="nether:netherrack"}, - {pos={x=5,y=0,z=0}, block="nether:netherrack"}, - {pos={x=4,y=0,z=0}, block="nether:netherrack"}, - {pos={x=3,y=0,z=0}, block="nether:netherrack"}, - {pos={x=2,y=0,z=0}, block="nether:netherrack"}, - {pos={x=1,y=0,z=0}, block="nether:netherrack"}, - -- Floor 2 - {pos={x=0,y=1,z=0}, block="nether:netherrack"}, - {pos={x=0,y=1,z=1}, block="nether:netherrack"}, - {pos={x=0,y=1,z=2}, block="nether:netherrack"}, - {pos={x=0,y=1,z=3}, block="nether:netherrack"}, - {pos={x=0,y=1,z=4}, block="nether:netherrack"}, - {pos={x=0,y=1,z=5}, block="nether:netherrack"}, - {pos={x=1,y=1,z=5}, block="nether:netherrack"}, - {pos={x=2,y=1,z=5}, block="nether:netherrack"}, - {pos={x=3,y=1,z=5}, block="nether:netherrack"}, - {pos={x=4,y=1,z=5}, block="nether:netherrack"}, - {pos={x=5,y=1,z=5}, block="nether:netherrack"}, - {pos={x=0,y=1,z=6}, block="nether:netherrack"}, - {pos={x=1,y=1,z=6}, block="nether:netherrack"}, - {pos={x=2,y=1,z=6}, block="nether:netherrack"}, - {pos={x=3,y=1,z=6}, block="nether:netherrack"}, - {pos={x=4,y=1,z=6}, block="nether:netherrack"}, - {pos={x=5,y=1,z=6}, block="nether:netherrack"}, - {pos={x=5,y=1,z=4}, block="nether:netherrack"}, - {pos={x=5,y=1,z=3}, block="nether:netherrack"}, - {pos={x=5,y=1,z=2}, block="nether:netherrack"}, - {pos={x=5,y=1,z=1}, block="nether:netherrack"}, - {pos={x=5,y=1,z=0}, block="nether:netherrack"}, - {pos={x=4,y=1,z=0}, block="nether:netherrack"}, - {pos={x=3,y=1,z=1}, block="nether:netherrack"}, - {pos={x=2,y=1,z=1}, block="nether:netherrack"}, - {pos={x=1,y=1,z=0}, block="nether:netherrack"}, - {pos={x=1,y=1,z=1}, block="nether:netherrack"}, - {pos={x=4,y=1,z=1}, block="nether:netherrack"}, - -- Floor 3 - {pos={x=0,y=2,z=0}, block="nether:netherrack"}, - {pos={x=0,y=2,z=1}, block="nether:netherrack"}, - {pos={x=0,y=2,z=2}, block="nether:netherrack"}, - {pos={x=0,y=2,z=3}, block="nether:netherrack"}, - {pos={x=0,y=2,z=4}, block="nether:netherrack"}, - {pos={x=0,y=2,z=5}, block="nether:netherrack"}, - {pos={x=1,y=2,z=5}, block="nether:netherrack"}, - {pos={x=2,y=2,z=5}, block="nether:netherrack"}, - {pos={x=3,y=2,z=5}, block="nether:netherrack"}, - {pos={x=4,y=2,z=5}, block="nether:netherrack"}, - {pos={x=5,y=2,z=5}, block="nether:netherrack"}, - {pos={x=0,y=2,z=6}, block="nether:netherrack"}, - {pos={x=1,y=2,z=6}, block="nether:netherrack"}, - {pos={x=2,y=2,z=6}, block="nether:netherrack"}, - {pos={x=3,y=2,z=6}, block="nether:netherrack"}, - {pos={x=4,y=2,z=6}, block="nether:netherrack"}, - {pos={x=5,y=2,z=6}, block="nether:netherrack"}, - {pos={x=5,y=2,z=4}, block="nether:netherrack"}, - {pos={x=5,y=2,z=3}, block="nether:netherrack"}, - {pos={x=5,y=2,z=2}, block="nether:netherrack"}, - {pos={x=5,y=2,z=1}, block="nether:netherrack"}, - {pos={x=5,y=2,z=0}, block="nether:netherrack"}, - {pos={x=4,y=2,z=0}, block="nether:netherrack"}, - {pos={x=3,y=2,z=2}, block="nether:netherrack"}, - {pos={x=2,y=2,z=2}, block="nether:netherrack"}, - {pos={x=1,y=2,z=0}, block="nether:netherrack"}, - {pos={x=1,y=2,z=1}, block="nether:netherrack"}, - {pos={x=4,y=2,z=1}, block="nether:netherrack"}, - {pos={x=1,y=2,z=2}, block="nether:netherrack"}, - {pos={x=4,y=2,z=2}, block="nether:netherrack"}, - -- Floor 4 - {pos={x=0,y=3,z=0}, block="nether:netherrack"}, - {pos={x=0,y=3,z=1}, block="nether:netherrack"}, - {pos={x=0,y=3,z=2}, block="nether:netherrack"}, - {pos={x=0,y=3,z=3}, block="nether:netherrack"}, - {pos={x=0,y=3,z=4}, block="nether:netherrack"}, - {pos={x=0,y=3,z=5}, block="nether:netherrack"}, - {pos={x=1,y=3,z=5}, block="nether:netherrack"}, - {pos={x=2,y=3,z=5}, block="nether:netherrack"}, - {pos={x=3,y=3,z=5}, block="nether:netherrack"}, - {pos={x=4,y=3,z=5}, block="nether:netherrack"}, - {pos={x=5,y=3,z=5}, block="nether:netherrack"}, - {pos={x=0,y=3,z=6}, block="nether:netherrack"}, - {pos={x=1,y=3,z=6}, block="nether:netherrack"}, - {pos={x=2,y=3,z=6}, block="nether:netherrack"}, - {pos={x=3,y=3,z=6}, block="nether:netherrack"}, - {pos={x=4,y=3,z=6}, block="nether:netherrack"}, - {pos={x=5,y=3,z=6}, block="nether:netherrack"}, - {pos={x=5,y=3,z=4}, block="nether:netherrack"}, - {pos={x=5,y=3,z=3}, block="nether:netherrack"}, - {pos={x=5,y=3,z=2}, block="nether:netherrack"}, - {pos={x=5,y=3,z=1}, block="nether:netherrack"}, - {pos={x=5,y=3,z=0}, block="nether:netherrack"}, - {pos={x=4,y=3,z=0}, block="nether:netherrack"}, - {pos={x=3,y=3,z=3}, block="nether:netherrack"}, - {pos={x=2,y=3,z=3}, block="nether:netherrack"}, - {pos={x=1,y=3,z=0}, block="nether:netherrack"}, - {pos={x=1,y=3,z=1}, block="nether:netherrack"}, - {pos={x=4,y=3,z=1}, block="nether:netherrack"}, - {pos={x=1,y=3,z=2}, block="nether:netherrack"}, - {pos={x=4,y=3,z=2}, block="nether:netherrack"}, - {pos={x=1,y=3,z=3}, block="nether:netherrack"}, - {pos={x=4,y=3,z=3}, block="nether:netherrack"}, - {pos={x=1,y=3,z=4}, block="nether:netherrack"}, - {pos={x=4,y=3,z=4}, block="nether:netherrack"}, - {pos={x=2,y=3,z=4}, block="nether:netherrack"}, - {pos={x=2,y=3,z=5}, block="nether:netherrack"}, - {pos={x=3,y=3,z=4}, block="nether:netherrack"}, - {pos={x=3,y=3,z=5}, block="nether:netherrack"}, - -- Floor 5 - {pos={x=2,y=4,z=4}, block="nether:netherrack"}, - {pos={x=2,y=4,z=5}, block="nether:netherrack"}, - {pos={x=3,y=4,z=4}, block="nether:netherrack"}, - {pos={x=3,y=4,z=5}, block="nether:netherrack"}, - {pos={x=2,y=4,z=6}, block="nether:netherrack"}, - {pos={x=3,y=4,z=6}, block="nether:netherrack"}, - -- Torches on floor 5 - {pos={x=0,y=4,z=4}, block="nether:nether_torch_bottom"}, - {pos={x=1,y=4,z=4}, block="nether:nether_torch_bottom"}, - {pos={x=0,y=4,z=5}, block="nether:nether_torch_bottom"}, - {pos={x=1,y=4,z=5}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=4}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=4}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=5}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=5}, block="nether:nether_torch_bottom"}, - {pos={x=0,y=4,z=0}, block="nether:nether_torch_bottom"}, - {pos={x=1,y=4,z=0}, block="nether:nether_torch_bottom"}, - {pos={x=0,y=4,z=1}, block="nether:nether_torch_bottom"}, - {pos={x=1,y=4,z=1}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=0}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=0}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=1}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=1}, block="nether:nether_torch_bottom"}, - {pos={x=0,y=4,z=2}, block="nether:nether_torch_bottom"}, - {pos={x=1,y=4,z=2}, block="nether:nether_torch_bottom"}, - {pos={x=0,y=4,z=3}, block="nether:nether_torch_bottom"}, - {pos={x=1,y=4,z=3}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=2}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=2}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=3}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=3}, block="nether:nether_torch_bottom"}, - {pos={x=4,y=4,z=6}, block="nether:nether_torch_bottom"}, - {pos={x=5,y=4,z=6}, block="nether:nether_torch_bottom"}, - -- Floor 6 - {pos={x=2,y=5,z=6}, block="nether:netherrack"}, - {pos={x=3,y=5,z=6}, block="nether:netherrack"}, - -- Floor 7 - {pos={x=2,y=6,z=6}, block="nether:netherrack"}, - {pos={x=3,y=6,z=6}, block="nether:netherrack"}, diff --git a/nether/crafting.lua b/nether/crafting.lua old mode 100644 new mode 100755 index 78dfc35..e0cd34a --- a/nether/crafting.lua +++ b/nether/crafting.lua @@ -214,7 +214,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", - output = "default:coal", + output = "default:coal_lump", recipe = "nether:tree", }) diff --git a/nether/depends.txt b/nether/depends.txt old mode 100644 new mode 100755 index 2f29bdb..a6b36a8 --- a/nether/depends.txt +++ b/nether/depends.txt @@ -2,5 +2,6 @@ default glow riesenpilz stairs +vector_extras fence_registration? watershed? diff --git a/nether/furnace.lua b/nether/furnace.lua old mode 100644 new mode 100755 index ee293cd..44d4b44 --- a/nether/furnace.lua +++ b/nether/furnace.lua @@ -250,7 +250,7 @@ minetest.register_abm({ if last_time == current_time then return end - + local timediff = get_timediff(last_time, current_time)+meta:get_string("timedif") local times = math.floor(timediff) meta:set_string("last_active", current_time) @@ -272,13 +272,13 @@ minetest.register_abm({ local srclist = inv:get_list("src") local cooked = nil local aftercooked - + if srclist then cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) end - + local was_active = false - + if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then was_active = true meta:set_float("fuel_time", meta:get_float("fuel_time") + 1) @@ -298,7 +298,7 @@ minetest.register_abm({ meta:set_string("src_time", 0) end end - + if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then local percent = math.floor(meta:get_float("fuel_time") / meta:get_float("fuel_totaltime") * 100) @@ -313,7 +313,7 @@ minetest.register_abm({ local cooked = nil local fuellist = inv:get_list("fuel") local srclist = inv:get_list("src") - + if srclist then cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) end @@ -339,7 +339,7 @@ minetest.register_abm({ meta:set_string("fuel_totaltime", fuel.time) meta:set_string("fuel_time", 0) - + inv:set_stack("fuel", 1, afterfuel.items[1]) end end, diff --git a/nether/guide.lua b/nether/guide.lua old mode 100644 new mode 100755 index 4bb9322..60b2d29 --- a/nether/guide.lua +++ b/nether/guide.lua @@ -3,15 +3,15 @@ local cube = minetest.inventorycube -- the content of the guide local guide_infos = { { - description = "mushroom", - {"text", "You can find the nether mushroom on the ground of the nether and on netherrack soil, it can be dug by hand."}, - {"y", -0.3}, + description = "Mushrooms", + {"text", "Nether mushrooms can be found on the nether's ground and\n".. + "on netherrack soil, it can be dug by hand."}, {"image", {1, 1, "riesenpilz_nether_shroom_side.png"}}, {"y", 0.2}, - {"text", "If you drop it without holding aux1 (the fast key), you can split it into its stem and head:"}, + {"text", "If you drop it without holding the fast key, you can split it into its stem and head:"}, {"image", {1, 1, "nether_shroom_top.png", 1}}, {"image", {1, 1, "nether_shroom_stem.png"}}, - {"y", 0.2}, + {"y", 0.1}, {"text", "You can get more mushrooms by using a netherrack soil:\n".. "1. search a dark place and, if necessary, place netherrack with air about it\n".. "2. right click with cooked blood onto the netherrack to make it soiled\n".. @@ -27,81 +27,89 @@ local guide_infos = { {"image", {1, 1, "nether_netherrack.png"}}, }, { - description = "tools", - {"text", "You can craft 5 types of tools in the nether, which (except the mushroom pick) require sticks to be crafted:"}, - {"y", 0.4}, + description = "Tools", + {"text", "You can craft 5 kinds of tools in the nether,\n".. + "which (except the mushroom pick) require sticks to be crafted:"}, {"image", {1, 1, "nether_pick_mushroom.png"}}, - {"text", "strength: 1\n".. + {"y", 0.1}, + {"text", "strength : 1\n".. "The mushroom pick needs mushroom stems and heads to be crafted."}, - {"y", 0.2}, {"image", {1, 1, "nether_pick_wood.png"}}, - {"text", "strength: 2\n".. + {"y", 0.1}, + {"text", "strength : 2\n".. "The nether wood pick can be crafted with cooked nether blood wood."}, - {"y", 0.2}, - {"image", {1, 1, "nether_axe_netherrack.png", 1}}, - {"image", {1, 1, "nether_shovel_netherrack.png", 2}}, - {"image", {1, 1, "nether_sword_netherrack.png", 3}}, + {"image", {1, 1, "nether_axe_netherrack.png", 1.5}}, + {"image", {1, 1, "nether_shovel_netherrack.png", 3}}, + {"image", {1, 1, "nether_sword_netherrack.png", 4.5}}, {"image", {1, 1, "nether_pick_netherrack.png"}}, - {"text", "strength: 3\n".. + {"y", 0.1}, + {"text", "strength : 3\n".. "The red netherrack tools can be crafted with usual netherrack."}, - {"y", 0.2}, - {"image", {1, 1, "nether_axe_netherrack_blue.png", 1}}, - {"image", {1, 1, "nether_shovel_netherrack_blue.png", 2}}, - {"image", {1, 1, "nether_sword_netherrack_blue.png", 3}}, + {"image", {1, 1, "nether_axe_netherrack_blue.png", 1.5}}, + {"image", {1, 1, "nether_shovel_netherrack_blue.png", 3}}, + {"image", {1, 1, "nether_sword_netherrack_blue.png", 4.5}}, {"image", {1, 1, "nether_pick_netherrack_blue.png"}}, - {"text", "strength: 3\n".. + {"y", 0.1}, + {"text", "strength : 3\n".. "The blue netherrack tools can be crafted with blue netherrack."}, - {"y", 0.2}, - {"image", {1, 1, "nether_axe_white.png", 1}}, - {"image", {1, 1, "nether_shovel_white.png", 2}}, - {"image", {1, 1, "nether_sword_white.png", 3}}, + {"image", {1, 1, "nether_axe_white.png", 1.5}}, + {"image", {1, 1, "nether_shovel_white.png", 3}}, + {"image", {1, 1, "nether_sword_white.png", 4.5}}, {"image", {1, 1, "nether_pick_white.png"}}, - {"text", "strength: 3\n".. + {"y", 0.1}, + {"text", "strength : 3\n".. "The siwtonic tools can be crafted with the siwtonic ore."}, }, { - description = "blood structures", - {"text", "You can find blood structures on the ground and dig their nodes even with the bare hand."}, - {"y", 0.2}, - {"text", "One contains 4 kinds of blocks:"}, + description = "Blood structures", + {"text", "You can find blood structures on the ground and\n".. + "dig their nodes even with the bare hand."}, + {"y", 0.5}, + {"text", "One contains 4 kinds of blocks :"}, {"image", {1, 1, cube("nether_blood.png"), 1}}, {"image", {1, 1, cube("nether_blood_top.png", "nether_blood.png^nether_blood_side.png", "nether_blood.png^nether_blood_side.png"), 2}}, {"image", {1, 1, "nether_fruit.png", 3}}, {"image", {1, 1, cube("nether_blood_stem_top.png", "nether_blood_stem.png", "nether_blood_stem.png")}}, - {"text", "the blood stem, blood, blood head and nether fruit"}, - {"y", 0.2}, - {"text", "You can craft the stem to 4 blood wood:"}, + {"y", 0.1}, + {"text", "Blood stem, blood, blood head and nether fruit"}, + {"y", 0.1}, + {"text", "You can craft 4 blood wood with the stem :"}, {"image", {1, 1, cube("nether_wood.png")}}, - {"y", 0.2}, - {"text", "The 4 blood nodes can be cooked and, except blood wood, their blood can be extracted."}, + {"y", 0.1}, + {"text", "The 4 blood nodes can be cooked and, except\n".. + "blood wood, their blood can be extracted."}, }, { - description = "fruit", - {"text", "You can find the nether fruit at blood structures and dig it even with the bare hand."}, - {"y", 0.05}, + description = "Fruits", + {"text", "You can find the nether fruits on blood structures\n".. + "and dig them even with the bare hand."}, {"image", {1, 1, "nether_fruit.png"}}, - {"text", "You can eat it to get a bit blood because of its acid effect:"}, + {"text", "Eating it will make you lose life but\n".. + "it might feed you and give you blood :"}, {"image", {1, 1, "nether_blood_extracted.png"}}, {"y", 0.2}, - {"text", "If you eat it at the right place inside a portal, you teleport instead of getting blood."}, + {"text", "If you eat it at the right place inside a portal,\n".. + "you will teleport instead of getting blood."}, {"y", 0.2}, - {"text", "If you drop it without holding aux1 (the fast key), you can split it into its fruit and leaf:"}, + {"text", "If you drop it without holding the fast key,\n".. + "you can split it into its fruit and leaf:"}, {"image", {1, 1, "nether_fruit_leaf.png", 1}}, {"image", {1, 1, "nether_fruit_no_leaf.png"}}, {"y", 0.2}, - {"text", "9 fruit leaves can be crafted to a fruit leaves block and the fruit without leaf can be used for crafting a nether pearl."}, - {"y", 0.2}, + {"text", "Craft a fruit leave block out of 9 fruit leaves\n".. + "The fruit can be used to craft a nether pearl."}, {"image", {1, 1, cube("nether_fruit_leaves.png")}}, - {"text", "fruit leaves block"}, + {"y", 0.2}, + {"text", "A fruit leaves block"}, }, { - description = "cooking", + description = "Cooking", {"text", "To get a furnace you need to dig at least 8 netherrack bricks.\n".. - "They can be found at pyramid like constructions and require at least a strength 1 nether pick to be dug.\n".. - "For crafting the furnace, use the netherrack bricks like cobble:"}, - {"y", 0.2}, + "They can be found at pyramid like constructions and require at least\n".. + "a strength 1 nether pick to be dug.\n".. + "To craft the furnace, use the netherrack bricks like cobble:"}, {"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 0.5}}, {"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}}, {"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}}, @@ -113,29 +121,27 @@ local guide_infos = { {"y", 0.2}, {"text", "To begin cooking stuff, you can use a mushroom or fruit.\n".. "After that it's recommended to use cooked blood nodes."}, - {"y", 0.2}, - {"text", "Some nether items can be cooked:"}, {"y", 0.1}, + {"text", "Some nether items can be cooked:"}, {"image", {1, 1, cube("nether_blood_stem_top_cooked.png", "nether_blood_stem_cooked.png", "nether_blood_stem_cooked.png"), 0.35}}, {"image", {1, 1, cube("nether_blood_cooked.png"), 1.6}}, {"image", {1, 1, cube("nether_blood_top_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png"), 2.9}}, {"image", {1, 1, cube("nether_wood_cooked.png"), 4.3}}, - {"y", 1}, - {"text", "cooked blood stem, cooked blood, cooked blood head, cooked blood wood,"}, - {"y", 0.2}, + {"y", 1.2}, + {"text", "Some cooked blood stem, cooked blood,\n".. + "cooked blood head and cooked blood wood,"}, {"image", {1, 1, "nether_hotbed.png", 0.3}}, {"image", {1, 1, "nether_pearl.png", 2}}, - {"y", 1}, - {"text", "cooked extracted blood and nether pearl"}, + {"y", 1.2}, + {"text", "Some cooked extracted blood and a nether pearl"}, }, { - description = "extractor", + description = "Extractors", {"text", "Here you can find out information about the nether extractor."}, - {"y", 0.4}, - {"text", "Here you can see its craft recipe:"}, {"y", 0.2}, + {"text", "Here you can see its craft recipe:"}, {"image", {0.5, 0.5, cube("nether_blood_top_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png"), 0.5}}, {"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}}, {"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}}, @@ -147,7 +153,7 @@ local guide_infos = { {"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}}, {"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}}, {"y", 0.2}, - {"text", "You can extract blood from the blood nodes you get from the blood structure.\n".. + {"text", "Extract blood from the blood nodes you get from the blood structures.\n".. "You can also get blood with a nether fruit."}, {"y", 0.2}, {"text", "So you can use it:\n".. @@ -169,69 +175,76 @@ local guide_infos = { {"image", {1, 1, "nether_blood.png", 0.82, -0.12}}, {"image", {1, 1, "nether_blood_empty.png", 3.82, -0.12}}, {"y", 1.2}, - {"text", "The empty blood stem can be crafted to empty nether wood, which can be crafted to nether sticks."}, + {"text", "The empty blood stem can be crafted into empty nether wood,\n".. + "which can be crafted into nether sticks."}, }, { - description = "ores", + description = "Ores", {"text", "You can find 5 types of ores:"}, - {"y", 0.4}, {"image", {1, 1, cube("nether_netherrack_black.png"), 4}}, {"image", {1, 1, cube("nether_netherrack.png")}}, - {"text", "The red netherrack is generated like stone and the black netherrack is generated like gravel.\n".. - "Both require at least a strength 2 nether pick to be dug."}, {"y", 0.2}, + {"text", "The red netherrack is generated like stone.\n".. + "The black netherrack is generated like gravel.\n".. + "Both require at least a strength 2 nether pick to be dug."}, {"image", {1, 1, cube("nether_white.png"), 4}}, {"image", {1, 1, cube("nether_netherrack_blue.png")}}, - {"text", "The blue netherrack is generated like diamond ore and the siwtonic ore is generated like mese blocks.\n".. - "Both require at least a strength 3 nether pick to be dug."}, {"y", 0.2}, + {"text", "The blue netherrack is generated like diamond ore.\n".. + "The siwtonic ore is generated like mese blocks.\n".. + "Both require at least a strength 3 nether pick to be dug."}, {"image", {1, 1, cube("nether_netherrack_tiled.png"), 4}}, {"image", {1, 1, cube("glow_stone.png")}}, - {"text", "The glow stone can be used for lighting and the tiled netherrack is generated like coal ore.\n".. + {"y", 0.2}, + {"text", "Glow stone can be used for lighting.\n".. + "Tiled netherrack is generated like coal ore.\n".. "Glow stone requires at least a strength 1 pick to be dug.\n".. - "Tiled netherrack requires at least a strength 2 nether pick to be dug."}, + "Dig tiled netherrack with at least a level 2 pickaxe."}, }, { - description = "vines", - {"text", "The nether vines can be fed with blood.\n".. - "They can be dug by hand and drop nether children."}, + description = "Vines", + {"text", "Feed nether vines with blood.\n".. + "Dig them with anything."}, {"image", {1, 1, "nether_vine.png"}}, {"y", 0.2}, - {"text", "To let a nether child grow to a blood structure, place it at a dark place onto a blood structure head node."}, + {"text", "Grow nether child by placing\n".. + "placing it to a dark place onto a\n".. + "blood structure head node."}, {"image", {1, 1, "nether_sapling.png"}}, - {"y", -0.11}, + {"y", -0.10}, {"image", {1, 1, "nether_blood.png^nether_blood_side.png"}}, }, { - description = "pearl", - {"text", "The nether pearl can be thrown for teleporting.\n".. - "So cou can get one:"}, - {"y", 0.4}, - {"text", "At first you need to craft 2 mushroom heads and 1 nether fruit without leaf together:"}, + description = "Pearls", + {"text", "The nether pearl can be used to teleport by throwing it.\n".. + "Here is how to get one :"}, + {"y", 0.2}, + {"text", "First of all craft 2 mushroom heads and 1 nether fruit\n".. + "without leaf together :"}, {"image", {1, 1, "nether_shroom_top.png"}}, {"image", {1, 1, "nether_fim.png", 3}}, {"image", {1, 1, "nether_fruit_no_leaf.png"}}, {"image", {1, 1, "nether_shroom_top.png"}}, {"y", 0.2}, - {"text", "Then you need to put the result into the furnance to cook it to a nether pearl:"}, + {"text", "Put the result into the furnace\n".. + "to cook it into a nether pearl :"}, {"image", {1, 1, "nether_pearl.png"}}, }, { - description = "bricks", - {"text", "You can craft bricks of red, black and blue netherrack."}, - {"y", 0.4}, + description = "Bricks", + {"text", "Craft bricks out of red,\n".. + "black and blue netherrack."}, {"image", {1, 1, cube("nether_netherrack_brick_black.png"), 1}}, {"image", {1, 1, cube("nether_netherrack_brick_blue.png"), 2}}, {"image", {1, 1, cube("nether_netherrack_brick.png")}}, + {"y", 0.4}, + {"text", "Dig them with at least a level 1 pickaxe."}, {"y", 0.2}, - {"text", "These bricks require at least a strength 1 nether pick to be dug."}, - {"y", 0.2}, - {"text", "Because the crafing recipe of bricks is well known, it's not shown here."}, }, { - description = "portal", + description = "Portals", {"text", "Here you can find out how to built the nether portal."}, - {"y", 0.4}, + {"y", 0.3}, {"text", "A nether portal requires following nodes:"}, {"y", 0.05}, {"text", "21 empty nether wooden planks\n".. @@ -245,48 +258,49 @@ local guide_infos = { {"text", "It should look approximately like this one:"}, {"image", {5.625, 6, "nether_teleporter.png", 0, -1.5}}, {"y", 5.5}, - {"text", "You can activate it by standing in the middle on a siwtonic block and eating a nether fruit.\n".. - "Don't forget to take enough stuff with you to be able to build a portal back."}, + {"text", "Activate it by standing in the middle,\n".. + "on the siwtonic block and eating a nether fruit.\n".. + "Take enough stuff with you to build a portal when you'll come back."}, }, { - description = "nether forest", - {"text", "The nether forest is generated in caves above the usual nether."}, + description = "Forests", + {"text", "The nether forest is generated in caves,\n".. + "above the usual nether."}, {"y", 0.2}, {"text", "There you can find some plants:"}, - {"y", 0.2}, {"image", {1, 1, "nether_grass_middle.png", 1}}, {"image", {1, 1, "nether_grass_big.png", 2}}, {"image", {1, 1, "nether_grass_small.png"}}, {"y", 0.2}, - {"text", "The nether forest grass can be used to get paper.\n".. - "Just dig it, put the grass into the furnace and craft paper out of the dried grass.\n".. - "The recipe is similar to the one of crafting paper with papyrus."}, - {"y", 0.2}, + {"text", "Use the nether forest grass to get paper.\n".. + "Craft paper out of the dried grass."}, {"image", {1, 1, cube("nether_tree_top.png", "nether_tree.png", "nether_tree.png")}}, - {"text", "Nether trunks can be found at nether trees, you can craft nether wood out of them."}, {"y", 0.2}, + {"text", "Nether trunks can be found at nether trees.\n".. + "Craft nether wood out of nether trunk."}, {"image", {1, 1, "nether_glowflower.png"}}, - {"text", "Currently this flower can be used for lighting and decoration."}, + {"y", 0.2}, + {"text", "Use it for lighting and decoration."}, }, } -- the size of guide pages -local guide_size = {x=15, y=10, cx=0.1, cy=-0.2} +local guide_size = {x=40, y=10, cx=0.2, cy=0.2} -- informations about settings and ... -local formspec_offset = {x=0.25, y=0.55} +local formspec_offset = {x=0.25, y=0.50} local font_size if minetest.is_singleplayer() then font_size = tonumber(minetest.setting_get("font_size")) or 13 else font_size = 13 end -guide_size.fx = math.floor((guide_size.x-2*(guide_size.cx+formspec_offset.x))*font_size) -guide_size.fy = font_size/65 +guide_size.fx = math.floor((40*(guide_size.cx+formspec_offset.x))*font_size) +guide_size.fy = font_size/40 -- the default guide formspecs local guide_forms = { - contents = "size[3,"..(#guide_infos+1)*0.5 ..";]label["..guide_size.cx+0.8 ..","..guide_size.cy..";Contents:]", + contents = "size[3.6,"..(#guide_infos)-2 ..";]label["..guide_size.cx+0.7 ..","..guide_size.cy+0.2 ..";Contents:]", } -- change the infos to formspecs @@ -301,13 +315,13 @@ for n,data in ipairs(guide_infos) do elseif typ == "x" then x = math.max(x, content) elseif typ == "text" then - local tab = minetest.splittext(content, guide_size.fx) + --local tab = minetest.splittext(content, guide_size.fx) local l = guide_size.cx - for _,str in ipairs(tab) do - form = form.."label["..guide_size.cx..","..guide_size.cy+y..";"..str.."]" + --[[for _,str in ipairs(tab) do + form = form.."label["..guide_size.cx ..","..guide_size.cy+y..";"..str.."]" y = y+guide_size.fy l = math.max(l, #str) - end + end]] x = math.max(x, l/font_size) elseif typ == "image" then local w, h, texture_name, px, py = unpack(content) @@ -323,7 +337,7 @@ for n,data in ipairs(guide_infos) do end end end - form = "size["..x..","..y+1 ..";]"..form.."button["..x/2-0.5 ..","..y ..";1,2;quit;back]" + form = "size["..x*1.8 ..","..y+1 ..";]"..form.."button["..x/2-0.5 ..","..y ..";1,2;quit;Back]" guide_forms[n] = {data.description, form} end @@ -336,8 +350,8 @@ end local y = 0 for y,i in ipairs(guide_forms) do local desc, form = unpack(i) - local s = #desc*1.3/font_size+0.3 - guide_forms.contents = guide_forms.contents.."button["..guide_size.cx+math.random()..","..guide_size.cy+y/2 ..";"..s..",1;name;"..desc.."]" + local s = #desc*1.3/font_size+1.5 + guide_forms.contents = guide_forms.contents.."button["..guide_size.cx*12/s-0.5 ..","..guide_size.cy+y/1.3 ..";"..s..",1;name;"..desc.."]" end -- shows the contents of the formspec @@ -372,10 +386,10 @@ minetest.register_chatcommand("nether_help", { minetest.chat_send_player(name, "Something went wrong.") return false end - if player:getpos().y > nether.start then +--[[ if player:getpos().y > nether.start then minetest.chat_send_player(name, "Usually you don't neet this guide here. You can view it in the nether.") return false - end + end --]] minetest.chat_send_player(name, "Showing guide...") show_guide(name) return true diff --git a/nether/init.lua b/nether/init.lua old mode 100644 new mode 100755 index fcfc91a..4aa43f5 --- a/nether/init.lua +++ b/nether/init.lua @@ -55,6 +55,9 @@ local mushroom_rarity = 80 -- Frequency of trees in the nether forest (higher is less frequent) local tree_rarity = 200 +local abm_tree_interval = 864 +local abm_tree_chance = 100 + -- height of the nether generation's end nether.start = f_h_max+100 @@ -100,7 +103,7 @@ if nether.info then else info = "[nether] "..msg end - print(info) + minetest.log("action", info) if self.inform_all then minetest.chat_send_all(info) end @@ -195,8 +198,9 @@ end local function fix_light(minp, maxp) local manip = minetest.get_voxel_manip() local emerged_pos1, emerged_pos2 = manip:read_from_map(minp, maxp) - area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2}) - nodes = manip:get_data() + local area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2}) + local nodes = manip:get_data() + -- MODIFICATION MADE FOR MFF ^ manip:set_data(nodes) manip:write_to_map() @@ -403,14 +407,14 @@ minetest.register_on_generated(function(minp, maxp, seed) if forest_possible then perlin_f_bottom = minetest.get_perlin(11, 3, 0.8, tmp2) pmap_f_top = minetest.get_perlin_map(perlins.forest_top, map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z}) - strassx = get_ws_list(2, minp.x) - strassz = get_ws_list(2, minp.z) + strassx = get_ws_list(2, minp.x, side_length) + strassz = get_ws_list(2, minp.z, side_length) end local num2, tab2 if buildings >= 1 then num2 = 1 - tab2 = nether_weird_noise({x=minp.x, y=nether.buildings-79, z=minp.z}, pymg, 200, 8, 10, 79) + tab2 = nether_weird_noise({x=minp.x, y=nether.buildings-(maxp.y-minp.y), z=minp.z}, pymg, 200, 8, 10, maxp.y-minp.y) end local count = 0 @@ -689,6 +693,10 @@ function nether.grow_netherstructure(pos, generated) end +local set = vector.set_data_to_pos +local get = vector.get_data_from_pos +local remove = vector.remove_data_from_pos + local function soft_node(id) return id == c.air or id == c.ignore end @@ -698,7 +706,6 @@ local function update_minmax(min, max, p) max.x = math.max(max.x, p.x) min.z = math.min(min.z, p.z) max.z = math.max(max.z, p.z) - return min, max end local fruit_chances = {} @@ -769,18 +776,18 @@ function nether.grow_tree(pos, generated) for j = 1,r do local x = p.x+j*dir[1] local z = p.z+j*dir[2] - trunks[x.." "..p.y.." "..z] = dir[3] + set(trunks, z,p.y,x, dir[3]) end r = r+1 p.x = p.x+r*dir[1] p.z = p.z+r*dir[2] - trunk_corners[p.x.." "..p.y.." "..p.z] = dir[4] or dir[3] + set(trunk_corners, p.z,p.y,p.x, dir[4] or dir[3]) local h = math.random(h_arm_min, h_arm_max) for i = 1,h do - trunks[p.x.." "..p.y+i.." "..p.z] = true + set(trunks, p.z,p.y+i,p.x, true) end p.y = p.y+h - --n = #todo+1 -- causes small trees + --n = #todo+1 -- caused small trees todo[#todo+1] = p end if p.y > pos.y+h_trunk_max then @@ -793,13 +800,17 @@ function nether.grow_tree(pos, generated) local fruits = {} local trunk_ps = {} local count = 0 - for n,par in pairs(trunks) do - local p = {} - p.x, p.y, p.z = unpack(string.split(n, " ")) - if par ~= true then - p.par = par + local ps, trmin, trmax, trunk_count = vector.get_data_pos_table(trunks) + + update_minmax(min, max, trmin) + update_minmax(min, max, trmax) + + for _,d in pairs(ps) do + if d[4] == true then + d[4] = nil end - table.insert(trunk_ps, p) + trunk_ps[#trunk_ps+1] = d + local pz, py, px = unpack(d) count = count+1 if count > leaf_thickness then count = 0 @@ -807,18 +818,21 @@ function nether.grow_tree(pos, generated) local fruit_chance = fruit_chances[y] for z = -2,2 do for x = -2,2 do - local dist = math.sqrt(x*x+y*y+z*z) - if math.floor(dist) ~= 0 - and math.random(1, dist) == 1 then - local pstr = p.x+x.." "..p.y+y.." "..p.z+z - if not trunks[pstr] then - if math.random(1, fruit_rarity) == 1 - and fruit_chance + local distq = x*x+y*y+z*z + if distq ~= 0 + and math.random(1, math.sqrt(distq)) == 1 then + local x = x+px + local y = y+py + local z = z+pz + if not get(trunks, z,y,x) then + if fruit_chance + and math.random(1, fruit_rarity) == 1 and math.random(1, fruit_chance) == 1 then - fruits[pstr] = true + set(fruits, z,y,x, true) else - leaves[pstr] = true + set(leaves, z,y,x, true) end + update_minmax(min, max, {x=x, z=z}) end end end @@ -827,37 +841,8 @@ function nether.grow_tree(pos, generated) end end - local leaf_ps = {} - for n,_ in pairs(leaves) do - local p = {} - p.x, p.y, p.z = unpack(string.split(n, " ")) - table.insert(leaf_ps, p) - min, max = update_minmax(min, max, p) - end - - for n,_ in pairs(trunks) do - local p = {} - p.x, _, p.z = unpack(string.split(n, " ")) - min, max = update_minmax(min, max, p) - end - for i = -1,h_stem+1 do - table.insert(trunk_ps, {x=pos.x, y=pos.y+i, z=pos.z, par=0}) - end - - local trunk_corner_ps = {} - for n,par in pairs(trunk_corners) do - local p = {} - p.x, p.y, p.z = unpack(string.split(n, " ")) - p.par = par - table.insert(trunk_corner_ps, p) - end - - local fruit_ps = {} - for n,_ in pairs(fruits) do - local p = {} - p.x, p.y, p.z = unpack(string.split(n, " ")) - table.insert(fruit_ps, p) + trunk_ps[#trunk_ps+1] = {pos.z, pos.y+i, pos.x, 0} -- par 0 because of leaves end local manip = minetest.get_voxel_manip() @@ -866,8 +851,8 @@ function nether.grow_tree(pos, generated) local nodes = manip:get_data() local param2s = manip:get_param2_data() - for _,p in pairs(leaf_ps) do - p = area:indexp(p) + for _,p in pairs(vector.get_data_pos_table(leaves)) do + p = area:index(p[3], p[2], p[1]) if soft_node(nodes[p]) then nodes[p] = c.nether_leaves param2s[p] = math.random(0,179) @@ -875,30 +860,28 @@ function nether.grow_tree(pos, generated) end end - for _,p in pairs(fruit_ps) do - p = area:indexp(p) + for _,p in pairs(vector.get_data_pos_table(fruits)) do + p = area:index(p[3], p[2], p[1]) if soft_node(nodes[p]) then nodes[p] = c.nether_apple end end for _,p in pairs(trunk_ps) do - local par = p.par - p = area:indexp(p) + local par = p[4] + p = area:index(p[3], p[2], p[1]) if par then param2s[p] = par end nodes[p] = c.nether_tree end - for _,p in pairs(trunk_corner_ps) do - local par = p.par - p = area:indexp(p) - nodes[p] = c.nether_tree_corner - param2s[p] = par + for _,p in pairs(vector.get_data_pos_table(trunk_corners)) do + local vi = area:index(p[3], p[2], p[1]) + nodes[vi] = c.nether_tree_corner + param2s[vi] = p[4] end - --calculating took ca. 0.07 - 0.18 [s] manip:set_data(nodes) manip:set_param2_data(param2s) manip:write_to_map() @@ -906,7 +889,7 @@ function nether.grow_tree(pos, generated) if generated then spam = 3 end - nether:inform("a nether tree grew at ("..pos.x.."|"..pos.y.."|"..pos.z..")", spam, t1) + nether:inform("a nether tree with "..trunk_count.." branch trunk nodes grew at ("..pos.x.."|"..pos.y.."|"..pos.z..")", spam, t1) if not generated then local t1 = os.clock() manip:update_map() @@ -935,8 +918,8 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"nether:tree_sapling"}, neighbors = {"group:nether_dirt"}, - interval = 864, - chance = 100, + interval = abm_tree_interval, + chance = abm_tree_chance, action = function(pos) if minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z}).name == "air" and minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name == "air" then @@ -1037,7 +1020,7 @@ dofile(path.."/guide.lua") local time = math.floor(tonumber(os.clock()-load_time_start)*100+0.5)/100 local msg = "[nether] loaded after ca. "..time if time > 0.05 then - print(msg) + minetest.log("warning", msg) else minetest.log("info", msg) end diff --git a/nether/items.lua b/nether/items.lua old mode 100644 new mode 100755 index 6b1d0b5..e30bd84 --- a/nether/items.lua +++ b/nether/items.lua @@ -376,6 +376,18 @@ minetest.register_node("nether:apple", { if nether_port(user, vector.round(user:getpos())) then return itemstack end + + local p_hunger = tonumber(hbhunger.hunger[user:get_player_name()]) + if not p_hunger then + return + end + p_hunger = p_hunger + 9 + if p_hunger > 30 then + p_hunger = 30 + end + hbhunger.hunger[user:get_player_name()] = p_hunger + hbhunger.set_hunger(user) + local amount = math.random(4, 6) inv:add_item("main", {name="nether:blood_extracted", count=math.floor(amount/3)}) user:set_hp(user:get_hp()-amount) @@ -813,51 +825,53 @@ minetest.register_craftitem("nether:hotbed", { }) + -- Modif MFF the entire tool minetest.register_tool("nether:pick_mushroom", { description = "Nether Mushroom Pickaxe", inventory_image = "nether_pick_mushroom.png", tool_capabilities = { max_drop_level=0, groupcaps={ - cracky = {times={[3]=3}, uses=1, maxlevel=1}, - nether = {times={[3]=3}, uses=1, maxlevel=1}, + cracky = {times={[3]=3.0}, uses=5, maxlevel=1}, + nether = {times={[3]=3}, uses=5, maxlevel=1}, }, + damage_groups = {fleshy=2}, }, }) -minetest.register_tool("nether:pick_wood", { +minetest.register_tool("nether:pick_wood", { -- Modif MFF the entire tool description = "Nether Wood Pickaxe", inventory_image = "nether_pick_wood.png", tool_capabilities = { full_punch_interval = 1.2, max_drop_level=0, groupcaps={ - cracky = {times={[3]=1.6}, uses=10, maxlevel=1}, - nether = {times={[2]=6, [3]=1.6}, uses=10, maxlevel=1}, + cracky = {times={[3]=1.60}, uses=10, maxlevel=1}, + nether = {times={[2]=6, [3]=1.60}, uses=10, maxlevel=1}, }, damage_groups = {fleshy=2}, }, }) -minetest.register_tool("nether:pick_netherrack", { +minetest.register_tool("nether:pick_netherrack", { -- Modif MFF the entire tool description = "Netherrack Pickaxe", inventory_image = "nether_pick_netherrack.png", tool_capabilities = { - full_punch_interval = 1.3, + full_punch_interval = 1.2, max_drop_level=0, groupcaps={ - cracky = {times={[2]=2.0, [3]=1.20}, uses=20, maxlevel=1}, - nether = {times={[1]=16, [2]=2, [3]=1.20}, uses=20, maxlevel=1}, + cracky = {times={[2]=2.00, [3]=1.20}, uses=20, maxlevel=2}, + nether = {times={[1]=16, [2]=2.00, [3]=1.20}, uses=20, maxlevel=1}, }, damage_groups = {fleshy=3}, }, }) -minetest.register_tool("nether:pick_netherrack_blue", { +minetest.register_tool("nether:pick_netherrack_blue", { -- Modif MFF the entire tool description = "Blue Netherrack Pickaxe", inventory_image = "nether_pick_netherrack_blue.png", tool_capabilities = { - full_punch_interval = 1.0, + full_punch_interval = 0.8, max_drop_level=1, groupcaps={ cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=30, maxlevel=2}, @@ -867,60 +881,62 @@ minetest.register_tool("nether:pick_netherrack_blue", { }, }) -minetest.register_tool("nether:pick_white", { +minetest.register_tool("nether:pick_white", { -- Modif MFF the entire tool description = "Siwtonic Pickaxe", inventory_image = "nether_pick_white.png", tool_capabilities = { - full_punch_interval = 0.9, + full_punch_interval = 0.5, max_drop_level=3, groupcaps={ - cracky = {times={[1]=1, [2]=0.8, [3]=0.3}, uses=180, maxlevel=3}, - nether = {times={[1]=1, [2]=0.5, [3]=0.3}, uses=180, maxlevel=3}, + cracky = {times={[1]=1.75, [2]=0.85, [3]=0.40}, uses=125, maxlevel=3}, + nether = {times={[1]=1, [2]=0.5, [3]=0.3}, uses=125, maxlevel=3}, }, damage_groups = {fleshy=5}, }, }) -minetest.register_tool("nether:axe_netherrack", { +-- Nether Axe +minetest.register_tool("nether:axe_netherrack", { -- Modif MFF the entire tool description = "Netherrack Axe", inventory_image = "nether_axe_netherrack.png", tool_capabilities = { full_punch_interval = 1.3, max_drop_level=0, groupcaps={ - choppy={times={[1]=2.9, [2]=1.9, [3]=1.4}, uses=20, maxlevel=1}, + choppy={times={[1]=3.00, [2]=1.00, [3]=0.60}, uses=20, maxlevel=2}, }, - damage_groups = {fleshy=4}, + damage_groups = {fleshy=3}, }, }) -minetest.register_tool("nether:axe_netherrack_blue", { +minetest.register_tool("nether:axe_netherrack_blue", { -- Modif MFF the entire tool description = "Blue Netherrack Axe", inventory_image = "nether_axe_netherrack_blue.png", tool_capabilities = { full_punch_interval = 0.9, max_drop_level=1, groupcaps={ - choppy={times={[1]=2.5, [2]=1.5, [3]=1}, uses=30, maxlevel=2}, + choppy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=30, maxlevel=2}, }, - damage_groups = {fleshy=6}, + damage_groups = {fleshy=4}, }, }) -minetest.register_tool("nether:axe_white", { +minetest.register_tool("nether:axe_white", { -- Modif MFF the entire tool description = "Siwtonic Axe", inventory_image = "nether_axe_white.png", tool_capabilities = { full_punch_interval = 0.9, max_drop_level=1, groupcaps={ - choppy={times={[1]=1.2, [2]=0.5, [3]=0.3}, uses=180, maxlevel=2}, + choppy={times={[1]=0.90, [2]=0.45, [3]=0.20}, uses=125, maxlevel=3}, }, - damage_groups = {fleshy=8}, + damage_groups = {fleshy=5}, }, }) -minetest.register_tool("nether:shovel_netherrack", { +-- Nether Shovel +minetest.register_tool("nether:shovel_netherrack", { -- Modif MFF the entire tool description = "Netherrack Shovel", inventory_image = "nether_shovel_netherrack.png", wield_image = "nether_shovel_netherrack.png^[transformR90", @@ -928,13 +944,13 @@ minetest.register_tool("nether:shovel_netherrack", { full_punch_interval = 1.4, max_drop_level=0, groupcaps={ - crumbly = {times={[1]=1.7, [2]=1.1, [3]=0.45}, uses=22, maxlevel=2}, + crumbly = {times={[1]=3.30, [2]=2.20, [3]=1.32}, uses=20, maxlevel=2}, }, - damage_groups = {fleshy=2}, + damage_groups = {fleshy=3}, }, }) -minetest.register_tool("nether:shovel_netherrack_blue", { +minetest.register_tool("nether:shovel_netherrack_blue", { -- Modif MFF the entire tool description = "Blue Netherrack Shovel", inventory_image = "nether_shovel_netherrack_blue.png", wield_image = "nether_shovel_netherrack_blue.png^[transformR90", @@ -942,13 +958,13 @@ minetest.register_tool("nether:shovel_netherrack_blue", { full_punch_interval = 1.1, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=1.4, [2]=0.8, [3]=0.35}, uses=50, maxlevel=2}, + crumbly = {times={[1]=4.40, [2]=1.76, [3]=0.88}, uses=30, maxlevel=2}, }, - damage_groups = {fleshy=3}, + damage_groups = {fleshy=4}, }, }) -minetest.register_tool("nether:shovel_white", { +minetest.register_tool("nether:shovel_white", { -- Modif MFF the entire tool description = "Siwtonic Shovel", inventory_image = "nether_shovel_white.png", wield_image = "nether_shovel_white.png^[transformR90", @@ -956,48 +972,49 @@ minetest.register_tool("nether:shovel_white", { full_punch_interval = 1, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=0.95, [2]=0.45, [3]=0.1}, uses=151, maxlevel=3}, - }, - damage_groups = {fleshy=4}, - }, -}) - -minetest.register_tool("nether:sword_netherrack", { - description = "Netherrack Sword", - inventory_image = "nether_sword_netherrack.png", - tool_capabilities = { - full_punch_interval = 1, - max_drop_level=0, - groupcaps={ - snappy={times={[2]=1.3, [3]=0.38}, uses=40, maxlevel=1}, + crumbly = {times={[1]=1.93, [2]=0.94, [3]=0.44}, uses=125, maxlevel=3}, }, damage_groups = {fleshy=5}, }, }) -minetest.register_tool("nether:sword_netherrack_blue", { - description = "Blue Netherrack Sword", - inventory_image = "nether_sword_netherrack_blue.png", +-- Nether Sword +minetest.register_tool("nether:sword_netherrack", { -- Modif MFF the entire tool + description = "Netherrack Sword", + inventory_image = "nether_sword_netherrack.png", tool_capabilities = { - full_punch_interval = 0.8, - max_drop_level=1, + full_punch_interval = 0.9, + max_drop_level=0, groupcaps={ - snappy={times={[1]=2.5, [2]=1.1, [3]=0.33}, uses=40, maxlevel=2}, + snappy={times={[2]=1.3, [3]=0.38}, uses=40, maxlevel=1}, }, - damage_groups = {fleshy=7}, + damage_groups = {fleshy=4}, }, }) -minetest.register_tool("nether:sword_white", { - description = "Siwtonic Sword", - inventory_image = "nether_sword_white.png", - wield_image = "nether_sword_white.png^[transformR90", +minetest.register_tool("nether:sword_netherrack_blue", { -- Modif MFF the entire tool + description = "Blue Netherrack Sword", + inventory_image = "nether_sword_netherrack_blue.png", tool_capabilities = { full_punch_interval = 0.7, max_drop_level=1, groupcaps={ - snappy={times={[1]=1.7, [2]=0.8, [3]=0.2}, uses=100, maxlevel=3}, + snappy={times={[1]=2.5, [2]=1.1, [3]=0.33}, uses=40, maxlevel=2}, }, - damage_groups = {fleshy=11}, + damage_groups = {fleshy=6}, + }, +}) + +minetest.register_tool("nether:sword_white", { -- Modif MFF the entire tool + description = "Siwtonic Sword", + inventory_image = "nether_sword_white.png", + wield_image = "nether_sword_white.png^[transformR90", + tool_capabilities = { + full_punch_interval = 0.6, + max_drop_level=1, + groupcaps={ + snappy={times={[1]=1.7, [2]=0.8, [3]=0.2}, uses=100, maxlevel=3}, + }, + damage_groups = {fleshy=8}, }, }) diff --git a/nether/pearl.lua b/nether/pearl.lua old mode 100644 new mode 100755 diff --git a/nether/portal.lua b/nether/portal.lua old mode 100644 new mode 100755 index 2a5c2ba..37a9573 --- a/nether/portal.lua +++ b/nether/portal.lua @@ -11,6 +11,9 @@ minetest.after(5, function() abm_allowed = true end) +nether.spawn_point = minetest.string_to_pos(minetest.setting_get("nether_static_spawnpoint") or "") +-- If nil then we use random spawn points + table.icontains = table.icontains or function(t, v) for _,i in ipairs(t) do if i == v then @@ -20,7 +23,7 @@ table.icontains = table.icontains or function(t, v) return false end -local players_in_nether = {} +nether.players_in_nether = {} -- only get info from file if nether prisons if nether_prisons then local file = io.open(minetest.get_worldpath()..'/nether_players', "r") @@ -28,14 +31,14 @@ if nether_prisons then local contents = file:read('*all') io.close(file) if contents then - players_in_nether = string.split(contents, " ") + nether.players_in_nether = string.split(contents, " ") end end end local function save_nether_players() local output = '' - for _,name in ipairs(players_in_nether) do + for _,name in ipairs(nether.players_in_nether) do output = output..name..' ' end local f = io.open(minetest.get_worldpath()..'/nether_players', "w") @@ -44,7 +47,7 @@ local function save_nether_players() end local update_background -if nether_prisons then +--if nether_prisons then function update_background(player, down) if down then player:set_sky({r=15, g=0, b=0}, "plain") @@ -52,9 +55,9 @@ if nether_prisons then player:set_sky(nil, "regular") end end -else - function update_background()end -end +--else +-- function update_background()end +--end -- returns nodename if area is generated, else calls generation function local function generated_or_generate(pos) @@ -77,6 +80,7 @@ local function get_player_died_target(player) target.y = portal_target + math.random(4) return target end +nether.get_player_died_target = get_player_died_target -- used for obsidian portal local function obsidian_teleport(player, pname) @@ -86,39 +90,44 @@ local function obsidian_teleport(player, pname) return true end if not mclike_portal then + -- Pick random for obsidian, poor people gotta suffer local target = vector.round(get_player_died_target(player)) if generated_or_generate(target) then player:moveto(target) - return true end + return true end return false end -- teleports players to nether or helps it -local function player_to_nether(player, safe) +function nether.player_to_nether(player, safe) local pname = player:get_player_name() - if table.icontains(players_in_nether, pname) then + if table.icontains(nether.players_in_nether, pname) then return end - players_in_nether[#players_in_nether+1] = pname + nether.players_in_nether[#nether.players_in_nether+1] = pname save_nether_players() if not safe then minetest.chat_send_player(pname, "For any reason you arrived here. Type /nether_help to find out things like craft recipes.") player:set_hp(0) if not nether_prisons then - player:moveto(get_player_died_target(player)) + if nether.spawn_point then + player:moveto(nether.spawn_point) + else + player:moveto(get_player_died_target(player)) + end end end update_background(player, true) end -local function player_from_nether(player) +function nether.player_from_nether(player) local pname = player:get_player_name() local changes - for n,i in ipairs(players_in_nether) do + for n,i in ipairs(nether.players_in_nether) do if i == pname then - table.remove(players_in_nether, n) + table.remove(nether.players_in_nether, n) changes = true end end @@ -138,7 +147,9 @@ local function player_exists(name) return false end --- Chatcommands (edited) written by sss + +-- Chatcommands removed +--[[ Chatcommands (edited) written by sss minetest.register_chatcommand("to_hell", { params = "[]", description = "Send someone to hell", @@ -176,20 +187,30 @@ minetest.register_chatcommand("from_hell", { minetest.chat_send_player(pname, "You are free now") player_from_nether(player) local pos = player:getpos() - player:moveto({x=pos.x, y=100, z=pos.z}) + local pos_togo = {x=pos.x, y=100, z=pos.z} + if minetest.setting_getbool("static_spawnpoint") ~= nil then + local stsp_conf = minetest.setting_get("static_spawnpoint") + pos_togo = {x = stsp_conf:split(",")[1]+0,y = stsp_conf:split(",")[2]+0,z = stsp_conf:split(",")[3]+0} + end + player:moveto(pos_togo) return true, pname.." is now out of the nether." end -}) +})]] if nether_prisons then -- randomly set player position when he/she dies in nether minetest.register_on_respawnplayer(function(player) local pname = player:get_player_name() - if not table.icontains(players_in_nether, pname) then + if not table.icontains(nether.players_in_nether, pname) then return end - local target = get_player_died_target(player) + local target + if nether.spawn_point then + target = nether.spawn_point + else + target = get_player_died_target(player) + end player:moveto(target) minetest.after(0, function(pname, target) -- fixes respawn bug @@ -206,7 +227,7 @@ if nether_prisons then for _,player in pairs(minetest.get_connected_players()) do local pname = player:get_player_name() local ppos = player:getpos() - if table.icontains(players_in_nether, pname) then + if table.icontains(nether.players_in_nether, pname) then if ppos.y > nether.start then player:moveto({x=ppos.x, y=portal_target, z=ppos.z}) update_background(player, true) @@ -225,15 +246,11 @@ if nether_prisons then end -- fix wrong player positions - local timer = 0 --doesn't work if the server lags - minetest.register_globalstep(function(dtime) - timer = timer + dtime; - if timer >= 2 then - --minetest.after(1, update_players) - update_players() - timer = 0 - end - end) + local function tick() + update_players() + minetest.after(2, tick) + end + tick() -- set background when player joins minetest.register_on_joinplayer(function(player) @@ -247,15 +264,16 @@ else -- test if player is in nether when he/she joins minetest.register_on_joinplayer(function(player) minetest.after(0, function(player) + local pname = player:get_player_name() if player:getpos().y < nether.start then - if not table.icontains(players_in_nether, pname) then - players_in_nether[#players_in_nether+1] = pname + if not table.icontains(nether.players_in_nether, pname) then + nether.players_in_nether[#nether.players_in_nether+1] = pname end return end - for i,name in pairs(players_in_nether) do + for i,name in pairs(nether.players_in_nether) do if name == pname then - players_in_nether[i] = nil + nether.players_in_nether[i] = nil return end end @@ -295,7 +313,7 @@ local particledef = { -- teleports player to neter (obsidian portal) local function obsi_teleport_player(player, pos, target) local pname = player:get_player_name() - if table.icontains(players_in_nether, pname) then + if table.icontains(nether.players_in_nether, pname) then return end @@ -310,7 +328,7 @@ local function obsi_teleport_player(player, pos, target) return end - players_in_nether[#players_in_nether+1] = pname + nether.players_in_nether[#nether.players_in_nether+1] = pname save_nether_players() update_background(player, true) @@ -645,40 +663,49 @@ function nether_port(player, pos) if not netherport(pos) then return end + minetest.sound_play("nether_teleporter", {to_player=player:get_player_name()}) --MFF crabman (5/09/2015) fix positional sound don't work to player minetest.sound_play("nether_teleporter", {pos=pos}) local meta = minetest.get_meta({x=pos.x, y=pos.y-1, z=pos.z}) if pos.y < nether.start then set_portal(known_portals_d, pos.z,pos.x, pos.y) - player_from_nether(player) + nether.player_from_nether(player) - local my = tonumber(meta:get_string("y")) - local y = get_portal(known_portals_u, pos.z,pos.x) - if y then - if y ~= my then - meta:set_string("y", y) - end + if minetest.setting_getbool("static_spawnpoint") then + local stsp_conf = minetest.setting_get("static_spawnpoint") + pos = minetest.string_to_pos(stsp_conf) else - y = my or 100 + local my = tonumber(meta:get_string("y")) + local y = get_portal(known_portals_u, pos.z,pos.x) + if y then + if y ~= my then + meta:set_string("y", y) + end + else + y = my or 100 + end + pos.y = y end - pos.y = y - player:moveto(pos) else - set_portal(known_portals_u, pos.z,pos.x, pos.y) - - local my = tonumber(meta:get_string("y")) - local y = get_portal(known_portals_d, pos.z,pos.x) - if y then - if y ~= my then - meta:set_string("y", y) - end + if nether.spawn_point then + pos = nether.spawn_point else - y = my or portal_target+math.random(4) - end - pos.y = y + set_portal(known_portals_u, pos.z,pos.x, pos.y) + local my = tonumber(meta:get_string("y")) + local y = get_portal(known_portals_d, pos.z,pos.x) + if y then + if y ~= my then + meta:set_string("y", y) + end + else + y = my or portal_target+math.random(4) + end + pos.y = y + + end player:moveto(pos) - player_to_nether(player, true) + nether.player_to_nether(player, true) end minetest.sound_play("nether_teleporter", {pos=pos}) return true diff --git a/nether/sounds/nether_dig.1.ogg b/nether/sounds/nether_dig.1.ogg old mode 100644 new mode 100755 index 4c49832..8e48c68 Binary files a/nether/sounds/nether_dig.1.ogg and b/nether/sounds/nether_dig.1.ogg differ diff --git a/nether/sounds/nether_dig.2.ogg b/nether/sounds/nether_dig.2.ogg old mode 100644 new mode 100755 index c69b45e..67c247d Binary files a/nether/sounds/nether_dig.2.ogg and b/nether/sounds/nether_dig.2.ogg differ diff --git a/nether/sounds/nether_dug.1.ogg b/nether/sounds/nether_dug.1.ogg old mode 100644 new mode 100755 index a6dfa9e..c0e07ef Binary files a/nether/sounds/nether_dug.1.ogg and b/nether/sounds/nether_dug.1.ogg differ diff --git a/nether/sounds/nether_dug.2.ogg b/nether/sounds/nether_dug.2.ogg old mode 100644 new mode 100755 index cc7666b..b888ae3 Binary files a/nether/sounds/nether_dug.2.ogg and b/nether/sounds/nether_dug.2.ogg differ diff --git a/nether/sounds/nether_extract_blood.1.ogg b/nether/sounds/nether_extract_blood.1.ogg old mode 100644 new mode 100755 index c69d486..2d6310a Binary files a/nether/sounds/nether_extract_blood.1.ogg and b/nether/sounds/nether_extract_blood.1.ogg differ diff --git a/nether/sounds/nether_extract_blood.2.ogg b/nether/sounds/nether_extract_blood.2.ogg old mode 100644 new mode 100755 index bf41821..1a1bb80 Binary files a/nether/sounds/nether_extract_blood.2.ogg and b/nether/sounds/nether_extract_blood.2.ogg differ diff --git a/nether/sounds/nether_extract_blood.3.ogg b/nether/sounds/nether_extract_blood.3.ogg old mode 100644 new mode 100755 index db3a39c..53d5659 Binary files a/nether/sounds/nether_extract_blood.3.ogg and b/nether/sounds/nether_extract_blood.3.ogg differ diff --git a/nether/sounds/nether_extract_blood.4.ogg b/nether/sounds/nether_extract_blood.4.ogg old mode 100644 new mode 100755 index 2ac3495..4336930 Binary files a/nether/sounds/nether_extract_blood.4.ogg and b/nether/sounds/nether_extract_blood.4.ogg differ diff --git a/nether/sounds/nether_extract_blood.5.ogg b/nether/sounds/nether_extract_blood.5.ogg old mode 100644 new mode 100755 index 5d628d9..3bab7a7 Binary files a/nether/sounds/nether_extract_blood.5.ogg and b/nether/sounds/nether_extract_blood.5.ogg differ diff --git a/nether/sounds/nether_extract_blood.6.ogg b/nether/sounds/nether_extract_blood.6.ogg old mode 100644 new mode 100755 index 618d6d6..36224f7 Binary files a/nether/sounds/nether_extract_blood.6.ogg and b/nether/sounds/nether_extract_blood.6.ogg differ diff --git a/nether/sounds/nether_extract_blood.7.ogg b/nether/sounds/nether_extract_blood.7.ogg old mode 100644 new mode 100755 index fd0a7fe..de89438 Binary files a/nether/sounds/nether_extract_blood.7.ogg and b/nether/sounds/nether_extract_blood.7.ogg differ diff --git a/nether/sounds/nether_footstep.1.ogg b/nether/sounds/nether_footstep.1.ogg old mode 100644 new mode 100755 index 15f31a0..c88624a Binary files a/nether/sounds/nether_footstep.1.ogg and b/nether/sounds/nether_footstep.1.ogg differ diff --git a/nether/sounds/nether_footstep.2.ogg b/nether/sounds/nether_footstep.2.ogg old mode 100644 new mode 100755 index fbc200a..4789f45 Binary files a/nether/sounds/nether_footstep.2.ogg and b/nether/sounds/nether_footstep.2.ogg differ diff --git a/nether/sounds/nether_footstep.3.ogg b/nether/sounds/nether_footstep.3.ogg old mode 100644 new mode 100755 index 1648043..7e838e1 Binary files a/nether/sounds/nether_footstep.3.ogg and b/nether/sounds/nether_footstep.3.ogg differ diff --git a/nether/sounds/nether_pearl.ogg b/nether/sounds/nether_pearl.ogg old mode 100644 new mode 100755 index 90dde6a..61a0fa5 Binary files a/nether/sounds/nether_pearl.ogg and b/nether/sounds/nether_pearl.ogg differ diff --git a/nether/sounds/nether_portal_usual.ogg b/nether/sounds/nether_portal_usual.ogg old mode 100644 new mode 100755 index cf1f84a..fd25624 Binary files a/nether/sounds/nether_portal_usual.ogg and b/nether/sounds/nether_portal_usual.ogg differ diff --git a/nether/sounds/nether_remove_leaf.1.ogg b/nether/sounds/nether_remove_leaf.1.ogg old mode 100644 new mode 100755 index 224b424..836cdaa Binary files a/nether/sounds/nether_remove_leaf.1.ogg and b/nether/sounds/nether_remove_leaf.1.ogg differ diff --git a/nether/sounds/nether_remove_leaf.2.ogg b/nether/sounds/nether_remove_leaf.2.ogg old mode 100644 new mode 100755 index c02ef1c..b1d00d2 Binary files a/nether/sounds/nether_remove_leaf.2.ogg and b/nether/sounds/nether_remove_leaf.2.ogg differ diff --git a/nether/sounds/nether_remove_leaf.3.ogg b/nether/sounds/nether_remove_leaf.3.ogg old mode 100644 new mode 100755 index c5b79ba..d014dcf Binary files a/nether/sounds/nether_remove_leaf.3.ogg and b/nether/sounds/nether_remove_leaf.3.ogg differ diff --git a/nether/sounds/nether_teleporter.1.ogg b/nether/sounds/nether_teleporter.1.ogg old mode 100644 new mode 100755 index 65e4803..700b8af Binary files a/nether/sounds/nether_teleporter.1.ogg and b/nether/sounds/nether_teleporter.1.ogg differ diff --git a/nether/sounds/nether_teleporter.2.ogg b/nether/sounds/nether_teleporter.2.ogg old mode 100644 new mode 100755 index eaafec9..0977e3d Binary files a/nether/sounds/nether_teleporter.2.ogg and b/nether/sounds/nether_teleporter.2.ogg differ diff --git a/nether/sounds/nether_teleporter.3.ogg b/nether/sounds/nether_teleporter.3.ogg old mode 100644 new mode 100755 index 949dd93..f4601e5 Binary files a/nether/sounds/nether_teleporter.3.ogg and b/nether/sounds/nether_teleporter.3.ogg differ diff --git a/nether/textures/nether_axe_netherrack.png b/nether/textures/nether_axe_netherrack.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_axe_netherrack_blue.png b/nether/textures/nether_axe_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_axe_white.png b/nether/textures/nether_axe_white.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_bark.png b/nether/textures/nether_bark.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood.png b/nether/textures/nether_blood.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_cooked.png b/nether/textures/nether_blood_cooked.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_empty.png b/nether/textures/nether_blood_empty.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_extracted.png b/nether/textures/nether_blood_extracted.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_extractor.png b/nether/textures/nether_blood_extractor.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_side.png b/nether/textures/nether_blood_side.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_side_cooked.png b/nether/textures/nether_blood_side_cooked.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_side_empty.png b/nether/textures/nether_blood_side_empty.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_stem.png b/nether/textures/nether_blood_stem.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_stem_cooked.png b/nether/textures/nether_blood_stem_cooked.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_stem_empty.png b/nether/textures/nether_blood_stem_empty.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_stem_top.png b/nether/textures/nether_blood_stem_top.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_stem_top_cooked.png b/nether/textures/nether_blood_stem_top_cooked.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_stem_top_empty.png b/nether/textures/nether_blood_stem_top_empty.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_top.png b/nether/textures/nether_blood_top.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_top_cooked.png b/nether/textures/nether_blood_top_cooked.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_blood_top_empty.png b/nether/textures/nether_blood_top_empty.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt.png b/nether/textures/nether_dirt.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_normal.png b/nether/textures/nether_dirt_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_top.png b/nether/textures/nether_dirt_top.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_top_normal.png b/nether/textures/nether_dirt_top_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_top_side.png b/nether/textures/nether_dirt_top_side.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_top_side_normal.png b/nether/textures/nether_dirt_top_side_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_transition.png b/nether/textures/nether_dirt_transition.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_dirt_transition_normal.png b/nether/textures/nether_dirt_transition_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fim.png b/nether/textures/nether_fim.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_forest_planks.png b/nether/textures/nether_forest_planks.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_forest_wood.png b/nether/textures/nether_forest_wood.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_forest_wood_normal.png b/nether/textures/nether_forest_wood_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fruit.png b/nether/textures/nether_fruit.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fruit_bottom.png b/nether/textures/nether_fruit_bottom.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fruit_leaf.png b/nether/textures/nether_fruit_leaf.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fruit_leaves.png b/nether/textures/nether_fruit_leaves.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fruit_no_leaf.png b/nether/textures/nether_fruit_no_leaf.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_fruit_top.png b/nether/textures/nether_fruit_top.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_glowflower.png b/nether/textures/nether_glowflower.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_grass.png b/nether/textures/nether_grass.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_grass_big.png b/nether/textures/nether_grass_big.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_grass_dried.png b/nether/textures/nether_grass_dried.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_grass_middle.png b/nether/textures/nether_grass_middle.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_grass_small.png b/nether/textures/nether_grass_small.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_hotbed.png b/nether/textures/nether_hotbed.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_leaves.png b/nether/textures/nether_leaves.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack.png b/nether/textures/nether_netherrack.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_black.png b/nether/textures/nether_netherrack_black.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_black_normal.png b/nether/textures/nether_netherrack_black_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_blue.png b/nether/textures/nether_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_blue_normal.png b/nether/textures/nether_netherrack_blue_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_brick.png b/nether/textures/nether_netherrack_brick.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_brick_black.png b/nether/textures/nether_netherrack_brick_black.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_brick_blue.png b/nether/textures/nether_netherrack_brick_blue.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_normal.png b/nether/textures/nether_netherrack_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_soil.png b/nether/textures/nether_netherrack_soil.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_soil_normal.png b/nether/textures/nether_netherrack_soil_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_tiled.png b/nether/textures/nether_netherrack_tiled.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_netherrack_tiled_normal.png b/nether/textures/nether_netherrack_tiled_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_pearl.png b/nether/textures/nether_pearl.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_pick_mushroom.png b/nether/textures/nether_pick_mushroom.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_pick_netherrack.png b/nether/textures/nether_pick_netherrack.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_pick_netherrack_blue.png b/nether/textures/nether_pick_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_pick_white.png b/nether/textures/nether_pick_white.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_pick_wood.png b/nether/textures/nether_pick_wood.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_portal_particle.png b/nether/textures/nether_portal_particle.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_portal_stuff.png b/nether/textures/nether_portal_stuff.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_portal_stuff_normal.png b/nether/textures/nether_portal_stuff_normal.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_sapling.png b/nether/textures/nether_sapling.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_shovel_netherrack.png b/nether/textures/nether_shovel_netherrack.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_shovel_netherrack_blue.png b/nether/textures/nether_shovel_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_shovel_white.png b/nether/textures/nether_shovel_white.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_shroom_stem.png b/nether/textures/nether_shroom_stem.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_shroom_top.png b/nether/textures/nether_shroom_top.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_stick.png b/nether/textures/nether_stick.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_sword_netherrack.png b/nether/textures/nether_sword_netherrack.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_sword_netherrack_blue.png b/nether/textures/nether_sword_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_sword_white.png b/nether/textures/nether_sword_white.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_teleporter.png b/nether/textures/nether_teleporter.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_torch.png b/nether/textures/nether_torch.png old mode 100644 new mode 100755 index 317c880..9a5be9b Binary files a/nether/textures/nether_torch.png and b/nether/textures/nether_torch.png differ diff --git a/nether/textures/nether_torch_on_ceiling.png b/nether/textures/nether_torch_on_ceiling.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_torch_on_floor.png b/nether/textures/nether_torch_on_floor.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_transparent.png b/nether/textures/nether_transparent.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_tree.png b/nether/textures/nether_tree.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_tree_corner.png b/nether/textures/nether_tree_corner.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_tree_sapling.png b/nether/textures/nether_tree_sapling.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_tree_top.png b/nether/textures/nether_tree_top.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_vine.png b/nether/textures/nether_vine.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_vine_normal.png b/nether/textures/nether_vine_normal.png index 8c3c777..c6a3c9c 100644 Binary files a/nether/textures/nether_vine_normal.png and b/nether/textures/nether_vine_normal.png differ diff --git a/nether/textures/nether_white.png b/nether/textures/nether_white.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_wood.png b/nether/textures/nether_wood.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_wood_cooked.png b/nether/textures/nether_wood_cooked.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_wood_empty.png b/nether/textures/nether_wood_empty.png old mode 100644 new mode 100755 diff --git a/nether/textures/nether_wood_empty_normal.png b/nether/textures/nether_wood_empty_normal.png old mode 100644 new mode 100755 diff --git a/nether/weird_mapgen_noise.lua b/nether/weird_mapgen_noise.lua old mode 100644 new mode 100755