PB&J Pup: Remove mod

Also delete nyancat API documentation from game_api.txt.

diff --git a/game_api.txt b/game_api.txt
index fa6225a00baa3927dac21b9bb87b33fa788484e0..d9b88f48689d08473c1a3981bb237e3e42026b6d 100644 (file)
--- a/game_api.txt
+++ b/game_api.txt
@@ -282,18 +282,6 @@ Give Initial Stuff API
 ^ str is a comma separated list of initial stuff
 ^ Adds items to the list of items to be given
 
-Nyancat API
------------
-
-`nyancat.place(pos, facedir, length)`
-
-^ Place a cat at `pos` facing `facedir` with tail length `length`
-  Only accepts facedir 0-3, if facedir > 3 then it will be interpreted as facedir = 0
-
-`nyancat.generate(minp, maxp, seed)`
-
-^ Called by `minetest.register_on_generated`. To disable nyancat generation,
-  you can redefine nyancat.generate() to be an empty function
 
 TNT API
 ----------

diff --git a/mods/pbj_pup/depends.txt b/mods/pbj_pup/depends.txt
deleted file mode 100644 (file)
index 4ad96d5..0000000
--- a/mods/pbj_pup/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-default

diff --git a/mods/pbj_pup/init.lua b/mods/pbj_pup/init.lua
deleted file mode 100644 (file)
index 76eb1ac..0000000
--- a/mods/pbj_pup/init.lua
+++ /dev/null
@@ -1,136 +0,0 @@
-
---[[
-
-  Minetest's official Peanut Butter & Jelly Pup mod
-
-]]--
-
-local enable = minetest.setting_getbool("pbj_pup_enable")
-if enable == false then
-       return
-end
-
-local function howl(ttl, player)
-       if not player then
-               return
-       end
-       ttl = ttl - 15
-       if ttl < 0 then
-               return
-       end
-
-       minetest.sound_play("pbj_pup_howl", {object = player, loop = false})
-       minetest.do_item_eat(5, nil, ItemStack("pbj_pup:pbj_pup"), player, nil)
-
-       minetest.after(15, howl, ttl, player)
-end
-
---
--- nodes
---
-minetest.register_node("pbj_pup:pbj_pup", {
-       description = "PB&J Pup",
-       tiles = {
-               "pbj_pup_sides.png",
-               "pbj_pup_jelly.png",
-               "pbj_pup_sides.png",
-               "pbj_pup_sides.png",
-               "pbj_pup_back.png",
-               "pbj_pup_front.png"
-       },
-       paramtype = "light",
-       light_source = default.LIGHT_MAX,
-       paramtype2 = "facedir",
-       groups = {cracky = 2},
-       is_ground_content = false,
-       legacy_facedir_simple = true,
-       sounds = default.node_sound_defaults(),
-       stack_max = 1,
-       on_use = function(itemstack, user, pointed_thing)
-               howl(300, user)
-               itemstack:take_item()
-               return itemstack
-       end,
-})
-
-minetest.register_node("pbj_pup:pbj_pup_candies", {
-       description = "PB&J Pup Candies",
-       tiles = {{
-               name = "pbj_pup_candies_animated.png",
-               animation = {
-                       type = "vertical_frames",
-                       aspect_w = 16,
-                       aspect_h = 16,
-                       length = 1.6
-               }
-       }},
-       paramtype = "light",
-       light_source = default.LIGHT_MAX,
-       paramtype2 = "facedir",
-       groups = {cracky = 2},
-       is_ground_content = false,
-       stack_max = 5,
-       sounds = default.node_sound_defaults(),
-       on_use = function(itemstack, user, pointed_thing)
-               minetest.do_item_eat(5, nil, itemstack, user, pointed_thing)
-               minetest.sound_play("pbj_pup_barks", {object = user, loop = false})
-               itemstack:take_item()
-               return itemstack
-       end,
-})
-
---
--- mapgen
---
-local gen = minetest.setting_getbool("pbj_pup_generate")
-if gen == nil or gen then
-       local function place(pos, facedir, length)
-               if facedir > 3 then
-                       facedir = 0
-               end
-               local tailvec = minetest.facedir_to_dir(facedir)
-               local p = {x = pos.x, y = pos.y, z = pos.z}
-               minetest.set_node(p, {name = "pbj_pup:pbj_pup", param2 = facedir})
-               for i = 1, length do
-                       p.x = p.x + tailvec.x
-                       p.z = p.z + tailvec.z
-                       minetest.set_node(p, {name = "pbj_pup:pbj_pup_candies", param2 = facedir})
-               end
-       end
-
-       local function generate(minp, maxp, seed)
-               local height_min = -31000
-               local height_max = -32
-               if maxp.y < height_min or minp.y > height_max then
-                       return
-               end
-               local y_min = math.max(minp.y, height_min)
-               local y_max = math.min(maxp.y, height_max)
-               local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
-               local pr = PseudoRandom(seed + 9324342)
-               local max_num = math.floor(volume / (16 * 16 * 16))
-               for i = 1, max_num do
-                       if pr:next(0, 1000) == 0 then
-                               local x0 = pr:next(minp.x, maxp.x)
-                               local y0 = pr:next(minp.y, maxp.y)
-                               local z0 = pr:next(minp.z, maxp.z)
-                               local p0 = {x = x0, y = y0, z = z0}
-                               place(p0, pr:next(0, 3), pr:next(3, 15))
-                       end
-               end
-       end
-
-       minetest.register_on_generated(generate)
-end
---
--- compat
---
-
-if minetest.setting_getbool("pbj_pup_alias_nyancat") then
-       minetest.register_alias("default:nyancat", "pbj_pup:pbj_pup")
-       minetest.register_alias("default:nyancat_rainbow","pbj_pup:pbj_pup_candies")
-       minetest.register_alias("nyancat", "pbj_pup:pbj_pup")
-       minetest.register_alias("nyancat_rainbow", "pbj_pup:pbj_pup_candies")
-       minetest.register_alias("nyancat:nyancat", "pbj_pup:pbj_pup")
-       minetest.register_alias("nyancat:nyancat_rainbow", "pbj_pup:pbj_pup_candies")
-end

