diff --git a/overrides/groovy/classes/postInit/eioPrefixes.groovy b/overrides/groovy/classes/postInit/eioPrefixes.groovy new file mode 100644 index 0000000..8936cf9 --- /dev/null +++ b/overrides/groovy/classes/postInit/eioPrefixes.groovy @@ -0,0 +1,28 @@ +package classes.postInit + +import net.minecraft.item.ItemStack + +class EioPrefixes { + public static List prefixes = [null, 'holy', 'unholy', 'pasture', 'not_holy', 'not_unholy', 'not_pasture'] + public static List allItems + + static List 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 + } +} diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy index c6e5f08..0d1dc92 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy +++ b/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 diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy new file mode 100644 index 0000000..df600f4 --- /dev/null +++ b/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()) +} diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/thermal.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/thermal.groovy new file mode 100644 index 0000000..338b465 --- /dev/null +++ b/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 diff --git a/overrides/resources/modpack/lang/en_us.lang b/overrides/resources/modpack/lang/en_us.lang index 444d6a2..6c076b7 100644 --- a/overrides/resources/modpack/lang/en_us.lang +++ b/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 diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index 6e5b849..89d0e30 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -227,6 +227,10 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { #blockFuelCoke : [ + ], + #blockSoularium + : [ + ] }; @@ -478,7 +482,7 @@ var dustsDisabled as IItemStack[][IOreDictEntry] = { ], - #dustSulur + #dustSulfur : [ , @@ -509,6 +513,11 @@ var dustsDisabled as IItemStack[][IOreDictEntry] = { #dustEndstone : [ + ], + + #dustSoularium + : [ + ] }; @@ -914,6 +923,18 @@ var nuggetsDisabled as IItemStack[][IOreDictEntry] = { : [ ], + + : [ + + ], + + : [ + + ], + + : [ + + ] }; 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(); + +# Vibrant Alloy +mods.jei.JEI.hide(); + +# Pulsating Iron +mods.jei.JEI.hide(); + +# Dark Steel +mods.jei.JEI.hide(); + +// Leave Stellar Nugget, we use EIO's default Stellar Ingot + +/* END */ + +# Energetic Silver mods.jei.JEI.removeAndHide(); //////////////////////////// diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs index 6d7055b..be82d63 100644 --- a/overrides/scripts/extendedcrafting.zs +++ b/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 = .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 = .withTag({Creative: 1 as byte, Level: 4 as byte}, false); val creativetank = .withTag({RSControl: 0 as byte, Creative: 1 as byte, Level: 4 as byte}, false); val creativejetpack = .withTag({JetpackParticleType: 3}, false);