Merge branch 'main' of github.com-rollerozxa:minecraftnt-minetest/minecraftnt

mods/mcnt_itemdrop/init.lua

@@ -7,7 +7,7 @@ local function can_pickup(entity, player)
 	return true
 end
 
-local pickup_radius = 0.75
+local pickup_radius = 1
 
 minetest.registered_entities["__builtin:item"].pointable = false
 

mods/minecraft/blocks.lua

@@ -332,14 +332,15 @@ minetest.register_node("minecraft:crafting_table", {
 		local form = [[
 			size[9.5,9]
 			real_coordinates[true]
-			bgcolor[black;neither]
+			bgcolor[blue;true]
 			listcolors[#ffffff00;#ffffff80]
-			style_type[list;spacing=0,0]
+			style_type[list;spacing=0.125,0.125;size=0.85,0.85]
 			image[0,0;9.5,9;crafting.png]
-			list[current_player;main;0.25,7.75;9,1;0]
-			list[current_player;main;0.25,4.5;9,3;9]
-			list[current_player;craft;1.5,0.75;3,3;0]
-			list[current_player;craftpreview;6.75,1.75;1,1;0]
+			model[1.25,0.25;3,4;playermodel;character.b3d;character.png;0,180;false;false;walk,stand]
+			list[current_player;craft;1.65,0.95;3,3;0]
+			list[current_player;craftpreview;6.70,1.92;1,1;0]
+			list[current_player;main;0.45,7.70;9,1;0]
+			list[current_player;main;0.45,4.57;9,3;9]
 		]]
 
 		minetest.show_formspec(player:get_player_name(), "main", form)

mods/minecraft/items.lua

@@ -72,18 +72,21 @@ minetest.register_craftitem("minecraft:seeds", {
 
 minetest.register_craftitem("minecraft:apple", {
 	description = "Apple",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:10,0",
 	on_use = minetest.item_eat(4),
 })
 
 minetest.register_craftitem("minecraft:golden_apple", {
 	description = "Golden Apple",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:11,0",
 	on_use = minetest.item_eat(20),
 })
 
 minetest.register_craftitem("minecraft:bow", {
 	description = "Bow",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:5,1"
 })
 
@@ -124,12 +127,14 @@ minetest.register_craftitem("minecraft:gunpowder", {
 
 minetest.register_craftitem("minecraft:bread", {
 	description = "Bread",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:9,2",
 	on_use = minetest.item_eat(5),
 })
 
 minetest.register_craftitem("minecraft:sign", {
 	description = "Sign",
+	stack_max = 16,
 	inventory_image = "items.png^[sheet:16x16:10,2"
 })
 
@@ -150,24 +155,28 @@ minetest.register_craftitem("minecraft:bowl", {
 
 minetest.register_craftitem("minecraft:mushroom_stew", {
 	description = "Mushroom Stew",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:8,4",
 	on_use = minetest.item_eat(10, "minecraft:bowl"),
 })
 
 minetest.register_craftitem("minecraft:raw_porkchop", {
 	description = "Raw Porkchop",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:7,5",
 	on_use = minetest.item_eat(3),
 })
 
 minetest.register_craftitem("minecraft:cooked_porkchop", {
 	description = "Cooked Porkchop",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:8,5",
 	on_use = minetest.item_eat(8),
 })
 
 minetest.register_craftitem("minecraft:saddle", {
 	description = "Saddle",
+	stack_max = 1,
 	inventory_image = "items.png^[sheet:16x16:8,6"
 })
 
@@ -178,4 +187,4 @@ minetest.register_craftitem("minecraft:minecart", {
 
 dofile(minetest.get_modpath("minecraft") .. "/items/buckets.lua")
 dofile(minetest.get_modpath("minecraft") .. "/items/hoes.lua")
-dofile(minetest.get_modpath("minecraft") .. "/items/tools.lua")
+dofile(minetest.get_modpath("minecraft") .. "/items/tools.lua")

mods/minecraft/mapgen.lua

@@ -36,6 +36,8 @@ minetest.register_biome({
 
 minetest.register_biome({
 	name = "sea",
+	node_top = "minecraft:sand",
+	depth_top = 1,
 	node_filler = "minecraft:sand",
 	depth_filler = 2,
 	y_max = -3,
@@ -69,4 +71,4 @@ minetest.register_decoration({
 
 dofile(minetest.get_modpath("minecraft") .. "/mapgen/bedrock.lua")
 dofile(minetest.get_modpath("minecraft") .. "/mapgen/ores.lua")
-dofile(minetest.get_modpath("minecraft") .. "/mapgen/trees.lua")
+dofile(minetest.get_modpath("minecraft") .. "/mapgen/trees.lua")

mods/minecraft/mapgen/ores.lua

@@ -1,6 +1,52 @@
 
 --- Ores mapgen!
 
+--
+-- Misc stuff
+--
+
+-- Dirt
+minetest.register_ore({
+	ore_type       = "blob",
+	ore            = "minecraft:dirt",
+	wherein        = "minecraft:stone",
+	clust_scarcity = 15*15*15,
+	clust_num_ores = 33,
+	clust_size     = 4,
+	y_min          = -62,
+	y_max          = 65536,
+	noise_params = {
+		offset  = 0,
+		scale   = 1,
+		spread  = {x=250, y=250, z=250},
+		seed    = 12345,
+		octaves = 3,
+		persist = 0.6,
+		lacunarity = 2,
+	}
+})
+
+-- Gravel
+minetest.register_ore({
+	ore_type       = "blob",
+	ore            = "minecraft:gravel",
+	wherein        = "minecraft:stone",
+	clust_scarcity = 14*14*14,
+	clust_num_ores = 33,
+	clust_size     = 5,
+	y_min          = -62,
+	y_max          = 65536,
+	noise_params = {
+		offset  = 0,
+		scale   = 1,
+		spread  = {x=250, y=250, z=250},
+		seed    = 12345,
+		octaves = 3,
+		persist = 0.6,
+		lacunarity = 2,
+	}
+})
+
 --
 -- Coal
 --