diff --git a/config/ftbquests/quests/chapters/queststfg.snbt b/config/ftbquests/quests/chapters/queststfg.snbt index 63a98ffa3..8ddb3dcc3 100644 --- a/config/ftbquests/quests/chapters/queststfg.snbt +++ b/config/ftbquests/quests/chapters/queststfg.snbt @@ -51,6 +51,11 @@ description: ["{quests.tfg.create_team.desc}"] icon: "minecraft:cake" id: "6D43C29AC049341D" + rewards: [{ + id: "703B1DE66D788924" + item: "gtceu:copper_credit" + type: "item" + }] subtitle: "{quests.tfg.create_team.subtitle}" tasks: [{ id: "124CFC2DE7647588" diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index a5ea52d7b..811a4df3a 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -51,8 +51,16 @@ "item.gtceu.iron_quadruple_cable": "4x Cast Iron Cable", "item.gtceu.iron_octal_cable": "8x Cast Iron Cable", "item.gtceu.iron_hex_cable": "16x Cast Iron Cable", - "item.gtceu.ice_bucket": "Ice Water Bucket", - "material.gtceu.ice": "Ice Water", + "item.gtceu.ice_bucket": "Ice Slush Bucket", + "item.gtceu.copper_credit": "§71 Credit", + "item.gtceu.cupronickel_credit": "§78 Credits", + "item.gtceu.silver_credit": "§764 Credits", + "item.gtceu.gold_credit": "§7512 Credits", + "item.gtceu.platinum_credit": "§74,096 Credits", + "item.gtceu.osmium_credit": "§732,768 Credits", + "item.gtceu.naquadah_credit": "§7262,144 Credits", + "item.gtceu.neutronium_credit": "§72,097,152 Credits", + "material.gtceu.ice": "Ice Slush", "material.gtceu.cooperite": "Cooperite", "material.gtceu.fayalite": "Fayalite", "material.gtceu.diopside": "Diopside", diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 1788039cb..d65f9ae49 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1085,6 +1085,42 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Credits + + event.remove({ id: 'gtceu:forming_press/credit_cupronickel' }) + + event.recipes.gtceu.forming_press('gtceu:copper_credit') + .itemInputs('#forge:ingots/copper') + .notConsumable('gtceu:credit_casting_mold') + .itemOutputs('8x gtceu:copper_credit') + .duration(50) + .EUt(2) + + event.recipes.tfc.anvil('8x gtceu:copper_credit', '#forge:ingots/copper', ['bend_last', 'punch_not_last', 'draw_not_last']) + .tier(1) + .id(`tfc:anvil/copper_credit`) + + event.recipes.tfc.heating('gtceu:copper_credit', GTMaterials.Copper.getProperty(TFGPropertyKey.TFC_PROPERTY).getMeltTemp()) + .resultFluid(Fluid.of(GTMaterials.Copper.getFluid(), 144 / 8)) + .id(`tfc:heating/copper_credit`) + + event.custom({ + type: 'vintageimprovements:curving', + ingredients: [{ tag: 'forge:ingots/copper' }], + itemAsHead: 'gtceu:credit_casting_mold', + results: [{ item: 'gtceu:copper_credit', count: 8 }], + processingTime: 50 + }).id(`tfg:vi/curving/copper_credit`) + + event.recipes.gtceu.extractor('gtceu:copper_credit') + .itemInputs('gtceu:copper_credit') + .outputFluids(Fluid.of(GTMaterials.Copper.getFluid(), 144 / 8)) + .category(GTRecipeCategories.EXTRACTOR_RECYCLING) + .duration(10) + .EUt(2) + + //#endregion + // TODO: Greate again... event.shapeless('gtceu:programmed_circuit', ['minecraft:stick', '#forge:tools/wrenches']) .id('tfg:shapeless/programmed_circuit_from_stick') diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 5ce01f049..4bcbd13a1 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -2,7 +2,7 @@ function registerGTCEuTFCMetalsRecipes(event) { - //#region LV hull + //#region LV hull event.replaceInput('gtceu:shaped/lv_machine_hull', '#forge:plates/wrought_iron', '#forge:plates/red_steel') diff --git a/kubejs/server_scripts/vintage_improvements/tags.js b/kubejs/server_scripts/vintage_improvements/tags.js index dc872695d..5e18eb937 100644 --- a/kubejs/server_scripts/vintage_improvements/tags.js +++ b/kubejs/server_scripts/vintage_improvements/tags.js @@ -36,6 +36,7 @@ function registerVintageImprovementsItemTags(event) { event.add('vintageimprovements:curving_heads', 'gtceu:ingot_extruder_mold') event.add('vintageimprovements:curving_heads', 'gtceu:bottle_extruder_mold') event.add('vintageimprovements:curving_heads', 'gtceu:foil_extruder_mold') + event.add('vintageimprovements:curving_heads', 'gtceu:credit_casting_mold') }