Cleanup Thermal and EIO Items in JEI (#799)

[FEATURE]

overrides/groovy/classes/postInit/eioPrefixes.groovy

@@ -0,0 +1,28 @@
+package classes.postInit
+
+import net.minecraft.item.ItemStack
+
+class EioPrefixes {
+	public static List<String> prefixes = [null, 'holy', 'unholy', 'pasture', 'not_holy', 'not_unholy', 'not_pasture']
+	public static List<ItemStack> allItems
+
+	static List<ItemStack> getAllItems() {
+		if (allItems) return allItems
+
+		allItems = []
+		for (var prefix in prefixes) {
+			if (prefix == null) {
+				prefix = ''
+			} else {
+				prefix = "_$prefix"
+			}
+			allItems.add(item("enderio:block${prefix}_fused_quartz"))
+			allItems.add(item("enderio:block${prefix}_fused_glass"))
+			allItems.add(item("enderio:block${prefix}_enlightened_fused_quartz"))
+			allItems.add(item("enderio:block${prefix}_enlightened_fused_glass"))
+			allItems.add(item("enderio:block${prefix}_dark_fused_quartz"))
+			allItems.add(item("enderio:block${prefix}_dark_fused_glass"))
+		}
+		return allItems
+	}
+}

overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy

@@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack
 
 import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TooltipHelpers.*
 import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TranslationHelpers.*
+import classes.postInit.EioPrefixes
 
 /* Actually Additions */
 
@@ -199,6 +200,15 @@ addTooltip(item('extendedcrafting:trimmed', 5), [
 	translatable('nomiceu.tooltip.extendedcrafting.black_steel.omnium.2'),
 ])
 
+/* Ender IO */
+
+// Glasses
+addTooltip(item('enderio:block_fused_glass'), translatable('tooltip.fused_glass.make'))
+
+for (ItemStack stack in EioPrefixes.getAllItems()) {
+	addTooltip(stack, translatable('tooltip.eio_glass.dye'))
+}
+
 /* Project Red */
 
 // Transmission Wire

overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy

@@ -0,0 +1,10 @@
+import net.minecraft.item.ItemStack
+import classes.postInit.EioPrefixes
+
+/* Cleanup EIO Glasses in JEI
+ * Since we are lazy, remove all, then add back the original
+ */
+for (var stack in EioPrefixes.getAllItems()) {
+	mods.jei.ingredient.hide(new ItemStack(stack.getItem(), 1, Short.MAX_VALUE))
+	mods.jei.ingredient.add(stack.copy())
+}

overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/thermal.groovy

@@ -0,0 +1,18 @@
+import static com.nomiceu.nomilabs.groovy.GroovyHelpers.JEIHelpers.*
+
+// Fix Energy Cells in JEI
+// Remove all Energy Cells, then add them back
+hideItemIgnoreNBT(item('thermalexpansion:cell'))
+
+// Basic..Resonant
+for (int level : 0..4) {
+	mods.jei.ingredient.add(item('thermalexpansion:cell').withNbt(['Creative': (byte) 0, 'Level': (byte) level]))
+}
+
+// Creative
+mods.jei.ingredient.add(item('thermalexpansion:cell').withNbt(['Creative': (byte) 1, 'Level': (byte) 4]))
+
+// Hide Unused Thermal Machines
+removeAndHideItemIgnoreNBT(item('thermalexpansion:machine', 13)) // Arcane Ensorcellator
+removeAndHideItemIgnoreNBT(item('thermalexpansion:device', 8)) // Insightful Condenser
+removeAndHideItemIgnoreNBT(item('thermalexpansion:device', 9)) // Decoctive Diffuser

overrides/resources/modpack/lang/en_us.lang

@@ -77,6 +77,10 @@ nomiceu.tooltip.gregtech.facade.2=§3They craft into different amounts based on
 # Extended Crafting
 nomiceu.tooltip.extendedcrafting.black_steel.omnium=§7Omnium Trimmed§r
 
+# Ender IO
+tooltip.fused_glass.make=Made with §6Tempered Glass§r and §7White Dye§r
+tooltip.eio_glass.dye=Can be §bDyed§r!
+
 # Project Red
 nomiceu.tooltip.projectred.wire=§eFor use with ProjectRed.§r
 

overrides/scripts/_oreDict.zs

@@ -227,6 +227,10 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = {
 	#blockFuelCoke
 	<ore:blockFuelCoke> : [
 		<thermalfoundation:storage_resource:1>
+	],
+	#blockSoularium
+	<ore:blockSoularium> : [
+		<enderio:block_alloy:7>
 	]
 };
 
@@ -478,7 +482,7 @@ var dustsDisabled as IItemStack[][IOreDictEntry] = {
 		<thermalfoundation:material:96>
 	],
 
-	#dustSulur
+	#dustSulfur
 	<ore:dustSulfur>: [
 		<thermalfoundation:material:771>,
 		<nuclearcraft:gem_dust:6>
@@ -509,6 +513,11 @@ var dustsDisabled as IItemStack[][IOreDictEntry] = {
 	#dustEndstone
 	<ore:dustEndstone>: [
 		<nuclearcraft:gem_dust:11>
+	],
+
+	#dustSoularium
+	<ore:dustSoularium>: [
+		<enderio:item_material:74>
 	]
 };
 
@@ -914,6 +923,18 @@ var nuggetsDisabled as IItemStack[][IOreDictEntry] = {
 	<ore:nuggetEnergeticAlloy> : [
 		<enderio:item_alloy_nugget:1>
 	],
+
+	<ore:nuggetConductiveIron> : [
+		<enderio:item_alloy_nugget:4>
+	],
+
+	<ore:nuggetEndSteel> : [
+		<enderio:item_alloy_nugget:8>
+	],
+
+	<ore:nuggetSoularium> : [
+		<enderio:item_alloy_nugget:7>
+	]
 };
 
 for oreDictEntry, items in nuggetsDisabled {
@@ -923,6 +944,24 @@ for oreDictEntry, items in nuggetsDisabled {
 	oreDictEntry.removeItems(items);
 }
 
+/* Just Remove These Nuggets, so conversion is still possible (the ingots are achievable via dungeon) */
+# Electrical Steel
+mods.jei.JEI.hide(<enderio:item_alloy_nugget>);
+
+# Vibrant Alloy
+mods.jei.JEI.hide(<enderio:item_alloy_nugget:2>);
+
+# Pulsating Iron
+mods.jei.JEI.hide(<enderio:item_alloy_nugget:5>);
+
+# Dark Steel
+mods.jei.JEI.hide(<enderio:item_alloy_nugget:6>);
+
+// Leave Stellar Nugget, we use EIO's default Stellar Ingot
+
+/* END */
+
+# Energetic Silver
 mods.jei.JEI.removeAndHide(<enderio:item_alloy_endergy_nugget:5>);
 
 ////////////////////////////

overrides/scripts/extendedcrafting.zs

@@ -6,7 +6,7 @@ import scripts.common.makeExtremeRecipe5 as makeExtremeRecipe5;
 import scripts.common.makeExtremeRecipe7 as makeExtremeRecipe7;
 import scripts.common.makeExtremeRecipe9 as makeExtremeRecipe9;
 
-val creativecell = <thermalexpansion:cell>.withTag({Recv: 250000, RSControl: 0 as byte, Facing: 3 as byte, Energy: 500000000, Creative: 1 as byte, SideCache: [2, 2, 2, 2, 2, 2] as byte[] as byte[], Level: 4 as byte, Send: 250000}, false);
+val creativecell = <thermalexpansion:cell>.withTag({Creative: 1 as byte, Level: 4 as byte}, false);
 val creativetank = <thermalexpansion:tank>.withTag({RSControl: 0 as byte, Creative: 1 as byte, Level: 4 as byte}, false);
 val creativejetpack = <simplyjetpacks:itemjetpack>.withTag({JetpackParticleType: 3}, false);