From b70646b32d654713eddbf15904893217715b1875 Mon Sep 17 00:00:00 2001 From: quentin Date: Tue, 7 Jan 2025 23:59:45 -0600 Subject: [PATCH] Gregified new immersive vehicle recipes --- overrides/config/mtscraftingoverrides.json | 387 +++++++++++++++++- .../Mod-Specific/immersiveVehicles.groovy | 13 + 2 files changed, 378 insertions(+), 22 deletions(-) diff --git a/overrides/config/mtscraftingoverrides.json b/overrides/config/mtscraftingoverrides.json index 36bb5b1..5bc48fb 100644 --- a/overrides/config/mtscraftingoverrides.json +++ b/overrides/config/mtscraftingoverrides.json @@ -295,6 +295,21 @@ ] } }, + "bulletflare_red": { + "commonMaterialLists": [ + [ + "oredict:dustMagnesium:1", + "oredict:pipeTinyFluidAluminium:1", + "oredict:dustGunpowder:1", + "oredict:dyeRed:2" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "beacon_tower": { "commonMaterialLists": [ [ @@ -326,6 +341,14 @@ ] } }, + "glovebox_skyhawk": { + "commonMaterialLists": [], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "instrument_aircraft_attitude": { "commonMaterialLists": [ [ @@ -584,6 +607,21 @@ ] } }, + "gunflaregun": { + "commonMaterialLists": [ + [ + "oredict:pipeTinyFluidSteel:1", + "oredict:plateRubber:1", + "oredict:platePlastic:1", + "oredict:screwSteel:4" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "comanche": { "commonMaterialLists": [ [ @@ -876,6 +914,14 @@ ] } }, + "ocpbutter": { + "commonMaterialLists": [ + [ + "minecraft:milk_bucket:1", + "minecraft:clock:1" + ] + ] + }, "sign_speedlimit": { "commonMaterialLists": [ [ @@ -1044,36 +1090,161 @@ "extraMaterialLists": { "_birch": [ [ - "tags:birch_logs:4" + "minecraft:birch_slab:24", + "tags:birch_logs:2", + "minecraft:birch_planks:8" ] ], "_oak": [ [ - "tags:logs:4" + "tags:wooden_slabs:24", + "tags:logs:2", + "tags:planks:8" ] ], "_darkoak": [ [ - "tags:dark_oak_logs:4" + "minecraft:dark_oak_slab:24", + "tags:dark_oak_logs:2", + "minecraft:dark_oak_planks:8" ] ], "_jungle": [ [ - "tags:jungle_logs:4" + "minecraft:jungle_slab:24", + "tags:jungle_logs:2", + "minecraft:jungle_planks:8" ] ], "_spruce": [ [ - "tags:spruce_logs:4" + "minecraft:spruce_slab:24", + "tags:spruce_logs:2", + "minecraft:spruce_planks:8" ] ], "_acacia": [ [ - "tags:acacia_logs:4" + "minecraft:acacia_slab:24", + "tags:acacia_logs:2", + "minecraft:acacia_planks:8" ] ] } }, + "skyhawk": { + "commonMaterialLists": [ + [ + "oredict:plateAluminium:50", + "minecraft:lever:8", + "minecraft:stone_button:10", + "oredict:screwSteel:45", + "oredict:circuitMv:4", + "oredict:ringSteel:19", + "oredict:wireFineCopper:64", + "mts:mtsofficialpack.headlight:8", + "oredict:paneGlassColorless:7", + "gregtech:meta_item_1:128:10", + "oredict:plateRubber:10", + "oredict:platePlastic:15", + "oredict:batteryLv:1", + "oredict:screwAluminium:45", + "mts:mtsofficialpack.gunflaregun:1" + ] + ], + "extraMaterialLists": { + "_coffee": [ + [ + "tags:dyes/brown:4", + "tags:dyes/orange:2", + "tags:dyes/yellow:7" + ] + ], + "_blackorange": [ + [ + "tags:dyes/orange:2", + "tags:dyes/black:5" + ] + ], + "_blue": [ + [ + "tags:dyes/light_blue:2", + "tags:dyes/blue:4" + ] + ], + "_bluered": [], + "_green": [ + [ + "tags:dyes/blue:5", + "tags:dyes/red:3" + ] + ], + "_blackyellow": [ + [ + "tags:dyes/yellow:4", + "tags:dyes/black:2" + ] + ], + "_butter": [ + [ + "tags:dyes/yellow:4", + "tags:dyes/blue:7" + ] + ], + "_red": [ + [ + "tags:dyes/black:1", + "tags:dyes/red:5" + ] + ] + } + }, + "brigbeddump": { + "commonMaterialLists": [ + [ + "oredict:plateSteel:20", + "oredict:screwSteel:20" + ] + ], + "extraMaterialLists": { + "": [ + [] + ], + "_sand": [ + [] + ], + "_gold": [ + [] + ], + "_copper": [ + [] + ], + "_podzol": [ + [] + ], + "_iron": [ + [] + ], + "_moss": [ + [] + ], + "_cobble": [ + [] + ], + "_hay": [ + [] + ], + "_nether": [ + [] + ], + "_coal": [ + [] + ], + "_dirt": [ + [] + ] + } + }, "brigbedflat": { "commonMaterialLists": [ [ @@ -1266,6 +1437,14 @@ ] } }, + "dump_storage": { + "commonMaterialLists": [], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "sign_turn_left": { "commonMaterialLists": [ [ @@ -1279,6 +1458,16 @@ ] } }, + "snail_sculpture": { + "commonMaterialLists": [ + [] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "instrument_aircraft_electric": { "commonMaterialLists": [ [ @@ -1410,6 +1599,21 @@ ] } }, + "bulletflare_yellow": { + "commonMaterialLists": [ + [ + "oredict:dustMagnesium:1", + "oredict:pipeTinyFluidAluminium:1", + "oredict:dustGunpowder:1", + "oredict:dyeRed:2" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "ammocrate_shell37": { "commonMaterialLists": [ [ @@ -1429,6 +1633,11 @@ ] } }, + "spring": { + "commonMaterialLists": [ + [] + ] + }, "signalcontroller": { "commonMaterialLists": [ [ @@ -1584,6 +1793,11 @@ ] } }, + "repairkit": { + "commonMaterialLists": [ + [] + ] + }, "instrument_car_spedometer_blk": { "commonMaterialLists": [ [ @@ -1750,19 +1964,6 @@ ] } }, - "brigbeddump": { - "commonMaterialLists": [ - [ - "oredict:plateSteel:20", - "oredict:screwSteel:20" - ] - ], - "extraMaterialLists": { - "": [ - [] - ] - } - }, "scoutbedpickup": { "commonMaterialLists": [ [ @@ -1992,6 +2193,14 @@ ] } }, + "dump_dropper": { + "commonMaterialLists": [], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "telephonebooth": { "commonMaterialLists": [ [ @@ -2052,6 +2261,14 @@ ] } }, + "dump_hopper": { + "commonMaterialLists": [], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "spraycan_black": { "commonMaterialLists": [ [ @@ -2236,6 +2453,36 @@ ] ] }, + "bulletflare_white": { + "commonMaterialLists": [ + [ + "oredict:dustMagnesium:1", + "oredict:pipeTinyFluidAluminium:1", + "oredict:dustGunpowder:1", + "oredict:dyeWhite:2" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, + "bulletflare_green": { + "commonMaterialLists": [ + [ + "oredict:dustMagnesium:1", + "oredict:pipeTinyFluidAluminium:1", + "oredict:dustGunpowder:1", + "oredict:dyeGreen:2" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "instrument_car_clock": { "commonMaterialLists": [ [ @@ -2270,6 +2517,22 @@ ] } }, + "spraycan_glow": { + "commonMaterialLists": [ + [ + "oredict:platePlastic:1", + "oredict:pipeNormalFluidAluminium:1", + "tags:dyes/cyan:4", + "minecraft:glowstone_dust:8", + "minecraft:water_bucket:1" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "circuit": { "commonMaterialLists": [ [] @@ -2600,6 +2863,38 @@ [] ] }, + "paint_glow": { + "commonMaterialLists": [ + [] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, + "bomblet_bombrack": { + "commonMaterialLists": [ + [ + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, + "bomblet": { + "commonMaterialLists": [ + [ + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "pole_flashingsignal_red": { "commonMaterialLists": [ [ @@ -2846,9 +3141,22 @@ "sign_crosswalk": { "commonMaterialLists": [ [ - "oredict:plateAluminium:1", - "oredict:dyeBlue:1", - "oredict:dyeBlack:1" + "mts:mtsofficialpack.plating:1" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, + "bulletflare_rainbow": { + "commonMaterialLists": [ + [ + "oredict:dustMagnesium:1", + "oredict:pipeTinyFluidAluminium:1", + "oredict:dustGunpowder:1", + "minecraft:magmaCream:2" ] ], "extraMaterialLists": { @@ -2867,6 +3175,21 @@ ] } }, + "bulletflare_blue": { + "commonMaterialLists": [ + [ + "oredict:dustMagnesium:1", + "oredict:pipeTinyFluidAluminium:1", + "oredict:dustGunpowder:1", + "oredict:dyeBlue:2" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "wheellarge": { "commonMaterialLists": [ [ @@ -2895,6 +3218,14 @@ ] ] }, + "dump_placer": { + "commonMaterialLists": [], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "gunobserver": { "commonMaterialLists": [ [ @@ -2914,6 +3245,18 @@ ] } }, + "testingmodule1": { + "commonMaterialLists": [ + [ + "minecraft:barrier:1" + ] + ], + "extraMaterialLists": { + "": [ + [] + ] + } + }, "sign_priority": { "commonMaterialLists": [ [ diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/immersiveVehicles.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/immersiveVehicles.groovy index 409213c..bd0c852 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/immersiveVehicles.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/immersiveVehicles.groovy @@ -198,6 +198,8 @@ removeAndHideItemIgnoreNBT(item('mts:mtsofficialpack.processor')) removeAndHideItemIgnoreNBT(item('mts:mtsofficialpack.screws')) removeAndHideItemIgnoreNBT(item('mts:mtsofficialpack.smallarmscartridge')) removeAndHideItemIgnoreNBT(item('mts:mtsofficialpack.solidfuel')) +removeAndHideItemIgnoreNBT(item('mts:mtsofficialpack.explosives')) +removeAndHideItemIgnoreNBT(item('mts:mtsofficialpack.spring')) mods.jei.ingredient.hide(item('mts:mtsofficialpack.ft17_blue')) mods.jei.ingredient.hide(item('mts:mtsofficialpack.ft17_gray')) @@ -253,6 +255,8 @@ mods.jei.ingredient.hide(item('mts:mtsofficialpack.processor')) mods.jei.ingredient.hide(item('mts:mtsofficialpack.screws')) mods.jei.ingredient.hide(item('mts:mtsofficialpack.smallarmscartridge')) mods.jei.ingredient.hide(item('mts:mtsofficialpack.solidfuel')) +mods.jei.ingredient.hide(item('mts:mtsofficialpack.explosives')) +mods.jei.ingredient.hide(item('mts:mtsofficialpack.spring')) crafting.removeByOutput(item("mts:mtsofficialpack.blowtorch")) mods.gregtech.assembler.recipeBuilder() @@ -304,3 +308,12 @@ crafting.shapelessBuilder() .output(item("mts:mtsofficialpack.extinguisherfoam")) .input(item("mts:mtsofficialpack.watercannon_proj")) .replace().register() + + +crafting.removeByOutput(item("mts:mtsofficialpack.repairkit")) +mods.gregtech.assembler.recipeBuilder() + .inputs(item("mts:mtsofficialpack.blowtorch"), item("mts:mts.jumperpack"), item("mts:mts.wrench"), ore("wireFineCopper") * 64, item("gregtech:machine", 1627), ore("plateDoubleSteel") * 32, ore("ingotSolderingAlloy") * 16) + .outputs(item("mts:mtsofficialpack.repairkit")) + .circuitMeta(11) + .duration(400).EUt(VHA[MV]) + .buildAndRegister()