diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 7bd3630f5..36ed413c9 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -971,10 +971,7 @@ y: 9.0d } { - dependencies: [ - "16E3465CF94E2BDD" - "4024C831C77101CA" - ] + dependencies: ["4024C831C77101CA"] description: [ "The &aAdvanced Energy Detector&r is an RS-latch for Energy Control." "" diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 5e5c60c8f..8cbe27a96 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -42,8 +42,8 @@ type: "item" }] title: "Super Batteries" - x: -2.0d - y: -5.0d + x: -3.0d + y: -4.0d } { dependencies: ["52AD30F04DD5A812"] @@ -67,10 +67,7 @@ y: -4.0d } { - dependencies: [ - "4024C831C77101CA" - "16E3465CF94E2BDD" - ] + dependencies: ["52AD30F04DD5A812"] description: [ "The &3HV Chemical Bath&r is used to &ddye Lenses&r using &aChemical Dye&r. This will let you engrave more types of Wafers!" "" @@ -78,7 +75,8 @@ ] icon: "gtceu:hv_chemical_bath" id: "124B32A0583A636A" - size: 1.0d + shape: "octagon" + size: 1.5d subtitle: "Please don't bathe with electronics..." tasks: [{ id: "13B0B5168E4B06E3" @@ -86,8 +84,8 @@ type: "item" }] title: "High Voltage Bathing" - x: 3.0d - y: 2.0d + x: 2.0d + y: 0.0d } { dependencies: ["52AD30F04DD5A812"] @@ -123,7 +121,7 @@ ] title: "Advanced Maintenance" x: -2.0d - y: 0.0d + y: -3.0d } { dependencies: ["52AD30F04DD5A812"] @@ -233,8 +231,8 @@ } ] title: "I see the world in colour" - x: 4.0d - y: 3.5d + x: 2.0d + y: 1.5d } { dependencies: ["6975F16F5B50F17F"] @@ -248,8 +246,8 @@ type: "item" }] title: "Best ULV Circuits!" - x: 4.0d - y: 4.5d + x: 2.0d + y: 2.5d } { dependencies: [ @@ -380,7 +378,7 @@ }] title: "HV Superconductors" x: -6.5d - y: -9.0d + y: -10.0d } { dependencies: ["7E755297E9685374"] @@ -402,7 +400,7 @@ type: "item" }] title: "Nichrome Coils" - x: -6.5d + x: -5.5d y: -10.0d } { @@ -456,7 +454,7 @@ y: -7.5d } { - dependencies: ["6958029B5514D4EC"] + dependencies: ["124B32A0583A636A"] description: [ "&a4A&r of &bMV&r energy transmission may be appealing, but you probably don't need these at this point. The option is always there if you need it." "" @@ -472,8 +470,8 @@ type: "item" }] title: "MV Superconductors" - x: -6.5d - y: -7.5d + x: 3.5d + y: 0.0d } { dependencies: ["41D32C5178760F47"] @@ -496,17 +494,24 @@ y: 2.0d } { - dependencies: ["124B32A0583A636A"] - description: ["You now have everything you need to craft the &5Eye of Ender&r.\\nSimply extract &6Liquid Blaze&r from the &6Blaze Powder&r you previously crafted, and mix it with your &5Ender Pearl&r in a &6Chemical Bath&r.\\n\\nYou won’t need many for now — just one for your &6Rocket&r and another for your &6HV Circuit Assembler&r.\\nBut be warned: from &5EV&r and beyond, the demand will rise quickly."] - icon: "minecraft:ender_eye" + dependencies: [ + "4024C831C77101CA" + "05ABC370D7153350" + ] + description: [ + "TODO REPLACE ME WITH ID" + "You won’t need many for now — just one for your &6Rocket&r and another for your &6HV Circuit Assembler&r.\\nBut be warned: from &5EV&r and beyond, the demand will rise quickly." + ] + icon: "tfg:vitrified_pearl" id: "41D32C5178760F47" size: 1.0d + subtitle: "{quests.high_voltage.vitrified_pearl.subtitle}" tasks: [{ - id: "30A89DD2A22EE314" - item: "minecraft:ender_eye" + id: "4FBEF1C30CC89B7F" + item: "tfg:vitrified_pearl" type: "item" }] - title: "The Eye of the Gregtech" + title: "{quests.high_voltage.vitrified_pearl.title}" x: 6.0d y: 2.0d } @@ -774,24 +779,8 @@ } ] title: "TNT" - x: 3.0d - y: 3.5d - } - { - dependencies: ["390E59F05132FCB8"] - description: ["In order to get &6Blaze Powder&r, you must instead combine &7Carbon Dust&r and &eSulfur Dust&r in a &3HV Chemical Reactor&r."] - icon: "minecraft:blaze_powder" - id: "16E3465CF94E2BDD" - size: 1.0d - tasks: [{ - count: 12L - id: "00CC416ACB6CA99F" - item: "minecraft:blaze_powder" - type: "item" - }] - title: "Blaze Powder" - x: 1.5d - y: 2.0d + x: 4.5d + y: 3.0d } { dependencies: [ @@ -816,8 +805,8 @@ } ] title: "Ender Pearls" - x: 2.0d - y: 3.5d + x: 4.5d + y: 2.0d } { dependencies: ["3568BC9742092FC5"] @@ -867,8 +856,8 @@ type: "item" }] title: "Implosion Compressor" - x: 2.0d - y: 6.0d + x: 3.5d + y: 2.0d } { dependencies: [ @@ -1007,7 +996,7 @@ type: "item" }] title: "Universal Macerator" - x: 3.0d + x: -2.25d y: 0.0d } { @@ -1049,7 +1038,7 @@ item: "gtceu:hv_mixer" type: "item" }] - x: 3.0d + x: 3.5d y: -2.0d } { @@ -1190,9 +1179,9 @@ "56D337E264A4154F" "41D32C5178760F47" ] - description: ["The &6Rocket Nose Cone&r is the hardest part of your Rocket.\\nYou will need a hefty amount of &aPolyethylene&r — so we hope you already have it passively produced — and a &6HV&r Emitter.\\nYou should be able to get your hands on &dChromium&r by electrolyzing &cRuby Dust&r.\\n\\nThe &aEye of Ender&r is trickier and requires you to follow the quest unlocked by the &6HV Chemical Reactor&r.\\nGet ready to make &cTNT&r, build an &5Implosion Compressor&r, and recreate the famous Enderman drop — since you won’t find Ender Pearls natively in &2TFG&r."] + description: ["The &6Rocket Nose Cone&r is the hardest part of your Rocket.\\nYou will need a hefty amount of &aPolyethylene&r — so we hope you already have it passively produced — and a &6HV&r Emitter.\\nYou should be able to get your hands on &dChromium&r by electrolyzing &cRuby Dust&r.\\n\\nThe &aVitrified Ender Pearl&r is trickier and requires you to follow the quest unlocked by the &6HV Chemical Reactor&r.\\nGet ready to make &cTNT&r, build an &5Implosion Compressor&r, and recreate the famous Enderman drop — since you won’t find Ender Pearls natively in &2TFG&r."] id: "1E307CD76691C24F" - subtitle: "You really had to put an Eye of Ender..." + subtitle: "The nose knows..." tasks: [{ id: "05AEC4A2F295098C" item: "ad_astra:rocket_nose_cone" @@ -1397,26 +1386,8 @@ item: "gtceu:mv_bedrock_ore_miner" type: "item" }] - x: 0.0d - y: -13.0d - } - { - description: [ - "The HV Chapter will be updated with Moon Update. In the meantime be wary &lnot everything works&r with TFG." - "" - "From there on Space Progression will begin and it will alter your progression through TFG. Be wary for major changes." - ] - icon: "createdeco:decal_warning" - id: "66A1F17BB3453F0B" - size: 3.0d - tasks: [{ - id: "111DD6881AB718E1" - title: "Okay I understand it's not up to date" - type: "checkmark" - }] - title: "Quests are OLD and not updated for TFG" - x: 1.5d - y: -4.75d + x: 2.5d + y: -10.5d } ] subtitle: ["{quests.high_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/queststfg.snbt b/config/ftbquests/quests/chapters/queststfg.snbt index 9794993a0..9baa35e58 100644 --- a/config/ftbquests/quests/chapters/queststfg.snbt +++ b/config/ftbquests/quests/chapters/queststfg.snbt @@ -50,7 +50,16 @@ { dependencies: ["427814F6E9386772"] description: ["{quests.tfg.capture_territory.desc}"] - icon: "createaddition:chocolate_cake" + icon: { + Count: 1 + ForgeCaps: { + "tfc:food": { + creationDate: 14796000L + traits: [ ] + } + } + id: "createaddition:chocolate_cake" + } id: "0B42D4AE2AC67F93" subtitle: "{quests.tfg.capture_territory.subtitle}" tasks: [{ diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 782500dff..ed576afb3 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -294,6 +294,7 @@ "item.tfg.polycaprolactam_fabric": "Polycaprolactam Fabric", "item.tfg.polycaprolactam_string": "Polycaprolactam String", "item.tfg.space_suit_fabric": "Space Suit Fabric", + "item.tfg.vitrified_pearl": "Vitrified Ender Pearl", "item.tfg.fishing_net.wood": "Wood Fishing Net", "item.tfg.fishing_net.brass": "Brass Fishing Net", "item.tfg.fishing_net.rose_gold": "Rose Gold Fishing Net", @@ -446,6 +447,8 @@ "material.gtceu.thermochemically_treated_hardwood": "Thermochemically Treated Hardwood", "material.gtceu.hardwood": "Hardwood", "material.gtceu.asurine": "Asurine", + "material.tfg.kaolinite": "Kaolinite", + "material.tfg.vitrified_pearl": "Vitrified Ender", "material.tfg.compressed_nitrox": "Compressed Nitrox", "material.tfg.compressed_heliox": "Compressed Heliox", "material.tfg.compressed_heliox_3": "Compressed Heliox-3", diff --git a/kubejs/assets/tfg/textures/item/vitrified_pearl.png b/kubejs/assets/tfg/textures/item/vitrified_pearl.png new file mode 100644 index 000000000..aaacc7b85 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/vitrified_pearl.png differ diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index d142728b0..4768052ef 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -807,7 +807,7 @@ const registerMinecraftRecipes = (event) => { .EUt(420) event.recipes.gtceu.assembler('tfg:minecraft/elytra2') - .itemInputs('16x tfg:polycaprolactam_fabric', '16x #forge:foils/aluminium', '8x #forge:plates/ender_eye', '4x #forge:rings/aluminium', '2x #forge:rods/long/vanadium_steel', '2x #forge:small_springs/aluminium', '1x #forge:small_gears/aluminium') + .itemInputs('16x tfg:polycaprolactam_fabric', '16x #forge:foils/aluminium', '8x #forge:plates/ender_pearl', '4x #forge:rings/aluminium', '2x #forge:rods/long/vanadium_steel', '2x #forge:small_springs/aluminium', '1x #forge:small_gears/aluminium') .circuit(4) .itemOutputs(Item.of('minecraft:elytra', "{Damage:0}")) .duration(1600) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 4a19f1499..1b96a8fa6 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -131,9 +131,12 @@ const registerTFCRecipes = (event) => { event.smelting('tfc:powder/lime', 'tfc:powder/flux') .id('tfg:smelting/lime') - // Kaolinite Clay - event.smelting('tfc:powder/kaolinite', '2x tfc:kaolin_clay') - .id('tfg:smelting/kaolinite_clay') + // Kaolinite Clay - regular smelting recipes can't have multiple inputs + event.recipes.gtceu.alloy_smelter('tfg:kaolinite') + .itemInputs('5x tfc:kaolin_clay') + .itemOutputs('tfc:powder/kaolinite') + .duration(100) + .EUt(16) // Fire Clay event.recipes.gtceu.alloy_smelter('tfg:cheaper_fire_clay') diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index befe84cfe..4a7c721e8 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -610,4 +610,58 @@ function registerTFGMiscellaneousRecipes(event) { .inputs('tfg:sunflower_product', Fluid.of('minecraft:water', 100)) .outputFluid(Fluid.of('gtceu:seed_oil', 120)) .id('tfg:barrel/sunflower_to_oil') + + // Not-ender pearl stuff + + event.replaceInput({ mod: 'gtceu' }, 'minecraft:ender_eye', 'tfg:vitrified_pearl') + + event.recipes.gtceu.chemical_reactor('kaolinite') + .itemInputs('5x #tfg:aluminium_oxide', '2x #forge:dusts/silicon') + .inputFluids(Fluid.of('gtceu:distilled_water', 18000), Fluid.of('gtceu:chlorine', 8000)) + .itemOutputs('17x tfc:powder/kaolinite') + .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 16000)) + .duration(20 * 10) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.pyrolyse_oven('vitrified_ender_dust') + .itemInputs('#forge:dusts/ender_pearl', '2x tfc:powder/kaolinite', '4x #forge:insulation_t1') + .inputFluids(Fluid.of('gtceu:nitrogen', 100)) + .itemOutputs('#forge:dusts/vitrified_pearl') + .chancedOutput('gtceu:ash_dust', 2500, 0) + .duration(20 * 10) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.implosion_compressor('vitrified_ender_pearl_dynamite') + .itemInputs('4x #forge:dusts/vitrified_pearl', '2x gtceu:dynamite') + .itemOutputs('3x tfg:vitrified_pearl') + .chancedOutput('#forge:dusts/dark_ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.implosion_compressor('vitrified_ender_pearl_powderbarrel') + .itemInputs('4x #forge:dusts/vitrified_pearl', '8x gtceu:powderbarrel') + .itemOutputs('3x tfg:vitrified_pearl') + .chancedOutput('#forge:dusts/dark_ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.implosion_compressor('vitrified_ender_pearl_tnt') + .itemInputs('4x #forge:dusts/vitrified_pearl', '4x minecraft:tnt') + .itemOutputs('3x tfg:vitrified_pearl') + .chancedOutput('#forge:dusts/dark_ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.implosion_compressor('vitrified_ender_pearl_itnt') + .itemInputs('4x #forge:dusts/vitrified_pearl', 'gtceu:industrial_tnt') + .itemOutputs('3x tfg:vitrified_pearl') + .chancedOutput('#forge:dusts/dark_ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.macerator('vitrified_ender_pearl') + .itemInputs('tfg:vitrified_pearl') + .itemOutputs('#forge:dusts/vitrified_pearl') + .duration(40) + .EUt(GTValues.VA[GTValues.ULV]) } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index a4742242c..a7ae1574e 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -144,6 +144,11 @@ const registerTFGItemTags = (event) => { // Universal Circuits global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => { event.add(`gtceu:circuits/${tier}`, `tfg:${tier}_universal_circuit`); }) + // Crafting components + event.add('tfg:aluminium_oxide', '#forge:dusts/sapphire') + event.add('tfg:aluminium_oxide', '#forge:dusts/green_sapphire') + event.add('tfg:aluminium_oxide', '#forge:dusts/bauxite') + // Use either cast or wrought iron event.add('tfg:any_iron_double_ingot', '#forge:double_ingots/iron') event.add('tfg:any_iron_double_ingot', '#forge:double_ingots/wrought_iron') diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index d293dcd8d..40731d9a7 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -135,6 +135,13 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:small_skulk_dust', 'gtceu:skulk_dust', + // Ender eye + 'gtceu:ender_eye_plate', + 'gtceu:ender_eye_block', + 'gtceu:ender_eye_dust', + 'gtceu:small_ender_eye_dust', + 'gtceu:tiny_ender_eye_dust', + // Marble 'gtceu:marble', 'gtceu:marble_cobblestone', diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 25c98f1a9..943eb7056 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -143,7 +143,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.RoseGold.addFlags(GENERATE_DOUBLE_INGOTS); GTMaterials.Silver.addFlags(GENERATE_DOUBLE_INGOTS); GTMaterials.Tin.addFlags(GENERATE_DOUBLE_INGOTS); - GTMaterials.Zinc.addFlags(GENERATE_DOUBLE_INGOTS); + GTMaterials.Zinc.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_BOLT_SCREW); GTMaterials.SterlingSilver.addFlags(GENERATE_DOUBLE_INGOTS); // // /* Имеют инструменты, броню TFC, двойные слитки */ @@ -329,4 +329,7 @@ const registerGTCEuMaterialModification = (event) => { rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY()); rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz); rose_quartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) + + GTCEuAPI.materialManager.getMaterial('tfg:kaolinite').setFormula("Al2Si2O5(OH)4", true) + GTCEuAPI.materialManager.getMaterial('tfg:vitrified_pearl').setFormula("(Al2Si2O5(OH)4)(BeK4N5)", true) } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 49b114afb..0c1c6b7ac 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -660,6 +660,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:honeycomb', 'minecraft:grindstone', 'minecraft:fermented_spider_eye', + 'minecraft:ender_eye', // Кримзон незер дерево // TODO: Разблокировать после добавления ада diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 8d162060a..2aa0e40ed 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -47,8 +47,8 @@ const registerTFGItems = (event) => { // Unfinished Inscriber event.create('tfg:unfinished_inscriber_accumulation_press') - .translationKey('item.tfg.unfinished_inscriber_accumulation_press') - .texture('tfg:item/unfinished_inscriber_accumulation_press') + + event.create('tfg:vitrified_pearl') // #region Molds global.TFG_EXTRUDER_MOLDS.forEach(id => event.create(id)) diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index be4a1c23b..01200e8fb 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -31,6 +31,7 @@ const registerTFGMaterials = (event) => { .color(0xfbdf82) .secondaryColor(0xff9d2e) + // Cooking event.create('lactose') .dust() @@ -46,7 +47,7 @@ const registerTFGMaterials = (event) => { .components('6x aluminium', '2x stainless_steel', '1x red_steel') .color(0x333e47) .iconSet('metallic') - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_DENSE) + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE) .blastTemp(1760, 'low', 120, 1200) event.create('vitrified_asbestos') @@ -103,4 +104,19 @@ const registerTFGMaterials = (event) => { .gas() .components('2x carbon', '2x hydrogen', '4x fluorine') .color(0x46702e) + + // Crafting components + + event.create('tfg:kaolinite') + .dust() + .components('2x aluminium', '2x silicon', '9x oxygen', '4x hydrogen') + .color(0xEEB9AD) + .secondaryColor(0xF6A797) + + event.create('tfg:vitrified_pearl') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_CENTRIFUGING) + .components('2x aluminium', '2x silicon', '9x oxygen', '4x hydrogen', '1x ender_pearl') + .color(0xFFFFFF) + .secondaryColor(0x67FFE6) }