updated gloopblocks

removed stu's split-limb model and switched
to Rui's "bone-based player animation" mod

2 files changed, 50 insertions, 77 deletions

diff --git a/gloopblocks/crafts.lua b/gloopblocks/crafts.lua
index 95256bf..cacea22 100644
--- a/gloopblocks/crafts.lua
+++ b/gloopblocks/crafts.lua
@@ -79,38 +79,66 @@ if minetest.get_modpath("glooptest") then
 		}
 	})
 
-elseif minetest.get_modpath("gloopores") then
+	minetest.register_craft({
+		output = "gloopblocks:evil_block",
+		recipe = {
+			{"gloopblocks:evil_stick", "gloopblocks:evil_stick"},
+			{"gloopblocks:evil_stick", "gloopblocks:evil_stick"},
+		}
+	})
 
 	minetest.register_craft({
-		type = "shapeless",
-		output = "gloopblocks:evil_stick",
+		output = "gloopblocks:evil_stick 4",
 		recipe = {
-			"gloopores:kalite_lump",
-			"default:gold_ingot",
-			"default:coal_lump",
-			"group:stick"
+			{"gloopblocks:evil_block"}
 		}
 	})
-else
+
 	minetest.register_craft({
-		type = "shapeless",
-		output = "gloopblocks:evil_stick",
+		output = "gloopblocks:pick_evil",
 		recipe = {
-			"default:gold_ingot",
-			"default:gold_ingot",
-			"default:coal_lump",
-			"group:stick"
+			{"gloopblocks:evil_block", "gloopblocks:evil_block", "gloopblocks:evil_block"},
+			{"", "gloopblocks:evil_stick", ""},
+			{"", "gloopblocks:evil_stick", ""},
 		}
 	})
-end
 
-minetest.register_craft({
-	output = "gloopblocks:evil_block",
-	recipe = {
-		{"gloopblocks:evil_stick", "gloopblocks:evil_stick"},
-		{"gloopblocks:evil_stick", "gloopblocks:evil_stick"},
-	}
-})
+	minetest.register_craft({
+		output = "gloopblocks:axe_evil",
+		recipe = {
+			{"gloopblocks:evil_block", "gloopblocks:evil_block"},
+			{"gloopblocks:evil_block", "gloopblocks:evil_stick"},
+			{"", "gloopblocks:evil_stick"},
+		}
+	})
+
+	minetest.register_craft({
+		output = "gloopblocks:axe_evil",
+		recipe = {
+			{"gloopblocks:evil_block", "gloopblocks:evil_block"},
+			{"gloopblocks:evil_stick", "gloopblocks:evil_block"},
+			{"gloopblocks:evil_stick", ""},
+		}
+	})
+
+	minetest.register_craft({
+		output = "gloopblocks:shovel_evil",
+		recipe = {
+			{"gloopblocks:evil_block"},
+			{"gloopblocks:evil_stick"},
+			{"gloopblocks:evil_stick"},
+		}
+	})
+
+	minetest.register_craft({
+		output = "gloopblocks:sword_evil",
+		recipe = {
+			{"gloopblocks:evil_block"},
+			{"gloopblocks:evil_block"},
+			{"gloopblocks:evil_stick"},
+		}
+	})
+end
 
 minetest.register_craft({
 	output = "gloopblocks:scaffolding 12",
@@ -122,13 +150,6 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "gloopblocks:evil_stick 4",
-	recipe = {
-		{"gloopblocks:evil_block"}
-	}
-})
-
-minetest.register_craft({
 	output = "gloopblocks:pick_cement",
 	recipe = {
 		{"gloopblocks:cement", "gloopblocks:cement", "gloopblocks:cement"},
@@ -173,51 +194,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "gloopblocks:pick_evil",
-	recipe = {
-		{"gloopblocks:evil_block", "gloopblocks:evil_block", "gloopblocks:evil_block"},
-		{"", "gloopblocks:evil_stick", ""},
-		{"", "gloopblocks:evil_stick", ""},
-	}
-})
-
-minetest.register_craft({
-	output = "gloopblocks:axe_evil",
-	recipe = {
-		{"gloopblocks:evil_block", "gloopblocks:evil_block"},
-		{"gloopblocks:evil_block", "gloopblocks:evil_stick"},
-		{"", "gloopblocks:evil_stick"},
-	}
-})
-
-minetest.register_craft({
-	output = "gloopblocks:axe_evil",
-	recipe = {
-		{"gloopblocks:evil_block", "gloopblocks:evil_block"},
-		{"gloopblocks:evil_stick", "gloopblocks:evil_block"},
-		{"gloopblocks:evil_stick", ""},
-	}
-})
-
-minetest.register_craft({
-	output = "gloopblocks:shovel_evil",
-	recipe = {
-		{"gloopblocks:evil_block"},
-		{"gloopblocks:evil_stick"},
-		{"gloopblocks:evil_stick"},
-	}
-})
-
-minetest.register_craft({
-	output = "gloopblocks:sword_evil",
-	recipe = {
-		{"gloopblocks:evil_block"},
-		{"gloopblocks:evil_block"},
-		{"gloopblocks:evil_stick"},
-	}
-})
-
 if minetest.get_modpath("building_blocks") then
 	minetest.register_craft({
 		output = "default:wood 4",
diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua
index 860602f..c759119 100644
--- a/gloopblocks/init.lua
+++ b/gloopblocks/init.lua
@@ -535,9 +535,6 @@ if minetest.get_modpath("moreblocks") then
 	if minetest.setting_getbool("gloopblocks_mossy_conversion") ~= false then

 

 		gloopblocks_register_mossy_conversion({

-			{ "default:cobble", 						"default:mossycobble" },

-			{ "default:stair_cobble", 					"default:stair_mossycobble" },

-			{ "default:slab_cobble", 					"default:slab_mossycobble" },

 			{ "moreblocks:stair_cobble", 				"moreblocks:stair_mossycobble" },

 			{ "moreblocks:stair_cobble_inner", 			"moreblocks:stair_mossycobble_inner" },

 			{ "moreblocks:stair_cobble_outer", 			"moreblocks:stair_mossycobble_outer" },