v6.6

README.md

@@ -64,9 +64,35 @@ Dependencies: Minetest Game or MineClone.
 
 -----
 
+
+### PLANS/TODO FOR v7.0 (see dev branch for current progress)
+* Achievements/advancements/awards
+* Improvements to tools
+    * Wear bar for charge level
+    * Charge level affects speed
+    * Correct/accurate speeds compared to ProjectE (hopefully)
+    * Wear bar on Exchange Orbs for energy
+    * Slightly more efficient 3x3/3x1 digging (before, it would check every time any node was broken, now it will check when it's dug specifically with 3x3/3x1-capable tools)
+    * Only one item per tool (not a separate 3x3 tool)
+    * *MAYBE* changes to armor (but it's so hard to get it right)
+    * Make Philosopher's Stone only affect the node type you click on (and also not work when not pointed at anything), so clicking on a grass block will only transmute grass blocks in range (not everything else)
+* Divining rods
+* Swiftwolf's Rending Gale (maybe rename?)
+* Mind, Life, Body and Soul Stones (Mind = MCL only)
+* Talisman of Repair (will only work in player inventory, not Alchemical Chests like ProjectE)
+* Gem of Eternal Density (will only work in player inventory, not Alchemical Chests like ProjectE)
+* Remove deprecated PESA item (add alias to some existing item with 64 energy)
+
 ## Changelog
 <details><summary>Look at this fancy expanding changelog</summary>
 
+### v7.0
+* Nothing yet. See the to-do list above for my plans.
+
+### v6.6
+* Removed energy value for Ancient Debris (since it could be smelted in a DM/RM Furnace to get 2 Netherite Scrap)
+* Removed Philosopher's Stone recipes involving Ancient Debris, Netherite Scrap, and Netherite Ingots (since that's not a thing in ProjectE)
+
 ### v6.5
 * Fixed MCL gold nuggets sometimes having the energy value of gold horse armor (reported by @programmerjake)
 * Fixed the fact that the previous changelog entry was `##` instead of `###`
@@ -171,7 +197,7 @@ I didn't get to everything I wanted to, mostly because the automatic energy valu
     * Fixed Mineclonia energy values (I foolishly assumed that all items would have the same itemstrings and groups; reported by @Ranko-Saotome).
 
 ### 5.0 (bigger release than any before it)
-**I would recommend not updating to or past this version (any Constructors, Deconstructors, and Energy Collectors may become unusable...)**
+**I would recommend not updating existing 1.x-4.x worlds to this version (any Constructors, Deconstructors, and Energy Collectors may become unusable...)**
 * New features:
     * Added a [wiki](https://github.com/ThePython10110/ExchangeClone/wiki)! This is where you can find more complete information on pretty much everything.
         * Because the wiki exists, I won't be including anywhere near as many details about how features work in the changelog.
@@ -351,7 +377,7 @@ I didn't get to everything I wanted to, mostly because the automatic energy valu
 * ~~As soon as Minetest 5.8 comes out, better textures for armor...~~ Don't want to limit it to 5.8
 * Divining Rods
 * Rings (I'll probably add a new PESA-like item for holding rings)
-    * Archangel's Smite (arrows will not track targets, MineClone only)
+    * Archangel's Smite (MCL only, arrows will not track targets)
     * Ring of Ignition
     * Zero Ring
     * Swiftwolf's Rending Gale (but without the force field; basically Why's Flying Sausage with a different texture and maybe lightning in MCL)
@@ -363,4 +389,4 @@ I didn't get to everything I wanted to, mostly because the automatic energy valu
 * Mercurial Eye
 * Talisman of Repair
 * Gem of Eternal Density
-* Probably other things
+* Probably other things

exchangeclone/philosophers_stone.lua

@@ -257,7 +257,7 @@ exchangeclone.stone_action = {
     end
 }
 
-local on_left_click = nil
+local on_left_click
 if exchangeclone.mcl then
     on_left_click = function(itemstack, player, pointed_thing)
         if player:get_player_control().sneak then
@@ -496,57 +496,6 @@ minetest.register_craft({
     replacements = {{phil, phil}}
 })
 
-minetest.register_craft({
-    output = "mcl_nether:ancient_debris",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "mcl_core:diamond",
-        "mcl_core:diamond",
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "mcl_core:diamond 2",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "mcl_nether:ancient_debris"
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "mcl_core:diamond 2",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "mcl_nether:netherite_scrap"
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "mcl_core:diamond 9",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "mcl_nether:netherite_ingot"
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "mcl_nether:netherite_ingot",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "mcl_core:diamondblock"
-    },
-    replacements = {{phil, phil}}
-})
-
 minetest.register_craft({
     output = "mcl_nether:glowstone_dust",
     type = "shapeless",

exchangeclone/pickaxes.lua

@@ -161,6 +161,8 @@ minetest.register_craft({
     }
 })
 
+
+-- Can't find a good way to automate this...
 minetest.register_on_mods_loaded(function()
     for name, def in pairs(minetest.registered_nodes) do
         if name:find("_ore")

zzzz_exchangeclone_init/base_energy_values.lua

@@ -175,7 +175,7 @@ if exchangeclone.mcl then
 
         ["mcl_mud:mud"] = 1,
 
-        ["mcl_nether:ancient_debris"] = 12288,
+        ["mcl_nether:netherite_scrap"] = 12288,
         ["mcl_nether:nether_wart_item"] = 24,
         ["mcl_nether:netherrack"] = 1,
         ["mcl_nether:quartz"] = 256,