Organized textures, added matter/fuels

README.md

@@ -81,7 +81,7 @@ You can find the old textures and sounds by going back to previous commits in Gi
 - [x] Add ProjectE armor textures
 - [x] Add EMC Link
 - [x] Add Alchemical Books
-- [ ] Add more matter/fuel types
+- [x] Add more matter/fuel types
 - [ ] Make collectors less expensive and less effective (gold instead of glowstone)
 - [ ] Make collectors use ProjectExpansion's textures
 - [ ] Add Knowledge Sharing Book
@@ -101,6 +101,12 @@ You can find the old textures and sounds by going back to previous commits in Gi
     - [ ] Zero
     - [ ] Ignition
     - [ ] Black Hole/Void
+- [ ] Update wiki
+    - [ ] New matter/fuel types
+    - [ ] Changes to collectors
+    - [ ] New armor textures
+    - [ ] DM Pedestal/abilities
+    - [ ] All the new items
 
 ## Changelog
 <details><summary>Look at this fancy expanding changelog</summary>
@@ -110,11 +116,14 @@ You can find the old textures and sounds by going back to previous commits in Gi
     * Added the EMC Link to replace both the Constructor and Deconstructor.
     * Added the Dark Matter Pedestal.
     * Added Alchemical Books.
+    * DM/RM armor now use ProjectE's textures.
+    * Added Magenta through White Matter (would have added fading matter, but it's over 1 trillion EMC)
 * Changes:
     * The Constructor and Deconstructor are now deprecated, replaced with the EMC Link.
     * Upgrades and Stars can no longer be used as fuel.
     * Dark and Red Matter Armor now uses ProjectE's textures
     * Removed the ability to right click with stars to see the charge (it's unnecessary).
+    * Organized textures into folders
 * Bugfixes:
     * Dark and Red Matter Armor display properly (and identically) in both games, with ProjectE's textures.
     * `add_star_emc` now correctly works with negative energy values.

exchangeclone/craftitems.lua

@@ -1,213 +0,0 @@
-local S = minetest.get_translator()
-
-minetest.register_craftitem("exchangeclone:alchemical_coal", {
-    description = S("Alchemical Coal"),
-    wield_image = "exchangeclone_alchemical_coal.png",
-    inventory_image = "exchangeclone_alchemical_coal.png",
-	groups = { craftitem=1},
-})
-
-minetest.register_craftitem("exchangeclone:mobius_fuel", {
-    description = S("Mobius Fuel"),
-    wield_image = "exchangeclone_mobius_fuel.png",
-    inventory_image = "exchangeclone_mobius_fuel.png",
-	groups = { craftitem=1},
-})
-
-minetest.register_craftitem("exchangeclone:aeternalis_fuel", {
-    description = S("Aeternalis Fuel"),
-    wield_image = "exchangeclone_aeternalis_fuel.png",
-    inventory_image = "exchangeclone_aeternalis_fuel.png",
-	groups = { craftitem=1},
-})
-
-minetest.register_node("exchangeclone:alchemical_coal_block", {
-    description = S("Alchemical Coal Block"),
-    tiles = {"exchangeclone_alchemical_coal_block.png"},
-	is_ground_content = false,
-	sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
-	groups = {pickaxey=5, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 2 or 0},
-	_mcl_blast_resistance = 8,
-	_mcl_hardness = 7,
-})
-
-minetest.register_node("exchangeclone:mobius_fuel_block", {
-    description = S("Mobius Fuel Block"),
-    tiles = {"exchangeclone_mobius_fuel_block.png"},
-	is_ground_content = false,
-	sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
-	groups = {pickaxey=5, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 2 or 0},
-	_mcl_blast_resistance = 10,
-	_mcl_hardness = 8,
-})
-
-minetest.register_node("exchangeclone:aeternalis_fuel_block", {
-    description = S("Aeternalis Fuel Block"),
-    tiles = {"exchangeclone_aeternalis_fuel_block.png"},
-	is_ground_content = false,
-	sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
-	groups = {pickaxey=5, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 2 or 0},
-	_mcl_blast_resistance = 10,
-	_mcl_hardness = 8,
-})
-
-minetest.register_craft({
-    type = "fuel",
-    recipe = "exchangeclone:alchemical_coal",
-    burntime = 320,
-})
-
-minetest.register_craft({
-    type = "fuel",
-    recipe = "exchangeclone:mobius_fuel",
-    burntime = 1280,
-})
-
-minetest.register_craft({
-    type = "fuel",
-    recipe = "exchangeclone:aeternalis_fuel",
-    burntime = 5120,
-})
-
-minetest.register_craft({
-    type = "fuel",
-    recipe = "exchangeclone:alchemical_coal_block",
-    burntime = 3200,
-})
-
-minetest.register_craft({
-    type = "fuel",
-    recipe = "exchangeclone:mobius_fuel_block",
-    burntime = 12800,
-})
-
-minetest.register_craft({
-    type = "fuel",
-    recipe = "exchangeclone:aeternalis_fuel_block",
-    burntime = 51200,
-})
-
-minetest.register_craft({
-    output = "exchangeclone:alchemical_coal_block",
-    recipe = {
-        {"exchangeclone:alchemical_coal","exchangeclone:alchemical_coal","exchangeclone:alchemical_coal"},
-        {"exchangeclone:alchemical_coal","exchangeclone:alchemical_coal","exchangeclone:alchemical_coal"},
-        {"exchangeclone:alchemical_coal","exchangeclone:alchemical_coal","exchangeclone:alchemical_coal"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:alchemical_coal 9",
-    recipe = {{"exchangeclone:alchemical_coal_block"}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:aeternalis_fuel_block",
-    recipe = {
-        {"exchangeclone:aeternalis_fuel","exchangeclone:aeternalis_fuel","exchangeclone:aeternalis_fuel"},
-        {"exchangeclone:aeternalis_fuel","exchangeclone:aeternalis_fuel","exchangeclone:aeternalis_fuel"},
-        {"exchangeclone:aeternalis_fuel","exchangeclone:aeternalis_fuel","exchangeclone:aeternalis_fuel"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:aeternalis_fuel 9",
-    recipe = {{"exchangeclone:aeternalis_fuel_block"}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:mobius_fuel_block",
-    recipe = {
-        {"exchangeclone:mobius_fuel","exchangeclone:mobius_fuel","exchangeclone:mobius_fuel"},
-        {"exchangeclone:mobius_fuel","exchangeclone:mobius_fuel","exchangeclone:mobius_fuel"},
-        {"exchangeclone:mobius_fuel","exchangeclone:mobius_fuel","exchangeclone:mobius_fuel"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:mobius_fuel 9",
-    recipe = {{"exchangeclone:mobius_fuel_block"}}
-})
-
-minetest.register_craftitem("exchangeclone:dark_matter", {
-    description = S("Dark Matter Orb"),
-    wield_image = "exchangeclone_dark_matter.png",
-    inventory_image = "exchangeclone_dark_matter.png",
-    groups = {craftitem = 1}
-})
-
-minetest.register_craftitem("exchangeclone:red_matter", {
-    description = S("Red Matter Orb"),
-    wield_image = "exchangeclone_red_matter.png",
-    inventory_image = "exchangeclone_red_matter.png",
-    groups = {craftitem = 1},
-})
-
-minetest.register_node("exchangeclone:dark_matter_block", {
-    description = S("Dark Matter Block"),
-    tiles = {"exchangeclone_dark_matter_block.png"},
-	is_ground_content = false,
-	sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
-	groups = {pickaxey=5, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 4 or 0},
-	_mcl_blast_resistance = 1500,
-	_mcl_hardness = 12,
-})
-
-minetest.register_node("exchangeclone:red_matter_block", {
-    description = S("Red Matter Block"),
-    tiles = {"exchangeclone_red_matter_block.png"},
-	is_ground_content = false,
-	light_source = 14,
-	sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
-	groups = {pickaxey=6, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 5 or 0},
-	_mcl_blast_resistance = 1500,
-	_mcl_hardness = 37,
-})
-
-minetest.register_craft({
-    output = "exchangeclone:dark_matter",
-    recipe = {
-        {"exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel"},
-        {"exchangeclone:aeternalis_fuel", exchangeclone.mcl and "mcl_core:diamondblock" or 'default:diamondblock', "exchangeclone:aeternalis_fuel"},
-        {"exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:red_matter",
-    recipe = {
-        {"exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel"},
-        {"exchangeclone:dark_matter", "exchangeclone:dark_matter", "exchangeclone:dark_matter"},
-        {"exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:dark_matter_block",
-    recipe = {
-        {"exchangeclone:dark_matter", "exchangeclone:dark_matter"},
-        {"exchangeclone:dark_matter", "exchangeclone:dark_matter"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:red_matter_block",
-    recipe = {
-        {"exchangeclone:red_matter", "exchangeclone:red_matter"},
-        {"exchangeclone:red_matter", "exchangeclone:red_matter"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:dark_matter 4",
-    recipe = {
-        {"exchangeclone:dark_matter_block"}
-    }
-})
-
-minetest.register_craft({
-    output = "exchangeclone:red_matter 4",
-    recipe = {
-        {"exchangeclone:red_matter_block",}
-    }
-})

exchangeclone/fuels.lua

@@ -0,0 +1,93 @@
+local S = minetest.get_translator()
+
+exchangeclone.fuels = { -- If this one didn't end in "coal," I could get rid of "fuel" on all the rest... :(
+    "Alchemical Coal",
+    "Mobius Fuel",
+    "Aeternalis Fuel",
+    "Magenta Fuel",
+    "Pink Fuel",
+    "Purple Fuel",
+    "Violet Fuel",
+    "Blue Fuel",
+    "Cyan Fuel",
+    "Green Fuel",
+    "Lime Fuel",
+    "Yellow Fuel",
+    "Orange Fuel",
+    "White Fuel",
+}
+
+local fuel_time = 320
+
+for i, fuel in ipairs(exchangeclone.fuels) do
+    local codified = fuel:lower():gsub(" ", "_")
+
+    minetest.register_craftitem("exchangeclone:"..codified, {
+        description = S(fuel),
+        inventory_image = "exchangeclone_"..codified..".png",
+        groups = {craftitem = 1, exchangeclone_fuel = 1},
+    })
+
+    minetest.register_node("exchangeclone:"..codified.."_block", {
+        description = S(fuel.." Block"),
+        tiles = {"exchangeclone_"..codified.."_block.png"},
+        is_ground_content = false,
+        sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
+        groups = {pickaxey=5, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 2 or 0},
+        _mcl_blast_resistance = 8,
+        _mcl_hardness = 7,
+    })
+
+    minetest.register_craft({
+        type = "fuel",
+        recipe = "exchangeclone:"..codified,
+        burntime = fuel_time,
+    })
+
+    minetest.register_craft({
+        type = "fuel",
+        recipe = "exchangeclone:"..codified.."_block",
+        burntime = fuel_time * 10,
+    })
+    fuel_time = fuel_time * 4
+
+    minetest.register_craft({
+        output = "exchangeclone:"..codified.."_block",
+        recipe = {
+            {"exchangeclone:"..codified,"exchangeclone:"..codified,"exchangeclone:"..codified},
+            {"exchangeclone:"..codified,"exchangeclone:"..codified,"exchangeclone:"..codified},
+            {"exchangeclone:"..codified,"exchangeclone:"..codified,"exchangeclone:"..codified}
+        }
+    })
+
+    minetest.register_craft({
+        output = "exchangeclone:"..codified.." 9",
+        recipe = {{"exchangeclone:"..codified.."_block"}}
+    })
+
+    local phil = "exchangeclone:philosophers_stone"
+    local previous = (exchangeclone.fuels[i-1] and ("exchangeclone:"..exchangeclone.fuels[i-1]:lower():gsub(" ", "_"))) or exchangeclone.itemstrings.coal
+
+    minetest.register_craft({
+        output = "exchangeclone:"..codified,
+        type = "shapeless",
+        recipe = {
+            phil,
+            previous,
+            previous,
+            previous,
+            previous,
+        },
+        replacements = {{phil, phil}}
+    })
+
+    minetest.register_craft({
+        output = previous.." 4",
+        type = "shapeless",
+        recipe = {
+            phil,
+            "exchangeclone:"..codified,
+        },
+        replacements = {{phil, phil}}
+    })
+end

exchangeclone/init.lua

@@ -109,7 +109,8 @@ if exchangeclone.mcl2 then
 end
 
 local files = {
-	"craftitems",
+	"fuels",
+	"matter",
 	"deprecated_stuff",
 	"energy_collectors",
 	"klein_stars",

exchangeclone/matter.lua

@@ -0,0 +1,108 @@
+local S = minetest.get_translator()
+
+exchangeclone.matter_types = {
+    "Red",
+    "Magenta",
+    "Pink",
+    "Purple",
+    "Violet",
+    "Blue",
+    "Cyan",
+    "Green",
+    "Lime",
+    "Yellow",
+    "Orange",
+    "White",
+}
+
+minetest.register_craftitem("exchangeclone:dark_matter", {
+    description = S("Dark Matter Orb"),
+    wield_image = "exchangeclone_dark_matter.png",
+    inventory_image = "exchangeclone_dark_matter.png",
+    groups = {craftitem = 1}
+})
+
+minetest.register_craft({
+    output = "exchangeclone:dark_matter 4",
+    recipe = {
+        {"exchangeclone:dark_matter_block"}
+    }
+})
+
+minetest.register_node("exchangeclone:dark_matter_block", {
+    description = S("Dark Matter Block"),
+    tiles = {"exchangeclone_dark_matter_block.png"},
+	is_ground_content = false,
+	sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
+	groups = {pickaxey=5, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 4 or 0},
+	_mcl_blast_resistance = 1500,
+	_mcl_hardness = 12,
+})
+
+minetest.register_craft({
+    output = "exchangeclone:dark_matter",
+    recipe = {
+        {"exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel"},
+        {"exchangeclone:aeternalis_fuel", exchangeclone.mcl and "mcl_core:diamondblock" or 'default:diamondblock', "exchangeclone:aeternalis_fuel"},
+        {"exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel", "exchangeclone:aeternalis_fuel"}
+    }
+})
+
+minetest.register_craft({
+    output = "exchangeclone:dark_matter_block",
+    recipe = {
+        {"exchangeclone:dark_matter", "exchangeclone:dark_matter"},
+        {"exchangeclone:dark_matter", "exchangeclone:dark_matter"}
+    }
+})
+
+for i, matter in ipairs(exchangeclone.matter_types) do
+    local codified = matter:lower().."_matter"
+    local itemstring = "exchangeclone:"..codified
+
+    minetest.register_craftitem(itemstring, {
+        description = S(matter.." Matter Orb"),
+        wield_image = "exchangeclone_"..codified..".png",
+        inventory_image = "exchangeclone_"..codified..".png",
+        groups = {craftitem = 1},
+    })
+
+    minetest.register_node(itemstring.."_block", {
+        description = S(matter.." Matter Block"),
+        tiles = {"exchangeclone_"..codified.."_block.png"},
+        is_ground_content = false,
+        light_source = 14,
+        sounds = exchangeclone.sound_mod.node_sound_stone_defaults(),
+        groups = {pickaxey=6, material_stone=1, cracky = 3, building_block = 1, level = exchangeclone.mtg and 5 or 0},
+        _mcl_blast_resistance = 1500,
+        _mcl_hardness = 37,
+    })
+
+    local previous = exchangeclone.matter_types[i-1] or "Dark"
+    previous = "exchangeclone:"..previous:lower().."_matter"
+    local fuel = "exchangeclone:"..exchangeclone.fuels[i+2]:lower():gsub(" ", "_")
+
+    minetest.register_craft({
+        output = itemstring,
+        recipe = {
+            {fuel, fuel, fuel},
+            {previous, previous, previous},
+            {fuel, fuel, fuel},
+        }
+    })
+
+    minetest.register_craft({
+        output = itemstring.."_block",
+        recipe = {
+            {itemstring, itemstring},
+            {itemstring, itemstring}
+        }
+    })
+
+    minetest.register_craft({
+        output = itemstring.." 4",
+        recipe = {
+            {itemstring.."_block",}
+        }
+    })
+end

exchangeclone/philosophers_stone.lua

@@ -349,73 +349,4 @@ minetest.register_craft({
         "mcl_core:lapis",
     },
     replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:alchemical_coal",
-    type = "shapeless",
-    recipe = {
-        phil,
-        exchangeclone.itemstrings.coal,
-        exchangeclone.itemstrings.coal,
-        exchangeclone.itemstrings.coal,
-        exchangeclone.itemstrings.coal,
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = exchangeclone.itemstrings.coal.." 4",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "exchangeclone:alchemical_coal",
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:mobius_fuel",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "exchangeclone:alchemical_coal",
-        "exchangeclone:alchemical_coal",
-        "exchangeclone:alchemical_coal",
-        "exchangeclone:alchemical_coal",
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:alchemical_coal 4",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "exchangeclone:mobius_fuel",
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:aeternalis_fuel",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "exchangeclone:mobius_fuel",
-        "exchangeclone:mobius_fuel",
-        "exchangeclone:mobius_fuel",
-        "exchangeclone:mobius_fuel",
-    },
-    replacements = {{phil, phil}}
-})
-
-minetest.register_craft({
-    output = "exchangeclone:mobius_fuel 4",
-    type = "shapeless",
-    recipe = {
-        phil,
-        "exchangeclone:aeternalis_fuel",
-    },
-    replacements = {{phil, phil}}
 })