combine all of the EMC blocks into one

src/main/generation/generators/block/emc_link.js

@@ -0,0 +1,5 @@
+const { mkdirSync } = require("fs");
+const { genericBlock } = require("../../util");
+
+const BASE = `${__dirname}/emc_link.json`;
+module.exports = (outDir) => genericBlock(outDir, "emc_link", BASE);

src/main/resources/assets/projectexpansion/models/block/emc_link.json → src/main/generation/generators/block/emc_link.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "projectexpansion:block/emc_link"
+    "all": "projectexpansion:block/emc_link/$TIER$"
   }
-}
+}

src/main/generation/generators/blockstate/emc_link.js

@@ -0,0 +1,4 @@
+const { generic } = require("../../util");
+
+const BASE = `${__dirname}/emc_link.json`;
+module.exports = (outDir) => generic(outDir, "emc_link", BASE);

src/main/generation/generators/blockstate/emc_link.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/emc_link/$TIER$"
+    }
+  }
+}

src/main/generation/generators/item/emc_link.js

@@ -0,0 +1,4 @@
+const { generic } = require("../../util");
+
+const BASE = `${__dirname}/emc_link.json`;
+module.exports = (outDir) => generic(outDir, "emc_link", BASE);

src/main/generation/generators/item/emc_link.json

@@ -0,0 +1,3 @@
+{
+  "parent": "projectexpansion:block/emc_link/$TIER$"
+}

src/main/generation/generators/lang/en_US/block/emc_link.json

@@ -0,0 +1,28 @@
+{
+  "block.projectexpansion.emc_link.tooltip": "Imports both emc & items, and exports items.",
+  "block.projectexpansion.emc_link.limit_items": "Import/Export Limit: %s/s",
+  "block.projectexpansion.emc_link.limit_emc": "EMC Limit: %s/s",
+  "block.projectexpansion.emc_link.not_owner": "You do not own this, %s does.",
+  "block.projectexpansion.emc_link.not_set": "An export item has not been set.",
+  "block.projectexpansion.emc_link.already_set": "An export item has already been set, clear the current export first.",
+  "block.projectexpansion.emc_link.empty_hand": "Empty your hand to retrieve items.",
+  "block.projectexpansion.emc_link.cleared": "Export item has been cleared.",
+  "block.projectexpansion.emc_link.not_enough_emc": "You do not have enough emc to purchase this, you need %s.",
+  "block.projectexpansion.emc_link.set": "Export item has been set to %s.",
+  "block.projectexpansion.basic_emc_link": "Basic EMC Link [MK 1]",
+  "block.projectexpansion.dark_emc_link": "Dark EMC Link [MK 2]",
+  "block.projectexpansion.red_emc_link": "Red EMC Link [MK 3]",
+  "block.projectexpansion.magenta_emc_link": "Magenta EMC Link [MK 4]",
+  "block.projectexpansion.pink_emc_link": "Pink EMC Link [MK 5]",
+  "block.projectexpansion.purple_emc_link": "Purple EMC Link [MK 6]",
+  "block.projectexpansion.violet_emc_link": "Violet EMC Link [MK 7]",
+  "block.projectexpansion.blue_emc_link": "Blue EMC Link [MK 8]",
+  "block.projectexpansion.cyan_emc_link": "Cyan EMC Link [MK 9]",
+  "block.projectexpansion.green_emc_link": "Green EMC Link [MK 10]",
+  "block.projectexpansion.lime_emc_link": "Lime EMC Link [MK 11]",
+  "block.projectexpansion.yellow_emc_link": "Yellow EMC Link [MK 12]",
+  "block.projectexpansion.orange_emc_link": "Orange EMC Link [MK 13]",
+  "block.projectexpansion.white_emc_link": "White EMC Link [MK 14]",
+  "block.projectexpansion.fading_emc_link": "Fading EMC Link [MK 15]",
+  "block.projectexpansion.final_emc_link": "Final EMC Link [MK 16]"
+}

src/main/generation/generators/lang/en_US/block/misc.json

@@ -1,13 +1,5 @@
 {
   "block.projectexpansion.arcane_table": "Arcane Table",
-  "block.projectexpansion.emc_link": "EMC Link",
-  "block.projectexpansion.emc_link.tooltip": "This block will transfer emc from nearby blocks into your transmutation inventory.",
-  "block.projectexpansion.emc_export": "EMC Export",
-  "block.projectexpansion.emc_export.tooltip": "Exports items, using your emc.",
-  "block.projectexpansion.emc_export.not_owner": "You are not the owner of this, %s is.",
-  "block.projectexpansion.emc_import": "EMC Import",
-  "block.projectexpansion.emc_import.tooltip": "Import items directly into your emc.",
-  "block.projectexpansion.emc_import.not_owner": "You are not the owner of this, %s is.",
   "block.projectexpansion.transmutation_interface": "Transmutation Interface",
   "block.projectexpansion.transmutation_interface.tooltip": "This can be used with compatible mods like Refined Storage to access your transmutation inventory."
 }

