diff --git a/mods/boats b/mods/boats new file mode 160000 index 0000000000000000000000000000000000000000..a7534e938834c1a0322e49df796f613ca1f55880 --- /dev/null +++ b/mods/boats @@ -0,0 +1 @@ +Subproject commit a7534e938834c1a0322e49df796f613ca1f55880 diff --git a/mods/boats/README.txt b/mods/boats/README.txt deleted file mode 100644 index 3fa40f252e78695073f0e62a64229a81972fc2cd..0000000000000000000000000000000000000000 --- a/mods/boats/README.txt +++ /dev/null @@ -1,20 +0,0 @@ -Minetest 0.4 mod: boats -======================= -by PilzAdam, slightly modified for NeXt -changed by TenPlus1 to add some new features - - boat is destroyed when crashing (drops 3 wood) - - boat turns faster - - used model from ds_rowboat mod - -License of source code: ------------------------ -WTFPL - -License of media (textures and sounds): ---------------------------------------- -WTFPL - -Authors of media files: ------------------------ -textures: Zeg9 -model: thetoon and Zeg9, modified by PavelS(SokolovPavel) diff --git a/mods/boats/depends.txt b/mods/boats/depends.txt deleted file mode 100644 index 7c506cfbeac79d4052e0d012a7371cb7ca0b2bb1..0000000000000000000000000000000000000000 --- a/mods/boats/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -mobs? \ No newline at end of file diff --git a/mods/boats/init.lua b/mods/boats/init.lua deleted file mode 100644 index 136e09f41ddc50da17e340074f952daceb75fc40..0000000000000000000000000000000000000000 --- a/mods/boats/init.lua +++ /dev/null @@ -1,336 +0,0 @@ -handlers = {} - -minetest.register_on_leaveplayer(function(player) - handlers[player:get_player_name()] = nil -end) - --- --- Helper functions --- - -local function is_water(pos) - - return minetest.get_item_group(minetest.get_node(pos).name, "water") ~= 0 -end - -local function get_sign(i) - - if i == 0 then - return 0 - else - return i / math.abs(i) - end -end - -local function get_velocity(v, yaw, y) - - local x = -math.sin(yaw) * v - local z = math.cos(yaw) * v - - return {x = x, y = y, z = z} -end - -local square = math.sqrt - -local function get_v(v) - - return square(v.x *v.x + v.z *v.z) -end - --- --- Boat entity --- - -local boat = { - physical = true, - --collisionbox = {-0.5, -0.4, -0.5, 0.5, 0.3, 0.5}, -- rowboat - collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5}, -- boat - visual = "mesh", - --mesh = "rowboat.x", - mesh = "boat.obj", - textures = {"default_wood.png"}, - driver = nil, - v = 0, - last_v = 0, - removed = false -} - -function boat.on_rightclick(self, clicker) - - if not clicker or not clicker:is_player() then - return - end - - local name = clicker:get_player_name() - - if self.driver and clicker == self.driver then - - handlers[name] = nil - self.driver = nil - - clicker:set_detach() - - default.player_attached[name] = false - default.player_set_animation(clicker, "stand" , 30) - - local pos = clicker:getpos() - - minetest.after(0.1, function() - clicker:setpos({x=pos.x, y=pos.y+0.2, z=pos.z}) - end) - - elseif not self.driver then - - if handlers[name] and handlers[name].driver then - handlers[name].driver = nil - end - - handlers[name] = self.object:get_luaentity() - self.driver = clicker - - clicker:set_attach(self.object, "", - {x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0}) - - default.player_attached[name] = true - - minetest.after(0.2, function() - default.player_set_animation(clicker, "sit" , 30) - end) - - self.object:setyaw(clicker:get_look_yaw() - math.pi / 2) - end -end - -function boat.on_activate(self, staticdata, dtime_s) - - if (mobs and mobs.entity and mobs.entity == false) - or not self then - self.object:remove() - return - end - - self.object:set_armor_groups({immortal = 1}) - self.v = 0 - self.v2 = self.v - self.last_v = self.v - self.count = 0 -end - -function boat.on_punch(self, puncher) - - if not puncher or not puncher:is_player() or self.removed then - return - end - - if self.driver and puncher == self.driver then - local name = puncher:get_player_name() - puncher:set_detach() - self.driver = nil - handlers[name] = nil - default.player_attached[name] = false - end - - if not self.driver then - - self.removed = true - - if not minetest.setting_getbool("creative_mode") then - - local inv = puncher:get_inventory() - - if inv:room_for_item("main", "boats:boat") then - inv:add_item("main", "boats:boat") - else - minetest.add_item(self.object:getpos(), "boats:boat") - end - end - - self.object:remove() - end -end - -function boat.on_step(self, dtime) - - -- after 10 seconds remove boat and drop as item if not boarded - self.count = self.count + dtime - - if self.count > 10 then - minetest.add_item(self.object:getpos(), "boats:boat") - self.object:remove() - return - end - - self.v = get_v(self.object:getvelocity()) * get_sign(self.v) - - if self.driver then - - self.count = 0 - - local ctrl = self.driver:get_player_control() - local yaw = self.object:getyaw() - - if ctrl.up then - self.v = self.v + 0.1 - elseif ctrl.down then - self.v = self.v - 0.1 - end - - if ctrl.left then - - if self.v < 0 then - self.object:setyaw(yaw - (1 + dtime) * 0.08) -- 0.03 changed to speed up turning - else - self.object:setyaw(yaw + (1 + dtime) * 0.08) -- 0.03 - end - - elseif ctrl.right then - - if self.v < 0 then - self.object:setyaw(yaw + (1 + dtime) * 0.08) -- 0.03 - else - self.object:setyaw(yaw - (1 + dtime) * 0.08) -- 0.03 - end - end - end - - local velo = self.object:getvelocity() - - if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then - --self.object:setpos(self.object:getpos()) - return - end - - local s = get_sign(self.v) - self.v = self.v - 0.02 * s - - if s ~= get_sign(self.v) then - - self.object:setvelocity({x = 0, y = 0, z = 0}) - self.v = 0 - - return - end - - if math.abs(self.v) > 5 then - self.v = 5 * get_sign(self.v) - end - - local p = self.object:getpos() - local new_velo = {x = 0, y = 0, z = 0} - local new_acce = {x = 0, y = 0, z = 0} - - p.y = p.y - 0.5 - - if not is_water(p) then - - local nodedef = minetest.registered_nodes[minetest.get_node(p).name] - - if (not nodedef) or nodedef.walkable then - self.v = 0 - new_acce = {x = 0, y = 0, z = 0} -- y was 1 - else - new_acce = {x = 0, y = -9.8, z = 0} - end - - new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y) - --self.object:setpos(self.object:getpos()) - else - p.y = p.y + 1 - - if is_water(p) then - - local y = self.object:getvelocity().y - - if y >= 5 then - y = 5 - elseif y < 0 then - new_acce = {x = 0, y = 20, z = 0} - else - new_acce = {x = 0, y = 5, z = 0} - end - - new_velo = get_velocity(self.v, self.object:getyaw(), y) - --self.object:setpos(self.object:getpos()) - else - new_acce = {x = 0, y = 0, z = 0} - - if math.abs(self.object:getvelocity().y) < 1 then - local pos = self.object:getpos() - pos.y = math.floor(pos.y) + 0.5 - self.object:setpos(pos) - new_velo = get_velocity(self.v, self.object:getyaw(), 0) - else - new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y) - --self.object:setpos(self.object:getpos()) - end - end - end - - self.object:setvelocity(new_velo) - self.object:setacceleration(new_acce) - - -- if boat comes to sudden stop then it has crashed, destroy boat and drop 3x wood - if self.v2 - self.v >= 3 then - - if self.driver then ---print ("Crash! with driver", self.v2 - self.v) - self.driver:set_detach() - default.player_attached[self.driver:get_player_name()] = false - default.player_set_animation(self.driver, "stand" , 30) - else ---print ("Crash! no driver") - end - - minetest.add_item(self.object:getpos(), "default:wood 3") - - self.object:remove() - - return - end - - self.v2 = self.v - -end - -minetest.register_entity("boats:boat", boat) - -minetest.register_craftitem("boats:boat", { - description = "Boat", - --inventory_image = "rowboat_inventory.png", - inventory_image = "boats_inventory.png", - --wield_image = "rowboat_wield.png", - wield_image = "boats_wield.png", - wield_scale = {x = 2, y = 2, z = 1}, - liquids_pointable = true, - - on_place = function(itemstack, placer, pointed_thing) - - if pointed_thing.type ~= "node" - or not is_water(pointed_thing.under) then - return - end - - pointed_thing.under.y = pointed_thing.under.y + 0.5 - - minetest.add_entity(pointed_thing.under, "boats:boat") - - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - - return itemstack - end, -}) - -minetest.register_craft({ - output = "boats:boat", - recipe = { - {"", "", ""}, - {"group:wood", "", "group:wood"}, - {"group:wood", "group:wood", "group:wood"}, - }, -}) - -minetest.register_alias("ds_rowboat:ds_rowboat", "boats:boat") - -print ("[MOD] Boats loaded") diff --git a/mods/boats/models/boat.obj b/mods/boats/models/boat.obj deleted file mode 100644 index 0f21e47fd7bc9777309b987577695f3a49aab9cf..0000000000000000000000000000000000000000 --- a/mods/boats/models/boat.obj +++ /dev/null @@ -1,358 +0,0 @@ -# Blender v2.76 (sub 11) OBJ File: 'boat.blend' -# www.blender.org -mtllib boat.mtl -o boats_boat -v -6.786140 -3.033999 -9.415440 -v -6.786140 -1.967150 -9.415440 -v -6.786140 -1.967150 8.793510 -v -6.786140 -3.033999 8.793510 -v 5.732520 -1.967150 -9.415440 -v 5.732520 -3.033999 -9.415440 -v 5.732520 -3.033999 8.793510 -v 5.732520 -1.967150 8.793510 -v -2.233900 -3.033999 -9.415440 -v -2.233900 -1.967150 -9.415440 -v -2.233900 -1.967150 8.793510 -v -2.233900 -3.033999 8.793510 -v 2.318340 -3.033999 -9.415440 -v 2.318340 -1.967150 -9.415440 -v 2.318340 -1.967150 8.793510 -v 2.318340 -3.033999 8.793510 -v -3.371960 -3.033999 8.793510 -v -3.371960 -1.967150 8.793510 -v -3.371960 -1.967150 -9.415440 -v -3.371960 -3.033999 -9.415440 -v 2.318340 0.276645 8.793510 -v 1.180280 -1.967150 8.793510 -v 5.732520 0.276645 8.793510 -v 5.732520 1.039180 8.793510 -v 6.870580 0.276645 8.793510 -v 6.870580 -1.967150 8.793510 -v 2.318340 1.039180 8.793510 -v 1.180280 0.276645 8.793510 -v 1.180280 1.039180 8.793510 -v 1.180280 -3.033999 8.793510 -v -2.233900 0.276645 8.793510 -v -3.371960 0.276645 8.793510 -v -2.233900 1.039180 8.793510 -v -3.371960 1.039180 8.793510 -v -6.786140 0.276645 8.793510 -v -7.786200 0.276645 8.793510 -v -7.786200 -1.967150 8.793510 -v -6.786140 1.039180 8.793510 -v 1.180280 -1.967150 -9.415440 -v 1.180280 -3.033999 -9.415440 -v 2.318340 0.276645 -9.415440 -v 1.180280 0.276645 -9.415440 -v 2.318340 1.039180 -9.415440 -v 5.732520 0.276645 -9.415440 -v 6.870580 -1.967150 -9.415440 -v 5.732520 1.039180 -9.415440 -v 6.870580 0.276645 -9.415440 -v 0.042220 1.039180 -9.415440 -v 1.180280 1.039180 -9.415440 -v 0.042220 -1.967150 -9.415440 -v -1.095840 -1.967150 -9.415440 -v -2.233900 0.276645 -9.415440 -v -3.371960 0.276645 -9.415440 -v -2.233900 1.039180 -9.415440 -v -1.095840 1.039180 -9.415440 -v -3.371960 1.039180 -9.415440 -v -6.786140 0.276645 -9.415440 -v -6.786140 1.039180 -9.415440 -v -7.786200 -1.967150 -9.415440 -v -7.786200 0.276645 -9.415440 -v -1.095840 0.156645 -12.044100 -v -1.095840 -4.601110 -9.415440 -v -1.095840 1.039181 -10.802900 -v -1.095840 2.868579 -10.802900 -v -1.095840 2.868580 -7.883420 -v -1.095840 3.746069 -12.034100 -v -1.095840 3.746070 -7.883420 -v -1.095840 0.156645 -14.294900 -v -1.095840 -4.601110 -14.284900 -v 0.042220 -4.601110 -14.284900 -v 0.042220 -4.601110 -9.415440 -v 0.042220 1.039181 -10.802900 -v 0.042220 0.156645 -12.044100 -v 0.042220 2.868579 -10.802900 -v 0.042220 0.156645 -14.294900 -v 0.042220 3.746069 -12.034100 -v 0.042220 3.746070 -7.883420 -v 0.042220 2.868580 -7.883420 -v -1.096322 -3.033999 -9.415440 -v 0.044046 -3.035397 -9.415440 -vt 1.000000 0.187500 -vt -1.000000 0.312500 -vt 1.000000 0.312500 -vt 0.687500 1.000000 -vt 0.500000 0.875000 -vt 0.500000 0.625000 -vt -1.000000 0.062500 -vt 1.000000 0.062500 -vt 1.000000 -0.000000 -vt -1.000000 0.125000 -vt 1.000000 0.125000 -vt 0.437500 0.125000 -vt 0.312500 0.500000 -vt 0.312500 0.125000 -vt 1.000000 0.625000 -vt -1.000000 0.500000 -vt 1.000000 0.500000 -vt 0.187500 0.687500 -vt -0.187500 0.687500 -vt -0.187500 0.312500 -vt 1.000000 0.812500 -vt -1.000000 0.937500 -vt -1.000000 0.812500 -vt 0.812500 0.687500 -vt 1.187500 0.687500 -vt 0.812500 0.312500 -vt 1.000000 0.562500 -vt 0.312500 0.437500 -vt 1.000000 0.437500 -vt 1.000000 0.750000 -vt -1.000000 0.875000 -vt -1.000000 0.750000 -vt -1.000000 1.000000 -vt 1.000000 1.000000 -vt 0.437500 0.625000 -vt 0.562500 0.437500 -vt 0.562500 0.625000 -vt -1.000000 0.437500 -vt -1.000000 0.000000 -vt 0.500000 0.062500 -vt 0.375000 0.750000 -vt 0.500000 0.750000 -vt -1.000000 0.250000 -vt -1.000000 0.687500 -vt 1.000000 0.687500 -vt 0.625000 0.375000 -vt 1.000000 0.375000 -vt 1.000000 0.250000 -vt 1.000000 0.937500 -vt 0.437500 0.812500 -vt 0.312500 0.312500 -vt 0.312500 0.812500 -vt 0.437500 0.312500 -vt 0.437500 0.437500 -vt 0.687500 0.812500 -vt 0.000000 0.687500 -vt 0.000000 0.812500 -vt -1.000000 0.562500 -vt 0.875000 0.812500 -vt 0.875000 0.687500 -vt 0.250000 0.312500 -vt 0.562500 0.187500 -vt 0.250000 0.187500 -vt -1.000000 0.187500 -vt 0.312500 0.625000 -vt 0.312500 0.187500 -vt 0.312500 -0.187500 -vt 1.000000 -0.187500 -vt 0.687500 0.500000 -vt -0.000000 1.000000 -vt 0.000000 0.875000 -vt 0.437500 0.500000 -vt -1.000000 0.625000 -vt 0.812500 0.187500 -vt 1.187500 0.187500 -vt 1.187500 0.312500 -vt 1.312500 0.312500 -vt 1.312500 0.687500 -vt 0.687500 0.187500 -vt 0.687500 0.312500 -vt 1.187500 0.812500 -vt 0.812500 0.812500 -vt 0.187500 0.312500 -vt 0.312500 0.687500 -vt 0.687500 0.687500 -vt -0.187500 0.187500 -vt 0.187500 0.187500 -vt -0.312500 0.687500 -vt -0.312500 0.312500 -vt 0.187500 0.812500 -vt -0.187500 0.812500 -vt 0.437500 0.687500 -vt 0.437500 0.187500 -vt 0.562500 0.812500 -vt 0.562500 0.687500 -vt 0.312500 0.562500 -vt 1.000000 0.875000 -vt 0.375000 0.062500 -vt -1.000000 0.375000 -vt 0.625000 0.500000 -vt 0.875000 0.562500 -vt 0.937500 0.812500 -vt 0.937500 0.687500 -vt 0.875000 0.937500 -vt 0.562500 0.312500 -vn -1.000000 0.000000 0.000000 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -0.002100 -1.000000 -vn 0.001200 -1.000000 0.000000 -vn 0.000000 0.002800 -1.000000 -vn -0.001200 -1.000000 0.000200 -g boats_boat_boats_boat_None -usemtl None -s off -f 41/1/1 27/2/1 43/3/1 -f 76/4/2 74/5/2 72/6/2 -f 8/7/2 6/1/2 5/8/2 -f 15/9/1 13/10/1 16/11/1 -f 51/12/3 71/13/3 50/14/3 -f 56/15/2 32/16/2 53/17/2 -f 15/18/3 8/19/3 23/20/3 -f 22/21/2 40/22/2 39/23/2 -f 19/24/4 2/25/4 53/26/4 -f 70/27/5 62/28/5 69/29/5 -f 11/30/5 19/31/5 10/32/5 -f 4/15/5 20/33/5 17/34/5 -f 72/35/3 64/36/3 63/37/3 -f 13/8/5 7/38/5 16/7/5 -f 23/39/6 47/11/6 44/9/6 -f 68/40/7 70/41/7 69/42/7 -f 80/43/8 40/10/8 30/11/8 -f 3/15/1 1/32/1 4/30/1 -f 20/44/2 18/27/2 17/45/2 -f 74/17/5 65/46/5 64/47/5 -f 31/43/1 54/47/1 52/48/1 -f 22/47/5 14/43/5 15/48/5 -f 46/1/2 23/7/2 44/8/2 -f 57/21/1 38/22/1 58/49/1 -f 61/50/9 76/51/9 73/52/9 -f 37/45/5 2/23/5 3/21/5 -f 78/28/3 67/53/3 65/54/3 -f 64/5/1 66/4/1 63/6/1 -f 76/55/6 67/56/6 77/57/6 -f 47/17/2 26/10/2 45/11/2 -f 5/16/5 26/47/5 8/17/5 -f 33/58/6 48/59/6 55/60/6 -f 29/38/2 42/3/2 49/29/2 -f 32/44/6 52/21/6 53/45/6 -f 58/15/6 34/33/6 56/34/6 -f 27/7/6 46/29/6 43/8/6 -f 73/61/6 68/62/6 61/63/6 -f 21/58/6 42/29/6 28/38/6 -f 11/29/1 9/58/1 12/27/1 -f 59/45/1 36/2/1 60/3/1 -f 60/9/6 35/10/6 57/11/6 -f 41/1/1 21/64/1 27/2/1 -f 72/6/2 48/65/2 50/66/2 -f 50/66/2 71/67/2 70/68/2 -f 70/68/2 75/17/2 73/69/2 -f 76/4/2 77/70/2 74/5/2 -f 77/70/2 78/71/2 74/5/2 -f 50/66/2 70/68/2 73/69/2 -f 73/69/2 76/4/2 72/6/2 -f 72/6/2 50/66/2 73/69/2 -f 8/7/2 7/64/2 6/1/2 -f 15/9/1 14/39/1 13/10/1 -f 51/12/3 62/72/3 71/13/3 -f 56/15/2 34/73/2 32/16/2 -f 32/26/3 34/74/3 38/75/3 -f 35/76/3 36/77/3 37/78/3 -f 32/26/3 38/75/3 35/76/3 -f 29/66/3 33/79/3 31/80/3 -f 32/26/3 35/76/3 3/25/3 -f 28/51/3 29/66/3 31/80/3 -f 31/80/3 32/26/3 18/24/3 -f 3/25/3 4/81/3 17/82/3 -f 35/76/3 37/78/3 3/25/3 -f 21/83/3 28/51/3 22/84/3 -f 3/25/3 17/82/3 18/24/3 -f 11/85/3 12/55/3 30/52/3 -f 32/26/3 3/25/3 18/24/3 -f 11/85/3 30/52/3 22/84/3 -f 31/80/3 18/24/3 11/85/3 -f 24/86/3 27/87/3 21/83/3 -f 28/51/3 31/80/3 11/85/3 -f 11/85/3 22/84/3 28/51/3 -f 24/86/3 21/83/3 23/20/3 -f 26/88/3 25/89/3 23/20/3 -f 23/20/3 21/83/3 15/18/3 -f 15/18/3 16/90/3 7/91/3 -f 21/83/3 22/84/3 15/18/3 -f 8/19/3 26/88/3 23/20/3 -f 15/18/3 7/91/3 8/19/3 -f 22/21/2 30/49/2 40/22/2 -f 47/89/4 45/88/4 5/19/4 -f 5/19/4 6/91/4 13/90/4 -f 5/19/4 13/90/4 14/18/4 -f 44/20/4 47/89/4 5/19/4 -f 43/87/4 46/86/4 44/20/4 -f 41/83/4 43/87/4 44/20/4 -f 44/20/4 5/19/4 14/18/4 -f 39/84/4 40/52/4 80/50/4 -f 44/20/4 14/18/4 41/83/4 -f 42/51/4 41/83/4 39/84/4 -f 39/84/4 80/50/4 50/92/4 -f 41/83/4 14/18/4 39/84/4 -f 48/93/4 49/66/4 42/51/4 -f 50/92/4 48/93/4 42/51/4 -f 80/50/4 79/94/4 50/92/4 -f 50/92/4 42/51/4 39/84/4 -f 54/79/4 55/62/4 52/80/4 -f 50/92/4 79/94/4 51/95/4 -f 52/80/4 55/62/4 51/95/4 -f 51/95/4 79/94/4 10/85/4 -f 79/94/4 9/55/4 10/85/4 -f 53/26/4 52/80/4 10/85/4 -f 58/75/4 56/74/4 53/26/4 -f 59/78/4 60/77/4 57/76/4 -f 57/76/4 58/75/4 53/26/4 -f 52/80/4 51/95/4 10/85/4 -f 19/24/4 20/82/4 1/81/4 -f 53/26/4 10/85/4 19/24/4 -f 59/78/4 57/76/4 2/25/4 -f 19/24/4 1/81/4 2/25/4 -f 2/25/4 57/76/4 53/26/4 -f 70/27/5 71/96/5 62/28/5 -f 11/30/5 18/97/5 19/31/5 -f 4/15/5 1/73/5 20/33/5 -f 72/35/3 74/54/3 64/36/3 -f 13/8/5 6/29/5 7/38/5 -f 23/39/6 25/10/6 47/11/6 -f 68/40/7 75/98/7 70/41/7 -f 30/11/5 12/17/5 79/99/5 -f 79/99/10 80/43/10 30/11/10 -f 12/17/5 9/16/5 79/99/5 -f 3/15/1 2/73/1 1/32/1 -f 20/44/2 19/58/2 18/27/2 -f 74/17/5 78/100/5 65/46/5 -f 31/43/1 33/99/1 54/47/1 -f 22/47/5 39/99/5 14/43/5 -f 46/1/2 24/64/2 23/7/2 -f 57/21/1 35/23/1 38/22/1 -f 61/50/9 66/53/9 76/51/9 -f 37/45/5 59/44/5 2/23/5 -f 78/28/3 77/51/3 67/53/3 -f 62/67/1 51/66/1 69/68/1 -f 51/66/1 55/65/1 63/6/1 -f 68/17/1 69/68/1 61/69/1 -f 61/69/1 69/68/1 51/66/1 -f 61/69/1 51/66/1 63/6/1 -f 65/71/1 67/70/1 64/5/1 -f 61/69/1 63/6/1 66/4/1 -f 64/5/1 67/70/1 66/4/1 -f 76/55/6 66/85/6 67/56/6 -f 47/17/2 25/16/2 26/10/2 -f 5/16/5 45/99/5 26/47/5 -f 55/60/6 54/101/6 33/58/6 -f 33/58/6 29/22/6 48/59/6 -f 48/59/6 72/102/6 63/103/6 -f 29/22/6 49/104/6 48/59/6 -f 48/59/6 63/103/6 55/60/6 -f 29/38/2 28/2/2 42/3/2 -f 32/44/6 31/23/6 52/21/6 -f 58/15/6 38/73/6 34/33/6 -f 27/7/6 24/38/6 46/29/6 -f 73/61/6 75/105/6 68/62/6 -f 21/58/6 41/27/6 42/29/6 -f 11/29/1 10/38/1 9/58/1 -f 59/45/1 37/44/1 36/2/1 -f 60/9/6 36/39/6 35/10/6 diff --git a/mods/boats/models/rowboat.x b/mods/boats/models/rowboat.x deleted file mode 100644 index 73a61df38e229bda06ed30570f2b758bfb6d3161..0000000000000000000000000000000000000000 --- a/mods/boats/models/rowboat.x +++ /dev/null @@ -1,760 +0,0 @@ -xof 0303txt 0032 - -Frame Root { - FrameTransformMatrix { - 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000,-0.000000, 1.000000, 0.000000, - 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 0.000000, 0.000000, 1.000000;; - } - Frame Cube_000 { - FrameTransformMatrix { - 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 0.000000, 1.000000, 0.000000, - 0.000000, 0.000000, 0.000000, 1.000000;; - } - Mesh { // Cube_000 mesh - 240; - 6.000000; 3.999999; 2.376923;, - 5.999998;-8.000001; 2.376923;, - 5.999998;-8.000001; 4.376923;, - 6.000001; 3.999999; 4.376923;, - -2.000000; 8.000000; 2.376923;, - 2.000000; 8.000000; 2.376923;, - 2.000001; 8.000000; 4.376923;, - -1.999999; 8.000000; 4.376923;, - -6.000000; 4.000000; 4.376923;, - -6.000001;-8.000000; 4.376923;, - -6.000001;-7.999999; 2.376923;, - -6.000000; 4.000000; 2.376923;, - -3.999999; 6.000001; 2.376923;, - -1.999999; 6.000000; 2.376923;, - -2.000001;-8.000002; 2.376923;, - -4.000001;-8.000000; 2.376923;, - -2.000000; 4.000000;-1.623077;, - -2.000001;-7.999999;-1.623077;, - 1.999999;-8.000001;-1.623077;, - 2.000000; 4.000000;-1.623077;, - -2.000000; 4.000000; 0.376923;, - 2.000000; 3.999999; 0.376923;, - 1.999999;-8.000001; 0.376923;, - -2.000001;-8.000000; 0.376923;, - -2.000000; 4.000000;-1.623077;, - 2.000000; 4.000000;-1.623077;, - 2.000000; 3.999999; 0.376923;, - -2.000000; 4.000000; 0.376923;, - 2.000000; 4.000000;-1.623077;, - 1.999999;-8.000001;-1.623077;, - 1.999999;-8.000001; 0.376923;, - 2.000000; 3.999999; 0.376923;, - 1.999999;-8.000001;-1.623077;, - -2.000001;-7.999999;-1.623077;, - -2.000001;-8.000000; 0.376923;, - 1.999999;-8.000001; 0.376923;, - -2.000000; 4.000000; 0.376923;, - -2.000001;-8.000000; 0.376923;, - -2.000001;-7.999999;-1.623077;, - -2.000000; 4.000000;-1.623077;, - -4.000001;-8.000000; 0.376923;, - -4.000001;-10.000000; 0.376923;, - 4.000000;-10.000000; 0.376923;, - 3.999999;-8.000000; 0.376923;, - -4.000000;-7.999999; 4.376923;, - 4.000000;-8.000001; 4.376923;, - 3.999999;-10.000001; 4.376923;, - -4.000001;-10.000000; 4.376923;, - -4.000001;-8.000000; 0.376923;, - 3.999999;-8.000000; 0.376923;, - 4.000000;-8.000001; 4.376923;, - -4.000000;-7.999999; 4.376923;, - 3.999999;-8.000000; 0.376923;, - 4.000000;-10.000000; 0.376923;, - 3.999999;-10.000001; 4.376923;, - 4.000000;-8.000001; 4.376923;, - 4.000000;-10.000000; 0.376923;, - -4.000001;-10.000000; 0.376923;, - -4.000001;-10.000000; 4.376923;, - 3.999999;-10.000001; 4.376923;, - -4.000000;-7.999999; 4.376923;, - -4.000001;-10.000000; 4.376923;, - -4.000001;-10.000000; 0.376923;, - -4.000001;-8.000000; 0.376923;, - 4.000000; 4.000000; 2.376923;, - 3.999999;-8.000001; 2.376923;, - 5.999998;-8.000001; 2.376923;, - 6.000000; 3.999999; 2.376923;, - 4.000001; 4.000000; 4.376923;, - 6.000001; 3.999999; 4.376923;, - 5.999998;-8.000001; 4.376923;, - 4.000000;-8.000001; 4.376923;, - 4.000000; 4.000000; 2.376923;, - 6.000000; 3.999999; 2.376923;, - 6.000001; 3.999999; 4.376923;, - 4.000001; 4.000000; 4.376923;, - 5.999998;-8.000001; 2.376923;, - 3.999999;-8.000001; 2.376923;, - 4.000000;-8.000001; 4.376923;, - 5.999998;-8.000001; 4.376923;, - 4.000001; 4.000000; 4.376923;, - 4.000000;-8.000001; 4.376923;, - 3.999999;-8.000001; 2.376923;, - 4.000000; 4.000000; 2.376923;, - 2.000000; 6.000000; 0.376923;, - 1.999999;-8.000001; 0.376923;, - 3.999999;-8.000000; 0.376923;, - 4.000000; 6.000000; 0.376923;, - 2.000001; 6.000000; 2.376923;, - 4.000001; 5.999999; 2.376923;, - 3.999999;-8.000001; 2.376923;, - 1.999999;-8.000000; 2.376923;, - 2.000000; 6.000000; 0.376923;, - 4.000000; 6.000000; 0.376923;, - 4.000001; 5.999999; 2.376923;, - 2.000001; 6.000000; 2.376923;, - 4.000000; 6.000000; 0.376923;, - 3.999999;-8.000000; 0.376923;, - 3.999999;-8.000001; 2.376923;, - 4.000001; 5.999999; 2.376923;, - 3.999999;-8.000000; 0.376923;, - 1.999999;-8.000001; 0.376923;, - 1.999999;-8.000000; 2.376923;, - 3.999999;-8.000001; 2.376923;, - 2.000001; 6.000000; 2.376923;, - 1.999999;-8.000000; 2.376923;, - 1.999999;-8.000001; 0.376923;, - 2.000000; 6.000000; 0.376923;, - 2.000001; 6.000000; 2.376923;, - 2.000000; 4.000000; 2.376923;, - 4.000000; 4.000000; 2.376923;, - 4.000001; 5.999999; 2.376923;, - 2.000001; 6.000000; 4.376923;, - 4.000001; 5.999999; 4.376923;, - 4.000001; 4.000000; 4.376923;, - 2.000000; 4.000000; 4.376923;, - 2.000001; 6.000000; 2.376923;, - 4.000001; 5.999999; 2.376923;, - 4.000001; 5.999999; 4.376923;, - 2.000001; 6.000000; 4.376923;, - 4.000001; 5.999999; 2.376923;, - 4.000000; 4.000000; 2.376923;, - 4.000001; 4.000000; 4.376923;, - 4.000001; 5.999999; 4.376923;, - 4.000000; 4.000000; 2.376923;, - 2.000000; 4.000000; 2.376923;, - 2.000000; 4.000000; 4.376923;, - 4.000001; 4.000000; 4.376923;, - 2.000001; 6.000000; 4.376923;, - 2.000000; 4.000000; 4.376923;, - 2.000000; 4.000000; 2.376923;, - 2.000001; 6.000000; 2.376923;, - -3.999999; 6.000001; 2.376923;, - -4.000000; 4.000000; 2.376923;, - -2.000000; 4.000000; 2.376923;, - -1.999999; 6.000000; 2.376923;, - -3.999999; 6.000001; 4.376923;, - -1.999999; 6.000000; 4.376923;, - -2.000000; 4.000000; 4.376923;, - -4.000000; 3.999999; 4.376923;, - -3.999999; 6.000001; 2.376923;, - -1.999999; 6.000000; 2.376923;, - -1.999999; 6.000000; 4.376923;, - -3.999999; 6.000001; 4.376923;, - -1.999999; 6.000000; 2.376923;, - -2.000000; 4.000000; 2.376923;, - -2.000000; 4.000000; 4.376923;, - -1.999999; 6.000000; 4.376923;, - -2.000000; 4.000000; 2.376923;, - -4.000000; 4.000000; 2.376923;, - -4.000000; 3.999999; 4.376923;, - -2.000000; 4.000000; 4.376923;, - -3.999999; 6.000001; 4.376923;, - -4.000000; 3.999999; 4.376923;, - -4.000000; 4.000000; 2.376923;, - -3.999999; 6.000001; 2.376923;, - -2.000000; 8.000000; 2.376923;, - -1.999999; 6.000000; 2.376923;, - 2.000001; 6.000000; 2.376923;, - 2.000000; 8.000000; 2.376923;, - -1.999999; 8.000000; 4.376923;, - 2.000001; 8.000000; 4.376923;, - 2.000001; 6.000000; 4.376923;, - -1.999999; 6.000000; 4.376923;, - 2.000000; 8.000000; 2.376923;, - 2.000001; 6.000000; 2.376923;, - 2.000001; 6.000000; 4.376923;, - 2.000001; 8.000000; 4.376923;, - 2.000001; 6.000000; 2.376923;, - -1.999999; 6.000000; 2.376923;, - -1.999999; 6.000000; 4.376923;, - 2.000001; 6.000000; 4.376923;, - -1.999999; 8.000000; 4.376923;, - -1.999999; 6.000000; 4.376923;, - -1.999999; 6.000000; 2.376923;, - -2.000000; 8.000000; 2.376923;, - -2.000000; 6.000000; 0.376923;, - -2.000000; 4.000000; 0.376923;, - 2.000000; 3.999999; 0.376923;, - 2.000000; 6.000000; 0.376923;, - -1.999999; 6.000000; 2.376923;, - 2.000001; 6.000000; 2.376923;, - 2.000000; 4.000000; 2.376923;, - -2.000000; 4.000000; 2.376923;, - -2.000000; 6.000000; 0.376923;, - 2.000000; 6.000000; 0.376923;, - 2.000001; 6.000000; 2.376923;, - -1.999999; 6.000000; 2.376923;, - 2.000000; 6.000000; 0.376923;, - 2.000000; 3.999999; 0.376923;, - 2.000000; 4.000000; 2.376923;, - 2.000001; 6.000000; 2.376923;, - 2.000000; 3.999999; 0.376923;, - -2.000000; 4.000000; 0.376923;, - -2.000000; 4.000000; 2.376923;, - 2.000000; 4.000000; 2.376923;, - -1.999999; 6.000000; 2.376923;, - -2.000000; 4.000000; 2.376923;, - -2.000000; 4.000000; 0.376923;, - -2.000000; 6.000000; 0.376923;, - -6.000000; 4.000000; 2.376923;, - -6.000001;-7.999999; 2.376923;, - -4.000001;-8.000000; 2.376923;, - -4.000000; 4.000000; 2.376923;, - -6.000000; 4.000000; 4.376923;, - -4.000000; 3.999999; 4.376923;, - -4.000000;-7.999999; 4.376923;, - -6.000001;-8.000000; 4.376923;, - -6.000000; 4.000000; 2.376923;, - -4.000000; 4.000000; 2.376923;, - -4.000000; 3.999999; 4.376923;, - -6.000000; 4.000000; 4.376923;, - -4.000000; 4.000000; 2.376923;, - -4.000001;-8.000000; 2.376923;, - -4.000000;-7.999999; 4.376923;, - -4.000000; 3.999999; 4.376923;, - -4.000001;-8.000000; 2.376923;, - -6.000001;-7.999999; 2.376923;, - -6.000001;-8.000000; 4.376923;, - -4.000000;-7.999999; 4.376923;, - -4.000000; 6.000001; 0.376923;, - -4.000001;-8.000000; 0.376923;, - -2.000001;-8.000000; 0.376923;, - -2.000000; 6.000000; 0.376923;, - -4.000000; 6.000001; 0.376923;, - -2.000000; 6.000000; 0.376923;, - -1.999999; 6.000000; 2.376923;, - -3.999999; 6.000001; 2.376923;, - -2.000000; 6.000000; 0.376923;, - -2.000001;-8.000000; 0.376923;, - -2.000001;-8.000002; 2.376923;, - -1.999999; 6.000000; 2.376923;, - -2.000001;-8.000000; 0.376923;, - -4.000001;-8.000000; 0.376923;, - -4.000001;-8.000000; 2.376923;, - -2.000001;-8.000002; 2.376923;, - -3.999999; 6.000001; 2.376923;, - -4.000001;-8.000000; 2.376923;, - -4.000001;-8.000000; 0.376923;, - -4.000000; 6.000001; 0.376923;; - 60; - 4;0,1,2,3;, - 4;4,5,6,7;, - 4;8,9,10,11;, - 4;12,13,14,15;, - 4;16,17,18,19;, - 4;20,21,22,23;, - 4;24,25,26,27;, - 4;28,29,30,31;, - 4;32,33,34,35;, - 4;36,37,38,39;, - 4;40,41,42,43;, - 4;44,45,46,47;, - 4;48,49,50,51;, - 4;52,53,54,55;, - 4;56,57,58,59;, - 4;60,61,62,63;, - 4;64,65,66,67;, - 4;68,69,70,71;, - 4;72,73,74,75;, - 4;76,77,78,79;, - 4;80,81,82,83;, - 4;84,85,86,87;, - 4;88,89,90,91;, - 4;92,93,94,95;, - 4;96,97,98,99;, - 4;100,101,102,103;, - 4;104,105,106,107;, - 4;108,109,110,111;, - 4;112,113,114,115;, - 4;116,117,118,119;, - 4;120,121,122,123;, - 4;124,125,126,127;, - 4;128,129,130,131;, - 4;132,133,134,135;, - 4;136,137,138,139;, - 4;140,141,142,143;, - 4;144,145,146,147;, - 4;148,149,150,151;, - 4;152,153,154,155;, - 4;156,157,158,159;, - 4;160,161,162,163;, - 4;164,165,166,167;, - 4;168,169,170,171;, - 4;172,173,174,175;, - 4;176,177,178,179;, - 4;180,181,182,183;, - 4;184,185,186,187;, - 4;188,189,190,191;, - 4;192,193,194,195;, - 4;196,197,198,199;, - 4;200,201,202,203;, - 4;204,205,206,207;, - 4;208,209,210,211;, - 4;212,213,214,215;, - 4;216,217,218,219;, - 4;220,221,222,223;, - 4;224,225,226,227;, - 4;228,229,230,231;, - 4;232,233,234,235;, - 4;236,237,238,239;; - MeshNormals { // Cube_000 normals - 60; - -1.000000; 0.000000; 0.000000;, - 0.000000;-1.000000;-0.000000;, - 1.000000;-0.000000; 0.000000;, - 0.000000; 0.000000;-1.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000000;-1.000000;-0.000000;, - -1.000000; 0.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 1.000000;-0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000000;-1.000000;-0.000000;, - -1.000000; 0.000000;-0.000000;, - 0.000000; 1.000000; 0.000000;, - 1.000000;-0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000000;-1.000000;-0.000000;, - 0.000000; 1.000000; 0.000000;, - 1.000000;-0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000000;-1.000000;-0.000001;, - -1.000000; 0.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 1.000000;-0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000000;-1.000000; 0.000000;, - -1.000000; 0.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 1.000000;-0.000001;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000001;-1.000000; 0.000000;, - -1.000000; 0.000001;-0.000000;, - -0.000000; 1.000000; 0.000000;, - 1.000000;-0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -1.000000;-0.000000; 0.000000;, - -0.000000; 1.000000;-0.000000;, - 1.000000; 0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - 0.000000;-1.000000;-0.000000;, - -1.000000; 0.000000; 0.000000;, - 0.000000; 1.000000;-0.000000;, - 1.000000;-0.000000;-0.000000;, - 0.000000; 0.000000; 1.000000;, - 0.000000; 0.000000;-1.000000;, - -0.000000;-1.000000;-0.000000;, - -1.000000; 0.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 0.000000; 1.000000;, - -0.000000;-1.000000;-0.000000;, - -1.000000; 0.000000; 0.000000;, - 0.000001; 1.000000; 0.000001;, - 1.000000;-0.000000;-0.000000;; - 60; - 4;0,0,0,0;, - 4;1,1,1,1;, - 4;2,2,2,2;, - 4;3,3,3,3;, - 4;4,4,4,4;, - 4;5,5,5,5;, - 4;6,6,6,6;, - 4;7,7,7,7;, - 4;8,8,8,8;, - 4;9,9,9,9;, - 4;10,10,10,10;, - 4;11,11,11,11;, - 4;12,12,12,12;, - 4;13,13,13,13;, - 4;14,14,14,14;, - 4;15,15,15,15;, - 4;16,16,16,16;, - 4;17,17,17,17;, - 4;18,18,18,18;, - 4;19,19,19,19;, - 4;20,20,20,20;, - 4;21,21,21,21;, - 4;22,22,22,22;, - 4;23,23,23,23;, - 4;24,24,24,24;, - 4;25,25,25,25;, - 4;26,26,26,26;, - 4;27,27,27,27;, - 4;28,28,28,28;, - 4;29,29,29,29;, - 4;30,30,30,30;, - 4;31,31,31,31;, - 4;32,32,32,32;, - 4;33,33,33,33;, - 4;34,34,34,34;, - 4;35,35,35,35;, - 4;36,36,36,36;, - 4;37,37,37,37;, - 4;38,38,38,38;, - 4;39,39,39,39;, - 4;40,40,40,40;, - 4;41,41,41,41;, - 4;42,42,42,42;, - 4;43,43,43,43;, - 4;44,44,44,44;, - 4;45,45,45,45;, - 4;46,46,46,46;, - 4;47,47,47,47;, - 4;48,48,48,48;, - 4;49,49,49,49;, - 4;50,50,50,50;, - 4;51,51,51,51;, - 4;52,52,52,52;, - 4;53,53,53,53;, - 4;54,54,54,54;, - 4;55,55,55,55;, - 4;56,56,56,56;, - 4;57,57,57,57;, - 4;58,58,58,58;, - 4;59,59,59,59;; - } // End of Cube_000 normals - MeshTextureCoords { // Cube_000 UV coordinates - 240; - 6.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 6.000000; 0.000000;, - 2.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 2.000000; 0.000000;, - 6.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 6.000000; 0.000000;, - 7.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 5.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 5.000000;-1.000000;, - 6.000000;-1.000000;, - 6.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 2.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 2.000000; 0.000000;, - 6.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 6.000000; 0.000000;, - 3.000000; 0.999999;, - 0.000000; 1.000000;, - 0.000000; 0.000001;, - 3.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000001; 1.000000;, - 0.000000;-4.000000;, - 1.000000;-4.000000;, - 1.000000;-3.000000;, - 0.999999; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-3.000000;, - 4.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 4.000000;-1.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 1.000000;-1.000000;, - 5.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-0.999999;, - 5.000000;-1.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 1.000000;-1.000000;, - 5.375000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 5.375000; 0.000000;, - 5.375000; 0.000000;, - 5.375000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 6.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 6.000000; 0.000000;, - 7.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 1.000000;-1.000000;, - 1.000000;-1.000000;, - 0.999999; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 2.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000001;, - 2.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 1.000000;-1.000000;, - 1.000000;-1.000000;, - 0.999999; 1.000000;, - 0.000000; 1.000000;, - 0.000000;-1.000000;, - 2.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 2.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 2.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000001;, - 2.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 7.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 6.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 6.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;, - 1.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 1.000000; 0.000000;, - 7.000000; 1.000000;, - 0.000000; 1.000000;, - 0.000000; 0.000000;, - 7.000000; 0.000000;; - } // End of Cube_000 UV coordinates - MeshMaterialList { // Cube_000 material list - 1; - 60; - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0;; - Material Material { - 0.640000; 0.640000; 0.640000; 1.000000;; - 96.078431; - 0.500000; 0.500000; 0.500000;; - 0.000000; 0.000000; 0.000000;; - TextureFilename {"default_wood.png";} - } - } // End of Cube_000 material list - } // End of Cube_000 mesh - } // End of Cube_000 -} // End of Root diff --git a/mods/boats/textures/boats_inventory.png b/mods/boats/textures/boats_inventory.png deleted file mode 100644 index f9d082e31625c099490403a56906e922e2ea9e72..0000000000000000000000000000000000000000 Binary files a/mods/boats/textures/boats_inventory.png and /dev/null differ diff --git a/mods/boats/textures/boats_wield.png b/mods/boats/textures/boats_wield.png deleted file mode 100644 index f998b5bb9ddd75c680ad0faddb7934b4198879bd..0000000000000000000000000000000000000000 Binary files a/mods/boats/textures/boats_wield.png and /dev/null differ diff --git a/mods/boats/textures/rowboat_inventory.png b/mods/boats/textures/rowboat_inventory.png deleted file mode 100644 index 086bb92bc2b3f0a03463ff5474bf52dc75dbf760..0000000000000000000000000000000000000000 Binary files a/mods/boats/textures/rowboat_inventory.png and /dev/null differ diff --git a/mods/boats/textures/rowboat_wield.png b/mods/boats/textures/rowboat_wield.png deleted file mode 100644 index ea60fd6a68da97a623496b63402817fdb8cff40d..0000000000000000000000000000000000000000 Binary files a/mods/boats/textures/rowboat_wield.png and /dev/null differ diff --git a/mods/farming b/mods/farming new file mode 160000 index 0000000000000000000000000000000000000000..f93811a8ab8345e453b962620d997c736b02a8ff --- /dev/null +++ b/mods/farming @@ -0,0 +1 @@ +Subproject commit f93811a8ab8345e453b962620d997c736b02a8ff diff --git a/mods/farming/README.txt b/mods/farming/README.txt deleted file mode 100644 index 86a5fe3e6c1287469d1b10c495cec34dc4da417c..0000000000000000000000000000000000000000 --- a/mods/farming/README.txt +++ /dev/null @@ -1,150 +0,0 @@ -Farming Redo Mod -by TenPlus1 - -https://forum.minetest.net/viewtopic.php?id=9019 - -Farming Redo is a simplified version of the built-in farming mod in minetest and comes with wheat, cotton, carrot, cucumber, potato and tomato to start out with which spawn throughout the map... new foods need only be planted on tilled soil so no seeds are required, original wheat and cotton will require seeds which are found inside normal and jungle grass... - -This mod works by adding your new plant to the {growing=1} group and numbering the stages from _1 to as many stages as you like, but the underscore MUST be used only once in the node name to separate plant from stage number e.g. - -"farming:cotton_1" through to "farming:cotton_8" -"farming:wheat_1" through to "farming:wheat_8" -"farming:cucumber_4" through to "farming:cucumber_4" - -Changelog: - -1.23 - Huge code tweak and tidy done and added barley seeds to be found in dry grass, barley can make flour for bread also. -1.22 - Added grape bushes at high climates which can be cultivated into grape vines using trellis (9 sticks). -1.21 - Added auto-refill code for planting crops (thanks crabman77), also fixed a few bugs -1.20b- Tidied code, made api compatible with new 0.4.13 changes and changed to soil texture overlays -1.20 - NEW growing routine added that allows crops to grow while player is away doing other things (thanks prestidigitator) -1.14 - Added Green Beans from Crops mod (thanks sofar), little bushels in the wild but need to be grown using beanpoles crafted with 4 sticks (2 either side) -1.13 - Fixed seed double-placement glitch. Mapgen now uses 0.4.12+ for plant generation -1.12 - Player cannot place seeds in protected area, also growing speeds changed to match defaults -1.11 - Added Straw Bale, streamlined growing abm a little, fixed melon rotation bug with screwdriver -1.10 - Added Blueberry Bush and Blueberry Muffins, also Pumpkin/Melon easier to pick up, added check for unloaded map -1.09 - Corn now uses single nodes instead of 1 ontop of the other, Ethanol recipe is more expensive (requires 5 corn) and some code cleanup. -1.08 - Added Farming Plus compatibility, plus can be removed and no more missing nodes -1.07 - Added Rhubarb and Rhubarb Pie -1.06 - register_hoe and register_plant added for compatibility with default farming mod, although any plants registered will use farming redo to grow -1.05 - Added Raspberry Bushels and Raspberry Smoothie -1.04 - Added Donuts... normal, chocolate and apple... and a few code cleanups and now compatible with jungletree's from MoreTrees mod -1.03 - Bug fixes and more compatibility as drop-in replacement for built-in farming mod -1.02 - Added farming.mod string to help other mods identify which farming mod is running, if it returns "redo" then you're using this one, "" empty is built-in mod -1.01 - Crafting coffee or ethanol returns empty bucket/bottle, also Cocoa spawns a little rarer -1.0 - Added Cocoa which randomly grows on jungle tree's, pods give cocoa beans which can be used to farm more pods on a jungle trunk or make Cookies which have been added (or other treats) -0.9 - Added Pumpkin, Jack 'O Lantern, Pumpkin Slice and Sugar -(a huge thanks to painterly.net for allowing me to use their textures) -0.8 - Added Watermelon and Melon Slice -0.7 - Added Coffee, Coffee Beans, Drinking Cup, Cold and Hot Cup of Coffee -0.6 - Added Corn, Corn on the Cob... Also reworked Abm -0.5 - Added Carrot, Cucumber, Potato (and Baked Potato), Tomato -0.4 - Checks for Protection, also performance changes -0.3 - Added Diamond and Mese hoe -0.2 - Fixed check for wet soil -0.1 - Fixed growing bug -0.0 - Initial release - -License of media (textures): ----------------------------- -Created by PilzAdam (License: WTFPL): - farming_bread.png - farming_soil.png - farming_soil_wet.png - farming_soil_wet_side.png - farming_string.png - -Created by Calinou (License: CC BY-SA): - farming_tool_bronzehoe.png - farming_tool_steelhoe.png - farming_tool_stonehoe.png - farming_tool_woodhoe.png - farming_tool_mesehoe.png - farming_tool_diamondhoe.png - -Created by VanessaE (License: WTFPL): - farming_cotton_seed.png - farming_wheat_seed.png - farming_flour.png - farming_wheat.png - farming_wheat_1.png - farming_wheat_2.png - farming_wheat_3.png - farming_wheat_4.png - farming_wheat_5.png - farming_wheat_5.png - farming_wheat_7.png - farming_wheat_8.png - farming_cotton_1.png - farming_cotton_2.png - farming_cotton_3.png - farming_cotton_4.png - farming_cotton_5.png - farming_cotton_6.png - farming_cotton_7.png - farming_cotton_8.png - -Created by Doc (License: WTFPL): - farming_cucumber.png - farming_cucumber_1.png - farming_cucumber_2.png - farming_cucumber_3.png - farming_cucumber_4.png - farming_potato.png - farming_potato_1.png - farming_potato_2.png - farming_potato_3.png - farming_potato_4.png - farming_raspberries.png - farming_raspberry_1.png - farming_raspberry_2.png - farming_raspberry_3.png - farming_raspberry_4.png - -Created by Gambit: - default_junglegrass.png - farming_carrot.png - farming_carrot_1.png - farming_carrot_2.png - farming_carrot_3.png - farming_carrot_4.png - farming_carrot_5.png - farming_carrot_6.png - farming_carrot_7.png - farming_carrot_8.png - -Created by JoseTheCrafter and edited by TenPlus1: - farming_tomato.png - farming_tomato_1.png - farming_tomato_2.png - farming_tomato_3.png - farming_tomato_4.png - farming_tomato_5.png - farming_tomato_6.png - farming_tomato_7.png - farming_tomato_8.png - -Created by GeMinecraft and edited by TenPlus1: - farming_corn.png - farming_corn_cob.png - farming_corn_1.png - farming_corn_2.png - farming_corn_3.png - farming_corn_4.png - farming_corn_5.png - farming_corn_6.png - farming_corn_7.png - farming_corn_8.png - -Created by TenPlus1 - farming_cocoa_1.png - farming_cocoa_2.png - farming_cocoa_3.png - farming_cocoa_beans.png - farming_cookie.png - farming_raspberry_smoothie.png - farming_rhubarb_1.png - farming_rhubarb_2.png - farming_rhubarb_3.png - farming_rhubarb.png - farming_rhubarb_pie.png \ No newline at end of file diff --git a/mods/farming/api.lua b/mods/farming/api.lua deleted file mode 100644 index 69c6769b00c4e798c7d294689fcd691508542c47..0000000000000000000000000000000000000000 --- a/mods/farming/api.lua +++ /dev/null @@ -1,366 +0,0 @@ - --- Wear out hoes, place soil --- TODO Ignore group:flower -farming.hoe_on_use = function(itemstack, user, pointed_thing, uses) - local pt = pointed_thing - -- check if pointing at a node - if not pt then - return - end - if pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z} - local above = minetest.get_node(p) - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] then - return - end - if not minetest.registered_nodes[above.name] then - return - end - - -- check if the node above the pointed thing is air - if above.name ~= "air" then - return - end - - -- check if pointing at soil - if minetest.get_item_group(under.name, "soil") ~= 1 then - return - end - - -- check if (wet) soil defined - local regN = minetest.registered_nodes - if regN[under.name].soil == nil or regN[under.name].soil.wet == nil or regN[under.name].soil.dry == nil then - return - end - - if minetest.is_protected(pt.under, user:get_player_name()) then - minetest.record_protection_violation(pt.under, user:get_player_name()) - return - end - if minetest.is_protected(pt.above, user:get_player_name()) then - minetest.record_protection_violation(pt.above, user:get_player_name()) - return - end - - -- turn the node into soil, wear out item and play sound - minetest.set_node(pt.under, {name = regN[under.name].soil.dry}) - minetest.sound_play("default_dig_crumbly", { - pos = pt.under, - gain = 0.5, - }) - - if not minetest.setting_getbool("creative_mode") then - itemstack:add_wear(65535/(uses-1)) - end - return itemstack -end - --- Register new hoes -farming.register_hoe = function(name, def) - -- Check for : prefix (register new hoes in your mod's namespace) - if name:sub(1,1) ~= ":" then - name = ":" .. name - end - -- Check def table - if def.description == nil then - def.description = "Hoe" - end - if def.inventory_image == nil then - def.inventory_image = "unknown_item.png" - end - if def.recipe == nil then - def.recipe = { - {"air","air",""}, - {"","group:stick",""}, - {"","group:stick",""} - } - end - if def.max_uses == nil then - def.max_uses = 30 - end - -- Register the tool - minetest.register_tool(name, { - description = def.description, - inventory_image = def.inventory_image, - on_use = function(itemstack, user, pointed_thing) - return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses) - end - }) - -- Register its recipe - if def.material == nil then - minetest.register_craft({ - output = name:sub(2), - recipe = def.recipe - }) - else - minetest.register_craft({ - output = name:sub(2), - recipe = { - {def.material, def.material, ""}, - {"", "group:stick", ""}, - {"", "group:stick", ""} - } - }) - -- Reverse Recipe - minetest.register_craft({ - output = name:sub(2), - recipe = { - {"", def.material, def.material}, - {"", "group:stick", ""}, - {"", "group:stick", ""} - } - }) - end -end - --- how often node timers for plants will tick, +/- some random value -local function tick(pos) - minetest.get_node_timer(pos):start(math.random(166, 286)) -end --- how often a growth failure tick is retried (e.g. too dark) -local function tick_again(pos) - minetest.get_node_timer(pos):start(math.random(40, 80)) -end - --- Seed placement -farming.place_seed = function(itemstack, placer, pointed_thing, plantname) - local pt = pointed_thing - -- check if pointing at a node - if not pt then - return itemstack - end - if pt.type ~= "node" then - return itemstack - end - - local under = minetest.get_node(pt.under) - local above = minetest.get_node(pt.above) - - if minetest.is_protected(pt.under, placer:get_player_name()) then - minetest.record_protection_violation(pt.under, placer:get_player_name()) - return - end - if minetest.is_protected(pt.above, placer:get_player_name()) then - minetest.record_protection_violation(pt.above, placer:get_player_name()) - return - end - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] then - return itemstack - end - if not minetest.registered_nodes[above.name] then - return itemstack - end - - -- check if pointing at the top of the node - if pt.above.y ~= pt.under.y+1 then - return itemstack - end - - -- check if you can replace the node above the pointed node - if not minetest.registered_nodes[above.name].buildable_to then - return itemstack - end - - -- check if pointing at soil - if minetest.get_item_group(under.name, "soil") < 2 then - return itemstack - end - - -- add the node and remove 1 item from the itemstack - minetest.add_node(pt.above, {name = plantname, param2 = 1}) - tick(pt.above) - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack -end - -farming.grow_plant = function(pos, elapsed) - local node = minetest.get_node(pos) - local name = node.name - local def = minetest.registered_nodes[name] - - if not def.next_plant then - -- disable timer for fully grown plant - return - end - - -- grow seed - if minetest.get_item_group(node.name, "seed") and def.fertility then - local soil_node = minetest.get_node_or_nil({x = pos.x, y = pos.y - 1, z = pos.z}) - if not soil_node then - tick_again(pos) - return - end - -- omitted is a check for light, we assume seeds can germinate in the dark. - for _, v in pairs(def.fertility) do - if minetest.get_item_group(soil_node.name, v) ~= 0 then - minetest.swap_node(pos, {name = def.next_plant}) - if minetest.registered_nodes[def.next_plant].next_plant then - tick(pos) - return - end - end - end - - return - end - - -- check if on wet soil - local below = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) - if minetest.get_item_group(below.name, "soil") < 3 then - tick_again(pos) - return - end - - -- check light - local light = minetest.get_node_light(pos) - if not light or light < def.minlight or light > def.maxlight then - tick_again(pos) - return - end - - -- grow - minetest.swap_node(pos, {name = def.next_plant}) - - -- new timer needed? - if minetest.registered_nodes[def.next_plant].next_plant then - tick(pos) - end - return -end - --- Register plants -farming.register_plant = function(name, def) - local mname = name:split(":")[1] - local pname = name:split(":")[2] - - -- Check def table - if not def.description then - def.description = "Seed" - end - if not def.inventory_image then - def.inventory_image = "unknown_item.png" - end - if not def.steps then - return nil - end - if not def.minlight then - def.minlight = 1 - end - if not def.maxlight then - def.maxlight = 14 - end - if not def.fertility then - def.fertility = {} - end - - -- Register seed - local lbm_nodes = {mname .. ":seed_" .. pname} - local g = {seed = 1, snappy = 3, attached_node = 1} - for k, v in pairs(def.fertility) do - g[v] = 1 - end - minetest.register_node(":" .. mname .. ":seed_" .. pname, { - description = def.description, - tiles = {def.inventory_image}, - inventory_image = def.inventory_image, - wield_image = def.inventory_image, - drawtype = "signlike", - groups = g, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, - }, - fertility = def.fertility, - sounds = default.node_sound_dirt_defaults({ - dug = {name = "default_grass_footstep", gain = 0.2}, - place = {name = "default_place_node", gain = 0.25}, - }), - - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":seed_" .. pname) - end, - next_plant = mname .. ":" .. pname .. "_1", - on_timer = farming.grow_plant, - minlight = def.minlight, - maxlight = def.maxlight, - }) - - -- Register harvest - minetest.register_craftitem(":" .. mname .. ":" .. pname, { - description = pname:gsub("^%l", string.upper), - inventory_image = mname .. "_" .. pname .. ".png", - }) - - -- Register growing steps - for i = 1, def.steps do - local drop = { - items = { - {items = {mname .. ":" .. pname}, rarity = 9 - i}, - {items = {mname .. ":" .. pname}, rarity= 18 - i * 2}, - {items = {mname .. ":seed_" .. pname}, rarity = 9 - i}, - {items = {mname .. ":seed_" .. pname}, rarity = 18 - i * 2}, - } - } - local nodegroups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1} - nodegroups[pname] = i - - local next_plant = nil - local on_timer = nil - - if i < def.steps then - next_plant = mname .. ":" .. pname .. "_" .. (i + 1) - on_timer = farming.grow_plant - lbm_nodes[#lbm_nodes + 1] = mname .. ":" .. pname .. "_" .. i - end - - minetest.register_node(mname .. ":" .. pname .. "_" .. i, { - drawtype = "plantlike", - waving = 1, - tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - drop = drop, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, - }, - groups = nodegroups, - sounds = default.node_sound_leaves_defaults(), - next_plant = next_plant, - on_timer = farming.grow_plant, - minlight = def.minlight, - maxlight = def.maxlight, - }) - end - - -- replacement LBM for pre-nodetimer plants - minetest.register_lbm({ - name = ":" .. mname .. ":start_nodetimer_" .. pname, - nodenames = lbm_nodes, - action = function(pos, node) - tick_again(pos) - end, - }) - - -- Return - local r = { - seed = mname .. ":seed_" .. pname, - harvest = mname .. ":" .. pname - } - return r -end diff --git a/mods/farming/banana.lua b/mods/farming/banana.lua deleted file mode 100644 index 492d1cf74b1536230ae645bb5258ae88c89b2cf4..0000000000000000000000000000000000000000 --- a/mods/farming/banana.lua +++ /dev/null @@ -1,70 +0,0 @@ -minetest.register_node("farming:banana_sapling", { - description = "Banana Tree Sapling", - drawtype = "plantlike", - tiles = {"farming_banana_sapling.png"}, - inventory_image = "farming_banana_sapling.png", - wield_image = "farming_banana_sapling.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} - }, - groups = {dig_immediate=3,flammable=2}, - sounds = default.node_sound_defaults(), -}) - -minetest.register_node("farming:banana_leaves", { - drawtype = "allfaces_optional", - tiles = {"farming_banana_leaves.png"}, - paramtype = "light", - groups = {snappy=3, leafdecay=3, flammable=2, not_in_creative_inventory=1}, - drop = { - max_items = 1, - items = { - { - items = {'farming:banana_sapling'}, - rarity = 20, - }, - { - items = {'farming:banana_leaves'}, - } - } -}, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_abm({ - nodenames = {"farming:banana_sapling"}, - interval = 60, - chance = 20, - action = function(pos, node) - farming.generate_tree(pos, "default:tree", "farming:banana_leaves", {"default:dirt", "default:dirt_with_grass"}, {["farming:banana"]=20}) - end -}) - -minetest.register_on_generated(function(minp, maxp, blockseed) - if math.random(1, 100) > 5 then - return - end - local tmp = {x=(maxp.x-minp.x)/2+minp.x, y=(maxp.y-minp.y)/2+minp.y, z=(maxp.z-minp.z)/2+minp.z} - local pos = minetest.find_node_near(tmp, maxp.x-minp.x, {"default:dirt_with_grass"}) - if pos ~= nil then - farming.generate_tree({x=pos.x, y=pos.y+1, z=pos.z}, "default:tree", "farming:banana_leaves", {"default:dirt", "default:dirt_with_grass"}, {["farming:banana"]=10}) - end -end) - -minetest.register_node("farming:banana", { - description = "Banana", - tiles = {"farming_banana.png"}, - inventory_image = "farming_banana.png", - wield_image = "farming_banana.png", - drawtype = "torchlike", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - groups = {fleshy=3,dig_immediate=3,flammable=2,leafdecay=3,leafdecay_drop=1}, - sounds = default.node_sound_defaults(), - - on_use = minetest.item_eat(6), -}) diff --git a/mods/farming/barley.lua b/mods/farming/barley.lua deleted file mode 100644 index d69b0badc1003c2b3f8704ace4b44dcce50a85d6..0000000000000000000000000000000000000000 --- a/mods/farming/barley.lua +++ /dev/null @@ -1,96 +0,0 @@ - --- barley seeds -minetest.register_node("farming:seed_barley", { - description = "Barley Seed", - tiles = {"farming_barley_seed.png"}, - inventory_image = "farming_barley_seed.png", - wield_image = "farming_barley_seed.png", - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1") - end, -}) - --- harvested barley -minetest.register_craftitem("farming:barley", { - description = "barley", - inventory_image = "farming_barley.png", -}) - --- flour -minetest.register_craft({ - type = "shapeless", - output = "farming:flour", - recipe = {"farming:barley", "farming:barley", "farming:barley", "farming:barley"} -}) - --- barley definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_barley_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:barley_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_barley_2.png"} -minetest.register_node("farming:barley_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_barley_3.png"} -minetest.register_node("farming:barley_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_barley_4.png"} -minetest.register_node("farming:barley_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_barley_5.png"} -crop_def.drop = { - items = { - {items = {'farming:barley'}, rarity = 2}, - {items = {'farming:seed_barley'}, rarity = 2}, - } -} -minetest.register_node("farming:barley_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_barley_6.png"} -crop_def.drop = { - items = { - {items = {'farming:barley'}, rarity = 2}, - {items = {'farming:seed_barley'}, rarity = 1}, - } -} -minetest.register_node("farming:barley_6", table.copy(crop_def)) - --- stage 7 (final) -crop_def.tiles = {"farming_barley_7.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:barley'}, rarity = 1}, - {items = {'farming:barley'}, rarity = 3}, - {items = {'farming:seed_barley'}, rarity = 1}, - {items = {'farming:seed_barley'}, rarity = 3}, - } -} -minetest.register_node("farming:barley_7", table.copy(crop_def)) diff --git a/mods/farming/beanpole.lua b/mods/farming/beanpole.lua deleted file mode 100644 index cda736f9030b4ee5edcfc1395b93c9910a242837..0000000000000000000000000000000000000000 --- a/mods/farming/beanpole.lua +++ /dev/null @@ -1,194 +0,0 @@ ---[[ - All textures by - (C) Auke Kok <sofar@foo-projects.org> - CC-BY-SA-3.0 -]] - --- beans -minetest.register_craftitem("farming:beans", { - description = "Green Beans", - inventory_image = "farming_beans.png", - on_use = minetest.item_eat(1), - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if nodename == "farming:beanpole" then - minetest.set_node(pointed_thing.under, {name = "farming:beanpole_1"}) - - minetest.sound_play("default_place_node", {pos = pointed_thing.above, gain = 1.0}) - else - return - end - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 then - - minetest.after(0.20, - farming.refill_plant, - placer, - "farming:beans", - placer:get_wield_index() - ) - end - end - - return itemstack - end -}) - --- beans can be used for green dye -minetest.register_craft({ - output = "dye:green", - recipe = { - {'farming:beans'}, - } -}) - --- beanpole -minetest.register_node("farming:beanpole", { - description = "Bean Pole (place on soil before planting beans)", - drawtype = "plantlike", - tiles = {"farming_beanpole.png"}, - inventory_image = "farming_beanpole.png", - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = "farming:beanpole", - selection_box = farming.select, - groups = {snappy = 3, flammable = 2, attached_node = 1}, - sounds = default.node_sound_leaves_defaults(), - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if minetest.get_item_group(nodename, "soil") < 2 then - return - end - - local top = { - x = pointed_thing.above.x, - y = pointed_thing.above.y + 1, - z = pointed_thing.above.z - } - - nodename = minetest.get_node(top).name - - if nodename ~= "air" then - return - end - - minetest.set_node(pointed_thing.above, {name = "farming:beanpole"}) - - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - - return itemstack - end -}) - -minetest.register_craft({ - output = "farming:beanpole", - recipe = { - {'', '', ''}, - {'default:stick', '', 'default:stick'}, - {'default:stick', '', 'default:stick'}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "farming:beanpole", - burntime = 10, -}) - --- green bean definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_beanpole_1.png"}, - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:beanpole'}, rarity = 1}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 3, not_in_creative_inventory = 1, - attached_node = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:beanpole_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_beanpole_2.png"} -minetest.register_node("farming:beanpole_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_beanpole_3.png"} -minetest.register_node("farming:beanpole_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_beanpole_4.png"} -minetest.register_node("farming:beanpole_4", table.copy(crop_def)) - --- stage 5 (final) -crop_def.tiles = {"farming_beanpole_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:beanpole'}, rarity = 1}, - {items = {'farming:beans 3'}, rarity = 1}, - {items = {'farming:beans 2'}, rarity = 2}, - {items = {'farming:beans 2'}, rarity = 3}, - } -} -minetest.register_node("farming:beanpole_5", table.copy(crop_def)) - --- wild green bean bush (this is what you find on the map) -minetest.register_node("farming:beanbush", { - drawtype = "plantlike", - tiles = {"farming_beanbush.png"}, - paramtype = "light", - waving = 1, - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:beans 1'}, rarity = 1}, - {items = {'farming:beans 1'}, rarity = 2}, - {items = {'farming:beans 1'}, rarity = 3}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory=1 - }, - sounds = default.node_sound_leaves_defaults(), -}) diff --git a/mods/farming/blueberry.lua b/mods/farming/blueberry.lua deleted file mode 100644 index 6a29ba9785ecf2b44442e6ac3655518b6633091f..0000000000000000000000000000000000000000 --- a/mods/farming/blueberry.lua +++ /dev/null @@ -1,65 +0,0 @@ - --- blueberries -minetest.register_craftitem("farming:blueberries", { - description = "Blueberries", - inventory_image = "farming_blueberries.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1") - end, - on_use = minetest.item_eat(1), -}) - --- blueberry muffin (thanks to sosogirl123 @ deviantart.com for muffin image) - -minetest.register_craftitem("farming:muffin_blueberry", { - description = "Blueberry Muffin", - inventory_image = "farming_blueberry_muffin.png", - on_use = minetest.item_eat(2), -}) - -minetest.register_craft({ - output = "farming:muffin_blueberry 2", - recipe = { - {"farming:blueberries", "farming:bread", "farming:blueberries"}, - } -}) - --- blueberry definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_blueberry_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:blueberry_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_blueberry_2.png"} -minetest.register_node("farming:blueberry_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_blueberry_3.png"} -minetest.register_node("farming:blueberry_3", table.copy(crop_def)) - --- stage 4 (final) -crop_def.tiles = {"farming_blueberry_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:blueberries 2'}, rarity = 1}, - {items = {'farming:blueberries'}, rarity = 2}, - {items = {'farming:blueberries'}, rarity = 3}, - } -} -minetest.register_node("farming:blueberry_4", table.copy(crop_def)) diff --git a/mods/farming/carrot.lua b/mods/farming/carrot.lua deleted file mode 100644 index 90c1b918c521f3713088e3b8c3bab8c6fe045954..0000000000000000000000000000000000000000 --- a/mods/farming/carrot.lua +++ /dev/null @@ -1,103 +0,0 @@ - ---[[ - Original textures from PixelBox texture pack - https://forum.minetest.net/viewtopic.php?id=4990 -]] - -minetest.register_craftitem("farming:carrot_seed", { - description = "Carrot Seeds", - inventory_image = "farming_carrot_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1") - end -}) - --- carrot -minetest.register_craftitem("farming:carrot", { - description = "Carrot", - inventory_image = "farming_carrot.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1") - end, - on_use = minetest.item_eat(4), -}) - --- golden carrot -minetest.register_craftitem("farming:carrot_gold", { - description = "Golden Carrot", - inventory_image = "farming_carrot_gold.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:carrot_gold", - recipe = { - {"", "default:gold_lump", ""}, - {"default:gold_lump", "farming:carrot", "default:gold_lump"}, - {"", "default:gold_lump", ""}, - } -}) - --- carrot definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_carrot_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - - --- stage 1 -minetest.register_node("farming:carrot_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_carrot_2.png"} -minetest.register_node("farming:carrot_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_carrot_3.png"} -minetest.register_node("farming:carrot_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_carrot_4.png"} -minetest.register_node("farming:carrot_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_carrot_5.png"} -minetest.register_node("farming:carrot_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_carrot_6.png"} -minetest.register_node("farming:carrot_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_carrot_7.png"} -crop_def.drop = { - items = { - {items = {'farming:carrot'}, rarity = 1}, - {items = {'farming:carrot_seed'}, rarity = 1}, - {items = {'farming:carrot 2'}, rarity = 3}, - } -} -minetest.register_node("farming:carrot_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_carrot_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:carrot 2'}, rarity = 1}, - {items = {'farming:carrot_seed'}, rarity = 1}, - {items = {'farming:carrot 3'}, rarity = 2}, - } -} -minetest.register_node("farming:carrot_8", table.copy(crop_def)) diff --git a/mods/farming/cocoa.lua b/mods/farming/cocoa.lua deleted file mode 100644 index a11a6110f4b92a236b8331257d43fe97c78d232c..0000000000000000000000000000000000000000 --- a/mods/farming/cocoa.lua +++ /dev/null @@ -1,172 +0,0 @@ - --- place cocoa -function place_cocoa(itemstack, placer, pointed_thing, plantname) - - local pt = pointed_thing - - -- check if pointing at a node - if not pt or pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - - -- return if any of the nodes are not registered - if not minetest.registered_nodes[under.name] then - return - end - - -- check if pointing at jungletree - if under.name ~= "default:jungletree" - or minetest.get_node(pt.above).name ~= "air" then - return - end - - -- add the node and remove 1 item from the itemstack - minetest.set_node(pt.above, {name = plantname}) - - minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}) - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 then - - minetest.after(0.20, - farming.refill_plant, - placer, - "farming:cocoa_beans", - placer:get_wield_index() - ) - end - end - - return itemstack -end - --- cocoa beans -minetest.register_craftitem("farming:cocoa_beans", { - description = "Cocoa Beans", - inventory_image = "farming_cocoa_beans.png", - on_place = function(itemstack, placer, pointed_thing) - return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1") - end, -}) - -minetest.register_craft( { - output = "dye:brown 2", - recipe = { - { "farming:cocoa_beans" }, - } -}) - --- chocolate cookie -minetest.register_craftitem("farming:cookie", { - description = "Cookie", - inventory_image = "farming_cookie.png", - on_use = minetest.item_eat(2), -}) - -minetest.register_craft( { - output = "farming:cookie 8", - recipe = { - { "farming:wheat", "farming:cocoa_beans", "farming:wheat" }, - } -}) - --- bar of dark chocolate (thanks to Ice Pandora for her deviantart.com chocolate tutorial) -minetest.register_craftitem("farming:chocolate_dark", { - description = "Bar of Dark Chocolate", - inventory_image = "farming_chocolate_dark.png", - on_use = minetest.item_eat(3), -}) - -minetest.register_craft( { - output = "farming:chocolate_dark", - recipe = { - { "farming:cocoa_beans", "farming:cocoa_beans", "farming:cocoa_beans" }, - } -}) - --- cocoa definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_cocoa_1.png"}, - paramtype = "light", - walkable = true, - drop = { - items = { - {items = {'farming:cocoa_beans 1'}, rarity = 2}, - } - }, - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} - }, - groups = { - snappy = 3, flammable = 2, plant = 1, growing = 1, - not_in_creative_inventory=1, leafdecay = 1, leafdecay_drop = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:cocoa_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_cocoa_2.png"} -crop_def.drop = { - items = { - {items = {'farming:cocoa_beans 1'}, rarity = 1}, - } -} -minetest.register_node("farming:cocoa_2", table.copy(crop_def)) - --- stage 3 (final) -crop_def.tiles = {"farming_cocoa_3.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:cocoa_beans 2'}, rarity = 1}, - {items = {'farming:cocoa_beans 1'}, rarity = 2}, - } -} -minetest.register_node("farming:cocoa_3", table.copy(crop_def)) - --- add random cocoa pods to jungle tree trunks -minetest.register_abm({ - nodenames = {"default:jungletree"}, - neighbors = {"default:jungleleaves", "moretrees:jungletree_leaves_green"}, - interval = 8, - chance = 80, - catch_up = false, - action = function(pos, node) - - local dir = math.random(1, 50) - - if dir == 1 then - pos.x = pos.x + 1 - elseif dir == 2 then - pos.x = pos.x - 1 - elseif dir == 3 then - pos.z = pos.z + 1 - elseif dir == 4 then - pos.z = pos.z -1 - else return - end - - local nodename = minetest.get_node(pos).name - - if nodename == "air" - and minetest.get_node_light(pos) > 12 then - - --print ("Cocoa Pod added at " .. minetest.pos_to_string(pos)) - - minetest.set_node(pos, { - name = "farming:cocoa_" .. tostring(math.random(1, 3)) - }) - end - end, -}) diff --git a/mods/farming/coffee.lua b/mods/farming/coffee.lua deleted file mode 100644 index c9854e6e1c3f6602392f3a0fd54379aa0639b99b..0000000000000000000000000000000000000000 --- a/mods/farming/coffee.lua +++ /dev/null @@ -1,130 +0,0 @@ - --- coffee -minetest.register_craftitem("farming:coffee_beans", { - description = "Coffee Beans", - inventory_image = "farming_coffee_beans.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:coffee_1") - end, -}) - - --- drinking cup -minetest.register_node("farming:drinking_cup", { - description = "Drinking Cup (empty)", - drawtype = "plantlike", - tiles = {"vessels_drinking_cup.png"}, - inventory_image = "vessels_drinking_cup.png", - wield_image = "vessels_drinking_cup.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} - }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_glass_defaults(), -}) - -minetest.register_craft( { - output = "farming:drinking_cup 5", - recipe = { - { "default:glass", "", "default:glass" }, - {"", "default:glass",""}, - } -}) - --- cold cup of coffee -minetest.register_node("farming:coffee_cup", { - description = "Cold Cup of Coffee", - drawtype = "plantlike", - tiles = {"farming_coffee_cup.png"}, - inventory_image = "farming_coffee_cup.png", - wield_image = "farming_coffee_cup.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} - }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - on_use = minetest.item_eat(2, "farming:drinking_cup"), - sounds = default.node_sound_glass_defaults(), -}) - -minetest.register_craft( { - output = "farming:coffee_cup", - recipe = { - {"farming:drinking_cup", "farming:coffee_beans","bucket:bucket_water"}, - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 5, - output = "farming:coffee_cup_hot", - recipe = "farming:coffee_cup" -}) - --- hot cup of coffee -minetest.register_node("farming:coffee_cup_hot", { - description = "Hot Cup of Coffee", - drawtype = "plantlike", - tiles = {"farming_coffee_cup_hot.png"}, - inventory_image = "farming_coffee_cup_hot.png", - wield_image = "farming_coffee_cup_hot.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} - }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - on_use = minetest.item_eat(3, "farming:drinking_cup"), - sounds = default.node_sound_glass_defaults(), -}) - --- coffee definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_coffee_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:coffee_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_coffee_2.png"} -minetest.register_node("farming:coffee_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_coffee_3.png"} -minetest.register_node("farming:coffee_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_coffee_4.png"} -minetest.register_node("farming:coffee_4", table.copy(crop_def)) - --- stage 5 (final) -crop_def.tiles = {"farming_coffee_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:coffee_beans 2'}, rarity = 1}, - {items = {'farming:coffee_beans 2'}, rarity = 2}, - {items = {'farming:coffee_beans 2'}, rarity = 3}, - } -} -minetest.register_node("farming:coffee_5", table.copy(crop_def)) diff --git a/mods/farming/compatibility.lua b/mods/farming/compatibility.lua deleted file mode 100644 index 07a53404f25f27c25416e567f1f895d70ee96503..0000000000000000000000000000000000000000 --- a/mods/farming/compatibility.lua +++ /dev/null @@ -1,78 +0,0 @@ --- Banana -minetest.register_alias("farming_plus:banana_sapling", "farming:banana_sapling") -minetest.register_alias("farming_plus:banana_leaves", "farming:banana_leaves") -minetest.register_alias("farming_plus:banana", "farming:banana") - --- Carrot -minetest.register_alias("farming_plus:carrot_seed", "farming:carrot_seed") -minetest.register_alias("farming_plus:carrot_1", "farming:carrot_1") -minetest.register_alias("farming_plus:carrot_2", "farming:carrot_4") -minetest.register_alias("farming_plus:carrot_3", "farming:carrot_6") -minetest.register_alias("farming_plus:carrot", "farming:carrot_8") -minetest.register_alias("farming_plus:carrot_item", "farming:carrot") - --- Cocoa -minetest.register_alias("farming_plus:cocoa_sapling", "farming:cocoa_beans") -minetest.register_alias("farming_plus:cocoa_leaves", "default:leaves") -minetest.register_alias("farming_plus:cocoa", "default:apple") -minetest.register_alias("farming_plus:cocoa_bean", "farming:cocoa_beans") - --- Orange -minetest.register_alias("farming_plus:orange_1", "farming:orange_1") -minetest.register_alias("farming_plus:orange_2", "farming:orange_2") -minetest.register_alias("farming_plus:orange_3", "farming:orange_3") -minetest.register_alias("farming_plus:orange", "farming:orange_4") -minetest.register_alias("farming_plus:orange_8", "farming:orange") -minetest.register_alias("farming_plus:orange_item", "farming:orange_item") -minetest.register_alias("farming_plus:orange_seed", "farming:orange_seed") -minetest.register_alias("farming:orange", "farming:orange_4") - --- Potato -minetest.register_alias("farming_plus:potato_item", "farming:potato") -minetest.register_alias("farming_plus:potato_1", "farming:potato_1") -minetest.register_alias("farming_plus:potato_2", "farming:potato_2") -minetest.register_alias("farming_plus:potato", "farming:potato_3") -minetest.register_alias("farming_plus:potato_seed", "farming:potato_seed") - --- Pumpkin -minetest.register_alias("farming:pumpkin_seed", "farming:pumpkin_slice") -minetest.register_alias("farming:pumpkin_face", "farming:pumpkin") -minetest.register_alias("farming:pumpkin_face_light", "farming:jackolantern") -minetest.register_alias("farming:big_pumpkin", "farming:pumpkin") -minetest.register_alias("farming:big_pumpkin_side", "air") -minetest.register_alias("farming:big_pumpkin_corner", "air") -minetest.register_alias("farming:big_pumpkin_top", "air") -minetest.register_alias("farming:pumpkin_flour", "farming:pumpkin_dough") - --- Rhubarb -minetest.register_alias("farming_plus:rhubarb_seed", "farming:rhubarb_seed") -minetest.register_alias("farming_plus:rhubarb_1", "farming:rhubarb_1") -minetest.register_alias("farming_plus:rhubarb_2", "farming:rhubarb_2") -minetest.register_alias("farming_plus:rhubarb", "farming:rhubarb_3") -minetest.register_alias("farming_plus:rhubarb_item", "farming:rhubarb") - --- Strawberry -minetest.register_alias("farming_plus:strawberry_item", "farming:strawberry_item") -minetest.register_alias("farming_plus:strawberry_seed", "farming:strawberry_seed") -minetest.register_alias("farming_plus:strawberry_1", "farming:strawberry_1") -minetest.register_alias("farming_plus:strawberry_2", "farming:strawberry_2") -minetest.register_alias("farming_plus:strawberry_3", "farming:strawberry_3") -minetest.register_alias("farming_plus:strawberry", "farming:strawberry_3") -minetest.register_alias("farming:strawberry", "farming:strawberry_item") -minetest.register_alias("farming_plus:strawberry", "farming:strawberry_3") - --- Raspberry ---minetest.register_alias("farming_plus:raspberry_seed", "farming:raspberry_seed") ---minetest.register_alias("farming_plus:raspberrys", "farming:raspberrys") ---minetest.register_alias("farming_plus:raspberry_seed", "farming:raspberry_seed") - --- Tomato -minetest.register_alias("farming_plus:tomato_seed", "farming:tomato_seed") -minetest.register_alias("farming_plus:tomato_item", "farming:tomato") -minetest.register_alias("farming_plus:tomato_1", "farming:tomato_2") -minetest.register_alias("farming_plus:tomato_2", "farming:tomato_4") -minetest.register_alias("farming_plus:tomato_3", "farming:tomato_6") -minetest.register_alias("farming_plus:tomato", "farming:tomato_8") - --- Weed -minetest.register_alias("farming:weed", "default:grass_2") diff --git a/mods/farming/corn.lua b/mods/farming/corn.lua deleted file mode 100644 index 43707575e4514d517aaa4a39dadc491a2a455ae9..0000000000000000000000000000000000000000 --- a/mods/farming/corn.lua +++ /dev/null @@ -1,114 +0,0 @@ - ---[[ - Original textures from GeMinecraft - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1440575-1-2-5-generation-minecraft-beta-1-2-farming-and -]] - --- corn -minetest.register_craftitem("farming:corn", { - description = "Corn", - inventory_image = "farming_corn.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:corn_1") - end, - on_use = minetest.item_eat(3), -}) - --- corn on the cob (texture by TenPlus1) -minetest.register_craftitem("farming:corn_cob", { - description = "Corn on the Cob", - inventory_image = "farming_corn_cob.png", - on_use = minetest.item_eat(5), -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 10, - output = "farming:corn_cob", - recipe = "farming:corn" -}) - --- ethanol (thanks to JKMurray for this idea) -minetest.register_craftitem("farming:bottle_ethanol", { - description = "Bottle of Ethanol", - inventory_image = "farming_bottle_ethanol.png", -}) - -minetest.register_craft( { - output = "farming:bottle_ethanol", - recipe = { - { "vessels:glass_bottle", "farming:corn", "farming:corn"}, - { "farming:corn", "farming:corn", "farming:corn"}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "farming:bottle_ethanol", - burntime = 240, - replacements = {{ "farming:bottle_ethanol", "vessels:glass_bottle"}} -}) - --- corn definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_corn_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:corn_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_corn_2.png"} -minetest.register_node("farming:corn_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_corn_3.png"} -minetest.register_node("farming:corn_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_corn_4.png"} -minetest.register_node("farming:corn_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_corn_5.png"} -minetest.register_node("farming:corn_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_corn_6.png"} -crop_def.visual_scale = 1.45 -minetest.register_node("farming:corn_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_corn_7.png"} -crop_def.drop = { - items = { - {items = {'farming:corn'}, rarity = 1}, - {items = {'farming:corn'}, rarity = 2}, - {items = {'farming:corn'}, rarity = 3}, - } -} -minetest.register_node("farming:corn_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_corn_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:corn 2'}, rarity = 1}, - {items = {'farming:corn 2'}, rarity = 2}, - {items = {'farming:corn 2'}, rarity = 2}, - } -} -minetest.register_node("farming:corn_8", table.copy(crop_def)) diff --git a/mods/farming/cotton.lua b/mods/farming/cotton.lua deleted file mode 100644 index 2ddf88e2abbcef4a8f94ef730753091b7fe79dc5..0000000000000000000000000000000000000000 --- a/mods/farming/cotton.lua +++ /dev/null @@ -1,114 +0,0 @@ - --- cotton seeds -minetest.register_node("farming:seed_cotton", { - description = "Cotton Seed", - tiles = {"farming_cotton_seed.png"}, - inventory_image = "farming_cotton_seed.png", - wield_image = "farming_cotton_seed.png", - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1") - end, -}) - --- cotton / string - -minetest.register_craftitem("farming:cotton", { - description = "Cotton", - inventory_image = "farming_cotton.png", -}) - -minetest.register_alias("farming:string", "farming:cotton") - --- cotton to wool -minetest.register_craft({ - output = "wool:white", - recipe = { - {"farming:string", "farming:string"}, - {"farming:string", "farming:string"}, - } -}) - --- cotton definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_cotton_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:cotton_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_cotton_2.png"} -minetest.register_node("farming:cotton_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_cotton_3.png"} -minetest.register_node("farming:cotton_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_cotton_4.png"} -minetest.register_node("farming:cotton_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_cotton_5.png"} -crop_def.drop = { - items = { - {items = {"farming:seed_cotton"}, rarity = 1}, - } -} -minetest.register_node("farming:cotton_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_cotton_6.png"} -crop_def.drop = { - items = { - {items = {"farming:cotton"}, rarity = 1}, - {items = {"farming:cotton"}, rarity = 2}, - } -} -minetest.register_node("farming:cotton_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_cotton_7.png"} -crop_def.drop = { - items = { - {items = {"farming:cotton"}, rarity = 1}, - {items = {"farming:cotton"}, rarity = 2}, - {items = {"farming:seed_cotton"}, rarity = 1}, - {items = {"farming:seed_cotton"}, rarity = 2}, - } -} -minetest.register_node("farming:cotton_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_cotton_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {"farming:string"}, rarity = 1}, - {items = {"farming:string"}, rarity = 2}, - {items = {"farming:string"}, rarity = 3}, - {items = {"farming:seed_cotton"}, rarity = 1}, - {items = {"farming:seed_cotton"}, rarity = 2}, - {items = {"farming:seed_cotton"}, rarity = 3}, - } -} -minetest.register_node("farming:cotton_8", table.copy(crop_def)) diff --git a/mods/farming/cucumber.lua b/mods/farming/cucumber.lua deleted file mode 100644 index 22e367bc4099058c88d5b0d84f75db5330f9ca38..0000000000000000000000000000000000000000 --- a/mods/farming/cucumber.lua +++ /dev/null @@ -1,53 +0,0 @@ - ---[[ - Original textures from DocFarming mod - https://forum.minetest.net/viewtopic.php?id=3948 -]] - --- cucumber -minetest.register_craftitem("farming:cucumber", { - description = "Cucumber", - inventory_image = "farming_cucumber.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:cucumber_1") - end, - on_use = minetest.item_eat(4), -}) - --- cucumber definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_cucumber_1.png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:cucumber_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_cucumber_2.png"} -minetest.register_node("farming:cucumber_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_cucumber_3.png"} -minetest.register_node("farming:cucumber_3", table.copy(crop_def)) - --- stage 4 (final) -crop_def.tiles = {"farming_cucumber_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:cucumber'}, rarity = 1}, - {items = {'farming:cucumber 2'}, rarity = 2}, - } -} -minetest.register_node("farming:cucumber_4", table.copy(crop_def)) diff --git a/mods/farming/depends.txt b/mods/farming/depends.txt deleted file mode 100644 index be420a35cf3e6f6d20908d07a76c11d1a75289c4..0000000000000000000000000000000000000000 --- a/mods/farming/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -wool \ No newline at end of file diff --git a/mods/farming/description.txt b/mods/farming/description.txt deleted file mode 100644 index 58bdc810963630433ccbbd622eed75dd91e1df38..0000000000000000000000000000000000000000 --- a/mods/farming/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds many plants and food to Minetest \ No newline at end of file diff --git a/mods/farming/donut.lua b/mods/farming/donut.lua deleted file mode 100644 index 1b49848b63f60e4bfec823dbdf37b1dc050b8b86..0000000000000000000000000000000000000000 --- a/mods/farming/donut.lua +++ /dev/null @@ -1,45 +0,0 @@ --- Donut (thanks to Bockwurst for making the donut images) -minetest.register_craftitem("farming:donut", { - description = "Donut", - inventory_image = "farming_donut.png", - on_use = minetest.item_eat(4), -}) - -minetest.register_craft({ - output = "farming:donut 3", - recipe = { - {'', 'farming:wheat', ''}, - {'farming:wheat', '', 'farming:wheat'}, - {'', 'farming:wheat', ''}, - } -}) - --- Chocolate Donut -minetest.register_craftitem("farming:donut_chocolate", { - description = "Chocolate Donut", - inventory_image = "farming_donut_chocolate.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:donut_chocolate", - recipe = { - {'farming:cocoa_beans'}, - {'farming:donut'}, - } -}) - --- Apple Donut -minetest.register_craftitem("farming:donut_apple", { - description = "Apple Donut", - inventory_image = "farming_donut_apple.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:donut_apple", - recipe = { - {'default:apple'}, - {'farming:donut'}, - } -}) \ No newline at end of file diff --git a/mods/farming/grapes.lua b/mods/farming/grapes.lua deleted file mode 100644 index 9c93016b65224863f26df674ed8fabd4635ed742..0000000000000000000000000000000000000000 --- a/mods/farming/grapes.lua +++ /dev/null @@ -1,201 +0,0 @@ - --- grapes -minetest.register_craftitem("farming:grapes", { - description = "Grapes", - inventory_image = "farming_grapes.png", - on_use = minetest.item_eat(2), - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if nodename == "farming:trellis" then - minetest.set_node(pointed_thing.under, {name = "farming:grapes_1"}) - - minetest.sound_play("default_place_node", {pos = pointed_thing.above, gain = 1.0}) - else - return - end - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 then - - minetest.after(0.20, - farming.refill_plant, - placer, - "farming:grapes", - placer:get_wield_index() - ) - end - end - - return itemstack - end -}) - --- grapes can be used for violet dye -minetest.register_craft({ - output = "dye:violet", - recipe = { - {'farming:grapes'}, - } -}) - --- trellis -minetest.register_node("farming:trellis", { - description = "Trellis (place on soil before planting grapes)", - drawtype = "plantlike", - tiles = {"farming_trellis.png"}, - inventory_image = "farming_trellis.png", - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = "farming:trellis", - selection_box = farming.select, - groups = {snappy = 3, flammable = 2, attached_node = 1}, - sounds = default.node_sound_leaves_defaults(), - - on_place = function(itemstack, placer, pointed_thing) - - if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then - return - end - - local nodename = minetest.get_node(pointed_thing.under).name - - if minetest.get_item_group(nodename, "soil") < 2 then - return - end - - local top = { - x = pointed_thing.above.x, - y = pointed_thing.above.y + 1, - z = pointed_thing.above.z - } - - nodename = minetest.get_node(top).name - - if nodename ~= "air" then - return - end - - minetest.set_node(pointed_thing.above, {name = "farming:trellis"}) - - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - - return itemstack - end -}) - -minetest.register_craft({ - output = "farming:trellis", - recipe = { - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "farming:trellis", - burntime = 15, -}) - --- grapes definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_grapes_1.png"}, - visual_scale = 1.45, - paramtype = "light", - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:trellis'}, rarity = 1}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 3, not_in_creative_inventory = 1, - attached_node = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:grapes_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_grapes_2.png"} -minetest.register_node("farming:grapes_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_grapes_3.png"} -minetest.register_node("farming:grapes_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_grapes_4.png"} -minetest.register_node("farming:grapes_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_grapes_5.png"} -minetest.register_node("farming:grapes_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_grapes_6.png"} -minetest.register_node("farming:grapes_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_grapes_7.png"} -minetest.register_node("farming:grapes_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_grapes_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:trellis'}, rarity = 1}, - {items = {'farming:grapes 3'}, rarity = 1}, - {items = {'farming:grapes 1'}, rarity = 2}, - {items = {'farming:grapes 1'}, rarity = 3}, - } -} -minetest.register_node("farming:grapes_8", table.copy(crop_def)) - --- wild grape vine (this is what you find on the map) -minetest.register_node("farming:grapebush", { - drawtype = "plantlike", - tiles = {"farming_grapebush.png"}, - paramtype = "light", - waving = 1, - walkable = false, - buildable_to = true, - sunlight_propagates = true, - drop = { - items = { - {items = {'farming:grapes 1'}, rarity = 1}, - {items = {'farming:grapes 1'}, rarity = 2}, - {items = {'farming:grapes 1'}, rarity = 3}, - } - }, - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory=1 - }, - sounds = default.node_sound_leaves_defaults(), -}) diff --git a/mods/farming/grass.lua b/mods/farming/grass.lua deleted file mode 100644 index aacb220f4dc5b24b2db82aee1dff7307ebcb47d8..0000000000000000000000000000000000000000 --- a/mods/farming/grass.lua +++ /dev/null @@ -1,42 +0,0 @@ - -for i = 3, 5 do - - -- Override default grass and have it drop Wheat Seeds - - minetest.override_item("default:grass_" .. i, { - drop = { - max_items = 1, - items = { - {items = {'farming:seed_wheat'}, rarity = 5}, - {items = {'default:grass_1'}}, - } - }, - }) - - -- Override default dry grass and have it drop Barley Seeds - if minetest.registered_nodes["default:dry_grass_1"] then - - minetest.override_item("default:dry_grass_" .. i, { - drop = { - max_items = 1, - items = { - {items = {'farming:seed_barley'}, rarity = 6}, - {items = {'default:dry_grass_1'}}, - } - }, - }) - end - -end - --- Override default Jungle Grass and have it drop Cotton Seeds - -minetest.override_item("default:junglegrass", { - drop = { - max_items = 1, - items = { - {items = {'farming:seed_cotton'}, rarity = 8}, - {items = {'default:junglegrass'}}, - } - }, -}) diff --git a/mods/farming/hoes.lua b/mods/farming/hoes.lua deleted file mode 100644 index ef27d420ebe0985a02c5cf75f5d7ef358e6b7dae..0000000000000000000000000000000000000000 --- a/mods/farming/hoes.lua +++ /dev/null @@ -1,151 +0,0 @@ - --- Hoe registration function - -farming.register_hoe = function(name, def) - - -- Check for : prefix (register new hoes in your mod's namespace) - if name:sub(1,1) ~= ":" then - name = ":" .. name - end - - -- Check def table - if def.description == nil then - def.description = "Hoe" - end - - if def.inventory_image == nil then - def.inventory_image = "unknown_item.png" - end - - if def.recipe == nil then - def.recipe = { - {"air","air",""}, - {"","group:stick",""}, - {"","group:stick",""} - } - end - - if def.max_uses == nil then - def.max_uses = 30 - end - - -- Register the tool - minetest.register_tool(name, { - description = def.description, - inventory_image = def.inventory_image, - on_use = function(itemstack, user, pointed_thing) - return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses) - end - }) - - -- Register its recipe - if def.material == nil then - minetest.register_craft({ - output = name:sub(2), - recipe = def.recipe - }) - else - minetest.register_craft({ - output = name:sub(2), - recipe = { - {def.material, def.material, ""}, - {"", "group:stick", ""}, - {"", "group:stick", ""} - } - }) - end -end - --- Turns dirt with group soil=1 into soil - -function farming.hoe_on_use(itemstack, user, pointed_thing, uses) - - local pt = pointed_thing - - -- check if pointing at a node - if not pt or pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local upos = pointed_thing.under - - if minetest.is_protected(upos, user:get_player_name()) then - minetest.record_protection_violation(upos, user:get_player_name()) - return - end - - local p = {x = pt.under.x, y = pt.under.y + 1, z = pt.under.z} - local above = minetest.get_node(p) - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] - or not minetest.registered_nodes[above.name] then - return - end - - -- check if the node above the pointed thing is air - if above.name ~= "air" then - return - end - - -- check if pointing at dirt - if minetest.get_item_group(under.name, "soil") ~= 1 then - return - end - - -- turn the node into soil, wear out item and play sound - minetest.set_node(pt.under, {name = "farming:soil"}) - - minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5}) - - if not minetest.setting_getbool("creative_mode") then - itemstack:add_wear(65535/(uses-1)) - end - - return itemstack -end - --- Define Hoes - -farming.register_hoe(":farming:hoe_wood", { - description = "Wooden Hoe", - inventory_image = "farming_tool_woodhoe.png", - max_uses = 30, - material = "group:wood" -}) - -farming.register_hoe(":farming:hoe_stone", { - description = "Stone Hoe", - inventory_image = "farming_tool_stonehoe.png", - max_uses = 90, - material = "group:stone" -}) - -farming.register_hoe(":farming:hoe_steel", { - description = "Steel Hoe", - inventory_image = "farming_tool_steelhoe.png", - max_uses = 200, - material = "default:steel_ingot" -}) - -farming.register_hoe(":farming:hoe_bronze", { - description = "Bronze Hoe", - inventory_image = "farming_tool_bronzehoe.png", - max_uses = 220, - material = "default:bronze_ingot" -}) - -farming.register_hoe(":farming:hoe_mese", { - description = "Mese Hoe", - inventory_image = "farming_tool_mesehoe.png", - max_uses = 350, - material = "default:mese_crystal" -}) - -farming.register_hoe(":farming:hoe_diamond", { - description = "Diamond Hoe", - inventory_image = "farming_tool_diamondhoe.png", - max_uses = 500, - material = "default:diamond" -}) diff --git a/mods/farming/init.lua b/mods/farming/init.lua deleted file mode 100644 index 2d92e094c2c473d5a567d5bcd1fb98e0686e7b33..0000000000000000000000000000000000000000 --- a/mods/farming/init.lua +++ /dev/null @@ -1,797 +0,0 @@ ---[[ - Minetest Farming Redo Mod 1.22 (31st March 2016) - by TenPlus1 - NEW growing routine by prestidigitator - auto-refill by crabman77 -]] - -farming = {} -farming.mod = "redo" -farming.path = minetest.get_modpath("farming") -farming.hoe_on_use = default.hoe_on_use -farming.select = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} -} - -farming.DEBUG = false --- farming.DEBUG = {} -- Uncomment to turn on profiling code/functions - -local DEBUG_abm_runs = 0 -local DEBUG_abm_time = 0 -local DEBUG_timer_runs = 0 -local DEBUG_timer_time = 0 - -if farming.DEBUG then - - function farming.DEBUG.reset_times() - DEBUG_abm_runs = 0 - DEBUG_abm_time = 0 - DEBUG_timer_runs = 0 - DEBUG_timer_time = 0 - end - - function farming.DEBUG.report_times() - - local abm_n = DEBUG_abm_runs - local abm_dt = DEBUG_abm_time - local abm_avg = (abm_n > 0 and abm_dt / abm_n) or 0 - local timer_n = DEBUG_timer_runs - local timer_dt = DEBUG_timer_time - local timer_avg = (timer_n > 0 and timer_dt / timer_n) or 0 - local dt = abm_dt + timer_dt - - print("ABM ran for "..abm_dt.."µs over "..abm_n.." runs: "..abm_avg.."µs/run") - print("Timer ran for "..timer_dt.."µs over "..timer_n.." runs: "..timer_avg.."µs/run") - print("Total farming time: "..dt.."µs") - end -end - -local statistics = dofile(farming.path.."/statistics.lua") - -dofile(farming.path.."/soil.lua") -dofile(farming.path.."/banana.lua") -dofile(farming.path.."/hoes.lua") -dofile(farming.path.."/grass.lua") -dofile(farming.path.."/wheat.lua") -dofile(farming.path.."/cotton.lua") -dofile(farming.path.."/carrot.lua") -dofile(farming.path.."/potato.lua") -dofile(farming.path.."/tomato.lua") -dofile(farming.path.."/cucumber.lua") -dofile(farming.path.."/corn.lua") -dofile(farming.path.."/coffee.lua") -dofile(farming.path.."/melon.lua") -dofile(farming.path.."/sugar.lua") -dofile(farming.path.."/pumpkin.lua") -dofile(farming.path.."/cocoa.lua") -dofile(farming.path.."/raspberry.lua") -dofile(farming.path.."/strawberry.lua") -dofile(farming.path.."/blueberry.lua") -dofile(farming.path.."/rhubarb.lua") -dofile(farming.path.."/beanpole.lua") -dofile(farming.path.."/grapes.lua") -dofile(farming.path.."/barley.lua") -dofile(farming.path.."/oranges.lua") -dofile(farming.path.."/donut.lua") -dofile(farming.path.."/mapgen.lua") -dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility - --- Utility Functions - -local time_speed = tonumber(minetest.setting_get("time_speed")) or 72 -local SECS_PER_CYCLE = (time_speed > 0 and 24 * 60 * 60 / time_speed) or 0 - -local function clamp(x, min, max) - return (x < min and min) or (x > max and max) or x -end - -local function in_range(x, min, max) - return min <= x and x <= max -end - ---- Tests the amount of day or night time between two times. - -- - -- @param t_game - -- The current time, as reported by mintest.get_gametime(). - -- @param t_day - -- The current time, as reported by mintest.get_timeofday(). - -- @param dt - -- The amount of elapsed time. - -- @param count_day - -- If true, count elapsed day time. Otherwise, count elapsed night time. - -- @return - -- The amount of day or night time that has elapsed. - -local function day_or_night_time(t_game, t_day, dt, count_day) - - local t1_day = t_day - dt / SECS_PER_CYCLE - local t1_c, t2_c -- t1_c < t2_c and t2_c always in [0, 1) - - if count_day then - - if t_day < 0.25 then - t1_c = t1_day + 0.75 -- Relative to sunup, yesterday - t2_c = t_day + 0.75 - else - t1_c = t1_day - 0.25 -- Relative to sunup, today - t2_c = t_day - 0.25 - end - else - if t_day < 0.75 then - t1_c = t1_day + 0.25 -- Relative to sundown, yesterday - t2_c = t_day + 0.25 - else - t1_c = t1_day - 0.75 -- Relative to sundown, today - t2_c = t_day - 0.75 - end - end - - local dt_c = clamp(t2_c, 0, 0.5) - clamp(t1_c, 0, 0.5) -- this cycle - - if t1_c < -0.5 then - local nc = math.floor(-t1_c) - t1_c = t1_c + nc - dt_c = dt_c + 0.5 * nc + clamp(-t1_c - 0.5, 0, 0.5) - end - - return dt_c * SECS_PER_CYCLE -end - ---- Tests the amount of elapsed day time. - -- - -- @param dt - -- The amount of elapsed time. - -- @return - -- The amount of day time that has elapsed. - -- -local function day_time(dt) - return day_or_night_time(minetest.get_gametime(), minetest.get_timeofday(), dt, true) -end - ---- Tests the amount of elapsed night time. - -- - -- @param dt - -- The amount of elapsed time. - -- @return - -- The amount of night time that has elapsed. - -- -local function night_time(time_game, time_day, dt, count_day) - return day_or_night_time(minetest.get_gametime(), minetest.get_timeofday(), dt, false) -end - - --- Growth Logic - -local STAGE_LENGTH_AVG = 160.0 -local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 -local MIN_LIGHT = 13 -local MAX_LIGHT = 1000 - ---- Determines plant name and stage from node. - -- - -- Separates node name on the last underscore (_). - -- - -- @param node - -- Node or position table, or node name. - -- @return - -- List (plant_name, stage), or nothing (nil) if node isn't loaded - -local function plant_name_stage(node) - - local name - - if type(node) == 'table' then - - if node.name then - name = node.name - elseif node.x and node.y and node.z then - node = minetest.get_node_or_nil(node) - name = node and node.name - end - else - name = tostring(node) - end - - if not name or name == "ignore" then - return nil - end - - local sep_pos = name:find("_[^_]+$") - - if sep_pos and sep_pos > 1 then - - local stage = tonumber(name:sub(sep_pos + 1)) - - if stage and stage >= 0 then - return name:sub(1, sep_pos - 1), stage - end - end - - return name, 0 -end - --- Map from node name to --- { plant_name = ..., name = ..., stage = n, stages_left = { node_name, ... } } - -local plant_stages = {} - -farming.plant_stages = plant_stages - ---- Registers the stages of growth of a (possible plant) node. - -- - -- @param node - -- Node or position table, or node name. - -- @return - -- The (possibly zero) number of stages of growth the plant will go through - -- before being fully grown, or nil if not a plant. - -local register_plant_node - --- Recursive helper -local function reg_plant_stages(plant_name, stage, force_last) - - local node_name = plant_name and plant_name .. "_" .. stage - local node_def = node_name and minetest.registered_nodes[node_name] - - if not node_def then - return nil - end - - local stages = plant_stages[node_name] - - if stages then - return stages - end - - if minetest.get_item_group(node_name, "growing") > 0 then - - local ns = reg_plant_stages(plant_name, stage + 1, true) - local stages_left = (ns and { ns.name, unpack(ns.stages_left) }) or {} - - stages = { - plant_name = plant_name, - name = node_name, - stage = stage, - stages_left = stages_left - } - - if #stages_left > 0 then - - local old_constr = node_def.on_construct - local old_destr = node_def.on_destruct - - minetest.override_item(node_name, - { - on_construct = function(pos) - - if old_constr then - old_constr(pos) - end - - farming.handle_growth(pos) - end, - - on_destruct = function(pos) - - minetest.get_node_timer(pos):stop() - - if old_destr then - old_destr(pos) - end - end, - - on_timer = function(pos, elapsed) - return farming.plant_growth_timer(pos, elapsed, node_name) - end, - }) - end - - elseif force_last then - - stages = { - plant_name = plant_name, - name = node_name, - stage = stage, - stages_left = {} - } - else - return nil - end - - plant_stages[node_name] = stages - - return stages -end - -register_plant_node = function(node) - - local plant_name, stage = plant_name_stage(node) - - if plant_name then - - local stages = reg_plant_stages(plant_name, stage, false) - return stages and #stages.stages_left - else - return nil - end -end - -local function set_growing(pos, stages_left) - - if not stages_left then - return - end - - local timer = minetest.get_node_timer(pos) - - if stages_left > 0 then - - if not timer:is_started() then - - local stage_length = statistics.normal(STAGE_LENGTH_AVG, STAGE_LENGTH_DEV) - - stage_length = clamp(stage_length, 0.5 * STAGE_LENGTH_AVG, 3.0 * STAGE_LENGTH_AVG) - - timer:set(stage_length, -0.5 * math.random() * STAGE_LENGTH_AVG) - end - - elseif timer:is_started() then - timer:stop() - end -end - --- https://git.tchncs.de/Illuna-Minetest/farming_plus/blob/master/init.lua#L54 - -function farming.generate_tree(pos, trunk, leaves, underground, replacements) - pos.y = pos.y-1 - local nodename = minetest.get_node(pos).name - local ret = true - for _,name in ipairs(underground) do - if nodename == name then - ret = false - break - end - end - pos.y = pos.y+1 - if not minetest.get_node_light(pos) then - return - end - if ret or minetest.get_node_light(pos) < 8 then - return - end - - node = {name = ""} - for dy=1,4 do - pos.y = pos.y+dy - if minetest.get_node(pos).name ~= "air" then - return - end - pos.y = pos.y-dy - end - node.name = trunk - for dy=0,4 do - pos.y = pos.y+dy - minetest.set_node(pos, node) - pos.y = pos.y-dy - end - - if not replacements then - replacements = {} - end - - node.name = leaves - pos.y = pos.y+3 - for dx=-2,2 do - for dz=-2,2 do - for dy=0,3 do - pos.x = pos.x+dx - pos.y = pos.y+dy - pos.z = pos.z+dz - - if dx == 0 and dz == 0 and dy==3 then - if minetest.get_node(pos).name == "air" and math.random(1, 5) <= 4 then - minetest.set_node(pos, node) - for name,rarity in pairs(replacements) do - if math.random(1, rarity) == 1 then - minetest.set_node(pos, {name=name}) - end - end - end - elseif dx == 0 and dz == 0 and dy==4 then - if minetest.get_node(pos).name == "air" and math.random(1, 5) <= 4 then - minetest.set_node(pos, node) - for name,rarity in pairs(replacements) do - if math.random(1, rarity) == 1 then - minetest.set_node(pos, {name=name}) - end - end - end - elseif math.abs(dx) ~= 2 and math.abs(dz) ~= 2 then - if minetest.get_node(pos).name == "air" then - minetest.set_node(pos, node) - for name,rarity in pairs(replacements) do - if math.random(1, rarity) == 1 then - minetest.set_node(pos, {name=name}) - end - end - end - else - if math.abs(dx) ~= 2 or math.abs(dz) ~= 2 then - if minetest.get_node(pos).name == "air" and math.random(1, 5) <= 4 then - minetest.set_node(pos, node) - for name,rarity in pairs(replacements) do - if math.random(1, rarity) == 1 then - minetest.set_node(pos, {name=name}) - end - end - end - end - end - - pos.x = pos.x-dx - pos.y = pos.y-dy - pos.z = pos.z-dz - end - end - end -end - --- Detects a plant type node at the given position, starting --- or stopping the plant growth timer as appopriate - --- @param pos --- The node's position. --- @param node --- The cached node table if available, or nil. - -function farming.handle_growth(pos, node) - - if not pos then - return - end - - local stages_left = register_plant_node(node or pos) - - if stages_left then - set_growing(pos, stages_left) - end -end - -minetest.after(0, function() - - for _, node_def in pairs(minetest.registered_nodes) do - register_plant_node(node_def) - end -end) - -local abm_func = farming.handle_growth - -if farming.DEBUG then - - local normal_abm_func = abm_func - - abm_func = function(...) - - local t0 = minetest.get_us_time() - local r = { normal_abm_func(...) } - local t1 = minetest.get_us_time() - - DEBUG_abm_runs = DEBUG_abm_runs + 1 - DEBUG_abm_time = DEBUG_abm_time + (t1 - t0) - - return unpack(r) - end -end - --- Just in case a growing type or added node is missed (also catches existing --- nodes added to map before timers were incorporated). - -minetest.register_abm({ - nodenames = { "group:growing" }, - interval = 300, - chance = 1, - action = abm_func -}) - --- Plant timer function. --- Grows plants under the right conditions. - -function farming.plant_growth_timer(pos, elapsed, node_name) - - local stages = plant_stages[node_name] - - if not stages then - return false - end - - local max_growth = #stages.stages_left - - if max_growth <= 0 then - return false - end - - if stages.plant_name == "farming:cocoa" then - - if not minetest.find_node_near(pos, 1, - {"default:jungletree", "moretrees:jungletree_leaves_green"}) then - - return true - end - else - local under = minetest.get_node_or_nil({ x = pos.x, y = pos.y - 1, z = pos.z }) - - if not under or under.name ~= "farming:soil_wet" then - return true - end - end - - local growth - local light_pos = {x = pos.x, y = pos.y, z = pos.z} - local lambda = elapsed / STAGE_LENGTH_AVG - - if lambda < 0.1 then - return true - end - - if max_growth == 1 or lambda < 2.0 then - - local light = (minetest.get_node_light(light_pos) or 0) - --print ("light level:", light) - - if not in_range(light, MIN_LIGHT, MAX_LIGHT) then - return true - end - - growth = 1 - else - local night_light = (minetest.get_node_light(light_pos, 0) or 0) - local day_light = (minetest.get_node_light(light_pos, 0.5) or 0) - local night_growth = in_range(night_light, MIN_LIGHT, MAX_LIGHT) - local day_growth = in_range(day_light, MIN_LIGHT, MAX_LIGHT) - - if not night_growth then - - if not day_growth then - return true - end - - lambda = day_time(elapsed) / STAGE_LENGTH_AVG - - elseif not day_growth then - - lambda = night_time(elapsed) / STAGE_LENGTH_AVG - end - - growth = statistics.poisson(lambda, max_growth) - - if growth < 1 then - return true - end - end - - if minetest.registered_nodes[stages.stages_left[growth]] then - minetest.swap_node(pos, {name = stages.stages_left[growth]}) - else - return true - end - - return growth ~= max_growth -end - -if farming.DEBUG then - - local timer_func = farming.plant_growth_timer; - - farming.plant_growth_timer = function(pos, elapsed, node_name) - - local t0 = minetest.get_us_time() - local r = { timer_func(pos, elapsed, node_name) } - local t1 = minetest.get_us_time() - - DEBUG_timer_runs = DEBUG_timer_runs + 1 - DEBUG_timer_time = DEBUG_timer_time + (t1 - t0) - - return unpack(r) - end -end - --- refill placed plant by crabman (26/08/2015) -local can_refill_plant = { - ["farming:blueberry_1"] = "farming:blueberries", - ["farming:carrot_1"] = "farming:carrot", - ["farming:coffee_1"] = "farming:coffee_beans", - ["farming:corn_1"] = "farming:corn", - ["farming:cotton_1"] = "farming:seed_cotton", - ["farming:cucumber_1"] = "farming:cucumber", - ["farming:melon_1"] = "farming:melon_slice", - ["farming:potato_1"] = "farming:potato", - ["farming:pumpkin_1"] = "farming:pumpkin_slice", - ["farming:raspberry_1"] = "farming:raspberries", - ["farming:rhubarb_1"] = "farming:rhubarb", - ["farming:tomato_1"] = "farming:tomato", - ["farming:wheat_1"] = "farming:seed_wheat", - ["farming:grapes_1"] = "farming:grapes", - ["farming:beans_1"] = "farming:beans", - ["farming:rhubarb_1"] = "farming:rhubarb", - ["farming:cocoa_1"] = "farming:cocoa_beans", - ["farming:orange_1"] = "farming:orange_item", -} - -function farming.refill_plant(player, plantname, index) - - local inv = player:get_inventory() - local old_stack = inv:get_stack("main", index) - - if old_stack:get_name() ~= "" then - return - end - - for i, stack in pairs(inv:get_list("main")) do - - if stack:get_name() == plantname and i ~= index then - - inv:set_stack("main", index, stack) - stack:clear() - inv:set_stack("main", i, stack) - --minetest.log("action", "farming: refilled stack("..plantname..") of " .. player:get_player_name() ) - return - end - end -end - --- Place Seeds on Soil - -function farming.place_seed(itemstack, placer, pointed_thing, plantname) - - local pt = pointed_thing - - -- check if pointing at a node - if not pt or pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local above = minetest.get_node(pt.above) - - -- check if pointing at the top of the node - if pt.above.y ~= pt.under.y + 1 then - return - end - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] - or not minetest.registered_nodes[above.name] then - return - end - - -- can I replace above node, and am I pointing at soil - if not minetest.registered_nodes[above.name].buildable_to - or minetest.get_item_group(under.name, "soil") < 2 - -- avoid multiple seed placement bug - or minetest.get_item_group(above.name, "plant") ~= 0 then - return - end - - -- if not protected then add node and remove 1 item from the itemstack - if not minetest.is_protected(pt.above, placer:get_player_name()) then - - minetest.set_node(pt.above, {name = plantname, param2 = 1}) - - minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0}) - - if not minetest.setting_getbool("creative_mode") then - - itemstack:take_item() - - -- check for refill - if itemstack:get_count() == 0 - and can_refill_plant[plantname] then - - minetest.after(0.10, - farming.refill_plant, - placer, - can_refill_plant[plantname], - placer:get_wield_index() - ) - end - end - - return itemstack - end -end - --- Function to register plants (for compatibility) - -farming.register_plant = function(name, def) - - local mname = name:split(":")[1] - local pname = name:split(":")[2] - - -- Check def table - if not def.description then - def.description = "Seed" - end - - if not def.inventory_image then - def.inventory_image = "unknown_item.png" - end - - if not def.steps then - return nil - end - - -- Register seed - minetest.register_node(":" .. mname .. ":seed_" .. pname, { - - description = def.description, - tiles = {def.inventory_image}, - inventory_image = def.inventory_image, - wield_image = def.inventory_image, - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":"..pname.."_1") - end, - }) - - -- Register harvest - minetest.register_craftitem(":" .. mname .. ":" .. pname, { - description = pname:gsub("^%l", string.upper), - inventory_image = mname .. "_" .. pname .. ".png", - }) - - -- Register growing steps - for i = 1, def.steps do - - local drop = { - items = { - {items = {mname .. ":" .. pname}, rarity = 9 - i}, - {items = {mname .. ":" .. pname}, rarity= 18 - i * 2}, - {items = {mname .. ":seed_" .. pname}, rarity = 9 - i}, - {items = {mname .. ":seed_" .. pname}, rarity = 18 - i * 2}, - } - } - - local g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, growing = 1} - - -- Last step doesn't need growing=1 so Abm never has to check these - if i == def.steps then - g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1} - end - - local node_name = mname .. ":" .. pname .. "_" .. i - - minetest.register_node(node_name, { - drawtype = "plantlike", - waving = 1, - tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - drop = drop, - selection_box = farming.select, - groups = g, - sounds = default.node_sound_leaves_defaults(), - }) - - register_plant_node(node_name) - end - - -- Return info - local r = {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname} - return r -end - ---[[ Cotton (example, is already registered in cotton.lua) -farming.register_plant("farming:cotton", { - description = "Cotton2 seed", - inventory_image = "farming_cotton_seed.png", - steps = 8, -})]] diff --git a/mods/farming/init.lua_orig b/mods/farming/init.lua_orig deleted file mode 100644 index aee9976fcf7c3b9eda405a897517af6fe956b4b7..0000000000000000000000000000000000000000 --- a/mods/farming/init.lua_orig +++ /dev/null @@ -1,192 +0,0 @@ ---[[ - Minetest Farming Redo Mod 1.14 (11th May 2015) - by TenPlus1 -]] - -farming = {} -farming.mod = "redo" -farming.path = minetest.get_modpath("farming") -farming.hoe_on_use = default.hoe_on_use - -dofile(farming.path.."/soil.lua") -dofile(farming.path.."/hoes.lua") -dofile(farming.path.."/grass.lua") -dofile(farming.path.."/wheat.lua") -dofile(farming.path.."/cotton.lua") -dofile(farming.path.."/carrot.lua") -dofile(farming.path.."/potato.lua") -dofile(farming.path.."/tomato.lua") -dofile(farming.path.."/cucumber.lua") -dofile(farming.path.."/corn.lua") -dofile(farming.path.."/coffee.lua") -dofile(farming.path.."/melon.lua") -dofile(farming.path.."/sugar.lua") -dofile(farming.path.."/pumpkin.lua") -dofile(farming.path.."/cocoa.lua") -dofile(farming.path.."/raspberry.lua") -dofile(farming.path.."/blueberry.lua") -dofile(farming.path.."/rhubarb.lua") -dofile(farming.path.."/beanpole.lua") -dofile(farming.path.."/donut.lua") -dofile(farming.path.."/mapgen.lua") -dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility - --- Place Seeds on Soil - -function farming.place_seed(itemstack, placer, pointed_thing, plantname) - local pt = pointed_thing - - -- check if pointing at a node - if not pt and pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local above = minetest.get_node(pt.above) - - -- check if pointing at the top of the node - if pt.above.y ~= pt.under.y+1 then - return - end - - -- return if any of the nodes is not registered - if not minetest.registered_nodes[under.name] - or not minetest.registered_nodes[above.name] then - return - end - - -- can I replace above node, and am I pointing at soil - if not minetest.registered_nodes[above.name].buildable_to - or minetest.get_item_group(under.name, "soil") < 2 - or minetest.get_item_group(above.name, "plant") ~= 0 then -- ADDED this line for multiple seed placement bug - return - end - - -- add the node and remove 1 item from the itemstack - if not minetest.is_protected(pt.above, placer:get_player_name()) then - minetest.add_node(pt.above, {name=plantname}) - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack - end -end - --- Single ABM Handles Growing of All Plants - -minetest.register_abm({ - nodenames = {"group:growing"}, - neighbors = {"farming:soil_wet", "default:jungletree"}, - interval = 80, - chance = 2, - - action = function(pos, node) - - -- split plant name (e.g. farming:wheat_1) - local plant = node.name:split("_")[1].."_" - local numb = node.name:split("_")[2] - - -- fully grown ? - if not minetest.registered_nodes[plant..(numb + 1)] then return end - - -- cocoa pod on jungle tree ? - if plant ~= "farming:cocoa_" then - - -- growing on wet soil ? - if minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name ~= "farming:soil_wet" then return end - end - - -- enough light ? - if minetest.get_node_light(pos) < 13 then return end - - -- grow - minetest.set_node(pos, {name=plant..(numb + 1)}) - - end -}) - --- Function to register plants (for compatibility) - -farming.register_plant = function(name, def) - local mname = name:split(":")[1] - local pname = name:split(":")[2] - - -- Check def table - if not def.description then - def.description = "Seed" - end - if not def.inventory_image then - def.inventory_image = "unknown_item.png" - end - if not def.steps then - return nil - end - - -- Register seed - minetest.register_node(":" .. mname .. ":seed_" .. pname, { - description = def.description, - tiles = {def.inventory_image}, - inventory_image = def.inventory_image, - wield_image = def.inventory_image, - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},}, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":"..pname.."_1") - end - }) - - -- Register harvest - minetest.register_craftitem(":" .. mname .. ":" .. pname, { - description = pname:gsub("^%l", string.upper), - inventory_image = mname .. "_" .. pname .. ".png", - }) - - -- Register growing steps - for i=1,def.steps do - local drop = { - items = { - {items = {mname .. ":" .. pname}, rarity = 9 - i}, - {items = {mname .. ":" .. pname}, rarity= 18 - i * 2}, - {items = {mname .. ":seed_" .. pname}, rarity = 9 - i}, - {items = {mname .. ":seed_" .. pname}, rarity = 18 - i * 2}, - } - } - - local g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, growing = 1} - -- Last step doesn't need growing=1 so Abm never has to check these - if i == def.steps then - g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1} - end - - minetest.register_node(mname .. ":" .. pname .. "_" .. i, { - drawtype = "plantlike", - waving = 1, - tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, - paramtype = "light", - walkable = false, - buildable_to = true, - is_ground_content = true, - drop = drop, - selection_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},}, - groups = g, - sounds = default.node_sound_leaves_defaults(), - }) - end - - -- Return info - local r = {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname} - return r -end - ---[[ Cotton (example, is already registered in cotton.lua) -farming.register_plant("farming:cotton", { - description = "Cotton seed", - inventory_image = "farming_cotton_seed.png", - steps = 8, -}) ---]] diff --git a/mods/farming/license.txt b/mods/farming/license.txt deleted file mode 100644 index 5d30c149bb73f7a30c19826da0350853a0caa7e5..0000000000000000000000000000000000000000 --- a/mods/farming/license.txt +++ /dev/null @@ -1,14 +0,0 @@ - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. \ No newline at end of file diff --git a/mods/farming/mapgen.lua b/mods/farming/mapgen.lua deleted file mode 100644 index 1cb46ca2c16da44373a37c2be6716a5f61d8153f..0000000000000000000000000000000000000000 --- a/mods/farming/mapgen.lua +++ /dev/null @@ -1,65 +0,0 @@ --- decoration function -local function register_plant(name, min, max, spawnby, num) - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = 0.006, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_min = min, - y_max = max, - decoration = "farming:" .. name, - spawn_by = spawnby, - num_spawn_by = num, - }) -end - -function farming.register_mgv6_decorations() - register_plant("potato_3", 15, 40, "", -1) - register_plant("tomato_7", 5, 20, "", -1) - register_plant("carrot_8", 1, 30, "group:water", 1) - register_plant("cucumber_4", 1, 20, "group:water", 1) - register_plant("corn_7", 12, 22, "", -1) - register_plant("corn_8", 10, 20, "", -1) - register_plant("coffee_5", 20, 45, "", -1) - register_plant("melon_8", 1, 20, "group:water", 1) - register_plant("pumpkin_8", 1, 20, "group:water", 1) - register_plant("raspberry_4", 3, 10, "", -1) - register_plant("rhubarb_3", 3, 15, "", -1) - register_plant("blueberry_4", 3, 10, "", -1) - register_plant("beanbush", 18, 35, "", -1) - register_plant("grapebush", 25, 45, "", -1) - register_plant("strawberry_4", 3, 10, "", -1) -end - --- v7 maps have a beach so plants growing near water is limited to 6 high -function farming.register_mgv7_decorations() - register_plant("potato_3", 15, 40, "", -1) - register_plant("tomato_7", 5, 20, "", -1) - register_plant("carrot_8", 1, 6, "", -1) - register_plant("cucumber_4", 1, 6, "", -1) - register_plant("corn_7", 12, 22, "", -1) - register_plant("corn_8", 10, 20, "", -1) - register_plant("coffee_5", 20, 45, "", -1) - register_plant("melon_8", 1, 6, "", -1) - register_plant("pumpkin_8", 1, 6, "", -1) - register_plant("raspberry_4", 3, 10, "", -1) - register_plant("rhubarb_3", 3, 15, "", -1) - register_plant("blueberry_4", 3, 10, "", -1) - register_plant("beanbush", 18, 35, "", -1) - register_plant("grapebush", 25, 45, "", -1) - register_plant("strawberry_4", 3, 10, "", -1) -end - --- detect mapgen -if minetest.get_mapgen_params().mgname == "v6" then - farming.register_mgv6_decorations() -else - farming.register_mgv7_decorations() -end diff --git a/mods/farming/melon.lua b/mods/farming/melon.lua deleted file mode 100644 index fb59e7bf0989b226947f2c0d758e2c942546f2b9..0000000000000000000000000000000000000000 --- a/mods/farming/melon.lua +++ /dev/null @@ -1,80 +0,0 @@ - --- melon -minetest.register_craftitem("farming:melon_slice", { - description = "Melon Slice", - inventory_image = "farming_melon_slice.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:melon_1") - end, - on_use = minetest.item_eat(2), -}) - -minetest.register_craft({ - output = "farming:melon_8", - recipe = { - {"farming:melon_slice", "farming:melon_slice", "farming:melon_slice"}, - {"farming:melon_slice", "farming:melon_slice", "farming:melon_slice"}, - {"farming:melon_slice", "farming:melon_slice", "farming:melon_slice"}, - } -}) - -minetest.register_craft({ - output = "farming:melon_slice 9", - recipe = { - {"", "farming:melon_8", ""}, - } -}) - --- melon definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_melon_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:melon_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_melon_2.png"} -minetest.register_node("farming:melon_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_melon_3.png"} -minetest.register_node("farming:melon_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_melon_4.png"} -minetest.register_node("farming:melon_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_melon_5.png"} -minetest.register_node("farming:melon_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_melon_6.png"} -minetest.register_node("farming:melon_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_melon_7.png"} -minetest.register_node("farming:melon_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.drawtype = "nodebox" -crop_def.description = "Melon" -crop_def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"} -crop_def.selection_box = {-.5, -.5, -.5, .5, .5, .5} -crop_def.walkable = true -crop_def.groups = {snappy = 3, oddly_breakable_by_hand = 1, flammable = 2, plant = 1} -crop_def.drop = "farming:melon_slice 9" -minetest.register_node("farming:melon_8", table.copy(crop_def)) diff --git a/mods/farming/mod.conf b/mods/farming/mod.conf deleted file mode 100644 index 80ab8b0bd0247b83a5ea271c91069441da337369..0000000000000000000000000000000000000000 --- a/mods/farming/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = farming \ No newline at end of file diff --git a/mods/farming/oranges.lua b/mods/farming/oranges.lua deleted file mode 100644 index 88e39afade3898fb6de2cb7ae5759943c22e39ef..0000000000000000000000000000000000000000 --- a/mods/farming/oranges.lua +++ /dev/null @@ -1,58 +0,0 @@ -minetest.register_craftitem("farming:orange_seed", { - description = "Orange Seeds", - inventory_image = "farming_orange_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:orange_1") - end -}) - -minetest.register_craftitem("farming:orange_item", { - description = "Orange", - inventory_image = "farming_orange.png", - on_use = minetest.item_eat(4), - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:orange_1") - end -}) - --- orange definition -local crop_def = { - paramtype = "plantlike", - walkable = false, - paramtype = "light", - sunlight_propagates = true, - buildable_to = true, - drawtype = "plantlike", - drop = "", - tiles = {"farming_orange_1.png"}, - selection_box = farming.select, - groups = {snappy=3, flammable=2, not_in_creative_inventory=1,plant=1,growing=1}, - sounds = default.node_sound_leaves_defaults(), -} - --- stage 1 -minetest.register_node("farming:orange_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_orange_2.png"} -minetest.register_node("farming:orange_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_orange_3.png"} -minetest.register_node("farming:orange_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_orange_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - { items = {'farming:orange_seed'} }, - { items = {'farming:orange_seed'}, rarity = 2}, - { items = {'farming:orange_seed'}, rarity = 5}, - { items = {'farming:orange_item'} }, - { items = {'farming:orange_item'}, rarity = 2 }, - { items = {'farming:orange_item'}, rarity = 5 }, - } -} - -minetest.register_node("farming:orange_4", table.copy(crop_def)) diff --git a/mods/farming/potato.lua b/mods/farming/potato.lua deleted file mode 100644 index fa95442c8208021dfaeeabd76253b0bee1e8bf9b..0000000000000000000000000000000000000000 --- a/mods/farming/potato.lua +++ /dev/null @@ -1,85 +0,0 @@ - ---[[ - Original textures from DocFarming mod - https://forum.minetest.net/viewtopic.php?id=3948 -]] - -minetest.register_craftitem("farming:potato_seed", { - description = "Potato Seeds", - inventory_image = "farming_potato_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1") - end -}) - --- potato -minetest.register_craftitem("farming:potato", { - description = "Potato", - inventory_image = "farming_potato.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1") - end, - on_use = minetest.item_eat(1), -}) - --- baked potato -minetest.register_craftitem("farming:baked_potato", { - description = "Baked Potato", - inventory_image = "farming_baked_potato.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 10, - output = "farming:baked_potato", - recipe = "farming:potato" -}) - --- potato definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_potato_1.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:potato_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_potato_2.png"} -minetest.register_node("farming:potato_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_potato_3.png"} -crop_def.drop = { - items = { - {items = {'farming:potato'}, rarity = 1}, - {items = {'farming:potato_seed'}, rarity = 1}, - {items = {'farming:potato'}, rarity = 3}, - } -} -minetest.register_node("farming:potato_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_potato_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:potato 2'}, rarity = 1}, - {items = {'farming:potato_seed 2'}, rarity = 1}, - {items = {'farming:potato 3'}, rarity = 2}, - } -} -minetest.register_node("farming:potato_4", table.copy(crop_def)) diff --git a/mods/farming/pumpkin.lua b/mods/farming/pumpkin.lua deleted file mode 100644 index 67ecb9c5f847057478e45fca672f73cd5b3822f5..0000000000000000000000000000000000000000 --- a/mods/farming/pumpkin.lua +++ /dev/null @@ -1,346 +0,0 @@ - ---[[ - Big thanks to PainterlyPack.net for allowing me to use these textures -]] - -minetest.register_craftitem("farming:pumpkin_seed", { - description = "Pumpkin Seed", - inventory_image = "farming_pumpkin_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1") - end -}) - --- pumpkin -minetest.register_node("farming:pumpkin", { - description = "Pumpkin", - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png" - }, - groups = { - choppy = 1, oddly_breakable_by_hand = 1, - flammable = 2, plant = 1 - }, - drop = { - items = { - {items = {'farming:pumpkin_slice 9'}, rarity = 1}, - } - }, - sounds = default.node_sound_wood_defaults(), -}) - --- pumpkin slice -minetest.register_craftitem("farming:pumpkin_slice", { - description = "Pumpkin Slice", - inventory_image = "farming_pumpkin_slice.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1") - end, - on_use = minetest.item_eat(2), -}) - -minetest.register_craft({ - output = "farming:pumpkin", - recipe = { - {"farming:pumpkin_slice", "farming:pumpkin_slice", "farming:pumpkin_slice"}, - {"farming:pumpkin_slice", "farming:pumpkin_slice", "farming:pumpkin_slice"}, - {"farming:pumpkin_slice", "farming:pumpkin_slice", "farming:pumpkin_slice"}, - } -}) - -minetest.register_craft({ - output = "farming:pumpkin_slice 9", - recipe = { - {"", "farming:pumpkin", ""}, - } -}) - --- jack 'o lantern -minetest.register_node("farming:jackolantern", { - description = "Jack 'O Lantern", - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_face_off.png" - }, - paramtype2 = "facedir", - groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2}, - sounds = default.node_sound_wood_defaults(), - on_punch = function(pos, node, puncher) - node.name = "farming:jackolantern_on" - minetest.swap_node(pos, node) - end, -}) - -minetest.register_node("farming:jackolantern_on", { - description = "Jack 'O Lantern", - tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_face_on.png" - }, - light_source = default.LIGHT_MAX - 1, - paramtype2 = "facedir", - groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2}, - sounds = default.node_sound_wood_defaults(), - drop = "farming:jackolantern", - on_punch = function(pos, node, puncher) - node.name = "farming:jackolantern" - minetest.swap_node(pos, node) - end, -}) - -minetest.register_craft({ - output = "farming:jackolantern", - recipe = { - {"", "", ""}, - {"", "default:torch", ""}, - {"", "farming:pumpkin", ""}, - } -}) - --- scarecrow -local box1 = { - {-1, -8, -1, 1, 8, 1}, -} - -local box2 = { - {-1, -8, -1, 1, 8, 1}, - {-12, -8, -1, 12, -7, 1}, - {-5, -2, -5, 5, 8, 5} -} - -for j,list in ipairs(box1) do - for i,int in ipairs(list) do - list[i] = int/16 - end - box1[j] = list -end - -for j,list in ipairs(box2) do - for i,int in ipairs(list) do - list[i] = int/16 - end - box2[j] = list -end - -minetest.register_node("farming:scarecrow", { - description = "Scarecrow", - paramtype = "light", - sunlight_propagates = true, - paramtype2 = "facedir", - tiles = {"farming_scarecrow_top.png", "farming_scarecrow_top.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_front.png"}, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = box2 - }, - selection_box = { - type = "fixed", - fixed = { - {-12/16, -1.5, -0.5, 12/16, 0.5, 0.5} - } - }, - groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2}, - - after_place_node = function(pos, placer) - local node = minetest.get_node(pos) - local param2 = node.param2 - pos.y = pos.y+1 - if minetest.get_node(pos).name ~= "air" then - pos.y = pos.y-1 - minetest.remove_node(pos) - minetest.after(0.1, function(placer) - local inv = placer:get_inventory() - local index = placer:get_wield_index() - inv:set_stack("main", index, ItemStack("farming:scarecrow")) - end, placer) - return - end - minetest.set_node(pos, node) - pos.y = pos.y-1 - node.name = "farming:scarecrow_bottom" - minetest.set_node(pos, node) - end, - - after_destruct = function(pos, oldnode) - pos.y = pos.y-1 - if minetest.get_node(pos).name == "farming:scarecrow_bottom" then - minetest.remove_node(pos) - end - end -}) - -minetest.register_node("farming:scarecrow_bottom", { - paramtype = "light", - sunlight_propagates = true, - paramtype2 = "facedir", - tiles = {"default_wood.png"}, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = box1 - }, - groups = {not_in_creative_inventory=1}, - selection_box = { - type = "fixed", - fixed = { - {0, 0, 0, 0, 0, 0} - } - } -}) - -minetest.register_craft({ - output = "farming:scarecrow", - recipe = { - {"", "farming:pumpkin_face", "",}, - {"default:stick", "default:stick", "default:stick",}, - {"", "default:stick", "",} - } -}) - -minetest.register_node("farming:scarecrow_light", { - description = "Scarecrow With light", - paramtype = "light", - sunlight_propagates = true, - paramtype2 = "facedir", - light_source = LIGHT_MAX-2, - tiles = {"farming_scarecrow_top.png", "farming_scarecrow_top.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_side.png", "farming_scarecrow_front_light.png"}, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = box2 - }, - selection_box = { - type = "fixed", - fixed = { - {-12/16, -1.5, -0.5, 12/16, 0.5, 0.5} - } - }, - groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2}, - - after_place_node = function(pos, placer) - local node = minetest.get_node(pos) - local param2 = node.param2 - pos.y = pos.y+1 - if minetest.get_node(pos).name ~= "air" then - pos.y = pos.y-1 - minetest.remove_node(pos) - minetest.after(0.1, function(placer) - local inv = placer:get_inventory() - local index = placer:get_wield_index() - inv:set_stack("main", index, ItemStack("farming:scarecrow_light")) - end, placer) - return - end - minetest.set_node(pos, node) - pos.y = pos.y-1 - node.name = "farming:scarecrow_bottom" - minetest.set_node(pos, node) - end, - - after_destruct = function(pos, oldnode) - pos.y = pos.y-1 - if minetest.get_node(pos).name == "farming:scarecrow_bottom" then - minetest.remove_node(pos) - end - end -}) - -minetest.register_craft({ - output = "farming:scarecrow_light", - recipe = { - {"", "farming:pumpkin_face_light", "",}, - {"default:stick", "default:stick", "default:stick",}, - {"", "default:stick", "",} - } -}) - --- pumpkin bread -minetest.register_craftitem("farming:pumpkin_bread", { - description = ("Pumpkin Bread"), - inventory_image = "farming_pumpkin_bread.png", - on_use = minetest.item_eat(8) -}) - -minetest.register_craftitem("farming:pumpkin_dough", { - description = "Pumpkin Dough", - inventory_image = "farming_pumpkin_dough.png", -}) - -minetest.register_craft({ - output = "farming:pumpkin_dough", - type = "shapeless", - recipe = {"farming:flour", "farming:pumpkin_slice", "farming:pumpkin_slice"} -}) - -minetest.register_craft({ - type = "cooking", - output = "farming:pumpkin_bread", - recipe = "farming:pumpkin_dough", - cooktime = 10 -}) - --- pumpkin definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_pumpkin_1.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:pumpkin_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_pumpkin_2.png"} -minetest.register_node("farming:pumpkin_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_pumpkin_3.png"} -minetest.register_node("farming:pumpkin_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_pumpkin_4.png"} -minetest.register_node("farming:pumpkin_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_pumpkin_5.png"} -minetest.register_node("farming:pumpkin_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_pumpkin_6.png"} -minetest.register_node("farming:pumpkin_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_pumpkin_7.png"} -minetest.register_node("farming:pumpkin_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_pumpkin_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:pumpkin_slice 9'}, rarity = 1}, - {items = {'farming:pumpkin_slice 4'}, rarity = 1}, - } -} -minetest.register_node("farming:pumpkin_8", table.copy(crop_def)) diff --git a/mods/farming/raspberry.lua b/mods/farming/raspberry.lua deleted file mode 100644 index 686ea5a737ded53a48d9ea250251543371e4b31b..0000000000000000000000000000000000000000 --- a/mods/farming/raspberry.lua +++ /dev/null @@ -1,74 +0,0 @@ -minetest.register_craftitem("farming:raspberry_seed", { - description = "Raspberry Seeds", - inventory_image = "farming_raspberry_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1") - end -}) - --- raspberries -minetest.register_craftitem("farming:raspberries", { - description = "Raspberries", - inventory_image = "farming_raspberries.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1") - end, - on_use = minetest.item_eat(1), -}) - --- raspberry smoothie -minetest.register_craftitem("farming:smoothie_raspberry", { - description = "Raspberry Smoothie", - inventory_image = "farming_raspberry_smoothie.png", - on_use = minetest.item_eat(2, "vessels:drinking_glass"), -}) - -minetest.register_craft({ - output = "farming:smoothie_raspberry", - recipe = { - {"default:snow"}, - {"farming:raspberries"}, - {"vessels:drinking_glass"}, - } -}) - --- raspberries definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_raspberry_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:raspberry_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_raspberry_2.png"} -minetest.register_node("farming:raspberry_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_raspberry_3.png"} -minetest.register_node("farming:raspberry_3", table.copy(crop_def)) - --- stage 4 (final) -crop_def.tiles = {"farming_raspberry_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:raspberries 2'}, rarity = 1}, - {items = {'farming:raspberries'}, rarity = 2}, - {items = {'farming:raspberries'}, rarity = 3}, - {items = {'farming:raspberry_seed 4'}, rarity = 1}, - } -} -minetest.register_node("farming:raspberry_4", table.copy(crop_def)) diff --git a/mods/farming/rhubarb.lua b/mods/farming/rhubarb.lua deleted file mode 100644 index aaf50866ad6a9233c44b7ca6f30382d56205653e..0000000000000000000000000000000000000000 --- a/mods/farming/rhubarb.lua +++ /dev/null @@ -1,70 +0,0 @@ -minetest.register_craftitem("farming:rhubarb_seed", { - description = "Rhubarb Seeds", - inventory_image = "farming_rhubarb_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1") - end -}) - --- rhubarb -minetest.register_craftitem("farming:rhubarb", { - description = "Rhubarb", - inventory_image = "farming_rhubarb.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1") - end, - on_use = minetest.item_eat(1), -}) - --- rhubarb pie -minetest.register_craftitem("farming:rhubarb_pie", { - description = "Rhubarb Pie", - inventory_image = "farming_rhubarb_pie.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craft({ - output = "farming:rhubarb_pie", - recipe = { - {"", "farming:sugar", ""}, - {"farming:rhubarb", "farming:rhubarb", "farming:rhubarb"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, - } -}) - --- rhubarb definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_rhubarb_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:rhubarb_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_rhubarb_2.png"} -minetest.register_node("farming:rhubarb_2", table.copy(crop_def)) - --- stage 3 (final) -crop_def.tiles = {"farming_rhubarb_3.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:rhubarb 2'}, rarity = 1}, - {items = {'farming:rhubarb'}, rarity = 2}, - {items = {'farming:rhubarb_seed 2'}, rarity = 2}, - {items = {'farming:rhubarb'}, rarity = 3}, - } -} -minetest.register_node("farming:rhubarb_3", table.copy(crop_def)) diff --git a/mods/farming/screenshot.png b/mods/farming/screenshot.png deleted file mode 100644 index aba30f016aae3e97daa01c0793c2b8468a921880..0000000000000000000000000000000000000000 Binary files a/mods/farming/screenshot.png and /dev/null differ diff --git a/mods/farming/soil.lua b/mods/farming/soil.lua deleted file mode 100644 index e748d5c00cbe4bad27e9cb9e6ced9857b8aef6ab..0000000000000000000000000000000000000000 --- a/mods/farming/soil.lua +++ /dev/null @@ -1,64 +0,0 @@ --- normal soil -minetest.register_node("farming:soil", { - description = "Soil", - tiles = {"default_dirt.png^farming_soil.png", "default_dirt.png"}, - drop = "default:dirt", - groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 2}, - sounds = default.node_sound_dirt_defaults(), -}) - --- wet soil -minetest.register_node("farming:soil_wet", { - description = "Wet Soil", - tiles = {"default_dirt.png^farming_soil_wet.png", "default_dirt.png^farming_soil_wet_side.png"}, - drop = "default:dirt", - groups = {crumbly = 3, not_in_creative_inventory = 1, soil = 3}, - sounds = default.node_sound_dirt_defaults(), -}) - --- sand is not soil, change existing sand-soil to use normal soil -minetest.register_alias("farming:desert_sand_soil", "farming:soil") -minetest.register_alias("farming:desert_sand_soil_wet", "farming:soil_wet") - --- if water near soil then change to wet soil -minetest.register_abm({ - nodenames = {"farming:soil", "farming:soil_wet"}, - interval = 15, - chance = 4, - catch_up = false, - - action = function(pos, node) - - pos.y = pos.y + 1 - local nn = minetest.get_node_or_nil(pos) - pos.y = pos.y - 1 - - if nn then nn = nn.name else return end - - -- what's on top of soil, if solid/not plant change soil to dirt - if minetest.registered_nodes[nn] - and minetest.registered_nodes[nn].walkable - and minetest.get_item_group(nn, "plant") == 0 then - minetest.set_node(pos, {name = "default:dirt"}) - return - end - - -- if map around soil not loaded then skip until loaded - if minetest.find_node_near(pos, 3, {"ignore"}) then - return - end - - -- check if there is water nearby and change soil accordingly - if minetest.find_node_near(pos, 3, {"group:water"}) then - if node.name == "farming:soil" then - minetest.set_node(pos, {name = "farming:soil_wet"}) - end - - elseif node.name == "farming:soil_wet" then - minetest.set_node(pos, {name = "farming:soil"}) - - elseif node.name == "farming:soil" then - minetest.set_node(pos, {name = "default:dirt"}) - end - end, -}) \ No newline at end of file diff --git a/mods/farming/statistics.lua b/mods/farming/statistics.lua deleted file mode 100644 index c8defa2fa85580c652ee8040eeb8a0d37c40fc8d..0000000000000000000000000000000000000000 --- a/mods/farming/statistics.lua +++ /dev/null @@ -1,174 +0,0 @@ -local statistics = {} -local ROOT_2 = math.sqrt(2.0) - --- Approximations for erf(x) and erfInv(x) from --- https://en.wikipedia.org/wiki/Error_function - -local erf -local erf_inv - -local A = 8 * (math.pi - 3.0)/(3.0 * math.pi * (4.0 - math.pi)) -local B = 4.0 / math.pi -local C = 2.0/(math.pi * A) -local D = 1.0 / A - -erf = function(x) - - if x == 0 then return 0; end - - local xSq = x * x - local aXSq = A * xSq - local v = math.sqrt(1.0 - math.exp(-xSq * (B + aXSq) / (1.0 + aXSq))) - - return (x > 0 and v) or -v -end - -erf_inv = function(x) - - if x == 0 then return 0; end - - if x <= -1 or x >= 1 then return nil; end - - local y = math.log(1 - x * x) - local u = C + 0.5 * y - local v = math.sqrt(math.sqrt(u * u - D * y) - u) - - return (x > 0 and v) or -v -end - -local function std_normal(u) - return ROOT_2 * erf_inv(2.0 * u - 1.0) -end - -local poisson -local cdf_table = {} - -local function generate_cdf(lambda_index, lambda) - - local max = math.ceil(4 * lambda) - local pdf = math.exp(-lambda) - local cdf = pdf - local t = { [0] = pdf } - - for i = 1, max - 1 do - pdf = pdf * lambda / i - cdf = cdf + pdf - t[i] = cdf - end - - return t -end - -for li = 1, 100 do - cdf_table[li] = generate_cdf(li, 0.25 * li) -end - -poisson = function(lambda, max) - - if max < 2 then - return (math.random() < math.exp(-lambda) and 0) or 1 - elseif lambda >= 2 * max then - return max - end - - local u = math.random() - local lambda_index = math.floor(4 * lambda + 0.5) - local cdfs = cdf_table[lambda_index] - - if cdfs then - - lambda = 0.25 * lambda_index - - if u < cdfs[0] then return 0; end - if max > #cdfs then max = #cdfs + 1 else max = math.floor(max); end - if u >= cdfs[max - 1] then return max; end - - if max > 4 then -- Binary search - - local s = 0 - - while s + 1 < max do - - local m = math.floor(0.5 * (s + max)) - - if u < cdfs[m] then max = m; else s = m; end - end - else - for i = 1, max - 1 do - if u < cdfs[i] then return i; end - end - end - - return max - else - local x = lambda + math.sqrt(lambda) * std_normal(u) - - return (x < 0.5 and 0) or (x >= max - 0.5 and max) or math.floor(x + 0.5) - end -end - --- Error function. -statistics.erf = erf - --- Inverse error function. -statistics.erf_inv = erf_inv - ---- Standard normal distribution function (mean 0, standard deviation 1). - -- - -- @return - -- Any real number (actually between -3.0 and 3.0). - -statistics.std_normal = function() - - local u = math.random() - - if u < 0.001 then - return -3.0 - elseif u > 0.999 then - return 3.0 - end - - return std_normal(u) -end - ---- Standard normal distribution function (mean 0, standard deviation 1). - -- - -- @param mu - -- The distribution mean. - -- @param sigma - -- The distribution standard deviation. - -- @return - -- Any real number (actually between -3*sigma and 3*sigma). - -statistics.normal = function(mu, sigma) - - local u = math.random() - - if u < 0.001 then - return mu - 3.0 * sigma - elseif u > 0.999 then - return mu + 3.0 * sigma - end - - return mu + sigma * std_normal(u) -end - ---- Poisson distribution function. - -- - -- @param lambda - -- The distribution mean and variance. - -- @param max - -- The distribution maximum. - -- @return - -- An integer between 0 and max (both inclusive). - -statistics.poisson = function(lambda, max) - - lambda, max = tonumber(lambda), tonumber(max) - - if not lambda or not max or lambda <= 0 or max < 1 then return 0; end - - return poisson(lambda, max) -end - -return statistics diff --git a/mods/farming/strawberry.lua b/mods/farming/strawberry.lua deleted file mode 100644 index 919a8e8fb0cd854971f6e13b06c948916c616463..0000000000000000000000000000000000000000 --- a/mods/farming/strawberry.lua +++ /dev/null @@ -1,133 +0,0 @@ --- [ strawberrys from github.com/tenplus1/farming ] --- --- Strawberry (can also be planted as seed) -minetest.register_craftitem("farming:strawberry_item", { - description = "Strawberry", - inventory_image = "farming_strawberry.png", - wield_image = "farming_strawberry.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:strawberry_1") - end, - on_use = minetest.item_eat(1), -}) - --- added by illuna -minetest.register_craftitem("farming:strawberry_seed", { - description = "Strawberry Seeds", - inventory_image = "farming_strawberry_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:strawberry_1") - end, -}) - --- Define Strawberry Bush growth stages -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_strawberry_1.png"}, - paramtype = "light", - sunlight_propagates = true, - waving = 1, - walkable = false, - buildable_to = true, - drop = "", - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} - }, - groups = { - snappy = 3, flammable =2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults(), -} - ---stage 1 -minetest.register_node("farming:strawberry_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_strawberry_2.png"} -minetest.register_node("farming:strawberry_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_strawberry_3.png"} -minetest.register_node("farming:strawberry_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_strawberry_4.png"} -minetest.register_node("farming:strawberry_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_strawberry_5.png"} -minetest.register_node("farming:strawberry_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_strawberry_6.png"} -crop_def.drop = { - items = { - {items = {"farming:strawberry 1"},rarity = 2}, - {items = {"farming:strawberry 2"},rarity = 3}, - } -} -minetest.register_node("farming:strawberry_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_strawberry_7.png"} -crop_def.drop = { - items = { - {items = {"farming:strawberry 1"},rarity = 1}, - {items = {"farming:strawberry_item 2"},rarity = 3}, - } -} -minetest.register_node("farming:strawberry_7", table.copy(crop_def)) - --- stage 8 -crop_def.tiles = {"farming_strawberry_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {"farming:strawberry 2"},rarity = 1}, - {items = {"farming:strawberry_item 3"},rarity = 3}, - } -} -minetest.register_node("farming:strawberry_8", table.copy(crop_def)) - --- growing routine if farming redo isn't present -if not farming or not farming.mod or farming.mod ~= "redo" then - -minetest.register_abm({ - nodenames = { - "farming:strawberry_1", "farming:strawberry_2", "farming:strawberry_3", - "farming:strawberry_4", "farming:strawberry_5", "farming:strawberry_6", - "farming:strawberry_7" - }, - neighbors = {"farming:soil_wet"}, - interval = 9, - chance = 20, - catch_up = false, - action = function(pos, node) - - -- are we on wet soil? - pos.y = pos.y - 1 - if minetest.get_item_group(minetest.get_node(pos).name, "soil") < 3 then - return - end - pos.y = pos.y + 1 - - -- do we have enough light? - local light = minetest.get_node_light(pos) - - if not light - or light < 13 then - return - end - - -- grow to next stage - local num = node.name:split("_")[2] - - node.name = "farming:strawberry_" .. tonumber(num + 1) - - minetest.swap_node(pos, node) - end -}) - -end -- END IF diff --git a/mods/farming/sugar.lua b/mods/farming/sugar.lua deleted file mode 100644 index efc92efd66f8b8b8d190d47f30f1447288a46255..0000000000000000000000000000000000000000 --- a/mods/farming/sugar.lua +++ /dev/null @@ -1,14 +0,0 @@ - ---= Sugar - -minetest.register_craftitem("farming:sugar", { - description = "Sugar", - inventory_image = "farming_sugar.png", -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 3, - output = "farming:sugar 2", - recipe = "default:papyrus", -}) \ No newline at end of file diff --git a/mods/farming/textures/farming_baked_potato.png b/mods/farming/textures/farming_baked_potato.png deleted file mode 100644 index 425c4ae333ad4629fac7095108ebc6fc043656af..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_baked_potato.png and /dev/null differ diff --git a/mods/farming/textures/farming_banana.png b/mods/farming/textures/farming_banana.png deleted file mode 100644 index f775e14cd96d00ee04e28ff5ed0080e56036f673..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_banana.png and /dev/null differ diff --git a/mods/farming/textures/farming_banana_leaves.png b/mods/farming/textures/farming_banana_leaves.png deleted file mode 100644 index cf8eecbf1251e08347e964853dabed27c627c9c1..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_banana_leaves.png and /dev/null differ diff --git a/mods/farming/textures/farming_banana_sapling.png b/mods/farming/textures/farming_banana_sapling.png deleted file mode 100644 index 821c64ff374ad182b4b0bb87d4a4f7a44b450430..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_banana_sapling.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley.png b/mods/farming/textures/farming_barley.png deleted file mode 100644 index ca929e0e0cfa7852ad952325191cf22bb215e6eb..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_1.png b/mods/farming/textures/farming_barley_1.png deleted file mode 100644 index 4a458b166f4da9be9ab663b447decf7697f8f355..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_2.png b/mods/farming/textures/farming_barley_2.png deleted file mode 100644 index 96610c2f9f4e98fa44990ef6d947acffe15fc04c..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_3.png b/mods/farming/textures/farming_barley_3.png deleted file mode 100644 index ef14b5b321603ee5d643ab99f571187ab1f8985a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_4.png b/mods/farming/textures/farming_barley_4.png deleted file mode 100644 index f7c90544fff9159878eef2d06988e7ffad86f9b4..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_5.png b/mods/farming/textures/farming_barley_5.png deleted file mode 100644 index 68c0d683934b8b164bb092a1bbf61e83d453b49b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_6.png b/mods/farming/textures/farming_barley_6.png deleted file mode 100644 index 496a218526b6327d94126a7183d6588e1f1db3cf..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_7.png b/mods/farming/textures/farming_barley_7.png deleted file mode 100644 index 1c636afbea800b2748fade6f1718ddffc5b375f5..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_barley_seed.png b/mods/farming/textures/farming_barley_seed.png deleted file mode 100644 index 2f00a20af9e02653dff065ad6897fc40a3cb7ddd..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_barley_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanbush.png b/mods/farming/textures/farming_beanbush.png deleted file mode 100644 index 637e7162d46a9bf193f8b400c076ad7156a2958a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanbush.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanpole.png b/mods/farming/textures/farming_beanpole.png deleted file mode 100644 index ed07572e05ba64ff6aed4ca77ce0a9e089bb8d75..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanpole.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanpole_1.png b/mods/farming/textures/farming_beanpole_1.png deleted file mode 100644 index ef2bd5abe14f6a13a035f901d2ecc7d749335014..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanpole_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanpole_2.png b/mods/farming/textures/farming_beanpole_2.png deleted file mode 100644 index 34143e470fa2e7762acddb6d6ec296fe18ef0f3b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanpole_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanpole_3.png b/mods/farming/textures/farming_beanpole_3.png deleted file mode 100644 index d693f17090f63db73650a55b8691dac267d39b5a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanpole_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanpole_4.png b/mods/farming/textures/farming_beanpole_4.png deleted file mode 100644 index c779b254c52345ce2dea0642ce8e5243a98b19a0..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanpole_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_beanpole_5.png b/mods/farming/textures/farming_beanpole_5.png deleted file mode 100644 index 910f8a07d54f862539b2877ce6a389c4120c7bcd..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beanpole_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_beans.png b/mods/farming/textures/farming_beans.png deleted file mode 100644 index ad5cf8595eca8ccd8030b44ab2da0cf0daf0c4d2..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_beans.png and /dev/null differ diff --git a/mods/farming/textures/farming_blueberries.png b/mods/farming/textures/farming_blueberries.png deleted file mode 100644 index b0c493195c4b46e5196221e5f0c49b7cf16adbe7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_blueberries.png and /dev/null differ diff --git a/mods/farming/textures/farming_blueberry_1.png b/mods/farming/textures/farming_blueberry_1.png deleted file mode 100644 index 83832c86bbe553d3cb75a6888550931758c827ad..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_blueberry_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_blueberry_2.png b/mods/farming/textures/farming_blueberry_2.png deleted file mode 100644 index 308a0caf006a7d617319c7cc98453d7a36d8e55b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_blueberry_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_blueberry_3.png b/mods/farming/textures/farming_blueberry_3.png deleted file mode 100644 index 43d2ab135687f55ee1ea1ed9f089b5bc0d6f80a9..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_blueberry_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_blueberry_4.png b/mods/farming/textures/farming_blueberry_4.png deleted file mode 100644 index 75fb69a0ee637f2bcfd309bd8b3c1e8ddd049559..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_blueberry_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_blueberry_muffin.png b/mods/farming/textures/farming_blueberry_muffin.png deleted file mode 100644 index b1253d7074edfc48f8a336f8b1eb8aa217da07b6..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_blueberry_muffin.png and /dev/null differ diff --git a/mods/farming/textures/farming_bottle_ethanol.png b/mods/farming/textures/farming_bottle_ethanol.png deleted file mode 100644 index 84e6162de837acf5f930477d9c6ee8877d35229f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_bottle_ethanol.png and /dev/null differ diff --git a/mods/farming/textures/farming_bread.png b/mods/farming/textures/farming_bread.png deleted file mode 100644 index bd00e3e139782539349ad21ace6796e9d323ec79..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_bread.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot.png b/mods/farming/textures/farming_carrot.png deleted file mode 100644 index 73f2fd47bcdb21d6a2e8e708671be884cde03b46..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_1.png b/mods/farming/textures/farming_carrot_1.png deleted file mode 100644 index bbeae7e8a3ca2915c4b76dba28933e95a6ebdc0b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_2.png b/mods/farming/textures/farming_carrot_2.png deleted file mode 100644 index b24ecc05049160fe0965788b1c5b767530ae92b5..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_3.png b/mods/farming/textures/farming_carrot_3.png deleted file mode 100644 index 840050570f0fb4f23654553e1a90026f3defe895..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_4.png b/mods/farming/textures/farming_carrot_4.png deleted file mode 100644 index 32ee26245c9e8c2a2821d3fae65a911b4abdedbb..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_5.png b/mods/farming/textures/farming_carrot_5.png deleted file mode 100644 index 0bcd9c1e3baf7dcc4ce9c88dbf3dcfe4ca6dc1bd..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_6.png b/mods/farming/textures/farming_carrot_6.png deleted file mode 100644 index a17c6b2bbff968e6e4946726acf6442f54f92bcf..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_7.png b/mods/farming/textures/farming_carrot_7.png deleted file mode 100644 index d26eee7cce6a0d6cc021517a73d615b470958d6b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_8.png b/mods/farming/textures/farming_carrot_8.png deleted file mode 100644 index 00b6d92885e473fd0ca76295b14c1294559d9765..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_carrot_gold.png b/mods/farming/textures/farming_carrot_gold.png deleted file mode 100644 index b817101d7fa8ea04f17ed6ffad175f6e590a5f23..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_carrot_gold.png and /dev/null differ diff --git a/mods/farming/textures/farming_chocolate_dark.png b/mods/farming/textures/farming_chocolate_dark.png deleted file mode 100644 index 03243b274bcacd462e39b4042b2c364fbdee6007..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_chocolate_dark.png and /dev/null differ diff --git a/mods/farming/textures/farming_cocoa_1.png b/mods/farming/textures/farming_cocoa_1.png deleted file mode 100644 index f887a1fb1b758229c763a7f60d4bd15436877b8e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cocoa_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_cocoa_2.png b/mods/farming/textures/farming_cocoa_2.png deleted file mode 100644 index f0d393532509e2d9c2aae1735feff65735cafe99..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cocoa_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_cocoa_3.png b/mods/farming/textures/farming_cocoa_3.png deleted file mode 100644 index 8eaf67eba312f190d3a9602b351bba1942295c31..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cocoa_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_cocoa_beans.png b/mods/farming/textures/farming_cocoa_beans.png deleted file mode 100644 index 4022f8e8b748f132bcae1a762a0ee96d80c75fe4..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cocoa_beans.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_1.png b/mods/farming/textures/farming_coffee_1.png deleted file mode 100644 index 97c207a313610e5e4e8316d762ab75d8e8236aad..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_2.png b/mods/farming/textures/farming_coffee_2.png deleted file mode 100644 index a659f851fd94fe9e9025d2ef700b41bb19714e01..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_3.png b/mods/farming/textures/farming_coffee_3.png deleted file mode 100644 index 93088c80fb80b74a0e45c101060e04121d99bc92..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_4.png b/mods/farming/textures/farming_coffee_4.png deleted file mode 100644 index 37a609f66d24cd61f8aed53098d2f0eb4a19578f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_5.png b/mods/farming/textures/farming_coffee_5.png deleted file mode 100644 index e624fbebe1129c5c884a7c3abd76d86350e62e8c..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_beans.png b/mods/farming/textures/farming_coffee_beans.png deleted file mode 100644 index 0786f4e7ec4c60b67bc69814b5aa8a806e66b878..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_beans.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_cup.png b/mods/farming/textures/farming_coffee_cup.png deleted file mode 100644 index d3820bc74f092e74bc21475ee418f4444e5c66dc..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_cup.png and /dev/null differ diff --git a/mods/farming/textures/farming_coffee_cup_hot.png b/mods/farming/textures/farming_coffee_cup_hot.png deleted file mode 100644 index f4fae904142e3ac14ccd50da6311f4074b9a2e9e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_coffee_cup_hot.png and /dev/null differ diff --git a/mods/farming/textures/farming_cookie.png b/mods/farming/textures/farming_cookie.png deleted file mode 100644 index e80be35827d53a6307d8ded63261673ff1688f51..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cookie.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn.png b/mods/farming/textures/farming_corn.png deleted file mode 100644 index 2a2894a4807ecf9430db958827baba16a4ef0686..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_1.png b/mods/farming/textures/farming_corn_1.png deleted file mode 100644 index 60e8b9975ade8ef4ead063f564c25699f60e29ab..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_2.png b/mods/farming/textures/farming_corn_2.png deleted file mode 100644 index 6ba6cc976c0d2b202443fda81a0de92a0deb2c95..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_3.png b/mods/farming/textures/farming_corn_3.png deleted file mode 100644 index c5fa80b181ded51ba28cd87f9395c5e08b465b41..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_4.png b/mods/farming/textures/farming_corn_4.png deleted file mode 100644 index a43632dd31961ae18b82fcd2891d356ea05b339f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_5.png b/mods/farming/textures/farming_corn_5.png deleted file mode 100644 index 7b6fb02b707ae653e7b29c5b384271e3e94dd93f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_6.png b/mods/farming/textures/farming_corn_6.png deleted file mode 100644 index 313697b90653b62819b4df7606ac80e65157911d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_7.png b/mods/farming/textures/farming_corn_7.png deleted file mode 100644 index 6a937e79001af0610dda8411ba94809ce49fb0ef..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_8.png b/mods/farming/textures/farming_corn_8.png deleted file mode 100644 index 77e442b09977c3945e4b2cd3aec4cbe34a897e6d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_corn_cob.png b/mods/farming/textures/farming_corn_cob.png deleted file mode 100644 index a2fd9da7d09358e8ac76ea460d817656b5031c12..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_corn_cob.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton.png b/mods/farming/textures/farming_cotton.png deleted file mode 100644 index e2bbfd7af486b64c658bcc7c6101b22ca95ab7e7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_1.png b/mods/farming/textures/farming_cotton_1.png deleted file mode 100644 index 5fc218078722b9634503146a0fb0d3353c3e5859..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_2.png b/mods/farming/textures/farming_cotton_2.png deleted file mode 100644 index db4f4a3e58233f32f343f924218dc910e1f1be13..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_3.png b/mods/farming/textures/farming_cotton_3.png deleted file mode 100644 index df3d7a77d035e4fec271ad68e4c9e40914674f23..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_4.png b/mods/farming/textures/farming_cotton_4.png deleted file mode 100644 index f314b07b7e1968592fb8bf3f9fb592f4a6467010..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_5.png b/mods/farming/textures/farming_cotton_5.png deleted file mode 100644 index 3e890855ba12f05ad693f4e660924c6f74ecc361..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_6.png b/mods/farming/textures/farming_cotton_6.png deleted file mode 100644 index f4bd4fb346ec9ee2a71696d9337723d2be7de8dd..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_7.png b/mods/farming/textures/farming_cotton_7.png deleted file mode 100644 index 466d40a2d9636b6d043ec2fb6fe7cd774f172336..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_8.png b/mods/farming/textures/farming_cotton_8.png deleted file mode 100644 index f835ba5b3f6f2c4d0e6c3f730be01e599dab7b6e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_cotton_seed.png b/mods/farming/textures/farming_cotton_seed.png deleted file mode 100644 index f1d5b8ab714e2f074b8136aac0d8dab88c0acc2a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cotton_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_cucumber.png b/mods/farming/textures/farming_cucumber.png deleted file mode 100644 index 2acb7b2f5eda8c9390f1a0e717ac6b85ab5edd64..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cucumber.png and /dev/null differ diff --git a/mods/farming/textures/farming_cucumber_1.png b/mods/farming/textures/farming_cucumber_1.png deleted file mode 100644 index e008fd12aef55c66f70a05c7d444c0ad69eca6d5..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cucumber_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_cucumber_2.png b/mods/farming/textures/farming_cucumber_2.png deleted file mode 100644 index 9c345ff48d1a33c0f4beaff6db2042dfb9b20f27..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cucumber_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_cucumber_3.png b/mods/farming/textures/farming_cucumber_3.png deleted file mode 100644 index 25f3c54f7df34a020ff28db5ae67ee4b47381c52..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cucumber_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_cucumber_4.png b/mods/farming/textures/farming_cucumber_4.png deleted file mode 100644 index fc62f2f442b82927cbde3fa80d9cc56c3d473a8f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_cucumber_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_desert_sand_soil.png b/mods/farming/textures/farming_desert_sand_soil.png deleted file mode 100644 index 1450e014156d4c874fcc719e170a41db729614f2..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_desert_sand_soil.png and /dev/null differ diff --git a/mods/farming/textures/farming_desert_sand_soil_wet.png b/mods/farming/textures/farming_desert_sand_soil_wet.png deleted file mode 100644 index cffa955d6689ad88d675921a3e033256869343f7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_desert_sand_soil_wet.png and /dev/null differ diff --git a/mods/farming/textures/farming_desert_sand_soil_wet_side.png b/mods/farming/textures/farming_desert_sand_soil_wet_side.png deleted file mode 100644 index fbb2815e5e84b5cc1fcdbc91c1dcee8aad8fdf22..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_desert_sand_soil_wet_side.png and /dev/null differ diff --git a/mods/farming/textures/farming_donut.png b/mods/farming/textures/farming_donut.png deleted file mode 100644 index 8985299bb01d7abc91a4a81270891b52f0e933fb..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_donut.png and /dev/null differ diff --git a/mods/farming/textures/farming_donut_apple.png b/mods/farming/textures/farming_donut_apple.png deleted file mode 100644 index 6dfe63d5980364e3abe99d0ec5168b03d247dd93..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_donut_apple.png and /dev/null differ diff --git a/mods/farming/textures/farming_donut_chocolate.png b/mods/farming/textures/farming_donut_chocolate.png deleted file mode 100644 index aa4b93fafa9aaf21e594f3676994eff9a1f176ec..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_donut_chocolate.png and /dev/null differ diff --git a/mods/farming/textures/farming_flour.png b/mods/farming/textures/farming_flour.png deleted file mode 100644 index b1a97836efa64c2bf3867a9fe9155bd9247bc515..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_flour.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapebush.png b/mods/farming/textures/farming_grapebush.png deleted file mode 100644 index c2e662059176174f47bee9064eb63c9c36d99f1a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapebush.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes.png b/mods/farming/textures/farming_grapes.png deleted file mode 100644 index aa00ed633a2ee677dbd7bbf7251748d3c9863f8d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_1.png b/mods/farming/textures/farming_grapes_1.png deleted file mode 100644 index 64a935d27a6b088bfb71470cb180119014a75862..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_2.png b/mods/farming/textures/farming_grapes_2.png deleted file mode 100644 index 6cc2a33772508757d4ac630cbf711935f34be6e5..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_3.png b/mods/farming/textures/farming_grapes_3.png deleted file mode 100644 index 66d6310932e4815e3ae162e475dc93bdd78991cc..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_4.png b/mods/farming/textures/farming_grapes_4.png deleted file mode 100644 index 57cdc73f7a02ef12c3995aff14c950655d9ec4c5..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_5.png b/mods/farming/textures/farming_grapes_5.png deleted file mode 100644 index aad41f413c08b99008c422de19906a82c3b2d06d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_6.png b/mods/farming/textures/farming_grapes_6.png deleted file mode 100644 index 2e23a3caf9e273e094b646790054b6bb050aca96..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_7.png b/mods/farming/textures/farming_grapes_7.png deleted file mode 100644 index 9e70b6d559fe4dec85b6800cec67d983055021cb..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_grapes_8.png b/mods/farming/textures/farming_grapes_8.png deleted file mode 100644 index 5093a0666b55e5e3e42fe0fffcd728ce97d37c9f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_grapes_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_1.png b/mods/farming/textures/farming_melon_1.png deleted file mode 100644 index 3c6ea6d8d6e4f801d2479de7d62ed05d755775ae..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_2.png b/mods/farming/textures/farming_melon_2.png deleted file mode 100644 index 185ed8263087abd2af6704be4a67c4835ad1d438..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_3.png b/mods/farming/textures/farming_melon_3.png deleted file mode 100644 index 6e661f9246721c226d8589099e56d187ba32e4ef..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_4.png b/mods/farming/textures/farming_melon_4.png deleted file mode 100644 index d9199f3c822400e9a2d64e085a6ff49d562a6d83..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_5.png b/mods/farming/textures/farming_melon_5.png deleted file mode 100644 index 755cbd34062e5a62910963f304f544dddd80554e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_6.png b/mods/farming/textures/farming_melon_6.png deleted file mode 100644 index b31a5b4c42108dd21eb2bad0bea009707f5f2e6e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_7.png b/mods/farming/textures/farming_melon_7.png deleted file mode 100644 index 3aebfdd6d6d9d11483acb45d81b10f914b1d958c..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_side.png b/mods/farming/textures/farming_melon_side.png deleted file mode 100644 index 88e40c6a08421585274e41b58ecd19c88cc0a567..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_side.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_slice.png b/mods/farming/textures/farming_melon_slice.png deleted file mode 100644 index 6ee977577899412a6e1423c94cf160f1037e3c97..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_slice.png and /dev/null differ diff --git a/mods/farming/textures/farming_melon_top.png b/mods/farming/textures/farming_melon_top.png deleted file mode 100644 index f387dbd08d1489bcac7e66d90d8efce0b54b4f88..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_melon_top.png and /dev/null differ diff --git a/mods/farming/textures/farming_orange.png b/mods/farming/textures/farming_orange.png deleted file mode 100644 index 4c5e04596ac057f45357dfbf1da5dd782829df46..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_orange.png and /dev/null differ diff --git a/mods/farming/textures/farming_orange_1.png b/mods/farming/textures/farming_orange_1.png deleted file mode 100644 index 5a2aaa270725fda65e941e301b213f36417be1ce..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_orange_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_orange_2.png b/mods/farming/textures/farming_orange_2.png deleted file mode 100644 index 3de462383ce5cbeca3d5d1fac9a2c26000ce0a66..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_orange_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_orange_3.png b/mods/farming/textures/farming_orange_3.png deleted file mode 100644 index 851cd67b646f7b824bb0cec5d81d2747c11a357d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_orange_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_orange_4.png b/mods/farming/textures/farming_orange_4.png deleted file mode 100644 index accb7b7ff0375e4c88dbfabe23bdcb6e8fd8f946..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_orange_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_orange_seed.png b/mods/farming/textures/farming_orange_seed.png deleted file mode 100644 index 3873bade454bb2804fe4926ed7db9b02ffc8dd85..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_orange_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_potato.png b/mods/farming/textures/farming_potato.png deleted file mode 100644 index 6e91d6ae8949445d7edba0c3cc8c5f542e93b011..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_potato.png and /dev/null differ diff --git a/mods/farming/textures/farming_potato_1.png b/mods/farming/textures/farming_potato_1.png deleted file mode 100644 index a9c004091d5aac56bf26d71fda36ed3226cb926c..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_potato_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_potato_2.png b/mods/farming/textures/farming_potato_2.png deleted file mode 100644 index c81830c40bcf17038f5b7e927a2779f9a63f2e6a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_potato_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_potato_3.png b/mods/farming/textures/farming_potato_3.png deleted file mode 100644 index a3d7920918e958a2283b9ded3ed89b32830827b3..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_potato_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_potato_4.png b/mods/farming/textures/farming_potato_4.png deleted file mode 100644 index 405b7e56d71be2991d1330f58325f12b9c0934ec..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_potato_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_potato_seed.png b/mods/farming/textures/farming_potato_seed.png deleted file mode 100644 index 74e440df3d7d786f430d8b9c583374d886b92cd7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_potato_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_1.png b/mods/farming/textures/farming_pumpkin_1.png deleted file mode 100644 index e5b9a2bf946b3957a96b53dc9c6c7d1b87183fe5..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_2.png b/mods/farming/textures/farming_pumpkin_2.png deleted file mode 100644 index d977e8c22021375b2d19f1e0fdba16ba159bfbe7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_3.png b/mods/farming/textures/farming_pumpkin_3.png deleted file mode 100644 index 83f81905173ce0e5c5e113435a0e758b0280416b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_4.png b/mods/farming/textures/farming_pumpkin_4.png deleted file mode 100644 index 20de004acb7b925c5d3bce3a21c60a7e4e207246..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_5.png b/mods/farming/textures/farming_pumpkin_5.png deleted file mode 100644 index 59fa78eb0ebc9e5d8dc3b6989e3eeb22cb31eaec..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_6.png b/mods/farming/textures/farming_pumpkin_6.png deleted file mode 100644 index 6ae543e4b00d879d3776c43941b1e0a6297125bc..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_7.png b/mods/farming/textures/farming_pumpkin_7.png deleted file mode 100644 index 79190e09ec135158eee1ff6ccff404b3c09eed69..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_8.png b/mods/farming/textures/farming_pumpkin_8.png deleted file mode 100644 index b941442cc236ebf2b29362ba98433dd05c6f9a0e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_bread.png b/mods/farming/textures/farming_pumpkin_bread.png deleted file mode 100644 index 0dfae08fd83a2c6ee7a88c67adaceb5f2882215f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_bread.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_dough.png b/mods/farming/textures/farming_pumpkin_dough.png deleted file mode 100644 index 62ea7a65ffadc1aac24e9c9fde35a25130509537..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_dough.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_face_off.png b/mods/farming/textures/farming_pumpkin_face_off.png deleted file mode 100644 index df7017147ed7088768b756be54fef4da23b1b5e8..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_face_off.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_face_on.png b/mods/farming/textures/farming_pumpkin_face_on.png deleted file mode 100644 index fa71c9d474c140e8b123c3da04fe468ad6d2846f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_face_on.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_seed.png b/mods/farming/textures/farming_pumpkin_seed.png deleted file mode 100644 index 6933bc38e8a11650920f3bff1d16c80cc77ad543..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_side.png b/mods/farming/textures/farming_pumpkin_side.png deleted file mode 100644 index 2d30f203570c434bdb20c0deaa49834c4a2ff3a4..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_side.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_slice.png b/mods/farming/textures/farming_pumpkin_slice.png deleted file mode 100644 index 1fb659e2664a1b7ed724a99ba34b8002241ce54d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_slice.png and /dev/null differ diff --git a/mods/farming/textures/farming_pumpkin_top.png b/mods/farming/textures/farming_pumpkin_top.png deleted file mode 100644 index 79283454ef1f0d5ab418e9c6366b49a5783c1579..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_pumpkin_top.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberries.png b/mods/farming/textures/farming_raspberries.png deleted file mode 100644 index ab96e1bf9b381610a90efeef0d7964808e413d9b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberries.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberry_1.png b/mods/farming/textures/farming_raspberry_1.png deleted file mode 100644 index d1a7ffcadd02f666eea0a58dc31b26bc30a5f322..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberry_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberry_2.png b/mods/farming/textures/farming_raspberry_2.png deleted file mode 100644 index 308a0caf006a7d617319c7cc98453d7a36d8e55b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberry_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberry_3.png b/mods/farming/textures/farming_raspberry_3.png deleted file mode 100644 index 43d2ab135687f55ee1ea1ed9f089b5bc0d6f80a9..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberry_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberry_4.png b/mods/farming/textures/farming_raspberry_4.png deleted file mode 100644 index 32da6b9fb11cb9c6a88566d4b66c4cc1ea7a235f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberry_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberry_seed.png b/mods/farming/textures/farming_raspberry_seed.png deleted file mode 100644 index 08c958d9e850647d0fcf2d9e033fcbce5b08f4dc..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberry_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_raspberry_smoothie.png b/mods/farming/textures/farming_raspberry_smoothie.png deleted file mode 100644 index fe178d114214e7f35ed7bf02d40ddf466237088e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_raspberry_smoothie.png and /dev/null differ diff --git a/mods/farming/textures/farming_rhubarb.png b/mods/farming/textures/farming_rhubarb.png deleted file mode 100644 index 7d416ab21b752b0d4c59c01e5abf428d1d072db1..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_rhubarb.png and /dev/null differ diff --git a/mods/farming/textures/farming_rhubarb_1.png b/mods/farming/textures/farming_rhubarb_1.png deleted file mode 100644 index 01585b1bee3fcf44ad3e39e1cd562728576e0616..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_rhubarb_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_rhubarb_2.png b/mods/farming/textures/farming_rhubarb_2.png deleted file mode 100644 index 71845c750563c2898831177777aef51105c85b4a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_rhubarb_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_rhubarb_3.png b/mods/farming/textures/farming_rhubarb_3.png deleted file mode 100644 index b412f7e0105cdf29452d5c44e378ae73745dd3c0..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_rhubarb_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_rhubarb_pie.png b/mods/farming/textures/farming_rhubarb_pie.png deleted file mode 100644 index 1f77b535cc6a30729099d3ba2f1cbe7f2c8bdf08..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_rhubarb_pie.png and /dev/null differ diff --git a/mods/farming/textures/farming_rhubarb_seed.png b/mods/farming/textures/farming_rhubarb_seed.png deleted file mode 100644 index c16527d99aac89382de0fae41f28262582683d00..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_rhubarb_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_scarecrow_front.png b/mods/farming/textures/farming_scarecrow_front.png deleted file mode 100644 index 364738fd6f3020f97686e0350c7b20cb01ebca52..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_scarecrow_front.png and /dev/null differ diff --git a/mods/farming/textures/farming_scarecrow_front_light.png b/mods/farming/textures/farming_scarecrow_front_light.png deleted file mode 100644 index b4b3cf289b9525f2d4ae8004719a924434bb925a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_scarecrow_front_light.png and /dev/null differ diff --git a/mods/farming/textures/farming_scarecrow_side.png b/mods/farming/textures/farming_scarecrow_side.png deleted file mode 100644 index e22e84ba1dd15382c478abe92c35b03ffd9ba9f7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_scarecrow_side.png and /dev/null differ diff --git a/mods/farming/textures/farming_scarecrow_top.png b/mods/farming/textures/farming_scarecrow_top.png deleted file mode 100644 index 3a4addcd66f7399cedc6e9c415ff044c18ae5ec7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_scarecrow_top.png and /dev/null differ diff --git a/mods/farming/textures/farming_soil.png b/mods/farming/textures/farming_soil.png deleted file mode 100644 index 5cd3e681c4c3f74943026d67941e1f03a75d8cbe..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_soil.png and /dev/null differ diff --git a/mods/farming/textures/farming_soil_wet.png b/mods/farming/textures/farming_soil_wet.png deleted file mode 100644 index 0b4487d8a2460c3d06a49560ca5c5905fba69f30..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_soil_wet.png and /dev/null differ diff --git a/mods/farming/textures/farming_soil_wet_side.png b/mods/farming/textures/farming_soil_wet_side.png deleted file mode 100644 index f0b1bd45cf7b0ad04fc77229a9f5f2bdb80a2795..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_soil_wet_side.png and /dev/null differ diff --git a/mods/farming/textures/farming_straw.png b/mods/farming/textures/farming_straw.png deleted file mode 100644 index e4277723b128e9845d427fb22c6bffafd7292565..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_straw.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry.png b/mods/farming/textures/farming_strawberry.png deleted file mode 100644 index 5b43e6bc99bc21663a9e91440fcc97a2320b5adf..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_1.png b/mods/farming/textures/farming_strawberry_1.png deleted file mode 100644 index 3fa21edc5a73cff8a86f367ab663d9748427e6bb..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_2.png b/mods/farming/textures/farming_strawberry_2.png deleted file mode 100644 index 751115e9876d20ce7264a801486428c48f93640d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_3.png b/mods/farming/textures/farming_strawberry_3.png deleted file mode 100644 index 8b7a7b8c0b24eb4b9ed1b13d7a32af01bfc850a4..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_4.png b/mods/farming/textures/farming_strawberry_4.png deleted file mode 100644 index dcf001753c0770e613b6b5b551349f958886bd22..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_5.png b/mods/farming/textures/farming_strawberry_5.png deleted file mode 100644 index a2decaae04daafeb5882c19f67508e91c7b930d8..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_6.png b/mods/farming/textures/farming_strawberry_6.png deleted file mode 100644 index a4d0d603fc091f7ead1faa645646ba09e305e3d9..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_7.png b/mods/farming/textures/farming_strawberry_7.png deleted file mode 100644 index ace223cd88a0cd46bf55c2eda7c3d7d1646b8439..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_strawberry_8.png b/mods/farming/textures/farming_strawberry_8.png deleted file mode 100644 index 6d7280b68caf4af76c91035c711fee93fc037f1c..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_strawberry_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_sugar.png b/mods/farming/textures/farming_sugar.png deleted file mode 100644 index 5cb7fa01e3f66a0e0b46c0b5132aa92a4a32351f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_sugar.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato.png b/mods/farming/textures/farming_tomato.png deleted file mode 100644 index 586aa56de584ab5f8b9eeb101b430fb075f9c9f9..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_1.png b/mods/farming/textures/farming_tomato_1.png deleted file mode 100644 index d858e58664c55bbbc03a816047bdb714b716518f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_2.png b/mods/farming/textures/farming_tomato_2.png deleted file mode 100644 index 9d9ed6d01f2059b1f39209c3db9a8470875b9392..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_3.png b/mods/farming/textures/farming_tomato_3.png deleted file mode 100644 index fe3dcf0a1302c0353d2e64930465cb80214af8a4..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_4.png b/mods/farming/textures/farming_tomato_4.png deleted file mode 100644 index 27c32828dce42efbb2933fbf355752f46dc0335f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_5.png b/mods/farming/textures/farming_tomato_5.png deleted file mode 100644 index f369a68f4f864f7868965b3c05bfb649abb69e2b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_6.png b/mods/farming/textures/farming_tomato_6.png deleted file mode 100644 index 0135cb53beaee8d64cf0e39ce57bafabecedd70b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_7.png b/mods/farming/textures/farming_tomato_7.png deleted file mode 100644 index 4cd85f5f54dc323e52aa1113d03bb82099b7b109..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_8.png b/mods/farming/textures/farming_tomato_8.png deleted file mode 100644 index 0b490257f0dab5ec4a4d4e67775159ea75594e3d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_tomato_seed.png b/mods/farming/textures/farming_tomato_seed.png deleted file mode 100644 index dbef76e7984dbf972498ce7fc0c9917a85c0378d..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tomato_seed.png and /dev/null differ diff --git a/mods/farming/textures/farming_tool_bronzehoe.png b/mods/farming/textures/farming_tool_bronzehoe.png deleted file mode 100644 index ef07a80a4b5d4a4a7e8360863147c1c01cceb1e1..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tool_bronzehoe.png and /dev/null differ diff --git a/mods/farming/textures/farming_tool_diamondhoe.png b/mods/farming/textures/farming_tool_diamondhoe.png deleted file mode 100644 index 093acb821c6a8da2e1ec642f0f0401fa01b3f587..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tool_diamondhoe.png and /dev/null differ diff --git a/mods/farming/textures/farming_tool_mesehoe.png b/mods/farming/textures/farming_tool_mesehoe.png deleted file mode 100644 index ffd597a49544f1a65c7ebf8466d9949720badf42..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tool_mesehoe.png and /dev/null differ diff --git a/mods/farming/textures/farming_tool_steelhoe.png b/mods/farming/textures/farming_tool_steelhoe.png deleted file mode 100644 index 893a6958e4b4d2763513392378c2e1fe92cd2ac8..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tool_steelhoe.png and /dev/null differ diff --git a/mods/farming/textures/farming_tool_stonehoe.png b/mods/farming/textures/farming_tool_stonehoe.png deleted file mode 100644 index 4f8dade01c39dad208f481013cffc14369eeb91a..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tool_stonehoe.png and /dev/null differ diff --git a/mods/farming/textures/farming_tool_woodhoe.png b/mods/farming/textures/farming_tool_woodhoe.png deleted file mode 100644 index 8b20d2dc13490eff6255c84182d1889e91c842d7..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_tool_woodhoe.png and /dev/null differ diff --git a/mods/farming/textures/farming_trellis.png b/mods/farming/textures/farming_trellis.png deleted file mode 100644 index 855b932608cdcc2e22e7751858e4d0014b721735..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_trellis.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat.png b/mods/farming/textures/farming_wheat.png deleted file mode 100644 index 1e0ad3b3e05a8ff944b72661b8592c797e9e0ca2..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_1.png b/mods/farming/textures/farming_wheat_1.png deleted file mode 100644 index c16ad94ba4e9989dd795c452559376ea2137d78b..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_1.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_2.png b/mods/farming/textures/farming_wheat_2.png deleted file mode 100644 index baddb4c544c6ea55d23c5dec5462e351c0f80c54..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_2.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_3.png b/mods/farming/textures/farming_wheat_3.png deleted file mode 100644 index 36ebb1929de7851303f7b7da7a46fe831765608f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_3.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_4.png b/mods/farming/textures/farming_wheat_4.png deleted file mode 100644 index 735ed7772e5ed4e8ecf29004ce2fc92fc3001247..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_4.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_5.png b/mods/farming/textures/farming_wheat_5.png deleted file mode 100644 index f40b5f04f7e08f0b2275af580e2bd44a71891c52..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_5.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_6.png b/mods/farming/textures/farming_wheat_6.png deleted file mode 100644 index e9c78e00c1c1289017815af7bef5b2a38e3f5291..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_6.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_7.png b/mods/farming/textures/farming_wheat_7.png deleted file mode 100644 index cc26ca96990f96f8fe71d5c3eed9d0eea3bb7c2e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_7.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_8.png b/mods/farming/textures/farming_wheat_8.png deleted file mode 100644 index d0500934acb984e6e967d17cb855bca1b43b5a85..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_8.png and /dev/null differ diff --git a/mods/farming/textures/farming_wheat_seed.png b/mods/farming/textures/farming_wheat_seed.png deleted file mode 100644 index a9031fba979d5fd323ce9f5200f6ede53b2e733f..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/farming_wheat_seed.png and /dev/null differ diff --git a/mods/farming/textures/vessels_drinking_cup.png b/mods/farming/textures/vessels_drinking_cup.png deleted file mode 100644 index 2eba2321a5cf7650e0f3c0ced4896138f1da997e..0000000000000000000000000000000000000000 Binary files a/mods/farming/textures/vessels_drinking_cup.png and /dev/null differ diff --git a/mods/farming/todo.md b/mods/farming/todo.md deleted file mode 100644 index 5587027034407d4fab1678a5c90441ac170efdb4..0000000000000000000000000000000000000000 --- a/mods/farming/todo.md +++ /dev/null @@ -1,12 +0,0 @@ -* [x] orange trees from farming_plus -* [ ] optional - cocoa sapling -* [x] banana trees from farming_plus -* [x] carrot_seed -* [x] orange_seed -* [x] tomato_seed -* [x] potatoe_seed -* [x] rhubarb_seed -* [x] raspberry_seed -* [x] strawberry_seed -* [x] pumpkin_seed -* [x] aliases diff --git a/mods/farming/tomato.lua b/mods/farming/tomato.lua deleted file mode 100644 index 4ff6b6434882c7f70761c5a9aceb91961fa9230b..0000000000000000000000000000000000000000 --- a/mods/farming/tomato.lua +++ /dev/null @@ -1,86 +0,0 @@ - ---[[ - Textures edited from: - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288375-food-plus-mod-more-food-than-you-can-imagine-v2-9) -]] - -minetest.register_craftitem("farming:tomato_seed", { - description = "Tomato Seeds", - inventory_image = "farming_tomato_seed.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1") - end -}) - --- tomato -minetest.register_craftitem("farming:tomato", { - description = "Tomato", - inventory_image = "farming_tomato.png", - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1") - end, - on_use = minetest.item_eat(4), -}) - --- tomato definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_tomato_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:tomato_1", table.copy(crop_def)) - --- stage2 -crop_def.tiles = {"farming_tomato_2.png"} -minetest.register_node("farming:tomato_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_tomato_3.png"} -minetest.register_node("farming:tomato_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_tomato_4.png"} -minetest.register_node("farming:tomato_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_tomato_5.png"} -minetest.register_node("farming:tomato_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_tomato_6.png"} -minetest.register_node("farming:tomato_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_tomato_7.png"} -crop_def.drop = { - items = { - {items = {'farming:tomato'}, rarity = 1}, - {items = {'farming:tomato_seed'}, rarity = 1}, - {items = {'farming:tomato'}, rarity = 3}, - } -} -minetest.register_node("farming:tomato_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_tomato_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:tomato 3'}, rarity = 1}, - {items = {'farming:tomato_seed 4'}, rarity = 1}, - {items = {'farming:tomato 3'}, rarity = 2}, - } -} -minetest.register_node("farming:tomato_8", table.copy(crop_def)) diff --git a/mods/farming/wheat.lua b/mods/farming/wheat.lua deleted file mode 100644 index 72d65c42711e17defa7a3c9f89f64a59de93757e..0000000000000000000000000000000000000000 --- a/mods/farming/wheat.lua +++ /dev/null @@ -1,152 +0,0 @@ - --- wheat seeds -minetest.register_node("farming:seed_wheat", { - description = "Wheat Seed", - tiles = {"farming_wheat_seed.png"}, - inventory_image = "farming_wheat_seed.png", - wield_image = "farming_wheat_seed.png", - drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, - paramtype = "light", - paramtype2 = "wallmounted", - walkable = false, - sunlight_propagates = true, - selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1") - end, -}) - --- harvested wheat -minetest.register_craftitem("farming:wheat", { - description = "Wheat", - inventory_image = "farming_wheat.png", -}) - --- straw -minetest.register_node("farming:straw", { - description = "Straw", - tiles = {"farming_straw.png"}, - is_ground_content = false, - groups = {snappy = 3, flammable = 4, fall_damage_add_percent=-30}, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_craft({ - output = "farming:straw 3", - recipe = { - {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, - } -}) - -minetest.register_craft({ - output = "farming:wheat 3", - recipe = { - {"farming:straw"}, - } -}) - --- flour -minetest.register_craftitem("farming:flour", { - description = "Flour", - inventory_image = "farming_flour.png", -}) - -minetest.register_craft({ - type = "shapeless", - output = "farming:flour", - recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"} -}) - --- bread -minetest.register_craftitem("farming:bread", { - description = "Bread", - inventory_image = "farming_bread.png", - on_use = minetest.item_eat(5), -}) - -minetest.register_craft({ - type = "cooking", - cooktime = 15, - output = "farming:bread", - recipe = "farming:flour" -}) - --- wheat definition -local crop_def = { - drawtype = "plantlike", - tiles = {"farming_wheat_1.png"}, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "", - selection_box = farming.select, - groups = { - snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory = 1, growing = 1 - }, - sounds = default.node_sound_leaves_defaults() -} - --- stage 1 -minetest.register_node("farming:wheat_1", table.copy(crop_def)) - --- stage 2 -crop_def.tiles = {"farming_wheat_2.png"} -minetest.register_node("farming:wheat_2", table.copy(crop_def)) - --- stage 3 -crop_def.tiles = {"farming_wheat_3.png"} -minetest.register_node("farming:wheat_3", table.copy(crop_def)) - --- stage 4 -crop_def.tiles = {"farming_wheat_4.png"} -minetest.register_node("farming:wheat_4", table.copy(crop_def)) - --- stage 5 -crop_def.tiles = {"farming_wheat_5.png"} -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 2}, - {items = {'farming:seed_wheat'}, rarity = 2}, - } -} -minetest.register_node("farming:wheat_5", table.copy(crop_def)) - --- stage 6 -crop_def.tiles = {"farming_wheat_6.png"} -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 2}, - {items = {'farming:seed_wheat'}, rarity = 1}, - } -} -minetest.register_node("farming:wheat_6", table.copy(crop_def)) - --- stage 7 -crop_def.tiles = {"farming_wheat_7.png"} -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 1}, - {items = {'farming:wheat'}, rarity = 3}, - {items = {'farming:seed_wheat'}, rarity = 1}, - {items = {'farming:seed_wheat'}, rarity = 3}, - } -} -minetest.register_node("farming:wheat_7", table.copy(crop_def)) - --- stage 8 (final) -crop_def.tiles = {"farming_wheat_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {'farming:wheat'}, rarity = 1}, - {items = {'farming:wheat'}, rarity = 3}, - {items = {'farming:seed_wheat'}, rarity = 1}, - {items = {'farming:seed_wheat'}, rarity = 3}, - } -} -minetest.register_node("farming:wheat_8", table.copy(crop_def))