Bucket Sounds; Warning if clientmod is not installed

diff --git a/README.md b/README.md
index f3df32a546decd4eca996057c81f918ef05c6fba..12dd70ef925993f8ed1066716f6c5a2a7c34f21a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 ---
 
-## Be sure to install the clientside mod for this game mode: <a href="https://github.com/oilboi/crafter_client">Download here</a>
+## Be sure to install the clientside mod for this game mode: <a href="https://github.com/EliasFleckenstein03/crafter_client">Download here</a>
 
 
 
@@ -35,7 +35,10 @@ max_packets_per_iteration = 10096
 ## Alpha 0.07
 > RailRoad Tech
 
-- Added Suffocation
+- Warning when clientmod is not installed
+- Bucket sounds
+- Inventory improvements
+- Added suffocation
 - The /home command requires a priv now
 - Added in better minecart algorithm
 - Added in ability to link minecarts

diff --git a/mods/client_version_checker/init.lua b/mods/client_version_checker/init.lua
index c066c1a9cc4800d1678d1f79e54410deeb418e63..91fc5d459a51034d6ab541b04b612d5909352249 100644 (file)
--- a/mods/client_version_checker/init.lua
+++ b/mods/client_version_checker/init.lua
@@ -2,6 +2,7 @@ minetest.register_node("client_version_checker:this_is_the_signature_of_crafter0
 
 local client_versions = {}
 local client_version_channels = {}
+local client_has_clientmod = {}
 
 --I needed to add in a dev cycle to adopt for a decimal place error
 local current_development_cycle = "alpha"
@@ -10,11 +11,22 @@ local current_version = 0.07000
 minetest.register_on_joinplayer(function(player)
        local name = player:get_player_name()
     client_version_channels[name] = minetest.mod_channel_join(name..":client_version_channel")
+    client_has_clientmod[name] = nil
+    minetest.after(3, function()
+               if not client_has_clientmod[name] then
+                       minetest.chat_send_player(name, minetest.colorize("orange", "It seems like you don't have Crafter client installed."
+                               .. " You will not be able to use all features of this server without the clientmod."
+                               .. " Please dowload it here: https://github.com/EliasFleckenstein03/crafter_client"))
+               else
+                       client_has_clientmod[name] = nil
+               end
+    end)
 end)
 
 minetest.register_on_modchannel_message(function(channel_name, sender, message)
     local channel_decyphered = channel_name:gsub(sender,"")
     if channel_decyphered == ":client_version_channel" then
+               client_has_clientmod[sender] = true
         local version = tonumber(message)
         if type(version) ~= "number" then
             minetest.chat_send_player(sender, minetest.colorize("yellow", "Please do not try to crash the server."))

diff --git a/mods/main/bucket.lua b/mods/main/bucket.lua
index 76c1c6edffef91ce4344cc9078b37be4b7a0b31e..7e44f92194fcf75f06c2e6780584fe56d0ad4305 100644 (file)
--- a/mods/main/bucket.lua
+++ b/mods/main/bucket.lua
@@ -43,10 +43,12 @@ minetest.register_craftitem("main:bucket", {
                if node == "main:water" then
                        itemstack:replace(ItemStack("main:bucket_water"))
                        minetest.remove_node(pos_under)
+                       minetest.sound_play("water_take", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                elseif node == "main:lava" or node == "nether:lava" then
                        itemstack:replace(ItemStack("main:bucket_lava"))
                        minetest.remove_node(pos_under)
+                       minetest.sound_play("lava", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                end
        end,
@@ -62,10 +64,12 @@ minetest.register_craftitem("main:bucket", {
                if node == "main:water" then
                        itemstack:replace(ItemStack("main:bucket_water"))
                        minetest.remove_node(pos_under)
+                       minetest.sound_play("water_take", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                elseif node == "main:lava" or node == "nether:lava" then
                        itemstack:replace(ItemStack("main:bucket_lava"))
                        minetest.remove_node(pos_under)
+                       minetest.sound_play("lava", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                end
        end,
@@ -97,12 +101,15 @@ minetest.register_craftitem("main:bucket_water", {
                if buildable_under == true then
                        minetest.set_node(pos_under,{name="main:water"})
                        itemstack:replace(ItemStack("main:bucket"))
+                       minetest.sound_play("water_place", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                elseif buildable_above then
                        minetest.set_node(pos_above,{name="main:water"})
                        itemstack:replace(ItemStack("main:bucket"))
+                       minetest.sound_play("water_place", {gain=1.0, pos = pos_above, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                end
+               
        end,
        on_secondary_use = function(itemstack, user, pointed_thing)
                local pos = bucket_raycast(user)
@@ -124,10 +131,12 @@ minetest.register_craftitem("main:bucket_water", {
                if buildable_under == true then
                        minetest.add_node(pos_under,{name="main:water"})
                        itemstack:replace(ItemStack("main:bucket"))
+                       minetest.sound_play("water_place", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                elseif buildable_above then
                        minetest.add_node(pos_above,{name="main:water"})
                        itemstack:replace(ItemStack("main:bucket"))
+                       minetest.sound_play("water_place", {gain=1.0, pos = pos_above, pitch = 1 + math.random(-10, 10)*0.005}, true)
                        return(itemstack)
                end
        end,
@@ -171,6 +180,7 @@ minetest.register_craftitem("main:bucket_lava", {
                                        minetest.add_node(pos_under,{name="nether:lava"})
                                end
                                itemstack:replace(ItemStack("main:bucket"))
+                               minetest.sound_play("lava", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                                return(itemstack)
                        end
                elseif buildable_above then
@@ -181,6 +191,7 @@ minetest.register_craftitem("main:bucket_lava", {
                                        minetest.add_node(pos_above,{name="nether:lava"})
                                end
                                itemstack:replace(ItemStack("main:bucket"))
+                               minetest.sound_play("lava", {gain=1.0, pos = pos_above, pitch = 1 + math.random(-10, 10)*0.005}, true)
                                return(itemstack)
                        end
                end
@@ -210,6 +221,7 @@ minetest.register_craftitem("main:bucket_lava", {
                                        minetest.add_node(pos_under,{name="nether:lava"})
                                end
                                itemstack:replace(ItemStack("main:bucket"))
+                               minetest.sound_play("lava", {gain=1.0, pos = pos_under, pitch = 1 + math.random(-10, 10)*0.005}, true)
                                return(itemstack)
                        end
                elseif buildable_above then
@@ -220,6 +232,7 @@ minetest.register_craftitem("main:bucket_lava", {
                                        minetest.add_node(pos_above,{name="nether:lava"})
                                end
                                itemstack:replace(ItemStack("main:bucket"))
+                               minetest.sound_play("lava", {gain=1.0, pos = pos_above, pitch = 1 + math.random(-10, 10)*0.005}, true)
                                return(itemstack)
                        end
                end

diff --git a/mods/main/sounds/lava.ogg b/mods/main/sounds/lava.ogg
new file mode 100644 (file)
index 0000000..2ef7ff6
Binary files /dev/null and b/mods/main/sounds/lava.ogg differ

diff --git a/mods/main/sounds/water_place.ogg b/mods/main/sounds/water_place.ogg
new file mode 100644 (file)
index 0000000..36483f9
Binary files /dev/null and b/mods/main/sounds/water_place.ogg differ

diff --git a/mods/main/sounds/water_take.ogg b/mods/main/sounds/water_take.ogg
new file mode 100644 (file)
index 0000000..864458e
Binary files /dev/null and b/mods/main/sounds/water_take.ogg differ

diff --git a/todo.old.txt b/todo.old.txt
deleted file mode 100644 (file)
index d4110cb..0000000
--- a/todo.old.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-0) Make armor
-1.5) make bookshelves
-2.) make better enchanting
---find mod that has these?
-3.) add cows
-4.) add sheep
-5.) add coloured wools using texture mods dynamically for pretty much infinite colours
-6.) make enchanting use bookshelves
-7.) overhaul enchanting gui
-8.) make anvil to combine enchantments
-9.) Make lapiz
-10.) make inventory less crap
-11.) make aura (heal randomly when eating enchanted food)
-12.) make jetpack
-13.) do all redstone todo items
-14.) make steel
-15.) Make waypoints
-16.) Make the buildtest pipes actually work
-17.) Make the quarry
-432432.) fix the redstone piston bug https://forum.minetest.net/viewtopic.php?p=372505#p372505
-23432244.) overhaul redstone again https://forum.minetest.net/viewtopic.php?p=372654#p372654

diff --git a/todo.txt b/todo.txt
index 0d3cb69ec7110e776a86d41f0ad1854173009f1b..3352df75111276cf541f8102aecc6282bc862b42 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1,3 @@
-- Bucket sounds
-- Background images for armor in inventory
 - Equip armor with rightclick
 - Shift-click fuel into furnace
 - Throwing eggs