From 05b2d711652e433fdeb4d32cbd7febf84f711664 Mon Sep 17 00:00:00 2001 From: tracer4b <61507029+tracer4b@users.noreply.github.com> Date: Sat, 9 Apr 2022 20:43:34 +0800 Subject: [PATCH] hiding materials and trinium balance --- overrides/scripts/Endgame.zs | 9 + overrides/scripts/common.zs | 287 +++++++++++++++++++++++- overrides/scripts/multiblocks_expert.zs | 13 +- overrides/scripts/multiblocks_normal.zs | 5 +- overrides/scripts/normalmode.zs | 42 +++- 5 files changed, 346 insertions(+), 10 deletions(-) diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 0f8ed8d..592193d 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -256,6 +256,15 @@ alloy_blast_smelter.recipeBuilder() .EUt(7680) .buildAndRegister(); +// Trinium balance +// Trinium Sulfide Dust * 1 +.findRecipe(1920, null, [ * 2000]).remove(); +centrifuge.recipeBuilder() + .fluidInputs( * 2000) + .outputs( * 2, * 2) + .fluidOutputs( * 1000) + .duration(400).EUt(1920).buildAndRegister(); + // Stabilized Miners Tooltips .addTooltip(format.italic( format.white("A stabilized version, injected with a Heart of a Universe."))); diff --git a/overrides/scripts/common.zs b/overrides/scripts/common.zs index bbcaba4..7ea18b0 100644 --- a/overrides/scripts/common.zs +++ b/overrides/scripts/common.zs @@ -1,4 +1,5 @@ #priority 997 +import mods.gregtech.material.Material; import crafttweaker.item.IItemStack; import crafttweaker.item.IIngredient; import crafttweaker.item.IItemCondition; @@ -236,6 +237,289 @@ function makeExtremeRecipe9(output as IItemStack, textToIngredients(ingredients, output, recipe, replacements)); } +function removeMaterialSolid(materialId as int) { + val materialParts as string[] = [ + "meta_dust", + "meta_dust_small", + "meta_dust_tiny", + "meta_dust_impure", + "meta_dust_pure", + "meta_crushed", + "meta_crushed_purified", + "meta_crushed_centrifuged", + "meta_gem", + "meta_gem_flawless", + "meta_gem_exquisite", + "meta_ingot", + "meta_ingot_hot", + "meta_plate", + "meta_plate_double", + "meta_plate_dense", + "meta_foil", + "meta_stick", + "meta_stick_long", + "meta_bolt", + "meta_screw", + "meta_ring", + "meta_nugget", + "meta_spring", + "meta_spring_small", + "meta_gear", + "meta_gear_small", + "meta_wire_fine", + "meta_rotor", + "meta_lens", + "meta_turbine_blade", + "meta_tool_head_sword", + "meta_tool_head_pickaxe", + "meta_tool_head_shovel", + "meta_tool_head_axe", + "meta_tool_head_hoe", + "meta_tool_head_hammer", + "meta_tool_head_file", + "meta_tool_head_saw", + "meta_tool_head_drill", + "meta_tool_head_chainsaw", + "meta_tool_head_wrench", + "meta_tool_head_sense", + "meta_tool_head_buzz_saw", + "meta_tool_head_screwdriver" + ]; + val materialWireCableParts as string[] = [ + "wire_single", + "wire_double", + "wire_quadruple", + "wire_octal", + "wire_hex", + "cable_single", + "cable_double", + "cable_quadruple", + "cable_octal", + "cable_hex", + ]; + val materialFluidPipeParts as string[] = [ + "fluid_pipe_tiny", + "fluid_pipe_small", + "fluid_pipe_normal", + "fluid_pipe_large", + "fluid_pipe_huge", + "fluid_pipe_quadruple", + "fluid_pipe_nonuple", + ]; + val materialItemPipeParts as string[] = [ + "item_pipe_tiny", + "item_pipe_small", + "item_pipe_normal", + "item_pipe_large", + "item_pipe_huge", + "item_pipe_tiny_restrictive", + "item_pipe_small_restrictive", + "item_pipe_normal_restrictive", + "item_pipe_large_restrictive", + "item_pipe_huge_restrictive", + ]; + for materialPart in materialParts { + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:" + materialPart, materialId)); + } +// mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:meta_block_compressed_" + (materialId / 16), (materialId % 16))); +} + +function removeMaterialFluid(materialId as int, materialFluids as ILiquidStack[]) { + val materialParts as string[] = [ + "meta_dust", + "meta_dust_small", + "meta_dust_tiny", + "meta_dust_impure", + "meta_dust_pure", + "meta_crushed", + "meta_crushed_purified", + "meta_crushed_centrifuged", + "meta_gem", + "meta_gem_flawless", + "meta_gem_exquisite", + "meta_ingot", + "meta_ingot_hot", + "meta_plate", + "meta_plate_double", + "meta_plate_dense", + "meta_foil", + "meta_stick", + "meta_stick_long", + "meta_bolt", + "meta_screw", + "meta_ring", + "meta_nugget", + "meta_spring", + "meta_spring_small", + "meta_gear", + "meta_gear_small", + "meta_wire_fine", + "meta_rotor", + "meta_lens", + "meta_turbine_blade", + "meta_tool_head_sword", + "meta_tool_head_pickaxe", + "meta_tool_head_shovel", + "meta_tool_head_axe", + "meta_tool_head_hoe", + "meta_tool_head_hammer", + "meta_tool_head_file", + "meta_tool_head_saw", + "meta_tool_head_drill", + "meta_tool_head_chainsaw", + "meta_tool_head_wrench", + "meta_tool_head_sense", + "meta_tool_head_buzz_saw", + "meta_tool_head_screwdriver" + ]; + val materialWireCableParts as string[] = [ + "wire_single", + "wire_double", + "wire_quadruple", + "wire_octal", + "wire_hex", + "cable_single", + "cable_double", + "cable_quadruple", + "cable_octal", + "cable_hex", + ]; + val materialFluidPipeParts as string[] = [ + "fluid_pipe_tiny", + "fluid_pipe_small", + "fluid_pipe_normal", + "fluid_pipe_large", + "fluid_pipe_huge", + "fluid_pipe_quadruple", + "fluid_pipe_nonuple", + ]; + val materialItemPipeParts as string[] = [ + "item_pipe_tiny", + "item_pipe_small", + "item_pipe_normal", + "item_pipe_large", + "item_pipe_huge", + "item_pipe_tiny_restrictive", + "item_pipe_small_restrictive", + "item_pipe_normal_restrictive", + "item_pipe_large_restrictive", + "item_pipe_huge_restrictive", + ]; + for materialPart in materialParts { + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:" + materialPart, materialId)); + } +// mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:meta_block_compressed_" + (materialId / 16), (materialId % 16))); + for materialFluid in materialFluids { + mods.jei.JEI.hide(materialFluid); + } +} + +function removeMaterial(material as Material, materialId as int, materialFluids as ILiquidStack[]) { + val materialParts as string[] = [ + "meta_dust", + "meta_dust_small", + "meta_dust_tiny", + "meta_dust_impure", + "meta_dust_pure", + "meta_crushed", + "meta_crushed_purified", + "meta_crushed_centrifuged", + "meta_gem", + "meta_gem_flawless", + "meta_gem_exquisite", + "meta_ingot", + "meta_ingot_hot", + "meta_plate", + "meta_plate_double", + "meta_plate_dense", + "meta_foil", + "meta_stick", + "meta_stick_long", + "meta_bolt", + "meta_screw", + "meta_ring", + "meta_nugget", + "meta_spring", + "meta_spring_small", + "meta_gear", + "meta_gear_small", + "meta_wire_fine", + "meta_rotor", + "meta_lens", + "meta_turbine_blade", + "meta_tool_head_sword", + "meta_tool_head_pickaxe", + "meta_tool_head_shovel", + "meta_tool_head_axe", + "meta_tool_head_hoe", + "meta_tool_head_hammer", + "meta_tool_head_file", + "meta_tool_head_saw", + "meta_tool_head_drill", + "meta_tool_head_chainsaw", + "meta_tool_head_wrench", + "meta_tool_head_sense", + "meta_tool_head_buzz_saw", + "meta_tool_head_screwdriver" + ]; + val materialWireCableParts as string[] = [ + "wire_single", + "wire_double", + "wire_quadruple", + "wire_octal", + "wire_hex", + "cable_single", + "cable_double", + "cable_quadruple", + "cable_octal", + "cable_hex", + ]; + val materialFluidPipeParts as string[] = [ + "fluid_pipe_tiny", + "fluid_pipe_small", + "fluid_pipe_normal", + "fluid_pipe_large", + "fluid_pipe_huge", + "fluid_pipe_quadruple", + "fluid_pipe_nonuple", + ]; + val materialItemPipeParts as string[] = [ + "item_pipe_tiny", + "item_pipe_small", + "item_pipe_normal", + "item_pipe_large", + "item_pipe_huge", + "item_pipe_tiny_restrictive", + "item_pipe_small_restrictive", + "item_pipe_normal_restrictive", + "item_pipe_large_restrictive", + "item_pipe_huge_restrictive", + ]; + for materialPart in materialParts { + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:" + materialPart, materialId)); + } + if material.hasWires() { + for materialWireCablePart in materialWireCableParts { + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:" + materialWireCablePart, materialId)); + } + } + if material.hasFluidPipes() { + for materialFluidPipePart in materialFluidPipeParts { + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:" + materialFluidPipePart, materialId)); + } + } + if material.hasItemPipes() { + for materialItemPipePart in materialItemPipeParts { + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:" + materialItemPipePart, materialId)); + } + } + mods.jei.JEI.removeAndHide(itemUtils.getItem("gregtech:meta_block_compressed_" + (materialId / 16), (materialId % 16))); + for materialFluid in materialFluids { + mods.jei.JEI.hide(materialFluid); + mods.jei.JEI.removeAndHide(.withTag({FluidName: materialFluid.name, Amount: 1000})); + } +} + function absolute_int(n as int) as int { var MINUS_ONE = -1 as int; if (n < 0) { @@ -243,4 +527,5 @@ function absolute_int(n as int) as int { } else { return n; } -} \ No newline at end of file +} + diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index 70f0ead..2b5bcb6 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -794,13 +794,12 @@ microverse_projector_advanced.recipeMap .inputs(, * 16, * 32) - .outputs( * 48, + .outputs( * 64, * 64, * 64, * 64, * 64, - * 64) - + * 24) .buildAndRegister(); @@ -1300,8 +1299,12 @@ actualization_chamber.recipeMap .EUt(30720) .inputs() .circuit(2) - .outputs( * 24, - * 48) + .outputs( * 64, + * 64, + * 64, + * 64, + * 64, + * 24) .buildAndRegister(); diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs index c051db8..1c4d189 100644 --- a/overrides/scripts/multiblocks_normal.zs +++ b/overrides/scripts/multiblocks_normal.zs @@ -610,11 +610,10 @@ microverse_projector_advanced.recipeMap * 32) .outputs( * 64, * 64, - * 48, * 64, * 64, - * 64) - + * 64, + * 48) .buildAndRegister(); // t6 u/os/ir diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 438a9aa..c8f8066 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -19,6 +19,9 @@ import scripts.common.makeExtremeRecipe5 as makeExtremeRecipe5; import scripts.common.makeExtremeRecipe7 as makeExtremeRecipe7; import scripts.common.makeExtremeRecipe9 as makeExtremeRecipe9; import scripts.common.makeShapeless3 as makeShapeless3; +import scripts.common.removeMaterial as removeMaterial; +import scripts.common.removeMaterialSolid as removeMaterialSolid; +import scripts.common.removeMaterialFluid as removeMaterialFluid; //Nether Cake recipes.addShaped(, [[,,], [, , ],[,,]]); @@ -610,8 +613,45 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -// Stabilized Miners +// Materials +removeMaterialSolid(32032); +removeMaterialSolid(32033); +removeMaterialSolid(32034); +removeMaterialSolid(32035); +removeMaterialSolid(32036); +removeMaterialSolid(32037); +removeMaterialSolid(32038); +removeMaterialSolid(32039); +removeMaterialSolid(32040); +removeMaterialSolid(32041); +removeMaterialSolid(32042); +removeMaterialSolid(32043); +removeMaterialSolid(32044); +removeMaterialSolid(32045); +removeMaterialSolid(32049); +removeMaterialSolid(32051); +removeMaterialSolid(32052); +removeMaterialSolid(32055); +removeMaterialSolid(32057); +removeMaterialSolid(32058); +removeMaterialSolid(32059); +removeMaterialSolid(32060); +removeMaterialSolid(32061); +removeMaterialSolid(32066); +removeMaterialFluid(32046, []); +removeMaterialFluid(32047, []); +removeMaterialFluid(32048, []); +removeMaterialFluid(32050, []); +removeMaterialFluid(32053, []); +removeMaterialFluid(32054, []); +removeMaterialFluid(32056, []); +removeMaterialFluid(32062, []); +removeMaterialFluid(32063, []); +removeMaterialFluid(32064, []); +removeMaterialFluid(32065, []); + +// Stabilized Miners mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide();