From d16ec15cf35c3f2d28548b17f31c20958e2cbd5a Mon Sep 17 00:00:00 2001 From: Xeno333 Date: Wed, 7 Aug 2024 18:23:49 -0500 Subject: [PATCH] textures --- init.lua | 5 ++- src/enderite/ore.lua | 4 +- src/mapgen/biome.lua | 20 +++++++-- src/mapgen/biome_oasis.lua | 27 ++++++++++++ src/mapgen/biome_plains.lua | 23 +++++++--- src/nodes/nodes_oasis.lua | 41 ++++++++++++++++++ src/nodes/nodes_plains.lua | 26 ++++++++++- ..._grass_3d_blue.png => end_oasis_grass.png} | Bin ...lant.png => end_plains_magibulb_plant.png} | Bin ...rass.png => end_stone_oasis_turf_side.png} | Bin ...s_top.png => end_stone_oasis_turf_top.png} | Bin textures/{ => new}/blue_end_tree_leaves.png | Bin textures/{ => new}/blue_end_tree_sapling.png | Bin textures/{ => new}/blue_end_wood.png | Bin textures/{ => new}/blue_end_wood_door.png | Bin .../{ => new}/blue_end_wood_door_lower.png | Bin .../{ => new}/blue_end_wood_door_upper.png | Bin textures/{ => new}/blue_end_wood_planks.png | Bin textures/{ => new}/blue_end_wood_sign.png | Bin .../blue_end_wood_sign_3d_texture.png | Bin textures/{ => new}/blue_end_wood_top.png | Bin textures/{ => new}/blue_end_wood_trapdoor.png | Bin textures/{ => new}/blue_stripped_end_wood.png | Bin .../{ => new}/blue_stripped_end_wood_top.png | Bin textures/{ => new}/end_blue_berry.png | Bin textures/{ => new}/enderite.png | Bin textures/{ => new}/enderite_axe.png | Bin textures/{ => new}/enderite_chestplate.png | Bin textures/{ => new}/enderite_pick.png | Bin textures/{ => new}/endertite_leggings.png | Bin textures/{ => new}/purple_end_tree_leaves.png | Bin .../{ => new}/purple_end_tree_sapling.png | Bin textures/{ => new}/purple_end_wood_door.png | Bin .../{ => new}/purple_end_wood_door_lower.png | Bin .../{ => new}/purple_end_wood_door_upper..png | Bin textures/{ => new}/purple_end_wood_log.png | Bin textures/{ => new}/purple_end_wood_planks.png | Bin textures/{ => new}/purple_end_wood_sign.png | Bin .../purple_end_wood_sign_3d_texture.png | Bin textures/{ => new}/purple_end_wood_top.png | Bin .../{ => new}/purple_end_wood_trapdoor.png | Bin .../{ => new}/purple_stripped_end_wood.png | Bin .../purple_stripped_end_wood_top.png | Bin textures/{ => new}/raw_enderite.png | Bin 44 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 src/mapgen/biome_oasis.lua create mode 100644 src/nodes/nodes_oasis.lua rename textures/{end_grass_3d_blue.png => end_oasis_grass.png} (100%) rename textures/{end_flower_bulb_plant.png => end_plains_magibulb_plant.png} (100%) rename textures/{blue_end_grass.png => end_stone_oasis_turf_side.png} (100%) rename textures/{blue_end_grass_top.png => end_stone_oasis_turf_top.png} (100%) rename textures/{ => new}/blue_end_tree_leaves.png (100%) rename textures/{ => new}/blue_end_tree_sapling.png (100%) rename textures/{ => new}/blue_end_wood.png (100%) rename textures/{ => new}/blue_end_wood_door.png (100%) rename textures/{ => new}/blue_end_wood_door_lower.png (100%) rename textures/{ => new}/blue_end_wood_door_upper.png (100%) rename textures/{ => new}/blue_end_wood_planks.png (100%) rename textures/{ => new}/blue_end_wood_sign.png (100%) rename textures/{ => new}/blue_end_wood_sign_3d_texture.png (100%) rename textures/{ => new}/blue_end_wood_top.png (100%) rename textures/{ => new}/blue_end_wood_trapdoor.png (100%) rename textures/{ => new}/blue_stripped_end_wood.png (100%) rename textures/{ => new}/blue_stripped_end_wood_top.png (100%) rename textures/{ => new}/end_blue_berry.png (100%) rename textures/{ => new}/enderite.png (100%) rename textures/{ => new}/enderite_axe.png (100%) rename textures/{ => new}/enderite_chestplate.png (100%) rename textures/{ => new}/enderite_pick.png (100%) rename textures/{ => new}/endertite_leggings.png (100%) rename textures/{ => new}/purple_end_tree_leaves.png (100%) rename textures/{ => new}/purple_end_tree_sapling.png (100%) rename textures/{ => new}/purple_end_wood_door.png (100%) rename textures/{ => new}/purple_end_wood_door_lower.png (100%) rename textures/{ => new}/purple_end_wood_door_upper..png (100%) rename textures/{ => new}/purple_end_wood_log.png (100%) rename textures/{ => new}/purple_end_wood_planks.png (100%) rename textures/{ => new}/purple_end_wood_sign.png (100%) rename textures/{ => new}/purple_end_wood_sign_3d_texture.png (100%) rename textures/{ => new}/purple_end_wood_top.png (100%) rename textures/{ => new}/purple_end_wood_trapdoor.png (100%) rename textures/{ => new}/purple_stripped_end_wood.png (100%) rename textures/{ => new}/purple_stripped_end_wood_top.png (100%) rename textures/{ => new}/raw_enderite.png (100%) diff --git a/init.lua b/init.lua index 0dce7e8..071a85a 100644 --- a/init.lua +++ b/init.lua @@ -10,11 +10,14 @@ mcl_better_end.code_loc = minetest.get_modpath("mcl_better_end") .. "/src" dofile(mcl_better_end.code_loc .. "/nodes/nodes_plains.lua") +dofile(mcl_better_end.code_loc .. "/nodes/nodes_oasis.lua") dofile(mcl_better_end.code_loc .. "/nodes/nodes_ender_sea.lua") -dofile(mcl_better_end.code_loc .. "/enderite/ore.lua") dofile(mcl_better_end.code_loc .. "/mapgen/biome.lua") + dofile(mcl_better_end.code_loc .. "/mapgen/biome_plains.lua") +dofile(mcl_better_end.code_loc .. "/mapgen/biome_oasis.lua") dofile(mcl_better_end.code_loc .. "/mapgen/biome_ender_sea.lua") +dofile(mcl_better_end.code_loc .. "/enderite/ore.lua") diff --git a/src/enderite/ore.lua b/src/enderite/ore.lua index 0196ce1..e4e4748 100644 --- a/src/enderite/ore.lua +++ b/src/enderite/ore.lua @@ -15,12 +15,14 @@ minetest.register_node("mcl_better_end:enderite_ore", { groups = {pickaxey=7, building_block=1, material_stone=1, mbe_plains=1}, }) + +mcl_better_end.mapgen.registered_nodes.enderite_ore = minetest.get_content_id("mcl_better_end:enderite_ore") + mcl_better_end.mapgen.ores.enderite = function(data, vi, area, pr, x, y, z) --enderite if pr:next(1, 1000) == 5 then if pr:next(1, 10) == 5 then data[vi] = mcl_better_end.mapgen.registered_nodes.enderite_ore - print("AAAAAAAAAAAAAAAAAAA") end end end \ No newline at end of file diff --git a/src/mapgen/biome.lua b/src/mapgen/biome.lua index cb7908b..906319a 100644 --- a/src/mapgen/biome.lua +++ b/src/mapgen/biome.lua @@ -21,9 +21,18 @@ minetest.register_on_joinplayer( mcl_better_end.mapgen.registered_nodes = { air = minetest.get_content_id("air"), end_stone = minetest.get_content_id("mcl_end:end_stone"), - enderite_ore = minetest.get_content_id("mcl_better_end:enderite_ore") } +--API +mcl_better_end.api.register_biome = function(e) + mcl_better_end.biomes[#mcl_better_end.biomes + 1] = e +end + + + + +--Gen + function mcl_better_end.mapgen.gen(minp, maxp, seed) -- Check if the current Y range is within the desired bounds @@ -48,10 +57,13 @@ function mcl_better_end.mapgen.gen(minp, maxp, seed) --biome local noise_center = perlin:get_3d({x = x, y = 1, z = z}) - --plains - if noise_center > 0 then - mcl_better_end.biomes.plains.gen(data, vi, area, pr, x, y, z) + --do biomes + for _, p in pairs(mcl_better_end.biomes) do + if (noise_center <= p.noise_high) and (noise_center >= p.noise_low) then + p.gen(data, vi, area, pr, x, y, z) + end end + end --ores diff --git a/src/mapgen/biome_oasis.lua b/src/mapgen/biome_oasis.lua new file mode 100644 index 0000000..88d36ff --- /dev/null +++ b/src/mapgen/biome_oasis.lua @@ -0,0 +1,27 @@ + + + +--add nodes +mcl_better_end.mapgen.registered_nodes.oasis_filler = minetest.get_content_id("mcl_better_end:end_stone_oasis_turf") +mcl_better_end.mapgen.registered_nodes.oasis_topper = minetest.get_content_id("mcl_better_end:end_oasis_grass") + + +local topper = mcl_better_end.mapgen.registered_nodes.oasis_topper +local filler = mcl_better_end.mapgen.registered_nodes.oasis_filler + + +mcl_better_end.api.register_biome({ + gen = function(data, vi, area, pr, x, y, z) + data[vi] = filler + + --add top + if pr:next(1, 5) == 3 then + local vi = area:index(x, y+1, z) + if data[vi] == mcl_better_end.mapgen.registered_nodes.air then + data[vi] = topper + end + end + end, + noise_high = 1, + noise_low = 0 +}) \ No newline at end of file diff --git a/src/mapgen/biome_plains.lua b/src/mapgen/biome_plains.lua index 1587c63..151adb7 100644 --- a/src/mapgen/biome_plains.lua +++ b/src/mapgen/biome_plains.lua @@ -3,21 +3,32 @@ --add nodes mcl_better_end.mapgen.registered_nodes.plains_filler = minetest.get_content_id("mcl_better_end:end_stone_plains_turf") -mcl_better_end.mapgen.registered_nodes.plains_topper = minetest.get_content_id("mcl_better_end:end_stone_plains_grass") +mcl_better_end.mapgen.registered_nodes.plains_topper = minetest.get_content_id("mcl_better_end:end_plains_grass") +mcl_better_end.mapgen.registered_nodes.plains_magibulb = minetest.get_content_id("mcl_better_end:end_plains_magibulb_plant") +local topper = mcl_better_end.mapgen.registered_nodes.plains_topper +local filler = mcl_better_end.mapgen.registered_nodes.plains_filler +local magibulb = mcl_better_end.mapgen.registered_nodes.plains_magibulb -mcl_better_end.biomes.plains = { +mcl_better_end.api.register_biome({ gen = function(data, vi, area, pr, x, y, z) - data[vi] = mcl_better_end.mapgen.registered_nodes.plains_filler + data[vi] = filler --add top if pr:next(1, 10) == 5 then local vi = area:index(x, y+1, z) if data[vi] == mcl_better_end.mapgen.registered_nodes.air then - data[vi] = mcl_better_end.mapgen.registered_nodes.plains_topper + data[vi] = topper + end + elseif pr:next(1, 200) == 46 then + local vi = area:index(x, y+1, z) + if data[vi] == mcl_better_end.mapgen.registered_nodes.air then + data[vi] = magibulb end end - end -} \ No newline at end of file + end, + noise_high = 0, + noise_low = -1 +}) \ No newline at end of file diff --git a/src/nodes/nodes_oasis.lua b/src/nodes/nodes_oasis.lua new file mode 100644 index 0000000..44ac213 --- /dev/null +++ b/src/nodes/nodes_oasis.lua @@ -0,0 +1,41 @@ +minetest.register_node("mcl_better_end:end_stone_oasis_turf", { + description = "End Stone with Blue Mold", + tiles = { + "end_stone_oasis_turf_top.png", -- Top texture + "mcl_end_end_stone.png", -- Bottom texture + "mcl_end_end_stone.png^end_stone_oasis_turf_side.png", -- Side texture 1 + "mcl_end_end_stone.png^end_stone_oasis_turf_side.png", -- Side texture 2 + "mcl_end_end_stone.png^end_stone_oasis_turf_side.png", -- Side texture 3 + "mcl_end_end_stone.png^end_stone_oasis_turf_side.png", -- Side texture 4 + }, + stack_max = 64, + + drop = "mcl_end:end_stone", + sounds = mcl_sounds.node_sound_stone_defaults(), + + _mcl_blast_resistance = 9, + _mcl_hardness = 3, + light_source = 2, + + groups = {pickaxey=1, building_block=1, material_stone=1, mbe_plains=1}, +}) + +minetest.register_node("mcl_better_end:end_oasis_grass", { + description = ("Ender Oasis Grass"), + drawtype = "plantlike", + waving = 1, + tiles = {"end_oasis_grass.png"}, + inventory_image = "end_oasis_grass.png", + wield_image = "end_oasis_grass.png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + light_source = 4, + groups = {dig_immediate=3, shearsy=1, dig_by_water=1, destroy_by_lava_flow=1, dig_by_piston=1, deco_block=1, compostability=50}, + sounds = mcl_sounds.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, + }, +}) diff --git a/src/nodes/nodes_plains.lua b/src/nodes/nodes_plains.lua index e673385..ae1bd21 100644 --- a/src/nodes/nodes_plains.lua +++ b/src/nodes/nodes_plains.lua @@ -20,7 +20,30 @@ minetest.register_node("mcl_better_end:end_stone_plains_turf", { groups = {pickaxey=1, building_block=1, material_stone=1, mbe_plains=1}, }) -minetest.register_node("mcl_better_end:end_stone_plains_grass", { + + +minetest.register_node("mcl_better_end:end_plains_magibulb_plant", { + description = ("Magibulb"), + drawtype = "plantlike", + waving = 1, + tiles = {"end_plains_magibulb_plant.png"}, + inventory_image = "end_plains_magibulb_plant.png", + wield_image = "end_plains_magibulb_plant.png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + light_source = 4, + groups = {dig_immediate=3, shearsy=1, dig_by_water=1, destroy_by_lava_flow=1, dig_by_piston=1, deco_block=1, compostability=50}, + sounds = mcl_sounds.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, + }, +}) + + +minetest.register_node("mcl_better_end:end_plains_grass", { description = ("Ender Slime Grass"), drawtype = "plantlike", waving = 1, @@ -39,3 +62,4 @@ minetest.register_node("mcl_better_end:end_stone_plains_grass", { fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, }, }) + diff --git a/textures/end_grass_3d_blue.png b/textures/end_oasis_grass.png similarity index 100% rename from textures/end_grass_3d_blue.png rename to textures/end_oasis_grass.png diff --git a/textures/end_flower_bulb_plant.png b/textures/end_plains_magibulb_plant.png similarity index 100% rename from textures/end_flower_bulb_plant.png rename to textures/end_plains_magibulb_plant.png diff --git a/textures/blue_end_grass.png b/textures/end_stone_oasis_turf_side.png similarity index 100% rename from textures/blue_end_grass.png rename to textures/end_stone_oasis_turf_side.png diff --git a/textures/blue_end_grass_top.png b/textures/end_stone_oasis_turf_top.png similarity index 100% rename from textures/blue_end_grass_top.png rename to textures/end_stone_oasis_turf_top.png diff --git a/textures/blue_end_tree_leaves.png b/textures/new/blue_end_tree_leaves.png similarity index 100% rename from textures/blue_end_tree_leaves.png rename to textures/new/blue_end_tree_leaves.png diff --git a/textures/blue_end_tree_sapling.png b/textures/new/blue_end_tree_sapling.png similarity index 100% rename from textures/blue_end_tree_sapling.png rename to textures/new/blue_end_tree_sapling.png diff --git a/textures/blue_end_wood.png b/textures/new/blue_end_wood.png similarity index 100% rename from textures/blue_end_wood.png rename to textures/new/blue_end_wood.png diff --git a/textures/blue_end_wood_door.png b/textures/new/blue_end_wood_door.png similarity index 100% rename from textures/blue_end_wood_door.png rename to textures/new/blue_end_wood_door.png diff --git a/textures/blue_end_wood_door_lower.png b/textures/new/blue_end_wood_door_lower.png similarity index 100% rename from textures/blue_end_wood_door_lower.png rename to textures/new/blue_end_wood_door_lower.png diff --git a/textures/blue_end_wood_door_upper.png b/textures/new/blue_end_wood_door_upper.png similarity index 100% rename from textures/blue_end_wood_door_upper.png rename to textures/new/blue_end_wood_door_upper.png diff --git a/textures/blue_end_wood_planks.png b/textures/new/blue_end_wood_planks.png similarity index 100% rename from textures/blue_end_wood_planks.png rename to textures/new/blue_end_wood_planks.png diff --git a/textures/blue_end_wood_sign.png b/textures/new/blue_end_wood_sign.png similarity index 100% rename from textures/blue_end_wood_sign.png rename to textures/new/blue_end_wood_sign.png diff --git a/textures/blue_end_wood_sign_3d_texture.png b/textures/new/blue_end_wood_sign_3d_texture.png similarity index 100% rename from textures/blue_end_wood_sign_3d_texture.png rename to textures/new/blue_end_wood_sign_3d_texture.png diff --git a/textures/blue_end_wood_top.png b/textures/new/blue_end_wood_top.png similarity index 100% rename from textures/blue_end_wood_top.png rename to textures/new/blue_end_wood_top.png diff --git a/textures/blue_end_wood_trapdoor.png b/textures/new/blue_end_wood_trapdoor.png similarity index 100% rename from textures/blue_end_wood_trapdoor.png rename to textures/new/blue_end_wood_trapdoor.png diff --git a/textures/blue_stripped_end_wood.png b/textures/new/blue_stripped_end_wood.png similarity index 100% rename from textures/blue_stripped_end_wood.png rename to textures/new/blue_stripped_end_wood.png diff --git a/textures/blue_stripped_end_wood_top.png b/textures/new/blue_stripped_end_wood_top.png similarity index 100% rename from textures/blue_stripped_end_wood_top.png rename to textures/new/blue_stripped_end_wood_top.png diff --git a/textures/end_blue_berry.png b/textures/new/end_blue_berry.png similarity index 100% rename from textures/end_blue_berry.png rename to textures/new/end_blue_berry.png diff --git a/textures/enderite.png b/textures/new/enderite.png similarity index 100% rename from textures/enderite.png rename to textures/new/enderite.png diff --git a/textures/enderite_axe.png b/textures/new/enderite_axe.png similarity index 100% rename from textures/enderite_axe.png rename to textures/new/enderite_axe.png diff --git a/textures/enderite_chestplate.png b/textures/new/enderite_chestplate.png similarity index 100% rename from textures/enderite_chestplate.png rename to textures/new/enderite_chestplate.png diff --git a/textures/enderite_pick.png b/textures/new/enderite_pick.png similarity index 100% rename from textures/enderite_pick.png rename to textures/new/enderite_pick.png diff --git a/textures/endertite_leggings.png b/textures/new/endertite_leggings.png similarity index 100% rename from textures/endertite_leggings.png rename to textures/new/endertite_leggings.png diff --git a/textures/purple_end_tree_leaves.png b/textures/new/purple_end_tree_leaves.png similarity index 100% rename from textures/purple_end_tree_leaves.png rename to textures/new/purple_end_tree_leaves.png diff --git a/textures/purple_end_tree_sapling.png b/textures/new/purple_end_tree_sapling.png similarity index 100% rename from textures/purple_end_tree_sapling.png rename to textures/new/purple_end_tree_sapling.png diff --git a/textures/purple_end_wood_door.png b/textures/new/purple_end_wood_door.png similarity index 100% rename from textures/purple_end_wood_door.png rename to textures/new/purple_end_wood_door.png diff --git a/textures/purple_end_wood_door_lower.png b/textures/new/purple_end_wood_door_lower.png similarity index 100% rename from textures/purple_end_wood_door_lower.png rename to textures/new/purple_end_wood_door_lower.png diff --git a/textures/purple_end_wood_door_upper..png b/textures/new/purple_end_wood_door_upper..png similarity index 100% rename from textures/purple_end_wood_door_upper..png rename to textures/new/purple_end_wood_door_upper..png diff --git a/textures/purple_end_wood_log.png b/textures/new/purple_end_wood_log.png similarity index 100% rename from textures/purple_end_wood_log.png rename to textures/new/purple_end_wood_log.png diff --git a/textures/purple_end_wood_planks.png b/textures/new/purple_end_wood_planks.png similarity index 100% rename from textures/purple_end_wood_planks.png rename to textures/new/purple_end_wood_planks.png diff --git a/textures/purple_end_wood_sign.png b/textures/new/purple_end_wood_sign.png similarity index 100% rename from textures/purple_end_wood_sign.png rename to textures/new/purple_end_wood_sign.png diff --git a/textures/purple_end_wood_sign_3d_texture.png b/textures/new/purple_end_wood_sign_3d_texture.png similarity index 100% rename from textures/purple_end_wood_sign_3d_texture.png rename to textures/new/purple_end_wood_sign_3d_texture.png diff --git a/textures/purple_end_wood_top.png b/textures/new/purple_end_wood_top.png similarity index 100% rename from textures/purple_end_wood_top.png rename to textures/new/purple_end_wood_top.png diff --git a/textures/purple_end_wood_trapdoor.png b/textures/new/purple_end_wood_trapdoor.png similarity index 100% rename from textures/purple_end_wood_trapdoor.png rename to textures/new/purple_end_wood_trapdoor.png diff --git a/textures/purple_stripped_end_wood.png b/textures/new/purple_stripped_end_wood.png similarity index 100% rename from textures/purple_stripped_end_wood.png rename to textures/new/purple_stripped_end_wood.png diff --git a/textures/purple_stripped_end_wood_top.png b/textures/new/purple_stripped_end_wood_top.png similarity index 100% rename from textures/purple_stripped_end_wood_top.png rename to textures/new/purple_stripped_end_wood_top.png diff --git a/textures/raw_enderite.png b/textures/new/raw_enderite.png similarity index 100% rename from textures/raw_enderite.png rename to textures/new/raw_enderite.png