Skip to content

Commit

Permalink
Merge pull request #1615 from AllTheMods/FTBicWires
Browse files Browse the repository at this point in the history
FTBic wire and cable unification
  • Loading branch information
jeremiahwinsley authored Jul 30, 2023
2 parents bf8c05d + feb0da9 commit 66c49ce
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
11 changes: 11 additions & 0 deletions kubejs/server_scripts/mod_specific/ftbic/cable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
onEvent('recipes', event => {
event.remove({id: 'ftbic:shapeless/lv_cable'})
event.remove({id: 'ftbic:shapeless/mv_cable'})
event.remove({id: 'ftbic:shapeless/hv_cable'})
event.remove({id: 'ftbic:shapeless/ev_cable'})

event.shapeless('ftbic:lv_cable', ['#forge:wires/copper', 'ftbic:rubber']).id(`ftbic:lv_cable`)
event.shapeless('ftbic:mv_cable', ['#forge:wires/aluminum', 'ftbic:rubber']).id(`ftbic:mv_cable`)
event.shapeless('ftbic:hv_cable', ['#forge:wires/gold', 'ftbic:rubber']).id(`ftbic:hv_cable`)
event.shapeless('ftbic:ev_cable', ['#forge:wires/enderium', 'ftbic:rubber']).id(`ftbic:ev_cable`)
})
8 changes: 8 additions & 0 deletions kubejs/server_scripts/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ onEvent('tags.items', e => {
e.add('forge:raw_ores/cobalt', 'tconstruct:raw_cobalt');
e.add('forge:dusts/cobalt', 'kubejs:cobalt_dust');
e.add('forge:dusts/netherite', 'alltheores:netherite_dust');
e.add('forge:wires/aluminum', 'ftbic:aluminum_wire');
e.add('forge:wires/copper', 'ftbic:copper_wire');
e.add('immersiveengineering:circuits/solder', 'ftbic:copper_wire');
e.add('forge:wires/enderium', 'ftbic:enderium_wire');
e.add('forge:wires/gold', 'ftbic:gold_wire');
e.add('forge:dusts/ender_pearl', [ 'ftbic:ender_dust','potionsmaster:ender_powder']);

e.add('forge:raw_ores/iridium', 'ftbic:iridium_chunk');
e.remove('forge:silicon', 'ftbic:silicon')
Expand All @@ -47,6 +53,8 @@ onEvent('tags.items', e => {
'elementalcraft:receptacle_improved', 'elementalcraft:receptacle_improved_empty'
])

e.add('forge:cheese',['croptopia:cheese','thermal:cheese_wedge']);

// fix raw block crafting for other mods
e.add('forge:raw_ores/zinc', 'create:raw_zinc')
mekanismMetals.forEach(metal => e.add(`forge:raw_ores/${metal}`, `mekanism:raw_${metal}`))
Expand Down

0 comments on commit 66c49ce

Please sign in to comment.