Skip to content

Commit

Permalink
Merge pull request #1544 from Satherov/main
Browse files Browse the repository at this point in the history 
Some fixes
  • Loading branch information
@Satherov
Satherov authored Dec 26, 2024
2 parents d79a8a7 + 73a6732 commit 0fdba35
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 58 deletions.
60 changes: 11 additions & 49 deletions kubejs/server_scripts/mods/Mekanism/ore_processing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,6 @@

ServerEvents.recipes(allthemods => {

const overwrite = [
'tin',
'lead',
'uranium',
'osmium',
]

overwrite.forEach(material => {
allthemods.remove({id: `mekanism:processing/${material}/slurry/dirty/from_raw_block`})
allthemods.remove({id: `mekanism:processing/${material}/slurry/dirty/from_raw_ore`})
allthemods.remove({id: `mekanism:processing/${material}/slurry/dirty/from_ore`})
allthemods.remove({id: `mekanism:processing/${material}/crystal/from_slurry`})
allthemods.remove({id: `mekanism:processing/${material}/shard/from_crystal`})
allthemods.remove({id: `mekanism:processing/${material}/dirty_dust/from_clump`})
allthemods.remove({id: `mekanism:processing/${material}/dust/from_dirty_dust`})
})

const id = {
alltheores: [
'aluminum',
Expand All @@ -33,35 +16,35 @@ ServerEvents.recipes(allthemods => {
'lead',
'uranium',
'osmium',
'copper',
'iron',
'gold'
],
allthemodium: [
'allthemodium',
'vibranium',
'unobtainium'
],
mekanism: [
'iron',
'gold',
'copper'
]
};

Object.entries(id).forEach(([mod, materials]) => {
materials.forEach(material => {

if (mod === 'mekanism') {
washing(`mekanism:dirty_${material}`, `mekanism:clean_${material}`, `mekanism:processing/${material}/slurry/clean`);
injecting(`c:crystals/${material}`, `mekanism:shard_${material}`, `mekanism:processing/${material}/shard/from_crystal`);
crushing(`c:clumps/${material}`, `mekanism:dirty_dust_${material}`, `mekanism:processing/${material}/dirty_dust/from_clump`);
enriching(`c:dirty_dusts/${material}`, `alltheores:${material}_dust`, `mekanism:processing/${material}/dust/from_dirty_dust`);
}
if (mod === 'allthemodium') {
washing(`allthemodium:dirty_${material}`, `allthemodium:clean_${material}`, `allthemodium:processing/${material}/slurry/clean`);
injecting(`c:crystals/${material}`, `allthemodium:${material}_shard`, `allthemodium:processing/${material}/shard/from_crystal`);
crushing(`c:clumps/${material}`, `allthemodium:dirty_${material}_dust`, `allthemodium:processing/${material}/dirty_dust/from_clump`);
enriching(`c:dirty_dusts/${material}`, `allthemodium:${material}_dust`, `allthemodium:processing/${material}/dust/from_dirty_dust`);
}
if (mod === 'alltheores') {
allthemods.remove({id: `mekanism:processing/${material}/slurry/dirty/from_raw_block`})
allthemods.remove({id: `mekanism:processing/${material}/slurry/dirty/from_raw_ore`})
allthemods.remove({id: `mekanism:processing/${material}/slurry/dirty/from_ore`})
allthemods.remove({id: `mekanism:processing/${material}/crystal/from_slurry`})
allthemods.remove({id: `mekanism:processing/${material}/shard/from_crystal`})
allthemods.remove({id: `mekanism:processing/${material}/dirty_dust/from_clump`})
allthemods.remove({id: `mekanism:processing/${material}/dust/from_dirty_dust`})

washing(`alltheores:dirty_${material}`, `alltheores:clean_${material}`, `alltheores:processing/${material}/slurry/from_dirty`);
injecting(`c:crystals/${material}`, `alltheores:${material}_shard`, `alltheores:processing/${material}/shard/from_crystal`);
crushing(`c:clumps/${material}`, `alltheores:dirty_${material}_dust`, `alltheores:processing/${material}/dirty_dust/from_clumpy`);
Expand All @@ -70,27 +53,6 @@ ServerEvents.recipes(allthemods => {
});
});

function dissolution(input, output, amount, id) {
allthemods.custom(
{
"type": "mekanism:dissolution",
"chemical_input": {
"amount": 1,
"chemical": "mekanism:sulfuric_acid"
},
"item_input": {
"count": 1,
"tag": input
},
"output": {
"amount": amount,
"id": output
},
"per_tick_usage": true
}
).id(id)
}

function washing(input, output, id) {
allthemods.custom(
{
Expand Down
6 changes: 3 additions & 3 deletions kubejs/server_scripts/mods/modular_machinery/recipes/mekanism/chemical_crystallizer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ ServerEvents.recipes(allthemods => {
'alltheores:clean_uranium' : [crystalAmount, 'alltheores:uranium_crystal'],
'alltheores:clean_zinc' : [crystalAmount, 'alltheores:zinc_crystal'],
'alltheores:clean_iridium' : [crystalAmount, 'alltheores:iridium_crystal'],
'alltheores:clean_copper' : [crystalAmount, 'alltheores:copper_crystal'],
'alltheores:clean_iron' : [crystalAmount, 'alltheores:iron_crystal'],
'alltheores:clean_gold' : [crystalAmount, 'alltheores:gold_crystal'],
'allthemodium:clean_allthemodium' : [crystalAmount, 'allthemodium:allthemodium_crystal'],
'allthemodium:clean_vibranium' : [crystalAmount, 'allthemodium:vibranium_crystal'],
'allthemodium:clean_unobtainium' : [crystalAmount, 'allthemodium:unobtainium_crystal'],
'mekanism:clean_copper' : [crystalAmount, 'mekanism:crystal_copper'],
'mekanism:clean_iron' : [crystalAmount, 'mekanism:crystal_iron'],
'mekanism:clean_gold' : [crystalAmount, 'mekanism:crystal_gold'],
'kubejs:clean_crimson_iron' : [crystalAmount, 'kubejs:crimson_iron_crystal'],
'kubejs:clean_azure_silver' : [crystalAmount, 'kubejs:azure_silver_crystal'],
'mekanism:lithium' : [100, 'mekanism:dust_lithium'],
Expand Down
6 changes: 3 additions & 3 deletions ...js/server_scripts/mods/modular_machinery/recipes/mekanism/chemical_dissolution_chamber.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ ServerEvents.recipes(allthemods => {
'uranium' : 'alltheores:dirty_uranium',
'zinc' : 'alltheores:dirty_zinc',
'iridium' : 'alltheores:dirty_iridium',
'copper' : 'alltheores:dirty_copper',
'iron' : 'alltheores:dirty_iron',
'gold' : 'alltheores:dirty_gold',
'allthemodium' : 'allthemodium:dirty_allthemodium',
'vibranium' : 'allthemodium:dirty_vibranium',
'unobtainium' : 'allthemodium:dirty_unobtainium',
'copper' : 'mekanism:dirty_copper',
'iron' : 'mekanism:dirty_iron',
'gold' : 'mekanism:dirty_gold',
'crimson_iron' : 'kubejs:dirty_crimson_iron',
'azure_silver' : 'kubejs:dirty_azure_silver',
}
Expand Down
6 changes: 3 additions & 3 deletions kubejs/server_scripts/mods/modular_machinery/recipes/mekanism/chemical_washer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ ServerEvents.recipes(allthemods => {
'alltheores:dirty_uranium' : 'alltheores:clean_uranium',
'alltheores:dirty_zinc' : 'alltheores:clean_zinc',
'alltheores:dirty_iridium' : 'alltheores:clean_iridium',
'alltheores:dirty_copper' : 'alltheores:clean_copper',
'alltheores:dirty_iron' : 'alltheores:clean_iron',
'alltheores:dirty_gold' : 'alltheores:clean_gold',
'allthemodium:dirty_allthemodium' : 'allthemodium:clean_allthemodium',
'allthemodium:dirty_vibranium' : 'allthemodium:clean_vibranium',
'allthemodium:dirty_unobtainium' : 'allthemodium:clean_unobtainium',
'mekanism:dirty_copper' : 'mekanism:clean_copper',
'mekanism:dirty_iron' : 'mekanism:clean_iron',
'mekanism:dirty_gold' : 'mekanism:clean_gold',
'kubejs:dirty_crimson_iron' : 'kubejs:clean_crimson_iron',
'kubejs:dirty_azure_silver' : 'kubejs:clean_azure_silver',
}
Expand Down
54 changes: 54 additions & 0 deletions kubejs/startup_scripts/CustomAdditions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,60 @@ StartupEvents.modifyCreativeTab('ironfurnaces:ironfurnaces_tab', allthemods => {
StartupEvents.postInit((allthemods) => {
$BuiltInRegistries.BLOCK.addAlias("kubejs:blaze_block", "allthecompressed:blaze_rod_block")
$BuiltInRegistries.ITEM.addAlias("kubejs:blaze_block", "allthecompressed:blaze_rod_block")

const colors = [
'white',
'light_gray',
'gray',
'black',
'brown',
'red',
'orange',
'yellow',
'lime',
'green',
'cyan',
'light_blue',
'blue',
'purple',
'magenta',
'pink'
]

colors.forEach(color => {
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:bright_${color}`, `luminax:${color}_block`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:bright_${color}`, `luminax:${color}_block`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:wool_${color}`, `luminax:${color}_block`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:wool_${color}`, `luminax:${color}_block`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:bright_${color}_border`, `luminax:${color}_block`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:bright_${color}_border`, `luminax:${color}_block`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:wool_${color}_border`, `luminax:${color}_block`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:wool_${color}_border`, `luminax:${color}_block`)

$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:stair_${color}`, `luminax:${color}_stairs`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:stair_${color}`, `luminax:${color}_stairs`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:stair_${color}_bright`, `luminax:${color}_stairs`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:stair_${color}_bright`, `luminax:${color}_stairs`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:stair_${color}_wool`, `luminax:${color}_stairs`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:stair_${color}_wool`, `luminax:${color}_stairs`)

$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:slab_${color}`, `luminax:${color}_slab`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:slab_${color}`, `luminax:${color}_slab`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:slab_${color}_bright`, `luminax:${color}_slab`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:slab_${color}_bright`, `luminax:${color}_slab`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:slab_${color}_wool`, `luminax:${color}_slab`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:slab_${color}_wool`, `luminax:${color}_slab`)

$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:button_bright_${color}`, `luminax:${color}_button`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:button_bright_${color}`, `luminax:${color}_button`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:button_wool_${color}`, `luminax:${color}_button`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:button_wool_${color}`, `luminax:${color}_button`)

$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:pressure_plate_bright_${color}`, `luminax:${color}_pressure_plate`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:pressure_plate_bright_${color}`, `luminax:${color}_pressure_plate`)
$BuiltInRegistries.BLOCK.addAlias(`antiblocksrechiseled:pressure_plate_wool_${color}`, `luminax:${color}_pressure_plate`)
$BuiltInRegistries.ITEM.addAlias(`antiblocksrechiseled:pressure_plate_wool_${color}`, `luminax:${color}_pressure_plate`)
})
})


Expand Down

0 comments on commit 0fdba35

Please sign in to comment.