v7.1

README.md

@@ -1,7 +1,7 @@
 # ExchangeClone
 [![ContentDB](https://content.minetest.net/packages/ThePython/exchangeclone/shields/downloads/)](https://content.minetest.net/packages/ThePython/exchangeclone/)
 
-Allows players to turn items into EMC, or Energy Matter Covalence, and EMC into items. Supports all items in Minetest Game, Technic, More Ores, and MineClone2/Mineclonia, as well as anything that can be made from them! Also adds a whole bunch of other stuff.
+Allows players to turn items into EMC, or Energy Matter Covalence, and EMC into items. Supports all items in Minetest Game, MineClone2/Mineclonia, Technic, and More Ores, as well as anything that can be made from them! Also adds a whole bunch of other stuff.
 
 If you would like to see the latest changes, check out (pun) the dev branch! Beware of bugs.
 
@@ -30,10 +30,10 @@ Dependencies: Minetest Game or MineClone.
 * Tools do not show the wear bar (to show the charge level) when first created or crafted. It only appears after changing the range. This will not be fixed.
 * Unfortunately, caused by the performance improvements to various tool abilities, using the shear ability on sea grass (MCL) will also remove the sand below the sea grass. I can't think of a good way to fix it.
 * Dark and Red Matter Armor can make the player invincible. This is an [engine problem](https://github.com/minetest/minetest/issues/14344) that I can't fix.
-* ExchangeClone axes cannot strip bamboo blocks or remove wax from copper blocks in MCL. This will probably be fixed in v7.1, but I want to release this as soon as possible.
 * Mobs Redo (and mods that use it) don't care that DM/RM tools are supposed to be unbreakable and add wear to them anyway.
 * Covalence Dust and the Talisman of Repair cannot repair certain tools. This will not be fixed.
 * The recipe for Energy Collectors doesn't include glowstone even though they are very glowstone-y. This will probably not be fixed because glowstone doesn't exist in MTG.
+* DM/RM tools are too fast in MTG (can't figure out why)
 
 **If you have a suggestion or notice a bug that isn't on this list, visit the [GitHub issues page](https://github.com/thepython10110/exchangeclone/issues).**
 
@@ -62,6 +62,10 @@ You can find the old textures and sounds by going back to previous commits in Gi
 ## Changelog
 <details><summary>Look at this fancy expanding changelog</summary>
 
+### v7.1
+* Axes and Katars now correctly function when used on bamboo and copper blocks.
+* The Gem of Eternal Density and various other things now respects players' actual hotbar size (reported by @programmerjake)
+
 ### v7.0 (The Parity Update)
 
 #### Overview:

exchangeclone/axes.lua

@@ -1,6 +1,6 @@
 local S = minetest.get_translator()
 
-function exchangeclone.axe_action(itemstack, player, center)
+function exchangeclone.axe_action(itemstack, player, center, force_strip)
     if exchangeclone.check_cooldown(player, "axe") then return end
     local strip
     local start_node = minetest.get_node(center)
@@ -8,15 +8,17 @@ function exchangeclone.axe_action(itemstack, player, center)
     local start_def = minetest.registered_items[start_node.name]
     local stripped_variant = start_def._mcl_stripped_variant
     if exchangeclone.mcl then
-        if charge == 1 then
+        if force_strip then
+            strip = true
+        elseif charge == 1 then
             strip = true
         else
             strip = not player:get_player_control().sneak
         end
-        if strip and not stripped_variant then return end
+        if strip and not (exchangeclone.mcla or stripped_variant) then return end
     end
     local nodes
-    local groups_to_search = strip and {start_node.name} or {"group:tree", "group:leaves"}
+    local groups_to_search = strip and {start_node.name} or {"group:tree", "group:leaves", "group:bamboo_block"}
     local range_type = strip and "basic_radius" or "large_radius"
     if charge > 1 then
         local vector1, vector2 = exchangeclone.process_range(player, range_type, charge)
@@ -33,11 +35,14 @@ function exchangeclone.axe_action(itemstack, player, center)
         else
             if strip then
                 if node.param2 == start_node.param2 then
-                    local on_axe_place = minetest.registered_items[node.name]._on_axe_place
-                    if on_axe_place then
-                        on_axe_place(itemstack, player, {type="node",under=pos})
+                    if exchangeclone.mcla then
+                        local on_axe_place = minetest.registered_items[node.name]._on_axe_place
+                        if on_axe_place then
+                            on_axe_place(itemstack, player, {type="node",under=pos})
+                        end
+                    else
+                        minetest.swap_node(pos, {name=stripped_variant, param2=node.param2})
                     end
-                    minetest.swap_node(pos, {name=stripped_variant, param2=node.param2})
                 end
             else
                 local drops = minetest.get_node_drops(node.name, itemstack:get_name())
@@ -64,8 +69,18 @@ local function axe_on_place(itemstack, player, pointed_thing)
     end
 
     if pointed_thing.type == "node" then
-        if minetest.get_item_group(minetest.get_node(pointed_thing.under).name, "tree") > 0 then
+        local name = minetest.get_node(pointed_thing.under).name
+        if (minetest.get_item_group(name, "tree") > 0)
+        or (minetest.get_item_group(name, "bamboo_block") > 0) then
             exchangeclone.axe_action(itemstack, player, pointed_thing.under)
+        elseif exchangeclone.mcl then
+            if minetest.registered_items[name]._mcl_stripped_variant then
+                exchangeclone.axe_action(itemstack, player, pointed_thing.under, true)
+            end
+        elseif exchangeclone.mcla then
+            if minetest.registered_items[name]._on_axe_place then
+                exchangeclone.axe_action(itemstack, player, pointed_thing.under, true)
+            end
         end
     end
 

exchangeclone/gem_of_eternal_density.lua

@@ -20,7 +20,7 @@ local function condense(player, itemstack)
     local inv = player:get_inventory()
     local list = inv:get_list("main")
     -- Don't include hotbar
-    local min = exchangeclone.mcl and 10 or 9
+    local min = player:hud_get_hotbar_itemcount() + 1
     if player:get_wield_index() >= min then return end
 
     local total_emc = exchangeclone.get_item_emc(itemstack) - exchangeclone.get_item_emc(itemstack:get_name())

exchangeclone/red_matter_multitools.lua

@@ -46,8 +46,13 @@ local katar_on_use = function(itemstack, player, pointed_thing)
 			else
 				exchangeclone.hoe_action(itemstack, player, pointed_thing.under)
 			end
-		elseif minetest.get_item_group(node.name, "tree") > 0 then
+		elseif (minetest.get_item_group(node.name, "tree") > 0)
+		or (minetest.get_item_group(node.name, "bamboo_block") > 0) then
 			exchangeclone.axe_action(itemstack, player, pointed_thing.under)
+		elseif exchangeclone.mcl2 and minetest.registered_items[node.name]._mcl_stripped_variant then
+			exchangeclone.axe_action(itemstack, player, pointed_thing.under, true)
+		elseif exchangeclone.mcla and minetest.registered_items[node.name]._on_axe_place then
+			exchangeclone.axe_action(itemstack, player, pointed_thing.under, true)
 		elseif exchangeclone.mcl
 		and (minetest.get_item_group(node.name, "shearsy") > 0
 		or minetest.get_item_group(node.name, "shearsy_cobweb") > 0) then
@@ -164,10 +169,13 @@ local function morningstar_on_use(itemstack, player, pointed_thing)
 			exchangeclone.multidig_data[player:get_player_name()] = nil
 			exchangeclone.start_cooldown(player, "pickaxe", 0.5)
 			return
+		-- I don't remember why I'm doing the dirt group separetely... but there must be a reason.
 		elseif minetest.get_item_group(name, "exchangeclone_dirt") > 0 and exchangeclone.mcl then
 			exchangeclone.shovel_action(itemstack, player, pointed_thing.under)
 		elseif minetest.get_item_group(name, exchangeclone.shovel_group) > 0 then
 			exchangeclone.shovel_action(itemstack, player, pointed_thing.under)
+		elseif exchangeclone.mcla and minetest.registered_items[name]._on_shovel_place then
+			exchangeclone.shovel_action(itemstack, player, pointed_thing)
 		elseif minetest.get_item_group(name, exchangeclone.pickaxe_group) > 0 and sneaking then
 			exchangeclone.hammer_action(itemstack, player, pointed_thing.under)
 		else

zzzz_exchangeclone_init/lib.lua

@@ -1210,7 +1210,6 @@ function exchangeclone.place_torch(player, pointed_thing)
 end
 
 do
-    local hb_max = exchangeclone.mcl and 9 or 8
     local timer = 0
 
     minetest.register_globalstep(function(dtime)
@@ -1218,6 +1217,7 @@ do
         if timer >= 1 then
             timer = 0
             for _, player in pairs(minetest.get_connected_players()) do
+                local hb_max = player:hud_get_hotbar_itemcount()
                 local inv = player:get_inventory()
                 local processed_already = {}
                 for i, stack in ipairs(inv:get_list("main")) do