Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions kubejs/client_scripts/JEI.js

This file was deleted.

45 changes: 0 additions & 45 deletions kubejs/client_scripts/JEI_modespecific.js

This file was deleted.

21 changes: 1 addition & 20 deletions kubejs/client_scripts/deprecation_pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,11 @@
* This file implements some of the functionality necessary to fulfill the purpose of the deprecation pipeline
* as described in KubeJS/startup_scripts/deprecation_pipeline.js.
*
* In particular, in this file each deprecated item is hidden in EMI/JEI and given a helpful tooltip
* to indicate that it is deprecated.
* In particular, in this file each deprecated item is given a helpful tooltip to indicate that it is deprecated.
*
* All of these recipes are hidden by RegEx in assets/emi/recipe/filters/hiderecipes.json.
*/

JEIEvents.hideItems(event => {
Object.entries(global.deprecatedItems).forEach(([oldItemID, replacementItemID]) => {
event.hide(oldItemID)
})
Object.entries(global.deprecatedFluids).forEach(([oldFluidID, replacementFluidID]) => {
event.hide(oldFluidID.concat("_bucket"))
})
Object.entries(global.deprecatedBlocks).forEach(([oldBlockID, replacementBlockID]) => {
event.hide(oldBlockID)
})
})

ItemEvents.tooltip(event => {
Object.entries(global.deprecatedItems).forEach(([oldItemID, replacementItemID]) => {
event.add(oldItemID, Text.red(`Deprecated. Put this in a Crafting Table or Atomic Reconstructor to convert into ${Item.of(replacementItemID).getDisplayName().getString()}`).bold(true))
Expand All @@ -32,10 +19,4 @@ ItemEvents.tooltip(event => {
})
})

JEIEvents.hideFluids(event => {
Object.entries(global.deprecatedFluids).forEach(([oldFluidID, replacementFluidID]) => {
event.hide(oldFluidID)
})
})

// No corresponding tooltip event/api for fluids
17 changes: 0 additions & 17 deletions kubejs/client_scripts/mods/optionalCompats/architects_palette.js

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions kubejs/client_scripts/nukelists.js

This file was deleted.

14 changes: 14 additions & 0 deletions kubejs/client_scripts/whitelisted_jei_items.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/** whitelisting jei items. */

JEIEvents.addItems(event => {
// Iron Jetpacks' Cells are hard to selectively remove due to NBT shenanigans
event.add(Item.of("ironjetpacks:cell", {Id: "ironjetpacks:hardened"}))
event.add(Item.of("ironjetpacks:cell", {Id: "ironjetpacks:reinforced"}))
event.add(Item.of("ironjetpacks:cell", {Id: "ironjetpacks:resonant"}))

// NuclearCraft
event.add(["nuclearcraft:tough_alloy_ingot", "nuclearcraft:hard_carbon_ingot", "nuclearcraft:ferroboron_ingot", "nuclearcraft:rhodochrosite_dust"])

// Thermal
event.add("thermal:nuke_tnt")
})
20 changes: 20 additions & 0 deletions kubejs/server_scripts/deprecation_pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ Object.entries(global.deprecatedItems).forEach(([oldItemID, replacementItemID])
.duration(20)
.EUt(GTValues.VA[GTValues.ULV])
});

ServerEvents.tags("item", event => {
event.add("c:hidden_from_recipe_viewers", oldItemID)
event.add("forge:viewers/hidden_from_recipe", oldItemID)
})
});

Object.entries(global.deprecatedFluids).forEach(([oldFluidID, replacementFluidID]) => {
Expand All @@ -33,6 +38,16 @@ Object.entries(global.deprecatedFluids).forEach(([oldFluidID, replacementFluidID
.duration(20)
.EUt(GTValues.VA[GTValues.ULV])
});

ServerEvents.tags("item", event => {
event.add("c:hidden_from_recipe_viewers", oldFluidID.concat("_bucket"))
event.add("forge:viewers/hidden_from_recipe", oldFluidID.concat("_bucket"))
})

ServerEvents.tags("fluid", event => {
event.add("c:hidden_from_recipe_viewers", oldFluidID)
event.add("forge:viewers/hidden_from_recipe", oldFluidID)
})
});

Object.entries(global.deprecatedBlocks).forEach(([oldBlockID, replacementBlockID]) => {
Expand All @@ -45,4 +60,9 @@ Object.entries(global.deprecatedBlocks).forEach(([oldBlockID, replacementBlockID
.duration(20)
.EUt(GTValues.VA[GTValues.ULV])
});

ServerEvents.tags("item", event => {
event.add("c:hidden_from_recipe_viewers", oldBlockID)
event.add("forge:viewers/hidden_from_recipe", oldBlockID)
})
});
10 changes: 10 additions & 0 deletions kubejs/server_scripts/mods/optionalCompats/architects_palette.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,5 +412,15 @@ if (Platform.isLoaded("architects_palette")) {

})

ServerEvents.tags("item", event => {
[
"architects_palette:wardstone_blend",
"architects_palette:withered_bone"
].forEach(itemID => {
event.add("c:hidden_from_recipe_viewers", itemID)
event.add("forge:viewers/hidden_from_recipe", itemID)
})
})

console.log("Architect's Palette Loaded!")
}
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,38 @@ if (Platform.isLoaded("projectred_transmission")) {
S: "minecraft:glowstone_dust"
})
})

ServerEvents.tags("item", event => {
let listToHide = [
"projectred_core:silicon",
"projectred_core:sand_coal_comp",
"projectred_core:red_iron_comp",
"projectred_core:electrotine_iron_comp",
"projectred_core:peridot",
"projectred_core:sapphire",
"projectred_core:ruby",
"projectred_core:electrotine_dust",
"projectred_core:electrotine_generator",
"projectred_core:electrotine_ingot",
"projectred_core:red_ingot",
"projectred_core:sail",
"projectred_core:woven_cloth",
"projectred_core:motor",
"projectred_core:gold_coil",
"projectred_core:iron_coil",
"projectred_core:copper_coil",
"projectred_core:electrotine_silicon_comp",
"projectred_core:electrotine_silicon",
"projectred_core:boule",
"projectred_transmission:low_load_framed_power_wire",
"projectred_core:screwdriver",
"projectred_core:draw_plate",
"projectred_transmission:low_load_power_wire",
/cb_microblock:.*/
]
listToHide.forEach(itemID => {
event.add("c:hidden_from_recipe_viewers", itemID)
event.add("forge:viewers/hidden_from_recipe", itemID)
})
})
}
Loading