From caa8b2b4fb0cb603877213e1e90926377f5d3eb0 Mon Sep 17 00:00:00 2001
From: Nino Maruszewski <nino.maruszewski@gmail.com>
Date: Tue, 27 Jul 2021 14:49:28 -0500
Subject: [PATCH] Unify ender pearl dusts

---
 .../server_scripts/instantUnify/unify.js      | 19 +++++++++++--------
 .../theLatestSummerFun/tags/item.js           |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modpack/overrides/kubejs/server_scripts/instantUnify/unify.js b/modpack/overrides/kubejs/server_scripts/instantUnify/unify.js
index 097ef8a..9696be6 100644
--- a/modpack/overrides/kubejs/server_scripts/instantUnify/unify.js
+++ b/modpack/overrides/kubejs/server_scripts/instantUnify/unify.js
@@ -146,6 +146,9 @@ var tagGen = [
   "coal_coke=storage_blocks,ingots,nuggets,dusts,ores,gears,plates,rods,gems",
   // Charcoal
   "charcoal=storage_blocks,ingots,nuggets,dusts,ores,gears,plates,rods,gems",
+  // Ender Pearl Dust
+  "ender=dusts",
+  "ender_pearl=dusts",
   // Sawdust
   "wood=storage_blocks,dusts",
 ];
@@ -259,16 +262,16 @@ onEvent("entity.spawned", (event) => {
 
       // Check for every tag in the list
       outer: for (let tag of global["unifytags"]) {
-      // Check if item should be unified
-      for (let e of global["UNIFY_SKIP"]) {
-        // Check if item's mod is one that shouldn't be unified
-        if (e.mods === "*" || e.mods.indexOf(gItem.getMod()) == -1) {
-          // Check if current tag is one that shouldn't be unified
-          if (tag.match(e.filter)) {
-            continue outer;
+        // Check if item should be unified
+        for (let e of global["UNIFY_SKIP"]) {
+          // Check if item's mod is one that shouldn't be unified
+          if (e.mods === "*" || e.mods.indexOf(gItem.getMod()) == -1) {
+            // Check if current tag is one that shouldn't be unified
+            if (tag.match(e.filter)) {
+              continue outer;
+            }
           }
         }
-      }
 
         let ingr = Ingredient.of("#" + tag);
         if (ingr && ingr.test(gItem)) {
diff --git a/modpack/overrides/kubejs/server_scripts/theLatestSummerFun/tags/item.js b/modpack/overrides/kubejs/server_scripts/theLatestSummerFun/tags/item.js
index 3ce0c4c..12d9a2f 100644
--- a/modpack/overrides/kubejs/server_scripts/theLatestSummerFun/tags/item.js
+++ b/modpack/overrides/kubejs/server_scripts/theLatestSummerFun/tags/item.js
@@ -67,8 +67,8 @@ onEvent("item.tags", (event) => {
   event.add("appliedenergistics2:silicon", "#forge:gems/silicon");
 
   // Ender dust
-  event.add("forge:dusts", "appliedenergistics2:ender_dust");
   event.add("forge:dusts/ender", "appliedenergistics2:ender_dust");
+  event.add("forge:dusts/ender_pearl", "emendatusenigmatica:ender_dust");
 
   //$ Planks
   // Non-vanilla