summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-03-26 00:52:18 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-03-26 00:52:18 -0400
commit97f7566fa47b4dba67d40ae05ede7936a5c8553a (patch)
tree83393173f8884e8a498d994e5c762a716a130dbb
parent99cc59a497199aebac89d53ade9fd2840b723747 (diff)
downloaddreambuilder_modpack-97f7566fa47b4dba67d40ae05ede7936a5c8553a.tar
dreambuilder_modpack-97f7566fa47b4dba67d40ae05ede7936a5c8553a.tar.gz
dreambuilder_modpack-97f7566fa47b4dba67d40ae05ede7936a5c8553a.tar.bz2
dreambuilder_modpack-97f7566fa47b4dba67d40ae05ede7936a5c8553a.tar.xz
dreambuilder_modpack-97f7566fa47b4dba67d40ae05ede7936a5c8553a.zip
update gloopblocks and technic
-rw-r--r--gloopblocks/depends.txt1
-rw-r--r--gloopblocks/init.lua28
-rw-r--r--gloopblocks/textures/gloopblocks_rainbow_horizontal.pngbin0 -> 137 bytes
-rw-r--r--technic/radiation.lua3
4 files changed, 29 insertions, 3 deletions
diff --git a/gloopblocks/depends.txt b/gloopblocks/depends.txt
index 8b07d49..cdae19c 100644
--- a/gloopblocks/depends.txt
+++ b/gloopblocks/depends.txt
@@ -9,3 +9,4 @@ wool?
xdecor?
caverealms?
technic?
+nyancat?
diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua
index 5b059eb..48248fc 100644
--- a/gloopblocks/init.lua
+++ b/gloopblocks/init.lua
@@ -17,13 +17,37 @@ end
-- Nodes
-minetest.register_node("gloopblocks:rainbow_block", {
- description = S("Rainbow Block"),
+minetest.register_node("gloopblocks:rainbow_block_diagonal", {
+ description = S("Diagonal Rainbow Block"),
tiles = {"gloopblocks_rainbow_block.png"},
is_ground_content = true,
groups = {cracky=3},
sounds = default.node_sound_defaults(),
})
+minetest.register_alias("gloopblocks:rainbow_block", "gloopblocks:rainbow_block_diagonal")
+
+minetest.register_node("gloopblocks:rainbow_block_horizontal", {
+ description = "Horizontal Rainbow Block",
+ tiles = {
+ "gloopblocks_rainbow_horizontal.png^[transformR90",
+ "gloopblocks_rainbow_horizontal.png^[transformR90",
+ "gloopblocks_rainbow_horizontal.png"
+ },
+ paramtype = "light",
+ light_source = default.LIGHT_MAX,
+ paramtype2 = "facedir",
+ groups = {cracky = 2},
+ is_ground_content = false,
+ sounds = default.node_sound_defaults(),
+})
+
+if not minetest.setting_getbool("pbj_pup_alias_nyancat") then
+ if not minetest.registered_nodes["nyancat:nyancat_rainbow"] then
+ minetest.register_alias("nyancat:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
+ elseif not minetest.registered_nodes["default:nyancat_rainbow"] then
+ minetest.register_alias("default:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
+ end
+end
minetest.register_node("gloopblocks:cement", {
description = S("Cement"),
diff --git a/gloopblocks/textures/gloopblocks_rainbow_horizontal.png b/gloopblocks/textures/gloopblocks_rainbow_horizontal.png
new file mode 100644
index 0000000..685a22c
--- /dev/null
+++ b/gloopblocks/textures/gloopblocks_rainbow_horizontal.png
Binary files differ
diff --git a/technic/radiation.lua b/technic/radiation.lua
index 7bf70da..79dfcb4 100644
--- a/technic/radiation.lua
+++ b/technic/radiation.lua
@@ -56,7 +56,8 @@ local rad_resistance_node = {
["default:mossycobble"] = 15,
["pbj_pup:pbj_pup"] = 10000,
["pbj_pup:pbj_pup_candies"] = 10000,
- ["gloopblocks:rainbow_block"] = 5000,
+ ["gloopblocks:rainbow_block_diagonal"] = 5000,
+ ["gloopblocks:rainbow_block_horizontal"] = 10000,
["default:nyancat"] = 10000,
["default:nyancat_rainbow"] = 10000,
["nyancat:nyancat"] = 10000,