diff --git a/mods/ENTITIES/pyutest_mobs/init.lua b/mods/ENTITIES/pyutest_mobs/init.lua index 4a3d2c7..6875b56 100644 --- a/mods/ENTITIES/pyutest_mobs/init.lua +++ b/mods/ENTITIES/pyutest_mobs/init.lua @@ -1,5 +1,5 @@ local modpath = core.get_modpath("pyutest_mobs") -mobs.fallback_node = "pyutest_blocks:dirt_block" +mobs.fallback_node = "pyutest_blocks:dirt" dofile(modpath .. "/api.lua") diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index d461a27..ad453d5 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -1,9 +1,24 @@ -PyuTest.make_building_blocks("pyutest_blocks:dirt", "Dirt", { "pyutest-dirt.png" }, nil, { +PyuTest.make_node("pyutest_blocks:dirt", "Dirt", { ground = 1, dirt = 1, acid_vulnerable = 1, crumbly = PyuTest.BLOCK_FAST, grass_spawn = 1, +}, {"pyutest-dirt.png"}) +PyuTest.make_slab("pyutest_blocks:dirt_slab", "Dirt Slab", "pyutest_blocks:dirt", +{"pyutest-dirt.png"}, { + ground = 1, + dirt = 1, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, +}) + +PyuTest.make_stairs("pyutest_blocks:dirt_stairs", "Dirt Stairs", "pyutest_blocks:dirt", +{"pyutest-dirt.png"}, { + ground = 1, + dirt = 1, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, }) PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-dirt.png" }, nil, { diff --git a/mods/ITEMS/pyutest_crafts/blocks.lua b/mods/ITEMS/pyutest_crafts/blocks.lua index 77c89f3..a6d3f9c 100644 --- a/mods/ITEMS/pyutest_crafts/blocks.lua +++ b/mods/ITEMS/pyutest_crafts/blocks.lua @@ -62,7 +62,7 @@ core.register_craft({ recipe = { "pyutest_blocks:mushroom_block", "pyutest_blocks:mushroom_stem_block", - "pyutest_blocks:dirt_block", + "pyutest_blocks:dirt", "pyutest_blocks:swampy_grass_block" }, type = "shapeless" diff --git a/mods/ITEMS/pyutest_farming/api.lua b/mods/ITEMS/pyutest_farming/api.lua index 44a96e0..4274912 100644 --- a/mods/ITEMS/pyutest_farming/api.lua +++ b/mods/ITEMS/pyutest_farming/api.lua @@ -4,7 +4,7 @@ PyuTest.make_node("pyutest_farming:farmland", "Farmland", { crumbly = PyuTest.BLOCK_FAST, block = 1 }, { "pyutest-farmland.png", "pyutest-dirt.png" }, { - drop = "pyutest_blocks:dirt_block", + drop = "pyutest_blocks:dirt", drawtype = "nodebox", node_box = PyuTest.NODE_BOXES.SLIGHTLY_SMALLER }) diff --git a/mods/WORLD/pyutest_ores/init.lua b/mods/WORLD/pyutest_ores/init.lua index 07097c3..3a5987a 100644 --- a/mods/WORLD/pyutest_ores/init.lua +++ b/mods/WORLD/pyutest_ores/init.lua @@ -73,7 +73,7 @@ PyuTest.ORE_STONES = { core.register_ore({ ore_type = "blob", - ore = "pyutest_blocks:dirt_block", + ore = "pyutest_blocks:dirt", wherein = "pyutest_blocks:stone_block", clust_scarcity = 7 * 7 * 7, clust_num_ores = 35, diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index ebce092..66ceabe 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -1,7 +1,7 @@ -- "Just right" PyuTest.register_overworld_biome("Plains", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -17,7 +17,7 @@ PyuTest.register_overworld_biome("Plains", PyuTest.BIOME_TYPES.NORMAL, { PyuTest.register_overworld_biome("Forest", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -33,7 +33,7 @@ PyuTest.register_overworld_biome("Forest", PyuTest.BIOME_TYPES.NORMAL, { PyuTest.register_overworld_biome("BirchForest", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -49,7 +49,7 @@ PyuTest.register_overworld_biome("BirchForest", PyuTest.BIOME_TYPES.NORMAL, { PyuTest.register_overworld_biome("OldGrowthBirchForest", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -66,7 +66,7 @@ PyuTest.register_overworld_biome("OldGrowthBirchForest", PyuTest.BIOME_TYPES.NOR PyuTest.register_overworld_biome("Meadow", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", depth_filler = 4, y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, @@ -85,7 +85,7 @@ PyuTest.register_overworld_biome("Meadow", PyuTest.BIOME_TYPES.NORMAL, { PyuTest.register_overworld_biome("CherryGrove", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, @@ -123,7 +123,7 @@ PyuTest.register_overworld_biome("Desert", PyuTest.BIOME_TYPES.HOT, { PyuTest.register_overworld_biome("Savanna", PyuTest.BIOME_TYPES.WARM, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -138,7 +138,7 @@ PyuTest.register_overworld_biome("Savanna", PyuTest.BIOME_TYPES.WARM, { -- Decent PyuTest.register_overworld_biome("MushroomFields", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:mycelium_block", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -155,7 +155,7 @@ PyuTest.register_overworld_biome("MushroomFields", PyuTest.BIOME_TYPES.NORMAL, { PyuTest.register_overworld_biome("LargeMushroomForest", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:mycelium_block", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -172,7 +172,7 @@ PyuTest.register_overworld_biome("LargeMushroomForest", PyuTest.BIOME_TYPES.NORM PyuTest.register_overworld_biome("Swamp", PyuTest.BIOME_TYPES.WETLAND, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -190,7 +190,7 @@ PyuTest.register_overworld_biome("Swamp", PyuTest.BIOME_TYPES.WETLAND, { -- Chilly PyuTest.register_overworld_biome("Taiga", PyuTest.BIOME_TYPES.CHILLY, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -206,7 +206,7 @@ PyuTest.register_overworld_biome("Taiga", PyuTest.BIOME_TYPES.CHILLY, { PyuTest.register_overworld_biome("OldGrowthPineTaiga", PyuTest.BIOME_TYPES.CHILLY, { node_top = "pyutest_blocks:podzol_block", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -220,7 +220,7 @@ PyuTest.register_overworld_biome("OldGrowthPineTaiga", PyuTest.BIOME_TYPES.CHILL PyuTest.register_overworld_biome("AspenForest", PyuTest.BIOME_TYPES.CHILLY, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -237,7 +237,7 @@ PyuTest.register_overworld_biome("AspenForest", PyuTest.BIOME_TYPES.CHILLY, { PyuTest.register_overworld_biome("RedwoodForest", PyuTest.BIOME_TYPES.CHILLY, { node_top = "pyutest_blocks:podzol_block", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -254,7 +254,7 @@ PyuTest.register_overworld_biome("RedwoodForest", PyuTest.BIOME_TYPES.CHILLY, { PyuTest.register_overworld_biome("OminousForest", PyuTest.BIOME_TYPES.CHILLY, { node_top = "pyutest_blocks:grass", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -290,7 +290,7 @@ PyuTest.register_overworld_biome("FrozenPlains", PyuTest.BIOME_TYPES.COLD, { PyuTest.register_overworld_biome("SnowyForest", PyuTest.BIOME_TYPES.COLD, { node_dust = "pyutest_blocks:snow_carpet", node_top = "pyutest_blocks:snow_block", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, @@ -382,7 +382,7 @@ PyuTest.register_overworld_biome("JaggedPeaks", PyuTest.BIOME_TYPES.COLD, { PyuTest.register_overworld_biome("Grove", PyuTest.BIOME_TYPES.COLD, { node_top = "pyutest_blocks:snow_block", - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, diff --git a/mods/WORLD/pyutest_overworld/flowers.lua b/mods/WORLD/pyutest_overworld/flowers.lua index b584a35..f32fd56 100644 --- a/mods/WORLD/pyutest_overworld/flowers.lua +++ b/mods/WORLD/pyutest_overworld/flowers.lua @@ -18,7 +18,7 @@ core.register_decoration({ core.register_decoration({ deco_type = "simple", - place_on = { "pyutest_blocks:dirt_block", "pyutest_blocks:sand_block" }, + place_on = { "pyutest_blocks:dirt", "pyutest_blocks:sand_block" }, sidelen = 16, fill_ratio = 0.019, biomes = { "Desert" }, diff --git a/mods/WORLD/pyutest_overworld/init.lua b/mods/WORLD/pyutest_overworld/init.lua index db9b9b8..3f489aa 100644 --- a/mods/WORLD/pyutest_overworld/init.lua +++ b/mods/WORLD/pyutest_overworld/init.lua @@ -3,7 +3,7 @@ local modpath = core.get_modpath("pyutest_overworld") if PyuTest.is_flat() then PyuTest.register_overworld_biome("flat", PyuTest.BIOME_TYPES.NORMAL, { node_top = core.settings:get("superflat_block"), - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_BOTTOM, diff --git a/mods/WORLD/pyutest_worlds/sky.lua b/mods/WORLD/pyutest_worlds/sky.lua index 53f0102..e987170 100644 --- a/mods/WORLD/pyutest_worlds/sky.lua +++ b/mods/WORLD/pyutest_worlds/sky.lua @@ -10,7 +10,7 @@ PyuTest.SkyWorld:create_token("pyutest_worlds:sky_world_token", "Sky World", "#f PyuTest.SkyWorld:register_biome("SkyMeadow", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:grass", depth_top = 1, - node_filler = "pyutest_blocks:dirt_block", + node_filler = "pyutest_blocks:dirt", depth_filler = 3, node_stone = "pyutest_blocks:stone_block", heat_point = 50,