diff --git a/README.md b/README.md index 381a72b..9770c42 100644 --- a/README.md +++ b/README.md @@ -99,8 +99,15 @@ You can find the old textures and sounds by going back to previous commits in Gi
Look at this fancy expanding changelog ### v8.0 -* The Constructor and Deconstructor are now deprecated. Element Exchange is no more. -* Upgrades and Stars can no longer be used as fuel. +* New Features: + * +* Changes: + * The Constructor and Deconstructor are now deprecated. Element Exchange is no more. + * Upgrades and Stars can no longer be used as fuel. + * Dark and Red Matter Armor now uses ProjectE's textures +* Bugfixes: + * Dark and Red Matter Armor display properly (and identically) in both games. + ### v7.3 (not released yet because there's not enough) * Renamed Alchemical Tome to Tome of Knowledge, and made it uncraftable by default. diff --git a/exchangeclone/deprecated_stuff.lua b/exchangeclone/deprecated_stuff.lua index 45887d8..daaa332 100644 --- a/exchangeclone/deprecated_stuff.lua +++ b/exchangeclone/deprecated_stuff.lua @@ -53,7 +53,7 @@ minetest.register_node("exchangeclone:constructor", { "exchangeclone_constructor_right.png", "exchangeclone_constructor_right.png", }, - groups = {cracky = 2, container = exchangeclone.mcl2 and 2 or 4, pickaxey = 2, not_in_creative_inventory = 1, not_in_craft_guide = 1}, + groups = {cracky = 2, pickaxey = 2, not_in_creative_inventory = 1, not_in_craft_guide = 1}, _mcl_hardness = 3, _mcl_blast_resistance = 6, sounds = exchangeclone.sound_mod.node_sound_metal_defaults(), @@ -108,7 +108,7 @@ minetest.register_node("exchangeclone:deconstructor", { "exchangeclone_deconstructor_right.png", "exchangeclone_deconstructor_right.png", }, - groups = {cracky = 2, container = exchangeclone.mcl2 and 2 or 4, pickaxey = 2, not_in_creative_inventory = 1, not_in_craft_guide = 1}, + groups = {cracky = 2, pickaxey = 2, not_in_creative_inventory = 1, not_in_craft_guide = 1}, _mcl_hardness = 3, _mcl_blast_resistance = 6, sounds = exchangeclone.sound_mod.node_sound_metal_defaults(), diff --git a/exchangeclone/emc_link.lua b/exchangeclone/emc_link.lua new file mode 100644 index 0000000..ca8369c --- /dev/null +++ b/exchangeclone/emc_link.lua @@ -0,0 +1,46 @@ +-- I want to make this without a formspec. + +local function on_rightclick(pos, node, player, itemstack, pointed_thing) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if player:get_player_control().sneak then + local contained = inv:get_stack("star", 1) + if minetest.get_item_group(itemstack:get_name(), "klein_star") > 0 then + inv:set_stack("star", 1, itemstack) + return contained + elseif itemstack:is_empty() then + inv:set_stack("star", 1, ItemStack("")) + return contained + end + elseif not itemstack:is_empty() then + local dealiased = exchangeclone.handle_alias(itemstack) + local emc = exchangeclone.get_item_emc(dealiased) + if emc and emc > 0 then + minetest.chat_send_player(player:get_player_name(), "Target Item: "..ItemStack(dealiased):get_short_description()) + meta:set_string("target_item", dealiased) + end + end +end + +minetest.register_node("exchangeclone:emc_link", { + description = "EMC Link\nAllows automation with personal EMC", + tiles = {"exchangeclone_emc_link.png"}, + on_rightclick = on_rightclick, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + inv:set_size("star", 1) + inv:set_size("input", 1) + inv:set_size("output", 1) + meta:set_string("infotext", "EMC Link") + end, + after_place_node = function(pos, player, itemstack, pointed_thing) + local player_name = player:get_player_name() + local meta = minetest.get_meta(pos) + meta:set_string("exchangeclone_placer", player_name) + meta:set_string("infotext", "EMC Link".."\n"..S("Owned by ")..player_name) + if exchangeclone.pipeworks then + pipeworks.after_place(pos, player, itemstack, pointed_thing) + end + end, +}) \ No newline at end of file diff --git a/exchangeclone/energy_collector.lua b/exchangeclone/energy_collectors.lua similarity index 100% rename from exchangeclone/energy_collector.lua rename to exchangeclone/energy_collectors.lua diff --git a/exchangeclone/init.lua b/exchangeclone/init.lua index 381988c..2f25efc 100644 --- a/exchangeclone/init.lua +++ b/exchangeclone/init.lua @@ -109,14 +109,14 @@ if exchangeclone.mcl2 then end local files = { - "deprecated_stuff", - "energy_collector", - "klein_stars", "craftitems", - "tool_upgrades", + "deprecated_stuff", + "energy_collectors", + "klein_stars", "swords", "pickaxes", "axes", + "tool_upgrades", "shovels", "hoes", "hammers", @@ -130,6 +130,7 @@ local files = { "gem_of_eternal_density", "talisman_of_repair", "passive_stones", + "emc_link", } if exchangeclone.mcl or minetest.get_modpath("3d_armor") then diff --git a/exchangeclone/textures/exchangeclone_emc_link.png b/exchangeclone/textures/exchangeclone_emc_link.png new file mode 100644 index 0000000..91a71bb Binary files /dev/null and b/exchangeclone/textures/exchangeclone_emc_link.png differ