summaryrefslogtreecommitdiff
path: root/plantlife_modpack/bushes_classic
diff options
context:
space:
mode:
Diffstat (limited to 'plantlife_modpack/bushes_classic')
-rw-r--r--plantlife_modpack/bushes_classic/cooking.lua118
-rw-r--r--plantlife_modpack/bushes_classic/depends.txt3
-rw-r--r--plantlife_modpack/bushes_classic/image_credits.txt5
-rw-r--r--plantlife_modpack/bushes_classic/init.lua59
-rw-r--r--plantlife_modpack/bushes_classic/locale/de.txt43
-rw-r--r--plantlife_modpack/bushes_classic/locale/fr.txt43
-rw-r--r--plantlife_modpack/bushes_classic/locale/template.txt43
-rw-r--r--plantlife_modpack/bushes_classic/locale/tr.txt44
-rw-r--r--plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj46
-rw-r--r--plantlife_modpack/bushes_classic/models/bushes_basket_full.obj330
-rw-r--r--plantlife_modpack/bushes_classic/models/bushes_bush.obj329
-rw-r--r--plantlife_modpack/bushes_classic/nodes.lua214
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket.pngbin2956 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.pngbin3631 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.pngbin3627 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.pngbin3645 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.pngbin3587 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.pngbin3610 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.pngbin3607 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blackberry.pngbin1140 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.pngbin601 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.pngbin612 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.pngbin341 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blueberry.pngbin1615 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.pngbin602 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.pngbin606 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.pngbin347 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.pngbin9089 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.pngbin9203 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.pngbin7891 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.pngbin9275 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.pngbin9226 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.pngbin9137 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_gooseberry.pngbin979 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.pngbin607 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.pngbin597 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.pngbin348 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.pngbin565 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.pngbin586 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.pngbin337 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_raspberry.pngbin1360 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.pngbin613 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.pngbin610 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.pngbin352 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_strawberry.pngbin1961 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.pngbin577 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.pngbin606 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.pngbin339 -> 0 bytes
-rw-r--r--plantlife_modpack/bushes_classic/textures/bushes_sugar.pngbin2077 -> 0 bytes
49 files changed, 0 insertions, 1277 deletions
diff --git a/plantlife_modpack/bushes_classic/cooking.lua b/plantlife_modpack/bushes_classic/cooking.lua
deleted file mode 100644
index c672975..0000000
--- a/plantlife_modpack/bushes_classic/cooking.lua
+++ /dev/null
@@ -1,118 +0,0 @@
-local S = biome_lib.intllib
-
--- Basket
-
-minetest.register_craft({
- output = "bushes:basket_empty",
- recipe = {
- { "default:stick", "default:stick", "default:stick" },
- { "", "default:stick", "" },
- },
-})
-
--- Sugar
-
-minetest.register_craftitem(":bushes:sugar", {
- description = S("Sugar"),
- inventory_image = "bushes_sugar.png",
- on_use = minetest.item_eat(1),
- groups = {food_sugar=1}
-})
-
-minetest.register_craft({
- output = "bushes:sugar 1",
- recipe = {
- { "default:papyrus", "default:papyrus" },
- },
-})
-
-for i, berry in ipairs(bushes_classic.bushes) do
- local desc = bushes_classic.bushes_descriptions[i]
-
- minetest.register_craftitem(":bushes:"..berry.."_pie_raw", {
- description = S("Raw "..desc.." pie"),
- inventory_image = "bushes_"..berry.."_pie_raw.png",
- on_use = minetest.item_eat(4),
- })
-
- if berry ~= "mixed_berry" then
-
- if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then
- -- Special case for strawberries, when farming_plus is in use. Use
- -- the item from that mod, but redefine it so it has the right
- -- groups and does't look so ugly!
- minetest.register_craftitem(":farming_plus:strawberry_item", {
- description = S("Strawberry"),
- inventory_image = "bushes_"..berry..".png",
- on_use = minetest.item_eat(2),
- groups = {berry=1, strawberry=1}
- })
- minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item")
- else
- minetest.register_craftitem(":bushes:"..berry, {
- description = desc,
- inventory_image = "bushes_"..berry..".png",
- groups = {berry = 1, [berry] = 1},
- on_use = minetest.item_eat(1),
- })
- end
- minetest.register_craft({
- output = "bushes:"..berry.."_pie_raw 1",
- recipe = {
- { "group:food_sugar", "farming:flour", "group:food_sugar" },
- { "group:"..berry, "group:"..berry, "group:"..berry },
- },
- })
- end
-
- -- Cooked pie
-
- minetest.register_craftitem(":bushes:"..berry.."_pie_cooked", {
- description = S("Cooked "..desc.." pie"),
- inventory_image = "bushes_"..berry.."_pie_cooked.png",
- on_use = minetest.item_eat(6),
- })
-
- minetest.register_craft({
- type = "cooking",
- output = "bushes:"..berry.."_pie_cooked",
- recipe = "bushes:"..berry.."_pie_raw",
- cooktime = 30,
- })
-
- -- slice of pie
-
- minetest.register_craftitem(":bushes:"..berry.."_pie_slice", {
- description = S("Slice of "..desc.." pie"),
- inventory_image = "bushes_"..berry.."_pie_slice.png",
- on_use = minetest.item_eat(1),
- })
-
- minetest.register_craft({
- output = "bushes:"..berry.."_pie_slice 6",
- recipe = {
- { "bushes:"..berry.."_pie_cooked" },
- },
- })
-
- -- Basket with pies
-
- minetest.register_craft({
- output = "bushes:basket_"..berry.." 1",
- recipe = {
- { "bushes:"..berry.."_pie_cooked", "bushes:"..berry.."_pie_cooked", "bushes:"..berry.."_pie_cooked" },
- { "", "bushes:basket_empty", "" },
- },
- })
-end
-
-minetest.register_craft({
- output = "bushes:mixed_berry_pie_raw 2",
- recipe = {
- { "group:food_sugar", "farming:flour", "group:food_sugar" },
- { "group:berry", "group:berry", "group:berry" },
- { "group:berry", "group:berry", "group:berry" },
- },
-})
-
-
diff --git a/plantlife_modpack/bushes_classic/depends.txt b/plantlife_modpack/bushes_classic/depends.txt
deleted file mode 100644
index 16347c6..0000000
--- a/plantlife_modpack/bushes_classic/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-biome_lib
-farming?
-farming_plus?
diff --git a/plantlife_modpack/bushes_classic/image_credits.txt b/plantlife_modpack/bushes_classic/image_credits.txt
deleted file mode 100644
index a4ddc51..0000000
--- a/plantlife_modpack/bushes_classic/image_credits.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-strawberry: http://www.clker.com/clipart-4060.html
-blueberry: http://www.clker.com/clipart-cerezafiro12.html
-blackberry: http://www.clker.com/clipart-blackberry-2.html
-raspberry: http://www.clker.com/clipart-simple-raspberry.html
-gooseberry: http://www.clker.com/clipart-26281.html
diff --git a/plantlife_modpack/bushes_classic/init.lua b/plantlife_modpack/bushes_classic/init.lua
deleted file mode 100644
index 021f569..0000000
--- a/plantlife_modpack/bushes_classic/init.lua
+++ /dev/null
@@ -1,59 +0,0 @@
--- Bushes classic mod originally by unknown
--- now maintained by VanessaE
---
--- License: WTFPL
-
-local S = biome_lib.intllib
-
-bushes_classic = {}
-
-bushes_classic.bushes = {
- "strawberry",
- "blackberry",
- "blueberry",
- "raspberry",
- "gooseberry",
- "mixed_berry"
-}
-
-bushes_classic.bushes_descriptions = {
- "Strawberry",
- "Blackberry",
- "Blueberry",
- "Raspberry",
- "Gooseberry",
- "Mixed Berry"
-}
-
-bushes_classic.spawn_list = {}
-
-local modpath = minetest.get_modpath('bushes_classic')
-dofile(modpath..'/cooking.lua')
-dofile(modpath..'/nodes.lua')
-
-biome_lib:spawn_on_surfaces({
- spawn_delay = 3600,
- spawn_plants = bushes_classic.spawn_list,
- avoid_radius = 10,
- spawn_chance = 100,
- spawn_surfaces = {
- "default:dirt_with_grass",
- "woodsoils:dirt_with_leaves_1",
- "woodsoils:grass_with_leaves_1",
- "woodsoils:grass_with_leaves_2",
- "farming:soil",
- "farming:soil_wet"
- },
- avoid_nodes = {"group:bush"},
- seed_diff = 545342534, -- chosen by a fair mashing of the keyboard - guaranteed to be random :P
- plantlife_limit = -0.1,
- light_min = 10,
- temp_min = 0.15, -- approx 20C
- temp_max = -0.15, -- approx 35C
- humidity_min = 0, -- 50% RH
- humidity_max = -1, -- 100% RH
-})
-
-minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry")
-
-print(S("[Bushes] Loaded."))
diff --git a/plantlife_modpack/bushes_classic/locale/de.txt b/plantlife_modpack/bushes_classic/locale/de.txt
deleted file mode 100644
index 3724274..0000000
--- a/plantlife_modpack/bushes_classic/locale/de.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Translation by Xanthin
-
-Strawberry = Erdbeere
-Blackberry = Brombeere
-Blueberry = Blaubeere
-Raspberry = Himbeere
-Gooseberry = Stachelbeere
-Mixed Berry = Beerenmix
-Basket with Strawberry Pies = Korb mit Erdbeertorten
-Basket with Blackberry Pies = Korb mit Brombeertorten
-Basket with Blueberry Pies = Korb mit Blaubeertorten
-Basket with Raspberry Pies = Korb mit Himbeertorten
-Basket with Gooseberry Pies = Korb mit Stachelbeertorten
-Basket with Mixed Berry Pies = Korb mit Beerenmixtorten
-currently fruitless = zur Zeit fruechteloser
-Strawberry Bush = Erdbeerbusch
-Blackberry Bush = Brombeerbusch
-Blueberry Bush = Blaubeerbusch
-Raspberry Bush = Himbeerbusch
-Gooseberry Bush = Stachelbeerbusch
-Mixed Berry Bush = Beerenmixbusch
-Basket = Korb
-Sugar = Zucker
-Raw Strawberry pie = Rohe Erdbeertorte
-Raw Blackberry pie = Rohe Brombeertorte
-Raw Blueberry pie = Rohe Blaubeertorte
-Raw Raspberry pie = Rohe Himbeertorte
-Raw Gooseberry pie = Rohe Stachelbeertorte
-Raw Mixed Berry pie = Rohe Beerenmixtorte
-Cooked Strawberry pie = Erdbeertorte
-Cooked Blackberry pie = Brombeertorte
-Cooked Blueberry pie = Blaubeertorte
-Cooked Raspberry pie = Himbeertorte
-Cooked Gooseberry pie = Stachelbeertorte
-Cooked Mixed Berry pie = Beerenmixtorte
-Slice of Strawberry pie = Erdbeertortenstueck
-Slice of Blackberry pie = Brombeertortenstueck
-Slice of Blueberry pie = Blaubeertortenstueck
-Slice of Raspberry pie = Himbeertortenstueck
-Slice of Gooseberry pie = Stachelbeertortenstueck
-Slice of Mixed Berry pie = Beerenmixtortenstueck
-
-[Bushes] Loaded. = [Bushes] Geladen.
diff --git a/plantlife_modpack/bushes_classic/locale/fr.txt b/plantlife_modpack/bushes_classic/locale/fr.txt
deleted file mode 100644
index ce80613..0000000
--- a/plantlife_modpack/bushes_classic/locale/fr.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template
-
-Strawberry = Fraise
-Blackberry = Mûre
-Blueberry = Myrtille
-Raspberry = Framboise
-Gooseberry = Groseille
-Mixed Berry = Mélange de baies
-Basket with Strawberry Pies = Panier de tartes aux fraises
-Basket with Blackberry Pies = Panier de tartes aux mûres
-Basket with Blueberry Pies = Panier de tartes aux myrtilles
-Basket with Raspberry Pies = Panier de tartes aux framboises
-Basket with Gooseberry Pies = Panier de tartes aux groseilles
-Basket with Mixed Berry Pies = Panier de tartes au mélange de baies
-currently fruitless = actuellement sans fruit
-Strawberry Bush = Buisson à fraise
-Blackberry Bush = Buisson à mûre
-Blueberry Bush = Buisson à myrtille
-Raspberry Bush = Buisson à framboise
-Gooseberry Bush = Buisson à groseille
-Mixed Berry Bush = Buisson de baies mélangées
-Basket = Panier
-Sugar = Sucre
-Raw Strawberry pie = Tarte crue aux fraises
-Raw Blackberry pie = Tarte crue aux mûres
-Raw Blueberry pie = Tarte crue aux myrtilles
-Raw Raspberry pie = Tarte crue aux framboises
-Raw Gooseberry pie = Tarte crue aux groseilles
-Raw Mixed Berry pie = Tarte crue au mélange de baies
-Cooked Strawberry pie = Tarte cuite aux fraises
-Cooked Blackberry pie = Tarte cuite aux mûres
-Cooked Blueberry pie = Tarte cuite aux myrtilles
-Cooked Raspberry pie = Tarte cuite aux framboises
-Cooked Gooseberry pie = Tarte cuite aux groseilles
-Cooked Mixed Berry pie = Tarte cuite au mélange de baies
-Slice of Strawberry pie = Part de tarte aux fraises
-Slice of Blackberry pie = Part de tarte aux mûres
-Slice of Blueberry pie = Part de tarte aux myrtilles
-Slice of Raspberry pie = Part de tarts aux framboises
-Slice of Gooseberry pie = Part de tarte aux groseilles
-Slice of Mixed Berry pie = Part de tarte au mélange de baies
-
-[Bushes] Loaded. = [Buissons] Chargés.
diff --git a/plantlife_modpack/bushes_classic/locale/template.txt b/plantlife_modpack/bushes_classic/locale/template.txt
deleted file mode 100644
index 6c35312..0000000
--- a/plantlife_modpack/bushes_classic/locale/template.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template
-
-Strawberry =
-Blackberry =
-Blueberry =
-Raspberry =
-Gooseberry =
-Mixed Berry =
-Basket with Strawberry Pies =
-Basket with Blackberry Pies =
-Basket with Blueberry Pies =
-Basket with Raspberry Pies =
-Basket with Gooseberry Pies =
-Basket with Mixed Berry Pies =
-currently fruitless =
-Strawberry Bush =
-Blackberry Bush =
-Blueberry Bush =
-Raspberry Bush =
-Gooseberry Bush =
-Mixed Berry Bush =
-Basket =
-Sugar =
-Raw Strawberry pie =
-Raw Blackberry pie =
-Raw Blueberry pie =
-Raw Raspberry pie =
-Raw Gooseberry pie =
-Raw Mixed Berry pie =
-Cooked Strawberry pie =
-Cooked Blackberry pie =
-Cooked Blueberry pie =
-Cooked Raspberry pie =
-Cooked Gooseberry pie =
-Cooked Mixed Berry pie =
-Slice of Strawberry pie =
-Slice of Blackberry pie =
-Slice of Blueberry pie =
-Slice of Raspberry pie =
-Slice of Gooseberry pie =
-Slice of Mixed Berry pie =
-
-[Bushes] Loaded. =
diff --git a/plantlife_modpack/bushes_classic/locale/tr.txt b/plantlife_modpack/bushes_classic/locale/tr.txt
deleted file mode 100644
index 0472921..0000000
--- a/plantlife_modpack/bushes_classic/locale/tr.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# Turkish translation
-# mahmutelmas06@hotmail.com
-
-Strawberry = Çilek
-Blackberry = Böğürtlen
-Blueberry = Yaban mersini
-Raspberry = Ahududu
-Gooseberry = Bektaşi üzümü
-Mixed Berry = Dut
-Basket with Strawberry Pies = Çilekli pasta sepeti
-Basket with Blackberry Pies = Böğürtlenli pasta sepeti
-Basket with Blueberry Pies = Yaban mersini pastalı sepet
-Basket with Raspberry Pies = Ahududulu pasta sepeti
-Basket with Gooseberry Pies = Bektaşi üzümlü pasta sepeti
-Basket with Mixed Berry Pies = Dutlu pasta sepeti
-currently fruitless = şu anda meyvesiz
-Strawberry Bush = Çilek fidanı
-Blackberry Bush = Böğürtlen fidanı
-Blueberry Bush = Yaban mersini fidanı
-Raspberry Bush = Ahududu fidanı
-Gooseberry Bush = Bektaşi üzümü fidanı
-Mixed Berry Bush = Dut fidanı
-Basket = Sepet
-Sugar = Şeker
-Raw Strawberry pie = Çilekli çiğ pasta
-Raw Blackberry pie = Böğürtlenli çiğ pasta
-Raw Blueberry pie = Yaban mersinli çiğ pasta
-Raw Raspberry pie = Ahududulu çiğ pasta
-Raw Gooseberry pie = Bektaşi üzümlü çiğ pasta
-Raw Mixed Berry pie = Dutlu çiğ pasta
-Cooked Strawberry pie = Pişmiş çilekli pasta
-Cooked Blackberry pie = Pişmiş böğürtlenli pasta
-Cooked Blueberry pie = Pişmiş yaban mersinli pasta
-Cooked Raspberry pie = Pişmiş ahududulu pasta
-Cooked Gooseberry pie = Pişmiş bektaşi üzümlü pasta
-Cooked Mixed Berry pie = Pişmiş dutlu pasta
-Slice of Strawberry pie = Çilekli pasta dilimi
-Slice of Blackberry pie = Böğürtlenli pasta dilimi
-Slice of Blueberry pie = Yaban mersinli pasta dilimi
-Slice of Raspberry pie = Ahududulu pasta dilimi
-Slice of Gooseberry pie = Bektaşi üzümlü pasta dilimi
-Slice of Mixed Berry pie = Dutlu pasta dilimi
-
-[Bushes] Loaded. = [Bushes] yüklendi.
diff --git a/plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj b/plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj
deleted file mode 100644
index 0179c31..0000000
--- a/plantlife_modpack/bushes_classic/models/bushes_basket_empty.obj
+++ /dev/null
@@ -1,46 +0,0 @@
-# Blender v2.73 (sub 0) OBJ File: 'basket-of-pies.blend'
-# www.blender.org
-o basket_Cube.001
-v -0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v 0.500000 0.500000 0.500000
-v -0.437500 0.500000 0.437500
-v -0.437500 0.500000 -0.437500
-v 0.437500 0.500000 -0.437500
-v 0.437500 0.500000 0.437500
-v -0.437500 -0.437500 0.437500
-v -0.437500 -0.437500 -0.437500
-v 0.437500 -0.437500 -0.437500
-v 0.437500 -0.437500 0.437500
-vt 0.484848 0.984848
-vt 0.015152 0.984848
-vt 0.015152 0.515152
-vt 0.484848 0.515152
-vt 0.515152 0.984848
-vt 0.515152 0.515152
-vt 0.984848 0.515152
-vt 0.984848 0.984848
-vt 0.954545 0.545455
-vt 0.545455 0.545455
-vt 0.954545 0.954545
-vt 0.545455 0.954545
-s off
-f 5/1 6/2 2/3 1/4
-f 6/1 7/2 3/3 2/4
-f 7/1 8/2 4/3 3/4
-f 8/1 5/2 1/3 4/4
-f 1/5 2/6 3/7 4/8
-f 5/6 8/7 12/9 9/10
-f 8/7 7/8 11/11 12/9
-f 7/8 6/5 10/12 11/11
-f 6/5 5/6 9/10 10/12
-f 9/1 12/2 16/3 13/4
-f 12/1 11/2 15/3 16/4
-f 11/1 10/2 14/3 15/4
-f 10/1 9/2 13/3 14/4
-f 13/10 16/9 15/11 14/12
diff --git a/plantlife_modpack/bushes_classic/models/bushes_basket_full.obj b/plantlife_modpack/bushes_classic/models/bushes_basket_full.obj
deleted file mode 100644
index 5a3e1a8..0000000
--- a/plantlife_modpack/bushes_classic/models/bushes_basket_full.obj
+++ /dev/null
@@ -1,330 +0,0 @@
-# Blender v2.73 (sub 0) OBJ File: 'basket-of-pies.blend'
-# www.blender.org
-o pies_Cylinder
-v -0.089468 -0.116804 -0.438000
-v -0.116691 -0.091480 -0.438000
-v 0.024696 0.005921 -0.404659
-v -0.002527 0.031245 -0.404659
-v 0.121480 0.109962 -0.309713
-v 0.094258 0.135286 -0.309713
-v 0.186149 0.179480 -0.167615
-v 0.158927 0.204804 -0.167615
-v 0.208858 0.203891 0.000000
-v 0.181635 0.229215 0.000000
-v 0.186149 0.179480 0.167615
-v 0.158927 0.204804 0.167615
-v 0.121480 0.109962 0.309713
-v 0.094258 0.135286 0.309713
-v 0.024696 0.005921 0.404659
-v -0.002527 0.031245 0.404659
-v -0.089468 -0.116804 0.438000
-v -0.116691 -0.091480 0.438000
-v -0.230856 -0.214204 0.404659
-v -0.327640 -0.318245 0.309713
-v -0.392309 -0.387763 0.167615
-v -0.415018 -0.412175 -0.000000
-v -0.392309 -0.387763 -0.167615
-v -0.327640 -0.318245 -0.309713
-v -0.230856 -0.214204 -0.404659
-v -0.135230 -0.074234 -0.383250
-v -0.035336 0.033150 -0.354077
-v 0.049350 0.124186 -0.270999
-v 0.105936 0.185014 -0.146663
-v 0.125806 0.206374 0.000000
-v 0.105936 0.185014 0.146663
-v 0.049350 0.124186 0.270999
-v -0.035336 0.033150 0.354077
-v -0.135230 -0.074234 0.383250
-v -0.235124 -0.181618 0.354077
-v -0.319810 -0.272654 0.270999
-v -0.376395 -0.333482 0.146663
-v -0.396266 -0.354842 -0.000000
-v -0.376395 -0.333482 -0.146664
-v -0.319810 -0.272654 -0.270999
-v -0.235124 -0.181618 -0.354077
-v 0.071215 -0.085999 -0.438000
-v 0.041377 -0.063816 -0.438000
-v 0.171221 0.048513 -0.404659
-v 0.141384 0.070697 -0.404659
-v 0.256002 0.162547 -0.309713
-v 0.226165 0.184731 -0.309713
-v 0.312652 0.238743 -0.167615
-v 0.282814 0.260926 -0.167615
-v 0.332544 0.265499 0.000000
-v 0.302707 0.287682 0.000000
-v 0.312652 0.238743 0.167615
-v 0.282814 0.260926 0.167615
-v 0.256002 0.162547 0.309713
-v 0.226165 0.184731 0.309713
-v 0.171221 0.048513 0.404659
-v 0.141383 0.070697 0.404659
-v 0.071215 -0.085999 0.438000
-v 0.041377 -0.063816 0.438000
-v -0.058629 -0.198328 0.404659
-v -0.058629 -0.198328 -0.404659
-v 0.021058 -0.048709 -0.383250
-v 0.108564 0.068989 -0.354077
-v 0.182747 0.168769 -0.270999
-v 0.232315 0.235440 -0.146663
-v 0.249721 0.258852 0.000000
-v 0.232315 0.235440 0.146663
-v 0.182747 0.168769 0.270999
-v 0.108564 0.068989 0.354077
-v 0.021058 -0.048709 0.383250
-v -0.066448 -0.166408 0.354077
-v -0.140632 -0.266188 0.270999
-v -0.190200 -0.332858 0.146663
-v -0.207605 -0.356270 -0.000000
-v -0.190199 -0.332858 -0.146664
-v -0.140631 -0.266188 -0.270999
-v -0.066448 -0.166408 -0.354077
-v 0.220377 -0.057101 -0.438000
-v 0.188086 -0.038671 -0.438000
-v 0.303465 0.088470 -0.404659
-v 0.271175 0.106901 -0.404659
-v 0.373905 0.211880 -0.309713
-v 0.341614 0.230311 -0.309713
-v 0.420971 0.294340 -0.167615
-v 0.388680 0.312771 -0.167615
-v 0.437498 0.323296 0.000000
-v 0.405208 0.341727 0.000000
-v 0.420971 0.294340 0.167615
-v 0.388680 0.312771 0.167615
-v 0.373905 0.211880 0.309713
-v 0.341614 0.230311 0.309713
-v 0.303465 0.088470 0.404659
-v 0.271175 0.106901 0.404659
-v 0.220377 -0.057101 0.438000
-v 0.188086 -0.038671 0.438000
-v 0.104997 -0.184242 0.404659
-v 0.104997 -0.184242 -0.404659
-v 0.166096 -0.026119 -0.383250
-v 0.238799 0.101256 -0.354077
-v 0.300433 0.209240 -0.270999
-v 0.341616 0.281392 -0.146663
-v 0.356078 0.306728 0.000000
-v 0.341616 0.281392 0.146664
-v 0.300433 0.209240 0.270999
-v 0.238799 0.101256 0.354077
-v 0.166096 -0.026119 0.383250
-v 0.093393 -0.153495 0.354077
-v 0.031759 -0.261478 0.270999
-v -0.009424 -0.333631 0.146663
-v -0.023885 -0.358967 -0.000000
-v -0.009424 -0.333631 -0.146664
-v 0.031759 -0.261478 -0.270999
-v 0.093394 -0.153495 -0.354077
-vt 0.000000 0.054054
-vt 0.000000 0.000000
-vt 0.062500 0.000000
-vt 0.062500 0.054054
-vt 0.125000 0.000000
-vt 0.125000 0.054054
-vt 0.187500 0.000000
-vt 0.187500 0.054054
-vt 0.250000 0.000000
-vt 0.250000 0.054054
-vt 0.312500 0.000000
-vt 0.312500 0.054054
-vt 0.375000 0.000000
-vt 0.375000 0.054054
-vt 0.437500 0.000000
-vt 0.437500 0.054054
-vt 0.500000 0.000000
-vt 0.500000 0.054054
-vt 0.055610 0.293778
-vt 0.110171 0.184656
-vt 0.123905 0.225763
-vt 0.076165 0.321244
-vt 0.316174 0.801264
-vt 0.253798 0.852938
-vt 0.186282 0.852938
-vt 0.123905 0.801264
-vt 0.076165 0.705782
-vt 0.050327 0.581029
-vt 0.050327 0.445997
-vt 0.186282 0.174088
-vt 0.253798 0.174089
-vt 0.316174 0.225763
-vt 0.363915 0.321245
-vt 0.389752 0.445997
-vt 0.389752 0.581029
-vt 0.363915 0.705782
-vt 0.384468 0.733249
-vt 0.329907 0.842371
-vt 0.055610 0.733249
-vt 0.026082 0.590674
-vt 0.384468 0.293778
-vt 0.413996 0.436353
-vt 0.258619 0.901428
-vt 0.181458 0.901428
-vt 0.181458 0.125599
-vt 0.258619 0.125599
-vt 0.026082 0.436353
-vt 0.413996 0.590674
-vt 0.110171 0.842371
-vt 0.329907 0.184656
-vt 0.076566 0.705251
-vt 0.050729 0.580498
-vt 0.050729 0.445466
-vt 0.076566 0.320713
-vt 0.124307 0.225232
-vt 0.186684 0.173557
-vt 0.254199 0.173557
-vt 0.316576 0.225232
-vt 0.364317 0.320713
-vt 0.390154 0.445466
-vt 0.390154 0.580498
-vt 0.364317 0.705251
-vt 0.316576 0.800732
-vt 0.254199 0.852407
-vt 0.186684 0.852407
-vt 0.124307 0.800732
-vt 0.110573 0.841838
-vt 0.056012 0.732716
-vt 0.330309 0.841838
-vt 0.259022 0.900894
-vt 0.026484 0.590141
-vt 0.026484 0.435819
-vt 0.414398 0.435819
-vt 0.414398 0.590141
-vt 0.181861 0.900894
-vt 0.384870 0.732716
-vt 0.384870 0.293245
-vt 0.389637 0.582094
-vt 0.363799 0.706847
-vt 0.316059 0.802329
-vt 0.253682 0.854003
-vt 0.186166 0.854003
-vt 0.123790 0.802329
-vt 0.076049 0.706847
-vt 0.050212 0.582094
-vt 0.050212 0.447062
-vt 0.076049 0.322309
-vt 0.123790 0.226828
-vt 0.186166 0.175153
-vt 0.253682 0.175153
-vt 0.316058 0.226828
-vt 0.363799 0.322310
-vt 0.389637 0.447062
-vt 0.413881 0.437419
-vt 0.413881 0.591741
-vt 0.258504 0.126666
-vt 0.329792 0.185722
-vt 0.384353 0.734315
-vt 0.329792 0.843437
-vt 0.055495 0.294844
-vt 0.110056 0.185722
-vt 0.384353 0.294844
-vt 0.181343 0.126666
-vt 0.025967 0.437419
-g pies_Cylinder_pie
-s off
-f 1/1 2/2 4/3 3/4
-f 3/4 4/3 6/5 5/6
-f 5/6 6/5 8/7 7/8
-f 7/8 8/7 10/9 9/10
-f 9/10 10/9 12/11 11/12
-f 11/12 12/11 14/13 13/14
-f 13/14 14/13 16/15 15/16
-f 15/16 16/15 18/17 17/18
-f 20/19 19/20 35/21 36/22
-f 27/23 26/24 41/25 40/26 39/27 38/28 37/29 36/22 35/21 34/30 33/31 32/32 31/33 30/34 29/35 28/36
-f 6/37 4/38 27/23 28/36
-f 23/39 22/40 38/28 39/27
-f 12/41 10/42 30/34 31/33
-f 2/43 25/44 41/25 26/24
-f 4/38 2/43 26/24 27/23
-f 18/45 16/46 33/31 34/30
-f 21/47 20/19 36/22 37/29
-f 8/48 6/37 28/36 29/35
-f 24/49 23/39 39/27 40/26
-f 14/50 12/41 31/33 32/32
-f 19/20 18/45 34/30 35/21
-f 22/40 21/47 37/29 38/28
-f 10/42 8/48 29/35 30/34
-f 25/44 24/49 40/26 41/25
-f 16/46 14/50 32/32 33/31
-f 42/1 43/2 45/3 44/4
-f 44/4 45/3 47/5 46/6
-f 46/6 47/5 49/7 48/8
-f 48/8 49/7 51/9 50/10
-f 50/10 51/9 53/11 52/12
-f 52/12 53/11 55/13 54/14
-f 54/14 55/13 57/15 56/16
-f 56/16 57/15 59/17 58/18
-f 63/51 62/52 77/53 76/54 75/55 74/56 73/57 72/58 71/59 70/60 69/61 68/62 67/63 66/64 65/65 64/66
-f 47/67 45/68 63/51 64/66
-f 53/69 51/70 66/64 67/63
-f 43/71 61/72 77/53 62/52
-f 45/68 43/71 62/52 63/51
-f 59/73 57/74 69/61 70/60
-f 49/75 47/67 64/66 65/65
-f 55/76 53/69 67/63 68/62
-f 60/77 59/73 70/60 71/59
-f 51/70 49/75 65/65 66/64
-f 57/74 55/76 68/62 69/61
-f 78/1 79/2 81/3 80/4
-f 80/4 81/3 83/5 82/6
-f 82/6 83/5 85/7 84/8
-f 84/8 85/7 87/9 86/10
-f 86/10 87/9 89/11 88/12
-f 88/12 89/11 91/13 90/14
-f 90/14 91/13 93/15 92/16
-f 92/16 93/15 95/17 94/18
-f 99/78 98/79 113/80 112/81 111/82 110/83 109/84 108/85 107/86 106/87 105/88 104/89 103/90 102/91 101/92 100/93
-f 83/94 81/95 99/78 100/93
-f 89/96 87/97 102/91 103/90
-f 79/98 97/99 113/80 98/79
-f 81/95 79/98 98/79 99/78
-f 95/100 93/101 105/88 106/87
-f 85/102 83/94 100/93 101/92
-f 91/103 89/96 103/90 104/89
-f 96/104 95/100 106/87 107/86
-f 87/97 85/102 101/92 102/91
-f 93/101 91/103 104/89 105/88
-o basket_Cube.001
-v -0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v 0.500000 0.500000 0.500000
-v -0.437500 0.500000 0.437500
-v -0.437500 0.500000 -0.437500
-v 0.437500 0.500000 -0.437500
-v 0.437500 0.500000 0.437500
-v -0.437500 -0.437500 0.437500
-v -0.437500 -0.437500 -0.437500
-v 0.437500 -0.437500 -0.437500
-v 0.437500 -0.437500 0.437500
-vt 0.484848 0.984848
-vt 0.015152 0.984848
-vt 0.015152 0.515152
-vt 0.484848 0.515152
-vt 0.515152 0.984848
-vt 0.515152 0.515152
-vt 0.984848 0.515152
-vt 0.984848 0.984848
-vt 0.954545 0.545455
-vt 0.545455 0.545455
-vt 0.954545 0.954545
-vt 0.545455 0.954545
-g basket_Cube.001_basket
-s off
-f 118/105 119/106 115/107 114/108
-f 119/105 120/106 116/107 115/108
-f 120/105 121/106 117/107 116/108
-f 121/105 118/106 114/107 117/108
-f 114/109 115/110 116/111 117/112
-f 118/110 121/111 125/113 122/114
-f 121/111 120/112 124/115 125/113
-f 120/112 119/109 123/116 124/115
-f 119/109 118/110 122/114 123/116
-f 122/105 125/106 129/107 126/108
-f 125/105 124/106 128/107 129/108
-f 124/105 123/106 127/107 128/108
-f 123/105 122/106 126/107 127/108
-f 126/114 129/113 128/115 127/116
diff --git a/plantlife_modpack/bushes_classic/models/bushes_bush.obj b/plantlife_modpack/bushes_classic/models/bushes_bush.obj
deleted file mode 100644
index a69bfce..0000000
--- a/plantlife_modpack/bushes_classic/models/bushes_bush.obj
+++ /dev/null
@@ -1,329 +0,0 @@
-# Blender v2.73 (sub 0) OBJ File: 'bush.blend'
-# www.blender.org
-o nodebox-4
-v 0.467076 -0.122686 -0.190481
-v -0.453590 -0.119789 -0.192145
-v 0.420865 -0.181680 -0.171396
-v -0.429008 -0.188000 -0.182314
-v -0.450977 0.041977 -0.191409
-v -0.271687 -0.294075 -0.114977
-v -0.096925 -0.495759 -0.044091
-v -0.070286 -0.344209 -0.030750
-v -0.163971 -0.173437 -0.403793
-v -0.188139 -0.116431 0.446425
-v 0.069865 0.462329 0.170043
-v -0.175980 -0.180649 0.417932
-v -0.184276 0.039248 0.437271
-v -0.121692 -0.319322 0.290049
-v -0.039557 -0.495759 0.097032
-v -0.029307 -0.346230 0.070496
-v -0.440307 0.205163 -0.203598
-v -0.440281 0.206327 0.191785
-v -0.339366 0.327086 -0.144329
-v -0.267923 0.418413 0.108270
-v -0.264994 0.405691 -0.113216
-v 0.173823 0.186657 0.424935
-v -0.172109 0.470396 -0.073638
-v -0.090743 0.491063 -0.039539
-v -0.173625 0.180559 0.412022
-v 0.108534 0.404586 0.263698
-v -0.137870 0.317286 0.327397
-v 0.149454 0.342906 0.361857
-v -0.115069 0.426252 0.274637
-v 0.116858 -0.311812 0.284557
-v -0.074459 0.465500 0.178311
-v -0.036397 0.486640 0.094150
-v 0.044199 -0.495759 -0.101459
-v 0.034559 -0.377127 -0.079219
-v 0.116886 -0.299764 -0.276145
-v -0.172864 0.462259 0.069984
-v 0.173974 -0.178414 -0.411782
-v 0.191827 0.042411 -0.453422
-v 0.190055 -0.117435 -0.449613
-v -0.136929 0.321997 -0.339476
-v 0.101567 -0.495759 0.039664
-v 0.076778 -0.365788 0.030191
-v 0.292232 -0.320027 0.121743
-v -0.067752 0.451498 -0.167691
-v 0.433751 -0.189348 0.181586
-v 0.457624 0.044950 0.184732
-v 0.473778 -0.128221 0.198329
-v -0.113891 -0.307852 -0.282552
-v 0.081961 0.458662 -0.191580
-v 0.042947 0.491063 -0.093885
-v 0.109202 0.397842 -0.257691
-v 0.145450 0.328672 -0.343352
-v 0.191241 0.038411 0.444768
-v -0.184306 0.045052 -0.456452
-v -0.289997 -0.318897 0.117161
-v 0.182461 0.185982 -0.431178
-v 0.180190 0.469152 0.074510
-v 0.097292 0.491063 0.039804
-v 0.264954 0.412421 0.110505
-v 0.355939 0.336100 0.148277
-v -0.474575 0.042725 0.191924
-v -0.169486 0.185035 -0.418844
-v -0.445009 -0.118527 0.180804
-v 0.427054 0.187979 0.172057
-v 0.350926 0.339079 -0.143384
-v 0.189060 -0.125023 0.462241
-v 0.269270 -0.290650 -0.109472
-v 0.175816 -0.186803 0.429367
-v 0.259570 0.406980 -0.105942
-v -0.103158 0.398344 -0.255462
-v -0.339105 0.330270 0.137302
-v -0.186029 -0.123369 -0.460126
-v -0.418539 -0.180131 0.169838
-v 0.041492 0.491063 0.094145
-v 0.487251 0.041118 -0.191308
-v 0.173059 0.459504 -0.070716
-v 0.460259 0.206607 -0.196213
-v 0.108065 0.487446 -0.045199
-v -0.103423 0.491173 0.040772
-v -0.040665 0.496765 -0.107957
-v -0.070153 -0.343292 0.028053
-v -0.028215 -0.347521 -0.072596
-v 0.028031 -0.329368 0.067986
-v 0.075170 -0.358957 -0.031186
-v -0.037332 -0.495759 -0.099759
-v 0.099867 -0.495759 -0.041867
-v -0.095225 -0.495759 0.037440
-v 0.041974 -0.495759 0.095332
-v 0.001777 0.503796 -0.003546
-v 0.002321 -0.495758 -0.002214
-vt 0.875000 0.281250
-vt 1.000000 0.281250
-vt 1.000000 0.421875
-vt 0.875000 0.421875
-vt 0.375000 0.125000
-vt 0.500000 0.125000
-vt 0.500000 0.234375
-vt 0.375000 0.234375
-vt 0.625000 0.234375
-vt 0.625000 0.281250
-vt 0.500000 0.281250
-vt 0.500000 0.609375
-vt 0.500000 0.656250
-vt 0.375000 0.656250
-vt 0.375000 0.609375
-vt 0.625000 0.421875
-vt 0.500000 0.421875
-vt 0.375000 0.281250
-vt 0.375000 0.421875
-vt 0.125000 0.609375
-vt 0.125000 0.656250
-vt 0.000000 0.656250
-vt 0.000000 0.609375
-vt 0.846670 0.983596
-vt 0.823789 0.862038
-vt 0.861831 0.862038
-vt 0.500000 0.531250
-vt 0.375000 0.531250
-vt 0.234375 0.609375
-vt 0.234375 0.531250
-vt 0.875000 0.234375
-vt 0.750000 0.234375
-vt 0.750000 0.125000
-vt 0.875000 0.125000
-vt 0.125000 0.234375
-vt 0.125000 0.125000
-vt 0.234375 0.125000
-vt 0.234375 0.234375
-vt 0.125000 0.281250
-vt 0.234375 0.281250
-vt 0.234375 0.421875
-vt 0.125000 0.421875
-vt 0.125000 0.703125
-vt 0.000000 0.703125
-vt 0.875000 0.656250
-vt 0.750000 0.656250
-vt 0.750000 0.609375
-vt 0.875000 0.609375
-vt 0.625000 0.656250
-vt 0.625000 0.609375
-vt 0.234375 0.656250
-vt 0.375000 0.703125
-vt 0.234375 0.703125
-vt 0.125000 0.531250
-vt 0.875000 0.531250
-vt 1.000000 0.531250
-vt 1.000000 0.609375
-vt 0.500000 0.703125
-vt 0.000000 0.421875
-vt 0.000000 0.531250
-vt 0.875000 0.703125
-vt 0.750000 0.703125
-vt 0.328125 0.812500
-vt 0.328125 0.875000
-vt 0.265625 0.890625
-vt 0.265625 0.781250
-vt 0.750000 0.531250
-vt 1.000000 0.234375
-vt -0.000000 0.281250
-vt 0.000000 0.234375
-vt 0.375000 0.921875
-vt 0.328125 0.984375
-vt 0.562500 0.812500
-vt 0.500000 0.828125
-vt 0.625000 0.125000
-vt 0.625000 0.531250
-vt 0.970570 0.983596
-vt 0.918853 0.862038
-vt 0.983390 0.862038
-vt 1.000000 0.703125
-vt 1.000000 0.656250
-vt 0.694849 0.983596
-vt 0.653099 0.862038
-vt 0.703461 0.862038
-vt 0.453125 1.000000
-vt 0.437500 0.937500
-vt 0.546875 0.937500
-vt 0.375000 0.765625
-vt 0.625000 0.703125
-vt 0.750000 0.281250
-vt 0.000000 0.125000
-vt 0.781059 0.974219
-vt 0.740272 0.862038
-vt 0.773590 0.862038
-vt 0.823762 0.862067
-vt 0.773656 0.862066
-vt 0.800723 0.801332
-vt 0.750000 0.421875
-vt 1.000000 0.125000
-vt 0.881508 0.980225
-vt 0.923791 0.982865
-vt 0.819499 0.959318
-vt 0.634200 0.973424
-vt 0.659430 0.971277
-vt 0.724959 0.956989
-vt 0.755822 0.968617
-vt 0.125000 0.000000
-vt 0.234375 0.000000
-vt 0.375000 0.000000
-vt 0.500000 0.000000
-vt 0.750000 0.000000
-vt 0.875000 0.000000
-vt 1.000000 0.000000
-vt 0.625000 0.000000
-vt 0.000000 0.000000
-vt 0.618713 0.862038
-vt 0.453125 0.781250
-vt 0.484375 0.890625
-vt 0.406250 0.859375
-vt 0.738525 0.828462
-vt 0.741806 0.778103
-vt 0.777683 0.740596
-vt 0.827789 0.740597
-vt 0.862920 0.774201
-vt 0.859639 0.824560
-s off
-f 63/1 10/2 13/3 61/4
-f 67/5 35/6 37/7 3/8
-f 9/9 72/10 39/11 37/7
-f 52/12 51/13 69/14 65/15
-f 72/10 54/16 38/17 39/11
-f 1/18 39/11 38/17 75/19
-f 28/20 26/21 29/22 27/23
-f 82/24 33/25 85/26
-f 75/19 38/17 56/27 77/28
-f 77/28 65/15 60/29 64/30
-f 73/31 4/32 6/33 55/34
-f 68/35 30/36 43/37 45/38
-f 66/39 47/40 46/41 53/42
-f 11/43 31/44 29/22 26/21
-f 20/45 21/46 19/47 71/48
-f 70/49 40/50 19/47 21/46
-f 59/51 69/14 76/52 57/53
-f 3/8 37/7 39/11 1/18
-f 28/20 22/54 64/30 60/29
-f 71/48 18/55 25/56 27/57
-f 69/14 51/13 49/58 76/52
-f 13/59 53/42 22/54 25/60
-f 36/61 23/62 21/46 20/45
-f 58/63 74/64 11/65 57/66
-f 57/53 11/43 26/21 59/51
-f 19/47 17/67 18/55 71/48
-f 73/31 12/68 10/2 63/1
-f 68/35 66/39 10/69 12/70
-f 74/64 32/71 31/72 11/65
-f 53/42 46/41 64/30 22/54
-f 25/56 18/55 61/4 13/3
-f 49/58 44/73 80/74
-f 45/38 3/8 1/18 47/40
-f 9/9 48/75 6/33 4/32
-f 62/76 40/50 52/12 56/27
-f 81/77 7/78 87/79
-f 31/80 36/61 20/45 29/81
-f 83/82 15/83 88/84
-f 36/85 79/86 23/87
-f 78/88 58/63 57/66
-f 17/67 19/47 40/50 62/76
-f 45/38 47/40 66/39 68/35
-f 51/13 70/49 44/89 49/58
-f 4/32 73/31 63/1 2/90
-f 12/70 14/91 30/36 68/35
-f 84/92 41/93 86/94
-f 33/95 86/96 90/97
-f 70/49 21/46 23/62 44/89
-f 54/16 62/76 56/27 38/17
-f 29/81 20/45 71/48 27/57
-f 37/7 35/6 48/75 9/9
-f 5/98 17/67 62/76 54/16
-f 18/55 17/67 5/98 61/4
-f 10/69 66/39 53/42 13/59
-f 12/68 73/31 55/34 14/99
-f 51/13 52/12 40/50 70/49
-f 27/23 25/60 22/54 28/20
-f 65/15 69/14 59/51 60/29
-f 56/27 52/12 65/15 77/28
-f 46/41 75/19 77/28 64/30
-f 60/29 59/51 26/21 28/20
-f 47/40 1/18 75/19 46/41
-f 2/90 5/98 54/16 72/10
-f 4/32 2/90 72/10 9/9
-f 43/37 67/5 3/8 45/38
-f 2/90 63/1 61/4 5/98
-f 82/100 7/78 8/101
-f 82/24 34/102 33/25
-f 81/103 15/83 16/104
-f 81/77 8/101 7/78
-f 83/82 41/93 42/105
-f 83/82 16/104 15/83
-f 84/92 33/25 34/102
-f 84/92 42/106 41/93
-f 30/36 83/107 42/108 43/37
-f 42/108 84/109 67/5 43/37
-f 67/5 84/109 34/110 35/6
-f 55/34 6/33 8/111 81/112
-f 55/34 81/112 16/113 14/99
-f 34/110 82/114 48/75 35/6
-f 48/75 82/114 8/111 6/33
-f 30/36 14/91 16/115 83/107
-f 7/78 82/100 85/26
-f 15/83 81/103 87/116
-f 41/93 83/82 88/84
-f 33/25 84/92 86/94
-f 80/74 50/117 49/58
-f 23/87 24/118 80/74
-f 80/74 44/73 23/87
-f 79/86 36/85 31/72
-f 79/86 24/118 23/87
-f 31/72 32/71 79/86
-f 78/88 49/58 50/117
-f 78/88 57/66 76/52
-f 76/52 49/58 78/88
-f 24/118 79/86 89/119
-f 79/86 32/71 89/119
-f 32/71 74/64 89/119
-f 74/64 58/63 89/119
-f 58/63 78/88 89/119
-f 78/88 50/117 89/119
-f 50/117 80/74 89/119
-f 80/74 24/118 89/119
-f 86/96 41/120 90/97
-f 41/120 88/121 90/97
-f 88/121 15/122 90/97
-f 15/122 87/123 90/97
-f 87/123 7/124 90/97
-f 7/124 85/125 90/97
-f 85/125 33/95 90/97
diff --git a/plantlife_modpack/bushes_classic/nodes.lua b/plantlife_modpack/bushes_classic/nodes.lua
deleted file mode 100644
index 352e2a9..0000000
--- a/plantlife_modpack/bushes_classic/nodes.lua
+++ /dev/null
@@ -1,214 +0,0 @@
-local S = biome_lib.intllib
-
-plantlife_bushes = {}
-
--- TODO: add support for nodebreakers? those dig like mese picks
-plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
- if not (digger and pos and oldnode) then
- return
- end
-
- -- find out which bush type we are dealing with
- local bush_name = ""
- local can_harvest = false
-
- if oldnode.name == "bushes:fruitless_bush" then
- -- this bush has not grown fruits yet (but will eventually)
- bush_name = oldmetadata.fields.bush_type
- -- no fruits to be found, so can_harvest stays false
- else
- local name_parts = oldnode.name:split(":")
- if #name_parts >= 2 and name_parts[2] ~= nil then
-
- name_parts = name_parts[2]:split("_")
-
- if #name_parts >= 2 and name_parts[1] ~= nil then
- bush_name = name_parts[1]
- -- this bush really carries fruits
- can_harvest = true
- end
- end
- end
-
- -- find out which tool the digger was wielding (if any)
- local toolstack = digger:get_wielded_item()
- local capabilities = toolstack:get_tool_capabilities()
-
- -- what the player will get
- local harvested
-
- -- failure to find out what the tool can do: destroy the bush and return nothing
- local groupcaps = capabilities.groupcaps
- if not groupcaps then
- return
-
- -- digging with the hand or something like that
- elseif groupcaps.snappy then
-
- -- plant a new bush without fruits
- minetest.set_node(pos, {type = "node", name = "bushes:fruitless_bush"})
- local meta = minetest.get_meta(pos)
- meta:set_string('bush_type', bush_name)
-
- -- construct the stack of fruits the player will get
- -- only bushes that have grown fruits can actually give fruits
- if can_harvest then
- local amount = "4"
- harvested = "bushes:" .. bush_name .. " " .. amount
- end
-
- -- something like a shovel
- elseif groupcaps.crumbly then
-
- -- with a chance of 1/3, return 2 bushes
- local amount
- if math.random(1,3) == 1 then
- amount = "2"
- else
- amount = "1"
- end
- -- return the bush itself
- harvested = "bushes:" .. bush_name .. "_bush "..amount
-
- -- something like an axe
- elseif groupcaps.choppy then
-
- -- the amount of sticks may vary
- local amount = math.random(4, 20)
- -- return some sticks
- harvested = "default:stick " .. amount
-
- -- nothing known - destroy the plant
- else
- return
- end
-
- -- give the harvested result to the player
- if harvested then
- --minetest.chat_send_player("singleplayer","you would now get "..tostring( harvested ) );
- local itemstack = ItemStack(harvested)
- local inventory = digger:get_inventory()
- if inventory:room_for_item("main", itemstack) then
- inventory:add_item("main", itemstack)
- else
- minetest.item_drop(itemstack, digger, pos)
- end
- end
-end
-
-plantlife_bushes.after_place_node = function(pos, placer, itemstack)
-
- if not (itemstack and pos) then
- return
- end
-
- local name_parts = itemstack:get_name():split(":")
- if #name_parts < 2 or name_parts[2] == nil then
- return
- end
-
- name_parts = name_parts[2]:split("_")
-
- if #name_parts < 2 or name_parts[1] == nil then
- return
- end
-
- minetest.set_node(pos, {name = "bushes:fruitless_bush"})
- local meta = minetest.get_meta(pos)
- meta:set_string("bush_type", name_parts[1])
-end
-
--- regrow berries (uses a base abm instead of biome_lib because of the use of metadata).
-
-minetest.register_abm({
- nodenames = {"bushes:fruitless_bush"},
- neighbors = {"group:soil", "group:potting_soil"},
- interval = 500,
- chance = 5,
- action = function(pos, node, active_object_count, active_object_count_wider)
-
- local meta = minetest.get_meta(pos)
- local bush_name = meta:get_string("bush_type")
-
- if bush_name and bush_name ~= "" then
- local dirtpos = {x = pos.x, y = pos.y-1, z = pos.z}
- local dirt = minetest.get_node(dirtpos)
- local is_soil = minetest.get_item_group(dirt.name, "soil") or minetest.get_item_group(dirt.name, "potting_soil")
-
- if is_soil and (dirt.name == "farming:soil_wet" or math.random(1,3) == 1) then
- minetest.set_node( pos, {name = "bushes:" .. bush_name .. "_bush"})
- end
- end
- end
-})
-
--- Define the basket and bush nodes
-
-for i, bush_name in ipairs(bushes_classic.bushes) do
-
- local desc = bushes_classic.bushes_descriptions[i]
-
- minetest.register_node(":bushes:basket_"..bush_name, {
- description = S("Basket with "..desc.." Pies"),
- drawtype = "mesh",
- mesh = "bushes_basket_full.obj",
- tiles = {
- "bushes_basket_pie_"..bush_name..".png",
- "bushes_basket.png"
- },
- paramtype = "light",
- paramtype2 = "facedir",
- on_use = minetest.item_eat(18),
- groups = { dig_immediate = 3 },
- })
-
- local texture_top, texture_bottom
-
- local groups = {snappy = 3, bush = 1, flammable = 2, attached_node=1}
- if bush_name == "mixed_berry" then
- bush_name = "fruitless";
- desc = S("currently fruitless");
- texture_top = "bushes_fruitless_bush_top.png"
- texture_bottom = "bushes_fruitless_bush_bottom.png"
- groups.not_in_creative_inventory = 1
- else
- texture_top = "bushes_bush_top.png"
- texture_bottom = "bushes_bush_bottom.png"
- end
-
- minetest.register_node(":bushes:" .. bush_name .. "_bush", {
- description = S(desc.." Bush"),
- drawtype = "mesh",
- mesh = "bushes_bush.obj",
- tiles = {"bushes_bush_"..bush_name..".png"},
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = groups,
- sounds = default.node_sound_leaves_defaults(),
- drop = "",
- after_dig_node = function( pos, oldnode, oldmetadata, digger )
- return plantlife_bushes.after_dig_node(pos, oldnode, oldmetadata, digger);
- end,
- after_place_node = function( pos, placer, itemstack )
- return plantlife_bushes.after_place_node(pos, placer, itemstack);
- end,
- })
-
- -- do not spawn fruitless bushes
- if bush_name ~= "fruitless" then
- table.insert(bushes_classic.spawn_list, "bushes:"..bush_name.."_bush")
- end
-end
-
-minetest.register_node(":bushes:basket_empty", {
- description = S("Basket"),
- drawtype = "mesh",
- mesh = "bushes_basket_empty.obj",
- tiles = { "bushes_basket.png" },
- paramtype = "light",
- paramtype2 = "facedir",
- groups = { dig_immediate = 3 },
-})
-
-
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket.png b/plantlife_modpack/bushes_classic/textures/bushes_basket.png
deleted file mode 100644
index 4384fba..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.png b/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.png
deleted file mode 100644
index 83ee63c..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blackberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.png b/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.png
deleted file mode 100644
index 9f9b2c6..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_blueberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.png b/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.png
deleted file mode 100644
index d6bdff4..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_gooseberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.png b/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.png
deleted file mode 100644
index ff271ff..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_mixed_berry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.png b/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.png
deleted file mode 100644
index 3bfd42f..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_raspberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.png b/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.png
deleted file mode 100644
index c27b0b3..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_basket_pie_strawberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png b/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png
deleted file mode 100644
index 76b742b..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png b/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png
deleted file mode 100644
index a6af5ca..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png b/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png
deleted file mode 100644
index c37f987..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png b/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png
deleted file mode 100644
index 90be80e..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png b/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png
deleted file mode 100644
index e15047f..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png b/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png
deleted file mode 100644
index 11ce60f..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png b/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png
deleted file mode 100644
index 6e8dd9e..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png b/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png
deleted file mode 100644
index eb6bf5a..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.png b/plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.png
deleted file mode 100644
index fa76c61..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_bush_blackberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.png b/plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.png
deleted file mode 100644
index 3a305ca..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_bush_blueberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.png b/plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.png
deleted file mode 100644
index ffa2e0a..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_bush_fruitless.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.png b/plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.png
deleted file mode 100644
index 52eca60..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_bush_gooseberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.png b/plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.png
deleted file mode 100644
index 01809de..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_bush_raspberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.png b/plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.png
deleted file mode 100644
index a5060e2..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_bush_strawberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png b/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png
deleted file mode 100644
index e712cad..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png b/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png
deleted file mode 100644
index caa4e92..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png b/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png
deleted file mode 100644
index baf5af7..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png b/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png
deleted file mode 100644
index 5cf2844..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png b/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png
deleted file mode 100644
index 351a269..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png b/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png
deleted file mode 100644
index 6486989..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png b/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png
deleted file mode 100644
index 8844c3d..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png b/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png
deleted file mode 100644
index 034fd48..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png b/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png
deleted file mode 100644
index afeb7d8..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png b/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png
deleted file mode 100644
index bb76a1d..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png b/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png
deleted file mode 100644
index a094488..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png b/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png
deleted file mode 100644
index b6a74b6..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png b/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png
deleted file mode 100644
index 3d034ea..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png b/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png
deleted file mode 100644
index 932c073..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_raw.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png b/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png
deleted file mode 100644
index f8d1d36..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_slice.png
+++ /dev/null
Binary files differ
diff --git a/plantlife_modpack/bushes_classic/textures/bushes_sugar.png b/plantlife_modpack/bushes_classic/textures/bushes_sugar.png
deleted file mode 100644
index 726196b..0000000
--- a/plantlife_modpack/bushes_classic/textures/bushes_sugar.png
+++ /dev/null
Binary files differ