From f88f471423a729f89ff5c66f954082128888df5e Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Tue, 30 Oct 2018 20:45:23 -0400
Subject: [PATCH] use basic_materials mod where possible

---
 crafts.lua                          |  25 ----------------
 depends.txt                         |   1 +
 init.lua                            |  45 ++--------------------------
 textures/gloopblocks_cement.png     | Bin 344 -> 0 bytes
 textures/gloopblocks_wet_cement.png | Bin 366 -> 0 bytes
 5 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 textures/gloopblocks_cement.png
 delete mode 100644 textures/gloopblocks_wet_cement.png

diff --git a/crafts.lua b/crafts.lua
index 2d12d9f..634ea9b 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -41,31 +41,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "gloopblocks:wet_cement",
-	recipe = {
-		"bucket:bucket_water",
-		"default:gravel",
-	},
-	replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},},
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "gloopblocks:cement",
-	recipe = "gloopblocks:wet_cement",
-	cooktime = 8
-})
-
-minetest.register_craft({
-	output = "default:gravel",
-	recipe = {
-		{"gloopblocks:cement"},
-	},
-})
-
-
 if minetest.get_modpath("glooptest") then
 
 	minetest.register_craft({
diff --git a/depends.txt b/depends.txt
index be57871..a9d85c2 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,4 +1,5 @@
 default
+basic_materials
 moreblocks?
 stairs?
 glooptest?
diff --git a/init.lua b/init.lua
index c759119..9a4cd27 100644
--- a/init.lua
+++ b/init.lua
@@ -45,14 +45,6 @@ if not minetest.setting_getbool("pbj_pup_alias_nyancat") then
 	end
 end
 
-minetest.register_node("gloopblocks:cement", {
-	description = S("Cement"),
-	tiles = {"gloopblocks_cement.png"},
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_stone_defaults(),
-})
-
 minetest.register_node("gloopblocks:evil_block", {
 	description = S("Evil Block"),
 	tiles = {"gloopblocks_evil_block.png"},
@@ -360,35 +352,7 @@ if minetest.setting_getbool("gloopblocks_mossy_conversion") ~= false then
 		end
 	end
 end
---[[
-if minetest.get_modpath("xdecor") then
-	xdecor.worktable_nodes.gloopblocks = {
-		"oerkki_block", "stone_brick_mossy", "stone_mossy", "cobble_road",
-		"cobble_road_mossy", "cement", "pavement","rainbow_block",
-		"evil_block", "basalt", "pumice"
-	}
 
-	if minetest.setting_getbool("gloopblocks_mossy_conversion") then
-		local subnames = {
-			"", "_nanoslab", "_micropanel", "_microslab", "_thinstair", "_cube",
-			"_panel", "_slab", "_doublepanel", "_halfstair", "_outerstair",
-			"_stair", "_innerstair"
-		}
-		for _, subname in ipairs(subnames) do
-			gloopblocks_register_mossy_conversion({
-				-- Cobble --> Mossy Cobble
-				{ "default:cobble"..subname, "default:mossycobble"..subname },
-				-- Cobble Road --> Mossy Cobble Road
-				{ "gloopblocks:cobble_road"..subname, "gloopblocks:cobble_road_mossy"..subname },
-				-- Stone Brick --> Stone Brick Mossy
-				{ "default:stonebrick"..subname, "gloopblocks:stone_brick_mossy"..subname},
-				-- Stone --> Mossy Stone
-				{ "default:stone"..subname, "gloopblocks:stone_mossy"..subname}
-			})
-		end
-	end
-end
---]]
 if minetest.get_modpath("moreblocks") then
 
 	stairsplus:register_all("gloopblocks", "oerkki_block", "gloopblocks:oerkki_block", {
@@ -438,9 +402,9 @@ if minetest.get_modpath("moreblocks") then
 		sunlight_propagates = true,
 	})
 
-	stairsplus:register_all("gloopblocks", "cement", "gloopblocks:cement", {
+	stairsplus:register_all("gloopblocks", "cement", "basic_materials:cement_block", {
 		description = S("Cement"),
-		tiles = {"gloopblocks_cement.png"},
+		tiles = {"basic_materials_cement_block.png"},
 		groups = {cracky=2, not_in_creative_inventory=1},
 		sounds = default.node_sound_stone_defaults(),
 		sunlight_propagates = true,
@@ -826,11 +790,6 @@ minetest.register_tool("gloopblocks:sword_evil", {
 
 -- Other items
 
-minetest.register_craftitem("gloopblocks:wet_cement", {
-	description = S("Wet Cement"),
-	inventory_image = "gloopblocks_wet_cement.png",
-})
-
 minetest.register_craftitem("gloopblocks:evil_stick", {
 	description = S("Evil Stick"),
 	inventory_image = "gloopblocks_evil_stick.png",
diff --git a/textures/gloopblocks_cement.png b/textures/gloopblocks_cement.png
deleted file mode 100644
index c4c6a1191f17f8e59f893403607cee411e311ab0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00012P)t-sYiD75
zcX4fLV|a9KcXMrQXkvMFZ*p#EaBOCJc5rraYk_=rZ);_4YGiY7X?1aHdv<Vka%^#J
zXL@yScXDihdUSboZgg;JfO~a(cX57sb9i%YeRy(zk5!fc006v6L_t&-(*?nY0fZnB
z0I+)%P<rRu{&Ri;T-DdlUCF%mr#NA)y_z}kl=8961;V2}G3W2Adn!*5zrHuMcQVe|
zTZX#|{+tO!^~tGp$Q#Kv=yU72QZi78g3gjHNj)c8IHWr0E_P|<`)nACm-6$bPq*x$
zumv>`A7_4dRT)6YV@*2mRW#^8@B^v3w_J8iK@2dYj;EIvO<P+90g;2Wo^njbt1txi
q{^_T?<Jy+3u(qGnbB{g8CX4?bff1kRV?@sY0000<MNUMnLSTX<3zO&o

diff --git a/textures/gloopblocks_wet_cement.png b/textures/gloopblocks_wet_cement.png
deleted file mode 100644
index 6a7fbf1b94b47fb1f203515a708b937ab14a10ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU!K6fKP~P
zPFifRzh_2LWK~Iaac)YWuX|cTcxG}`T}6I?kDH~Lk&(W3er7^#d0uILT4ixod0|F%
zX-;-(Olo{sMNwu+UTRHQuD*^&SwXswhm(b=p}C2Hfv#qdpGQ_ow6TFsdSXOgMtp91
zoQa{Xp0>K7o|dVR9?<f<-+L8+ltxLAU+{n80K>jjdJ;fAxt=bLArhCDo^$7GP!M4W
zcoVy!+^XWgbeD?T<Dhi&{Ez<|{)&E(e4-Tok>Tm_<midqM;IoWm(?zr%G#R{xGlC{
zlUs~=mxlH<<G$A$Jf8_W%nd$c@x0{Ll*WaHvbs|ZO3%LGbxQkfDf)leeM<(*IZB2}
Tx=md`iy1s!{an^LB{Ts5n!}U|