Skip to content

Commit c53b594

Browse files
JeuvkeJeuvke
committed
Add/change RPP recipes
Change all existing RPP recipes and add recipes for the new palladium items.
1 parent 6c8e3c9 commit c53b594

5 files changed

Lines changed: 109 additions & 11 deletions

File tree

‎kubejs/server_scripts/greate/recipes.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -953,27 +953,27 @@ function registerGreateRecipes(event) {
953953

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

956-
event.shaped('gtceu:rhodium_plated_palladium_whisk', [
956+
event.shaped('gtceu:palladium_whisk', [
957957
'ABC',
958958
'D D',
959959
'D D'
960960
], {
961961
A: '#forge:tools/hammers',
962-
B: '#forge:rings/rhodium_plated_palladium',
962+
B: '#forge:rings/palladium',
963963
C: '#forge:tools/wrenches',
964-
D: '#forge:rods/long/rhodium_plated_palladium'
965-
}).id('gtceu:shaped/rhodium_plated_palladium_whisk')
964+
D: '#forge:rods/long/palladium'
965+
}).id('gtceu:shaped/palladium_whisk')
966966

967-
event.recipes.gtceu.extruder('gtceu:rhodium_plated_palladium_whisk')
968-
.itemInputs('4x #forge:ingots/rhodium_plated_palladium')
967+
event.recipes.gtceu.extruder('gtceu:palladium_whisk')
968+
.itemInputs('4x #forge:ingots/palladium')
969969
.notConsumable('tfg:whisk_extruder_mold')
970-
.itemOutputs('gtceu:rhodium_plated_palladium_whisk')
971-
.duration(GTMaterials.RhodiumPlatedPalladium.getMass() * 4)
970+
.itemOutputs('gtceu:palladium_whisk')
971+
.duration(GTMaterials.Palladium.getMass() * 4)
972972
.EUt(GTValues.VA[GTValues.MV])
973973
.removePreviousMaterialInfo()
974974
.addMaterialInfo(true)
975975

976-
event.remove({ id: 'gtceu:extractor/extract_rhodium_plated_palladium_whisk' })
976+
event.remove({ id: 'gtceu:extractor/extract_palladium_whisk' })
977977

978978
event.shaped('gtceu:naquadah_alloy_whisk', [
979979
'ABC',

‎kubejs/server_scripts/gregtech/recipes.materials.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,8 @@ function registerGTCEUMetalRecipes(event) {
11781178
|| material === $GreateMaterials.RefinedRadiance
11791179
|| material === $GreateMaterials.ShadowSteel
11801180
|| material === $GreateMaterials.ChromaticCompound
1181-
|| material === GTMaterials.DamascusSteel)
1181+
|| material === GTMaterials.DamascusSteel
1182+
|| material === GTMaterials.get("rhodium_plated_palladium"))
11821183
{ return; }
11831184

11841185
const toolProperty = material.getProperty(PropertyKey.TOOL)

‎kubejs/server_scripts/tfg/recipes.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ const registerTFGRecipes = (event) => {
6565
registerTFGTungstenRecipes(event)
6666
registerTFGAlloyingRecipes(event)
6767
registerTFGQuartzRecipes(event)
68+
registerTFGRPPRecipes(event)
6869

6970
registerTFGSpaceRecipes(event)
7071
registerTFGRailgunRecipes(event)

‎kubejs/server_scripts/tfg/rpp/recipes.rpp.js‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
// priority: 0
2+
"use strict";
3+
4+
/**
5+
*
6+
* @param {Internal.RecipesEventJS_} event
7+
*/
8+
function registerTFGRPPRecipes(event) {
9+
10+
//Change mixed rhodium palladium dust centrifuging so you don't lose items
11+
event.remove({id:'gtceu:centrifuge/decomposition_centrifuging__rhodium_plated_palladium'})
12+
event.recipes.gtceu.centrifuge('tfg:rpp/decomposition_centrifuging_rhodium_plated_palladium')
13+
.itemInputs('3x #forge:dusts/rhodium_plated_palladium')
14+
.itemOutputs('3x #forge:dusts/palladium', '1x #forge:dusts/rhodium')
15+
.duration(630)
16+
.EUt(GTValues.VA[GTValues.LV])
17+
18+
//Remove all the old recipes
19+
20+
event.remove({id: /.*extractor.*rhodium_plated_palladium.*/ })
21+
event.remove({id: /.*alloy_smelter.*rhodium_plated_palladium.*/ })
22+
event.remove({id: /.*vacuum_freezer.*rhodium_plated_palladium.*/ })
23+
event.remove({id: /.*mixer.*rhodium_plated_palladium/ })
24+
//EBF + ABS
25+
event.remove({id: /.*blast.*rhodium_plated_palladium.*/ })
26+
event.remove({id: /.*fluid_solidifier.*rhodium_plated_palladium.*/ })
27+
event.remove({id: /.*extruder.*rhodium_plated_palladium.*/ })
28+
//Crafting table recipes, excluding the buzzsaw tool and turbine blade
29+
event.remove({not: {id: /(.*rhodium_plated_palladium_buzzsaw.*)|(.*turbine_blade_rhodium_plated_palladium.*)/ } , id: /.*shaped.*rhodium_plated_palladium.*/ })
30+
event.remove({id: /.*lathe.*rhodium_plated_palladium.*/ })
31+
event.remove({id: /.*compressor.*rhodium_plated_palladium.*/ })
32+
event.remove({id: /.*bender.*rhodium_plated_palladium.*/ })
33+
event.remove({id: /.*forge_hammer.*rhodium_plated_palladium.*/ })
34+
event.remove({id: /.*cutter.*rhodium_plated_palladium.*/ })
35+
36+
//And add new ones
37+
38+
//rhodium solution
39+
event.recipes.gtceu.mixer('tfg:rpp/rhodium_solution')
40+
.itemInputs(Ingredient.of('#forge:dusts/rhodium'))
41+
.inputFluids(Fluid.of('gtceu:sulfuric_acid', 3000))
42+
.outputFluids(Fluid.of('tfg:rhodium_solution', 3000))
43+
.duration(9*20)
44+
.EUt(GTValues.VA[GTValues.HV])
45+
46+
event.recipes.gtceu.mixer('tfg:rpp/rhodium_solution_small')
47+
.itemInputs(Ingredient.of('#forge:small_dusts/rhodium'))
48+
.inputFluids(Fluid.of('gtceu:sulfuric_acid', 750))
49+
.outputFluids(Fluid.of('tfg:rhodium_solution', 750))
50+
.duration((9*20)/4)
51+
.EUt(GTValues.VA[GTValues.HV])
52+
53+
event.recipes.gtceu.centrifuge('tfg:rpp/decomposition_centrifuging_rhodium_solution')
54+
.inputFluids(Fluid.of('tfg:rhodium_solution', 750))
55+
.itemOutputs(Ingredient.of('#forge:small_dusts/rhodium'))
56+
.outputFluids(Fluid.of('gtceu:sulfuric_acid', 750))
57+
.duration(200)
58+
.EUt(GTValues.VA[GTValues.LV])
59+
60+
//electroplating
61+
const item_types = [
62+
{ input: '#forge:ingots/palladium', fluidQuantity: 1000 , output: 'ingot' , outputPrefix: ''},
63+
{ input: '#forge:plates/palladium', fluidQuantity: 1000 , output: 'plate' , outputPrefix: ''},
64+
{ input: '#forge:rods/palladium', fluidQuantity: 500 , output: 'rod' , outputPrefix: ''},
65+
{ input: '#forge:rings/palladium', fluidQuantity: 250 , output: 'ring' , outputPrefix: ''},
66+
{ input: '#forge:small_gears/palladium', fluidQuantity: 1000 , output: 'gear' , outputPrefix: 'small_'},
67+
{ input: '#forge:rods/long/palladium', fluidQuantity: 1000 , output: 'rod' , outputPrefix: 'long_'},
68+
{ input: '#forge:double_plates/palladium', fluidQuantity: 2000 , output: 'plate' , outputPrefix: 'double_'},
69+
{ input: '#forge:rotors/palladium', fluidQuantity: 4000 , output: 'rotor' , outputPrefix: ''},
70+
{ input: '#forge:whisks/palladium', fluidQuantity: 4000 , output: 'whisk' , outputPrefix: ''},
71+
{ input: '#forge:bolts/palladium', fluidQuantity: 125 , output: 'bolt' , outputPrefix: ''},
72+
{ input: '#forge:screws/palladium', fluidQuantity: 125 , output: 'screw' , outputPrefix: ''},
73+
{ input: '#forge:buzz_saw_heads/palladium', fluidQuantity: 2000 , output: 'buzz_saw_blade' , outputPrefix: ''},
74+
{ input: '#forge:dense_plates/palladium', fluidQuantity: 9000 , output: 'plate' , outputPrefix: 'dense_'}
75+
];
76+
item_types.forEach((item) => {
77+
event.recipes.gtceu.electrolyzer(`tfg:rpp/rpp_${item.outputPrefix}${item.output}`)
78+
.itemInputs(Ingredient.of(item.input))
79+
.inputFluids(Fluid.of('tfg:rhodium_solution', item.fluidQuantity))
80+
.itemOutputs(`gtceu:${item.outputPrefix}rhodium_plated_palladium_${item.output}`)
81+
.outputFluids(Fluid.of('gtceu:diluted_sulfuric_acid', item.fluidQuantity))
82+
.duration(item.fluidQuantity*1)
83+
.EUt(GTValues.VA[GTValues.IV])
84+
});
85+
86+
//correct recycling counts
87+
TFGHelpers.registerMaterialInfo('gtceu:rhodium_plated_palladium_whisk', { 'rhodium_plated_palladium': 4 });
88+
TFGHelpers.registerMaterialInfo('gtceu:rhodium_plated_palladium_buzz_saw_blade', { 'rhodium_plated_palladium': 2 });
89+
90+
//remove greate recycling until registerMaterialInfo + greate recycling works on first load
91+
//TODO: remove this once greate recycling works properly
92+
event.remove({id:/.*greate.*integration.*palladium_whisk/})
93+
event.remove({id:/.*greate.*integration.*rhodium_plated_palladium_buzz_saw_blade/})
94+
95+
}

‎kubejs/server_scripts/vintage_improvements/recipes.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ function registerVintageImprovementsRecipes(event) {
260260

261261
const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials")
262262
forEachMaterial(material => {
263-
if (material == $GreateMaterials.AndesiteAlloy)
263+
if (material == $GreateMaterials.AndesiteAlloy
264+
|| material === GTMaterials.get("rhodium_plated_palladium"))
264265
return;
265266

266267
const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1);

0 commit comments

Comments
 (0)