From 30c87bf910385fe8473170ad867fd5306ba8c051 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Sat, 8 Apr 2017 11:00:12 +0100 Subject: [PATCH] Added hemp, upped to ver 1.24 --- README.txt | 6 +- hemp.lua | 201 ++++++++++++++++++++++++++++++++ init.lua | 4 +- lucky_block.lua | 1 + mapgen.lua | 19 +++ textures/farming_hemp_1.png | Bin 0 -> 115 bytes textures/farming_hemp_2.png | Bin 0 -> 122 bytes textures/farming_hemp_3.png | Bin 0 -> 129 bytes textures/farming_hemp_4.png | Bin 0 -> 132 bytes textures/farming_hemp_5.png | Bin 0 -> 142 bytes textures/farming_hemp_6.png | Bin 0 -> 148 bytes textures/farming_hemp_7.png | Bin 0 -> 169 bytes textures/farming_hemp_8.png | Bin 0 -> 174 bytes textures/farming_hemp_fibre.png | Bin 0 -> 144 bytes textures/farming_hemp_leaf.png | Bin 0 -> 172 bytes textures/farming_hemp_oil.png | Bin 0 -> 164 bytes textures/farming_hemp_rope.png | Bin 0 -> 122 bytes textures/farming_hemp_seed.png | Bin 0 -> 147 bytes 18 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 hemp.lua create mode 100644 textures/farming_hemp_1.png create mode 100644 textures/farming_hemp_2.png create mode 100644 textures/farming_hemp_3.png create mode 100644 textures/farming_hemp_4.png create mode 100644 textures/farming_hemp_5.png create mode 100644 textures/farming_hemp_6.png create mode 100644 textures/farming_hemp_7.png create mode 100644 textures/farming_hemp_8.png create mode 100644 textures/farming_hemp_fibre.png create mode 100644 textures/farming_hemp_leaf.png create mode 100644 textures/farming_hemp_oil.png create mode 100644 textures/farming_hemp_rope.png create mode 100644 textures/farming_hemp_seed.png diff --git a/README.txt b/README.txt index 811a535..1457192 100644 --- a/README.txt +++ b/README.txt @@ -13,6 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t Changelog: +1.24 - Added Hemp which can be crafted into fibre, paper, string, rope and oil. 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 @@ -45,7 +46,7 @@ Changelog: 0.1 - Fixed growing bug 0.0 - Initial release -Lucky Blocks: 10 (plus 3 for default farming items) +Lucky Blocks: 11 (plus 3 for default farming items) License of media (textures): @@ -150,4 +151,5 @@ Created by TenPlus1 farming_rhubarb_2.png farming_rhubarb_3.png farming_rhubarb.png - farming_rhubarb_pie.png \ No newline at end of file + farming_rhubarb_pie.png + farming_hemp*.png diff --git a/hemp.lua b/hemp.lua new file mode 100644 index 0000000..7bb2e2b --- /dev/null +++ b/hemp.lua @@ -0,0 +1,201 @@ + +local S = farming.intllib + +-- hemp seeds +minetest.register_node("farming:seed_hemp", { + description = S("Hemp Seed"), + tiles = {"farming_hemp_seed.png"}, + inventory_image = "farming_hemp_seed.png", + wield_image = "farming_hemp_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:hemp_1") + end, +}) + +-- harvested hemp +minetest.register_craftitem("farming:hemp_leaf", { + description = S("Hemp Leaf"), + inventory_image = "farming_hemp_leaf.png", +}) + +-- hemp oil +minetest.register_craftitem("farming:hemp_oil", { + description = S("Hemp Oil"), + inventory_image = "farming_hemp_oil.png", +}) + +minetest.register_craft( { + output = "farming:hemp_oil", + recipe = { + {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}, + {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}, + {"", "vessels:glass_bottle", ""} + } +}) + +minetest.register_craft( { + output = "farming:hemp_oil", + recipe = { + {"farming:seed_hemp", "farming:seed_hemp", "farming:seed_hemp"}, + {"farming:seed_hemp", "farming:seed_hemp", "farming:seed_hemp"}, + {"farming:seed_hemp", "vessels:glass_bottle", "farming:seed_hemp"} + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "farming:hemp_oil", + burntime = 20, + replacements = {{ "farming:hemp_oil", "vessels:glass_bottle"}} +}) + +-- hemp fibre +minetest.register_craftitem("farming:hemp_fibre", { + description = S("Hemp Fibre"), + inventory_image = "farming_hemp_fibre.png", +}) + +minetest.register_craft( { + output = "farming:hemp_fibre 8", + recipe = { + {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}, + {"farming:hemp_leaf", "bucket:bucket_water", "farming:hemp_leaf"}, + {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"} + }, + replacements = {{ "bucket:bucket_water", "bucket:bucket_empty"}} +}) + +minetest.register_craft( { + output = "farming:hemp_fibre 8", + recipe = { + {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"}, + {"farming:hemp_leaf", "bucket:bucket_river_water", "farming:hemp_leaf"}, + {"farming:hemp_leaf", "farming:hemp_leaf", "farming:hemp_leaf"} + }, + replacements = {{ "bucket:bucket_river_water", "bucket:bucket_empty"}} +}) + +-- paper +minetest.register_craft( { + output = "default:paper", + recipe = { + {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, + } +}) + +-- string +minetest.register_craft( { + output = "farming:cotton", + recipe = { + {"farming:hemp_fibre"}, + {"farming:hemp_fibre"}, + {"farming:hemp_fibre"}, + } +}) + +-- hemp rope +minetest.register_node("farming:hemp_rope", { + description = S("Hemp Rope"), + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + tiles = {"farming_hemp_rope.png"}, + wield_image = "farming_hemp_rope.png", + inventory_image = "farming_hemp_rope.png", + drawtype = "plantlike", + groups = {flammable = 2, choppy = 3, oddly_breakable_by_hand = 3}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, +}) + +-- string +minetest.register_craft( { + output = "farming:hemp_rope 6", + recipe = { + {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, + {"farming:cotton", "farming:cotton", "farming:cotton"}, + {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, + } +}) + +-- hemp definition +local crop_def = { + drawtype = "plantlike", + tiles = {"farming_hemp_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:hemp_1", table.copy(crop_def)) + +-- stage 2 +crop_def.tiles = {"farming_hemp_2.png"} +minetest.register_node("farming:hemp_2", table.copy(crop_def)) + +-- stage 3 +crop_def.tiles = {"farming_hemp_3.png"} +minetest.register_node("farming:hemp_3", table.copy(crop_def)) + +-- stage 4 +crop_def.tiles = {"farming_hemp_4.png"} +minetest.register_node("farming:hemp_4", table.copy(crop_def)) + +-- stage 5 +crop_def.tiles = {"farming_hemp_5.png"} +minetest.register_node("farming:hemp_5", table.copy(crop_def)) + +-- stage 6 +crop_def.tiles = {"farming_hemp_6.png"} +crop_def.drop = { + items = { + {items = {'farming:hemp_leaf'}, rarity = 2}, + {items = {'farming:seed_hemp'}, rarity = 1}, + } +} +minetest.register_node("farming:hemp_6", table.copy(crop_def)) + +-- stage 7 +crop_def.tiles = {"farming_hemp_7.png"} +crop_def.drop = { + items = { + {items = {'farming:hemp_leaf'}, rarity = 1}, + {items = {'farming:hemp_leaf'}, rarity = 3}, + {items = {'farming:seed_hemp'}, rarity = 1}, + {items = {'farming:seed_hemp'}, rarity = 3}, + } +} +minetest.register_node("farming:hemp_7", table.copy(crop_def)) + +-- stage 8 (final) +crop_def.tiles = {"farming_hemp_8.png"} +crop_def.groups.growing = 0 +crop_def.drop = { + items = { + {items = {'farming:hemp_leaf 2'}, rarity = 1}, + {items = {'farming:hemp_leaf'}, rarity = 2}, + {items = {'farming:seed_hemp'}, rarity = 1}, + {items = {'farming:seed_hemp'}, rarity = 2}, + } +} +minetest.register_node("farming:hemp_8", table.copy(crop_def)) diff --git a/init.lua b/init.lua index 2d64f61..1292eac 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,5 @@ --[[ - Minetest Farming Redo Mod 1.23 (12th November 2016) + Minetest Farming Redo Mod 1.24 (8th March 2017) by TenPlus1 NEW growing routine by prestidigitator auto-refill by crabman77 @@ -502,6 +502,7 @@ local can_refill_plant = { ["farming:rhubarb_1"] = "farming:rhubarb", ["farming:cocoa_1"] = "farming:cocoa_beans", ["farming:barley_1"] = "farming:seed_barley", + ["farming:hemp_1"] = "farming:seed_hemp", } function farming.refill_plant(player, plantname, index) @@ -711,6 +712,7 @@ dofile(farming.path.."/rhubarb.lua") dofile(farming.path.."/beanpole.lua") dofile(farming.path.."/grapes.lua") dofile(farming.path.."/barley.lua") +dofile(farming.path.."/hemp.lua") dofile(farming.path.."/donut.lua") dofile(farming.path.."/mapgen.lua") dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility diff --git a/lucky_block.lua b/lucky_block.lua index df5c54f..41d5b90 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -14,5 +14,6 @@ if minetest.get_modpath("lucky_block") then {"dro", {"farming:bottle_ethanol"}, 1}, {"nod", "farming:melon", 0}, {"dro", {"farming:donut", "farming:donut_chocolate", "farming:donut_apple"}, 5}, + {"dro", {"farming:hemp_leaf", "farming:hemp_fibre", "farming:hemp_seed"}, 5}, }) end diff --git a/mapgen.lua b/mapgen.lua index 36d4792..59a485e 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -55,6 +55,25 @@ function farming.register_mgv7_decorations() register_plant("grapebush", 25, 45, "", -1) end +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = 0.06, + spread = {x = 100, y = 100, z = 100}, + seed = 420, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 35, + decoration = "farming:hemp_7", + spawn_by = "group:tree", + num_spawn_by = 1, +}) + -- detect mapgen local mg_name = minetest.get_mapgen_params().mgname diff --git a/textures/farming_hemp_1.png b/textures/farming_hemp_1.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb45108273f62dab7619fc6de9058858a9cc969 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_%$647rR9jjV3-gth|( z8B2ovf*Bm1-ADs+Bs^UlLpZJ{CoEvmXyE8$Q#kmHK}AARf`RKb!w2_08FD~144$rj JF6*2Ung9?I8g&2w literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_2.png b/textures/farming_hemp_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a676173cc121e25ad11a1ba92c14f3bf604443db GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|47rTfan=lttX*GT zX8^?+OM?7@862M7NCR?YJY5_^IIbrrC*kHxL>Bh#!AasziV*6pC QexN!APgg&ebxsLQ03=Nu`Tzg` literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_3.png b/textures/farming_hemp_3.png new file mode 100644 index 0000000000000000000000000000000000000000..57136d5072aa265a9527dfac39d6cc5e2d5ba123 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|47rTfan=lttX*GT zX8^?+OM?7@862M7NCR?|JzX3_IIbrrD2SclVBq}5rf`tskx?UuGqZwXIitr0D+d(@ Y?K4b1az76&0xDl8?e70Tsn^Mvo0v b4k`?x8q6izX8*Yf)WP8C>gTe~DWM4fZ;&A$ literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_5.png b/textures/farming_hemp_5.png new file mode 100644 index 0000000000000000000000000000000000000000..890a3d28e9486272f4f8c62a6bd9d0a78bf87918 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|47rTfan=lttX*GT zX8^?+OM?7@862M7NCR>VJY5_^IIbrr9N?6YZaBgiuMoI_)#C&U183O;31tCe`A4ji lTGbq!-Z4!`C~fdyU^uD97WB(&`a+;y22WQ%mvv4FO#l-7C7b{N literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_6.png b/textures/farming_hemp_6.png new file mode 100644 index 0000000000000000000000000000000000000000..258d4e3815f596d725cf2d1a6c19bd3fa99a7ce4 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|47rTfan=lttX*GT zX8^?+OM?7@862M7NCR@rJY5_^IIbrrI53-;IW*Zaco>*5e`JhTSe?KLJY5_^IIbrrB&7T}aG>Tz0S|M2qdqrt_ZcxZHnwjK{5*ep z&KmM8V{b@eVpTAl$uPl%nK_{8Cqwf~#d}O_jZVUhY-~HZ9XP|-6%L*_z`!u2nlJi& T>FZfQvl%>H{an^LB{Ts5IB7CX literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_fibre.png b/textures/farming_hemp_fibre.png new file mode 100644 index 0000000000000000000000000000000000000000..fe3c9187ef0e0d751ca94ea5078ac23b368d3b14 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|47rTfan=lttX*GT zX8^?+OM?7@862M7NCR?=JY5_^IIbrrC@>Z1G6<~_bx3+;%*M9tMyA6eqdkp{pI-(m o7}i!XF_*{OVP;!);sh(hV{PvDF;Ti-fw~zyUHx3vIVCg!0J)?n^#A|> literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_leaf.png b/textures/farming_hemp_leaf.png new file mode 100644 index 0000000000000000000000000000000000000000..997c8f0cd73688c33f89d20d2bb5e78731db87d9 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|47rTfan=lttX*GT zX8^?+OM?7@862M7NCR^GJY5_^IIbrrBv>3c(BNWV&5-$wfvt_{A43{jW>uH@nQ7A7qru}`=9Yh$CKhe=CgV`n2H!^T8mYpVnX Pko63nu6{1-oD!M)fl)HSs!N#qp zPwlnezWemS!s01O+|=PKS(deSK^k zt38>to*rOK-O=WpvF*YIrjWMmj0_33!#u0hBo?(DT+Hmjz`(D-&H7jE=PjTS44$rj JF6*2UngF~sH;@1T literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_rope.png b/textures/farming_hemp_rope.png new file mode 100644 index 0000000000000000000000000000000000000000..03a7082ff3a0d69445172c3ff65c2d3c2625a7ab GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uBp1|hNf)Iy+SjWi7L$5 z6Au(;ED7=pW^j0RBMr!r@pN$v;kcfhknsD^fddDu7(F(yGjP7-c4(?GWH@Bc?Rqon RkS|ajgQu&X%Q~loCIGt-Au<2} literal 0 HcmV?d00001 diff --git a/textures/farming_hemp_seed.png b/textures/farming_hemp_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..6be42c8607dc7e118b5493ae531668ed0031a823 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bO)b&o$z|YbWXZ`@uB%qs z~85ATGG#ao