From 6d8a85ea71f1832a0952ba8e0afadfed0179d9fc Mon Sep 17 00:00:00 2001
From: Milan <tchncs@vivaldi.net>
Date: Sat, 23 Apr 2022 21:27:14 +0200
Subject: [PATCH] =?UTF-8?q?switch=20to=20dirks=20nether=5Fmobs=20fork=20an?=
 =?UTF-8?q?d=20cleanup=20illuna=5Faestival=20=E2=80=93=20closes=20#41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules                   |  6 +++---
 illuna_aestival/src/mobs.lua  |  4 ----
 illuna_aestival/src/nodes.lua | 31 -------------------------------
 nether_mobs                   |  2 +-
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1b82489..264136b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -121,9 +121,6 @@
 [submodule "maptools"]
 	path = maptools
 	url = https://github.com/minetest-mods/maptools
-[submodule "nether_mobs"]
-	path = nether_mobs
-	url = https://github.com/rael5/minetest-nether-monsters
 [submodule "sickles"]
 	path = sickles
 	url = https://github.com/t-affeldt/sickles
@@ -223,3 +220,6 @@
 [submodule "colored_eggs"]
 	path = colored_eggs
 	url = https://github.com/auouymous/colored_eggs
+[submodule "nether_mobs"]
+	path = nether_mobs
+	url = https://github.com/GreenDirkfried/minetest-nether-monsters
diff --git a/illuna_aestival/src/mobs.lua b/illuna_aestival/src/mobs.lua
index 426e906..dcaab28 100755
--- a/illuna_aestival/src/mobs.lua
+++ b/illuna_aestival/src/mobs.lua
@@ -1,7 +1,3 @@
-local def = minetest.registered_entities["nether_mobs:netherman"]
-def.replace_with = nil
-def.replace_what = nil
-
 -- add and adjust drops to all livingnether mobs
 -- depends on default, obsidianstuff and farming
 
diff --git a/illuna_aestival/src/nodes.lua b/illuna_aestival/src/nodes.lua
index 94c295d..6db121c 100755
--- a/illuna_aestival/src/nodes.lua
+++ b/illuna_aestival/src/nodes.lua
@@ -300,37 +300,6 @@ for i = 1,33 do
 	})
 end
 
-minetest.register_node(":nether_mobs:permanent_dragon_fire", {
-	description = "Permanent nether dragon fire",
-	drawtype = "firelike",
-	tiles = {{
-		name = "nether_dragon_fire_animated.png",
-		animation = {type = "vertical_frames",
-			aspect_w = 16, aspect_h = 16, length = 1},
-	}},
-	inventory_image = "nether_dragon_fire.png",
-	light_source = 15,
-	groups = {snappy=1},
-	walkable = false,
-	buildable_to = false,
-	damage_per_second = 4,
-})
-
-minetest.override_item("nether_mobs:dragon_scale_block", {
-	after_destruct = function(pos)
-		pos.y = pos.y + 1
-		if minetest.get_node(pos).name == "nether_mobs:permanent_dragon_fire" then
-			minetest.remove_node(pos)
-		end
-	end,
-	on_ignite = function(pos)
-		local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
-		if minetest.get_node(flame_pos).name == "air" then
-			minetest.set_node(flame_pos, {name = "nether_mobs:permanent_dragon_fire"})
-		end
-	end
-})
-
 illuna = {}
 
 function illuna.wikiconstruct(pos)
diff --git a/nether_mobs b/nether_mobs
index 8e7e8b1..6f35843 160000
--- a/nether_mobs
+++ b/nether_mobs
@@ -1 +1 @@
-Subproject commit 8e7e8b1a2925dc89c60f41a3042005c15012a02c
+Subproject commit 6f35843630664b8ae5b2b97b94cee4e5b5274729