diff --git a/mods/pbj_pup/license.md b/mods/pbj_pup/license.md
deleted file mode 100644 (file)
index b5fcf3a..0000000
--- a/mods/pbj_pup/license.md
+++ /dev/null
@@ -1,26 +0,0 @@
-
-## PB&J Pup
-
-PB&J Pup is a parody on the "Nyan Cat" TM toasted poptart meme.
-
-
-## License and Copyright
-
-(C) 2017 Vanessa Ezekowitz, Auke Kok, celeron55
-
- * All Code: LGPL-2.1+
- * All Images: CC-BY-4.0
-
-
-## Sounds
-
- * `pbj_pup_barks.ogg`:
-   Artist: Tomlija <tshesound@gmail.com>
-   License: CC-BY-3.0
-   Url: http://freesound.org/people/Tomlija/sounds/97392/
-
- * `pbj_pup_howl.ogg`:
-   Copyright 2013 Iwan Gabovitch (qubodup)
-   License: CC-BY-3.0
-   Url: http://freesound.org/people/qubodup/sounds/193394/
-

diff --git a/mods/pbj_pup/sounds/pbj_pup_barks.ogg b/mods/pbj_pup/sounds/pbj_pup_barks.ogg
deleted file mode 100644 (file)
index bdd3440..0000000
Binary files a/mods/pbj_pup/sounds/pbj_pup_barks.ogg and /dev/null differ

diff --git a/mods/pbj_pup/sounds/pbj_pup_howl.ogg b/mods/pbj_pup/sounds/pbj_pup_howl.ogg
deleted file mode 100644 (file)
index 15e93bc..0000000
Binary files a/mods/pbj_pup/sounds/pbj_pup_howl.ogg and /dev/null differ

diff --git a/mods/pbj_pup/textures/pbj_pup_back.png b/mods/pbj_pup/textures/pbj_pup_back.png
deleted file mode 100644 (file)
index f72fc24..0000000
Binary files a/mods/pbj_pup/textures/pbj_pup_back.png and /dev/null differ

diff --git a/mods/pbj_pup/textures/pbj_pup_candies.png b/mods/pbj_pup/textures/pbj_pup_candies.png
deleted file mode 100644 (file)
index 185fa2d..0000000
Binary files a/mods/pbj_pup/textures/pbj_pup_candies.png and /dev/null differ

diff --git a/mods/pbj_pup/textures/pbj_pup_candies_animated.png b/mods/pbj_pup/textures/pbj_pup_candies_animated.png
deleted file mode 100644 (file)
index d092759..0000000
Binary files a/mods/pbj_pup/textures/pbj_pup_candies_animated.png and /dev/null differ

diff --git a/mods/pbj_pup/textures/pbj_pup_front.png b/mods/pbj_pup/textures/pbj_pup_front.png
deleted file mode 100644 (file)
index d1c5739..0000000
Binary files a/mods/pbj_pup/textures/pbj_pup_front.png and /dev/null differ

diff --git a/mods/pbj_pup/textures/pbj_pup_jelly.png b/mods/pbj_pup/textures/pbj_pup_jelly.png
deleted file mode 100644 (file)
index ec0c1eb..0000000
Binary files a/mods/pbj_pup/textures/pbj_pup_jelly.png and /dev/null differ

diff --git a/mods/pbj_pup/textures/pbj_pup_sides.png b/mods/pbj_pup/textures/pbj_pup_sides.png
deleted file mode 100644 (file)
index d65d7be..0000000
Binary files a/mods/pbj_pup/textures/pbj_pup_sides.png and /dev/null differ

diff --git a/settingtypes.txt b/settingtypes.txt
index 0e9a0149a0105ac967baacc1e76cf620895ca513..eeea0bfcdb8a3ab7799498ce735141e355755adb 100644 (file)
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -43,13 +43,3 @@ share_bones_time (Bone share time) int 1200 0
 
 #    Replaces old stairs with new ones. Only required for older worlds.
 enable_stairs_replace_abm (Replace old stairs) bool false
-
-#    Enable the PB&J Pup mod entirely
-pbj_pup_enable (Enable PB&J pup mod) bool true
-
-#    Generate PB&J Pup blocks in the world
-pbj_pup_generate (Generate PBJ Pup blocks in world) bool true
-
-#    Let the PB&J Pup mod replace Nyan Cat nodes
-pbj_pup_alias_nyancat (Replace Nyan Cat blocks) bool false
-