Merge pull request #1102 from TheBedrockMaster/main

Updated JEI Blacklist & Made ATM Alloy Dusts Obtainable
AllTheMods · Nov 11, 2024 · fb2f682 · fb2f682
2 parents f5c1a9b + f05d5c6
commit fb2f682
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/config/jei/blacklist.json b/config/jei/blacklist.json
@@ -17,5 +17,31 @@
   {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"immersiveengineering:armor_steel_boots"},"type":"item_stack"}},
   {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"immersiveengineering:armor_steel_leggings"},"type":"item_stack"}},
   {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"immersiveengineering:armor_steel_chestplate"},"type":"item_stack"}},
-  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"immersiveengineering:armor_steel_helmet"},"type":"item_stack"}}
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"immersiveengineering:armor_steel_helmet"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"mekanism:creative_chemical_tank"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"mekanism:creative_fluid_tank"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"mekanism:creative_bin"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"bigreactors:reinforced_reactorcreativewatergenerator"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"bigreactors:basic_turbinecreativesteamgenerator"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"bigreactors:reinforced_turbinecreativesteamgenerator"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"functionalstorage:creative_vending_upgrade"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"evilcraft:creative_blood_drop","components":{"cyclopscore:fluid_content":{"id":"evilcraft:blood","amount":1000}}},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"enderio:creative_power"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"arseng:creative_source_cell"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"ae2:creative_storage_cell"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"mysticalagriculture:creative_soulium_dagger"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"modularrouters:creative_module"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"modern_industrialization:creative_tank"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"modern_industrialization:creative_storage_unit"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"pneumaticcraft:creative_upgrade"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"quarryplus:creative_generator"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"rftoolspower:dimensionalcell_creative"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"railcraft:creative_locomotive"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"xycraft_machines:item_selector"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"xycraft_machines:fluid_selector"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"stevescarts:module_creative_engine"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"stevescarts:module_creative_hull"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"stevescarts:upgrade_creative_mode"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"ftbquests:stage_barrier"},"type":"item_stack"}},
+  {"hide_mode":"WILDCARD","ingredient":{"ingredient":{"id":"ftbquests:barrier"},"type":"item_stack"}}
 ]
diff --git a/kubejs/server_scripts/Tweaks/tags.js b/kubejs/server_scripts/Tweaks/tags.js
@@ -23,6 +23,17 @@ ServerEvents.tags('item', allthemods => {
     'utilitarian:tiny_charcoal',
     'actuallyadditions:tiny_charcoal',
   ])
+
+  // Allthemodium Alloy Dusts
+  allthemods.add('c:dusts/unobtainium_allthemodium_alloy', 'allthemodium:unobtainium_allthemodium_alloy_dust')
+  allthemods.add('c:dusts/unobtainium_vibranium_alloy', 'allthemodium:unobtainium_vibranium_alloy_dust')
+  allthemods.add('c:dusts/vibranium_allthemodium_alloy', 'allthemodium:vibranium_allthemodium_alloy_dust')
+  allthemods.add('c:dusts', [
+    '#c:dusts/unobtainium_allthemodium_alloy',
+    '#c:dusts/unobtainium_vibranium_alloy',
+    '#c:dusts/vibranium_allthemodium_alloy',
+  ])
+
   allthemods.add('c:storage_blocks', '#c:storage_blocks/raw_crimson_iron')
   allthemods.add('c:storage_blocks', '#c:storage_blocks/raw_azure_silver')
   allthemods.add('c:ores/cinnabar', 'alltheores:cinnabar_ore')