src/main/generation/generators/lang/en_US/gui.json

@@ -1,17 +1,17 @@
 {
-    "gui.projectexpansion.config.title": "Project Expansion Config",
-    "gui.projectexpansion.config.tick_delay": "Tick Delay",
-    "gui.projectexpansion.config.tick_delay.desc": "The delay between mod operations (in ticks, default 20) - this will slightly effect the amount of emc generated via rounding - increase if you're noticing lag",
-    "gui.projectexpansion.config.format_emc": "Format EMC",
-    "gui.projectexpansion.config.format_emc.desc": "If EMC should be formatted as M/B/T/etc",
-    "gui.projectexpansion.config.full_number_names": "Full Number Names",
-    "gui.projectexpansion.config.full_number_names.desc": "If full number names (Million/Billion/Trillion) should be used instead of abbreviations",
-    "gui.projectexpansion.config.emc_display": "EMC Display",
-    "gui.projectexpansion.config.emc_display.desc": "Displays your current emc and gained emc per second in the top left corner.",
-    "gui.projectexpansion.config.powerflower_multiplier": "Power Flower Multiplier",
-    "gui.projectexpansion.config.powerflower_multiplier.desc": "Multiplies the output of Power Flowers.",
-    "gui.projectexpansion.config.notify_emc_changes": "Notify EMC Changes",
-    "gui.projectexpansion.config.notify_emc_changes.desc": "Notify users when their emc is changed via /emc add|remove|set",
-    "gui.projectexpansion.emc_link": "Personal Link",
-    "gui.projectexpansion.emc_gain": "EMC Gain"
+  "gui.projectexpansion.config.title": "Project Expansion Config",
+  "gui.projectexpansion.config.tick_delay": "Tick Delay",
+  "gui.projectexpansion.config.tick_delay.desc": "The delay between mod operations (in ticks, default 20) - this will slightly effect the amount of emc generated via rounding - increase if you're noticing lag",
+  "gui.projectexpansion.config.format_emc": "Format EMC",
+  "gui.projectexpansion.config.format_emc.desc": "If EMC should be formatted as M/B/T/etc",
+  "gui.projectexpansion.config.full_number_names": "Full Number Names",
+  "gui.projectexpansion.config.full_number_names.desc": "If full number names (Million/Billion/Trillion) should be used instead of abbreviations",
+  "gui.projectexpansion.config.emc_display": "EMC Display",
+  "gui.projectexpansion.config.emc_display.desc": "Displays your current emc and gained emc per second in the top left corner.",
+  "gui.projectexpansion.config.powerflower_multiplier": "Power Flower Multiplier",
+  "gui.projectexpansion.config.powerflower_multiplier.desc": "Multiplies the output of Power Flowers.",
+  "gui.projectexpansion.config.notify_emc_changes": "Notify EMC Changes",
+  "gui.projectexpansion.config.notify_emc_changes.desc": "Notify users when their emc is changed via /emc add|remove|set",
+  "gui.projectexpansion.emc_link": "Personal Link",
+  "gui.projectexpansion.emc_gain": "EMC Gain"
 }

src/main/generation/generators/loot_tables/emc_link.js

@@ -0,0 +1,4 @@
+const { generic } = require("../../util");
+
+const BASE = `${__dirname}/emc_link.json`;
+module.exports = (outDir) => generic(outDir, "emc_link", BASE);

src/main/resources/data/projectexpansion/loot_tables/blocks/emc_link.json → src/main/generation/generators/loot_tables/emc_link.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "projectexpansion:emc_link"
+          "name": "projectexpansion:$TIER$_emc_link"
         }
       ],
       "conditions": [
@@ -16,4 +16,4 @@
       ]
     }
   ]
-}
+}

src/main/generation/generators/recipes/emc_link.js

@@ -0,0 +1,13 @@
+const { mkdirSync, readFileSync, existsSync, writeFileSync } = require("fs");
+const { MATTER_TIERS } = require("../../util");
+
+const BASE = `${__dirname}/emc_link.json`;
+module.exports = function run(outDir) {
+    if(!existsSync(`${outDir}/emc_link`)) mkdirSync(`${outDir}/emc_link`);
+    const base = readFileSync(BASE).toString();
+    return MATTER_TIERS.filter(tier => !["basic", "dark", "red", "final"].includes(tier)).map((tier, index, arr) => {
+        if(tier === "magenta") return; // we still need it for pink
+        writeFileSync(`${outDir}/emc_link/${tier}.json`, base.replace(/\$TIER\$/g, tier).replace(/\$PREV\$/g, arr[index - 1]));
+        return [BASE, `${outDir}/emc_link/${tier}.json`];
+    }).filter(Boolean);
+}

src/main/resources/data/projectexpansion/recipes/emc_link.json → src/main/generation/generators/recipes/emc_link.json

@@ -1,8 +1,9 @@
 {
   "type": "minecraft:crafting_shaped",
+  "group": "projectexpansion:matter/$TIER$",
   "pattern": [
     "LMH",
-    "SRS",
+    "CPC",
     "HML"
   ],
   "key": {
@@ -15,14 +16,14 @@
     "H": {
       "item": "projecte:high_covalence_dust"
     },
-    "S": {
-      "tag": "forge:stone"
+    "P": {
+      "item": "projectexpansion:$PREV$_emc_link"
     },
-    "R": {
-      "item": "projecte:red_matter"
+    "C": {
+      "item": "projectexpansion:$TIER$_compressed_collector"
     }
   },
   "result": {
-    "item": "projectexpansion:emc_link"
+    "item": "projectexpansion:$TIER$_emc_link"
   }
 }

src/main/generation/generators/recipes/power_flower.json

@@ -8,7 +8,7 @@
     ],
     "key": {
         "L": {
-            "item": "projectexpansion:emc_link"
+            "item": "projectexpansion:$TIER$_emc_link"
         },
         "C": {
             "item": "projectexpansion:$TIER$_compressed_collector"

src/main/generation/generators/recipes/single/emc_import.json → src/main/generation/generators/recipes/single/emc_link/basic.json

@@ -1,8 +1,9 @@
 {
   "type": "minecraft:crafting_shaped",
+  "group": "projectexpansion:matter/basic",
   "pattern": [
     "LMH",
-    "SRS",
+    "TAT",
     "HML"
   ],
   "key": {
@@ -15,14 +16,14 @@
     "H": {
       "item": "projecte:high_covalence_dust"
     },
-    "S": {
-      "tag": "forge:stone"
+    "T": {
+      "item": "projecte:transmutation_tablet"
     },
-    "R": {
-      "item": "projectexpansion:cyan_matter"
+    "A": {
+      "item": "projecte:aeternalis_fuel_block"
     }
   },
   "result": {
-    "item": "projectexpansion:emc_import"
+    "item": "projectexpansion:basic_emc_link"
   }
 }

src/main/generation/generators/recipes/single/emc_link/dark.json

@@ -0,0 +1,29 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"group": "projectexpansion:matter/dark",
+	"pattern": [
+		"LMH",
+		"TPT",
+		"HML"
+	],
+	"key": {
+		"L": {
+			"item": "projecte:low_covalence_dust"
+		},
+		"M": {
+			"item": "projecte:medium_covalence_dust"
+		},
+		"H": {
+			"item": "projecte:high_covalence_dust"
+		},
+		"T": {
+			"item": "projecte:transmutation_tablet"
+		},
+		"P": {
+			"item": "projectexpansion:basic_emc_link"
+		}
+	},
+	"result": {
+		"item": "projectexpansion:dark_emc_link"
+	}
+}

src/main/generation/generators/recipes/single/emc_link/final.json

@@ -0,0 +1,29 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"group": "projectexpansion:matter/dark",
+	"pattern": [
+		"LMH",
+		"SPS",
+		"HML"
+	],
+	"key": {
+		"L": {
+			"item": "projecte:low_covalence_dust"
+		},
+		"M": {
+			"item": "projecte:medium_covalence_dust"
+		},
+		"H": {
+			"item": "projecte:high_covalence_dust"
+		},
+		"S": {
+			"item": "projectexpansion:final_star_shard"
+		},
+		"P": {
+			"item": "projectexpansion:dark_emc_link"
+		}
+	},
+	"result": {
+		"item": "projectexpansion:final_emc_link"
+	}
+}

src/main/generation/generators/recipes/single/emc_link/magenta.json

@@ -0,0 +1,29 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"group": "projectexpansion:matter/magenta",
+	"pattern": [
+		"LMH",
+		"TPT",
+		"HML"
+	],
+	"key": {
+		"L": {
+			"item": "projecte:low_covalence_dust"
+		},
+		"M": {
+			"item": "projecte:medium_covalence_dust"
+		},
+		"H": {
+			"item": "projecte:high_covalence_dust"
+		},
+		"T": {
+			"item": "projecte:transmutation_tablet"
+		},
+		"P": {
+			"item": "projectexpansion:red_emc_link"
+		}
+	},
+	"result": {
+		"item": "projectexpansion:magenta_emc_link"
+	}
+}

src/main/generation/generators/recipes/single/emc_link/red.json

@@ -0,0 +1,29 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"group": "projectexpansion:matter/red",
+	"pattern": [
+		"LMH",
+		"TPT",
+		"HML"
+	],
+	"key": {
+		"L": {
+			"item": "projecte:low_covalence_dust"
+		},
+		"M": {
+			"item": "projecte:medium_covalence_dust"
+		},
+		"H": {
+			"item": "projecte:high_covalence_dust"
+		},
+		"T": {
+			"item": "projecte:transmutation_tablet"
+		},
+		"P": {
+			"item": "projectexpansion:dark_emc_link"
+		}
+	},
+	"result": {
+		"item": "projectexpansion:red_emc_link"
+	}
+}