Skip to content
Open
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
18 changes: 9 additions & 9 deletions kubejs/server_scripts/greate/recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -952,27 +952,27 @@ function registerGreateRecipes(event) {

event.remove({ id: 'gtceu:extractor/extract_tungsten_steel_whisk' })

event.shaped('gtceu:rhodium_plated_palladium_whisk', [
event.shaped('gtceu:palladium_whisk', [
'ABC',
'D D',
'D D'
], {
A: '#forge:tools/hammers',
B: '#forge:rings/rhodium_plated_palladium',
B: '#forge:rings/palladium',
C: '#forge:tools/wrenches',
D: '#forge:rods/long/rhodium_plated_palladium'
}).id('greate:shaped/rhodium_plated_palladium_whisk')
D: '#forge:rods/long/palladium'
}).id('gtceu:shaped/palladium_whisk')

event.recipes.gtceu.extruder('greate:rhodium_plated_palladium_whisk')
.itemInputs('4x #forge:ingots/rhodium_plated_palladium')
event.recipes.gtceu.extruder('gtceu:palladium_whisk')
.itemInputs('4x #forge:ingots/palladium')
.notConsumable('tfg:whisk_extruder_mold')
.itemOutputs('gtceu:rhodium_plated_palladium_whisk')
.duration(GTMaterials.RhodiumPlatedPalladium.getMass() * 4)
.itemOutputs('gtceu:palladium_whisk')
.duration(GTMaterials.Palladium.getMass() * 4)
.EUt(GTValues.VA[GTValues.MV])
.removePreviousMaterialInfo()
.addMaterialInfo(true)

event.remove({ id: 'gtceu:extractor/extract_rhodium_plated_palladium_whisk' })
event.remove({ id: 'gtceu:extractor/extract_palladium_whisk' })

event.shaped('gtceu:naquadah_alloy_whisk', [
'ABC',
Expand Down
3 changes: 2 additions & 1 deletion kubejs/server_scripts/gregtech/recipes.materials.js
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,8 @@ function registerGTCEUMetalRecipes(event) {
|| material === $GreateMaterials.RefinedRadiance
|| material === $GreateMaterials.ShadowSteel
|| material === $GreateMaterials.ChromaticCompound
|| material === GTMaterials.DamascusSteel)
|| material === GTMaterials.DamascusSteel
|| material === GTMaterials.get("rhodium_plated_palladium"))
{ return; }

const toolProperty = material.getProperty(PropertyKey.TOOL)
Expand Down
1 change: 1 addition & 0 deletions kubejs/server_scripts/tfg/recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const registerTFGRecipes = (event) => {
registerTFGTungstenRecipes(event)
registerTFGAlloyingRecipes(event)
registerTFGQuartzRecipes(event)
registerTFGRPPRecipes(event)

registerTFGSpaceRecipes(event)
registerTFGRailgunRecipes(event)
Expand Down
95 changes: 95 additions & 0 deletions kubejs/server_scripts/tfg/rpp/recipes.rpp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
// priority: 0
"use strict";

/**
*
* @param {Internal.RecipesEventJS_} event
*/
function registerTFGRPPRecipes(event) {

//Change mixed rhodium palladium dust centrifuging so you don't lose items
event.remove({id:'gtceu:centrifuge/decomposition_centrifuging__rhodium_plated_palladium'})
event.recipes.gtceu.centrifuge('tfg:rpp/decomposition_centrifuging_rhodium_plated_palladium')
.itemInputs('3x #forge:dusts/rhodium_plated_palladium')
.itemOutputs('3x #forge:dusts/palladium', '1x #forge:dusts/rhodium')
.duration(630)
.EUt(GTValues.VA[GTValues.LV])

//Remove all the old recipes

event.remove({id: /.*extractor.*rhodium_plated_palladium.*/ })
event.remove({id: /.*alloy_smelter.*rhodium_plated_palladium.*/ })
event.remove({id: /.*vacuum_freezer.*rhodium_plated_palladium.*/ })
event.remove({id: /.*mixer.*rhodium_plated_palladium/ })
//EBF + ABS
event.remove({id: /.*blast.*rhodium_plated_palladium.*/ })
event.remove({id: /.*fluid_solidifier.*rhodium_plated_palladium.*/ })
event.remove({id: /.*extruder.*rhodium_plated_palladium.*/ })
//Crafting table recipes, excluding the buzzsaw tool and turbine blade
event.remove({not: {id: /(.*rhodium_plated_palladium_buzzsaw.*)|(.*turbine_blade_rhodium_plated_palladium.*)/ } , id: /.*shaped.*rhodium_plated_palladium.*/ })
event.remove({id: /.*lathe.*rhodium_plated_palladium.*/ })
event.remove({id: /.*compressor.*rhodium_plated_palladium.*/ })
event.remove({id: /.*bender.*rhodium_plated_palladium.*/ })
event.remove({id: /.*forge_hammer.*rhodium_plated_palladium.*/ })
event.remove({id: /.*cutter.*rhodium_plated_palladium.*/ })

//And add new ones

//rhodium solution
event.recipes.gtceu.mixer('tfg:rpp/rhodium_solution')
.itemInputs(Ingredient.of('#forge:dusts/rhodium'))
.inputFluids(Fluid.of('gtceu:sulfuric_acid', 3000))
.outputFluids(Fluid.of('tfg:rhodium_solution', 3000))
.duration(9*20)
.EUt(GTValues.VA[GTValues.HV])

event.recipes.gtceu.mixer('tfg:rpp/rhodium_solution_small')
.itemInputs(Ingredient.of('#forge:small_dusts/rhodium'))
.inputFluids(Fluid.of('gtceu:sulfuric_acid', 750))
.outputFluids(Fluid.of('tfg:rhodium_solution', 750))
.duration((9*20)/4)
.EUt(GTValues.VA[GTValues.HV])

event.recipes.gtceu.centrifuge('tfg:rpp/decomposition_centrifuging_rhodium_solution')
.inputFluids(Fluid.of('tfg:rhodium_solution', 750))
.itemOutputs(Ingredient.of('#forge:small_dusts/rhodium'))
.outputFluids(Fluid.of('gtceu:sulfuric_acid', 750))
.duration(200)
.EUt(GTValues.VA[GTValues.LV])

//electroplating
const item_types = [
{ input: '#forge:ingots/palladium', fluidQuantity: 1000 , output: 'ingot' , outputPrefix: ''},
{ input: '#forge:plates/palladium', fluidQuantity: 1000 , output: 'plate' , outputPrefix: ''},
{ input: '#forge:rods/palladium', fluidQuantity: 500 , output: 'rod' , outputPrefix: ''},
{ input: '#forge:rings/palladium', fluidQuantity: 250 , output: 'ring' , outputPrefix: ''},
{ input: '#forge:small_gears/palladium', fluidQuantity: 1000 , output: 'gear' , outputPrefix: 'small_'},
{ input: '#forge:rods/long/palladium', fluidQuantity: 1000 , output: 'rod' , outputPrefix: 'long_'},
{ input: '#forge:double_plates/palladium', fluidQuantity: 2000 , output: 'plate' , outputPrefix: 'double_'},
{ input: '#forge:rotors/palladium', fluidQuantity: 4000 , output: 'rotor' , outputPrefix: ''},
{ input: '#forge:whisks/palladium', fluidQuantity: 4000 , output: 'whisk' , outputPrefix: ''},
{ input: '#forge:bolts/palladium', fluidQuantity: 125 , output: 'bolt' , outputPrefix: ''},
{ input: '#forge:screws/palladium', fluidQuantity: 125 , output: 'screw' , outputPrefix: ''},
{ input: '#forge:buzz_saw_heads/palladium', fluidQuantity: 2000 , output: 'buzz_saw_blade' , outputPrefix: ''},
{ input: '#forge:dense_plates/palladium', fluidQuantity: 9000 , output: 'plate' , outputPrefix: 'dense_'}
];
item_types.forEach((item) => {
event.recipes.gtceu.electrolyzer(`tfg:rpp/rpp_${item.outputPrefix}${item.output}`)
.itemInputs(Ingredient.of(item.input))
.inputFluids(Fluid.of('tfg:rhodium_solution', item.fluidQuantity))
.itemOutputs(`gtceu:${item.outputPrefix}rhodium_plated_palladium_${item.output}`)
.outputFluids(Fluid.of('gtceu:diluted_sulfuric_acid', item.fluidQuantity))
.duration(item.fluidQuantity*1)
.EUt(GTValues.VA[GTValues.IV])
});

//correct recycling counts
TFGHelpers.registerMaterialInfo('gtceu:rhodium_plated_palladium_whisk', { 'rhodium_plated_palladium': 4 });
TFGHelpers.registerMaterialInfo('gtceu:rhodium_plated_palladium_buzz_saw_blade', { 'rhodium_plated_palladium': 2 });

//remove greate recycling until registerMaterialInfo + greate recycling works on first load
//TODO: remove this once greate recycling works properly
event.remove({id:/.*greate.*integration.*palladium_whisk/})
event.remove({id:/.*greate.*integration.*rhodium_plated_palladium_buzz_saw_blade/})

}
3 changes: 2 additions & 1 deletion kubejs/server_scripts/vintage_improvements/recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ function registerVintageImprovementsRecipes(event) {

const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials")
forEachMaterial(material => {
if (material == $GreateMaterials.AndesiteAlloy)
if (material == $GreateMaterials.AndesiteAlloy
|| material === GTMaterials.get("rhodium_plated_palladium"))
return;

const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1);
Expand Down
5 changes: 5 additions & 0 deletions kubejs/startup_scripts/gtceu/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([
"gtceu:damascus_steel_shovel_head",
"gtceu:damascus_steel_scythe_head",

"gtceu:palladium_buzzsaw",
"gtceu:molten_rhodium_plated_palladium_bucket",
"gtceu:rhodium_plated_palladium_bucket",
"gtceu:hot_rhodium_plated_palladium_ingot",

"gtceu:molten_black_bronze_bucket",
"gtceu:molten_bismuth_bronze_bucket",

Expand Down
4 changes: 4 additions & 0 deletions kubejs/startup_scripts/gtceu/material_modification.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Silicon.addFlags(GENERATE_DENSE);
GTMaterials.RTMAlloy.addFlags(GENERATE_DENSE, GENERATE_SPRING);
GTMaterials.Lead.addFlags(GENERATE_DENSE);

GTMaterials.Palladium.addFlags(GENERATE_LONG_ROD, GENERATE_DENSE, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_ROTOR, GENERATE_BOLT_SCREW, GreateMaterialFlags.GENERATE_WHISK);
//No way to generate just a blade
GTMaterials.Palladium.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 1.0, 20, 2, [GTToolType.BUZZSAW]).build());

GTMaterials.Quartzite.addFlags(GENERATE_ROD);

Expand Down
1 change: 1 addition & 0 deletions kubejs/startup_scripts/tfg/materials.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const registerTFGMaterials = (event) => {
registerTFGBiolineMaterials(event);
registerTFGPrimitiveMaterials(event);
registerTFGRockMaterials(event);
registerTFGRPPMaterials(event);

registerTFGRocketMaterials(event);
registerTFGMoonMaterials(event);
Expand Down
14 changes: 14 additions & 0 deletions kubejs/startup_scripts/tfg/rpp/materials.rpp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// priority: 0
"use strict";

const registerTFGRPPMaterials = (event) => {

// #region RPP

event.create('tfg:rhodium_solution')
.liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID))
.color(0xbf693b)

// #endregion

}