From a23f8d6a2cf191da6f6597bf48882d3c01d7ea0c Mon Sep 17 00:00:00 2001 From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com> Date: Wed, 11 Jan 2023 11:59:42 +1100 Subject: [PATCH] Finally fix all ct errors Tested on both NM and HM. --- overrides/scripts/Endgame.zs | 8 ++-- overrides/scripts/common.zs | 48 ++---------------------- overrides/scripts/electronics.zs | 2 +- overrides/scripts/gregtech_recipemaps.zs | 38 ++++++++++++++++++- overrides/scripts/normalmode.zs | 4 +- 5 files changed, 47 insertions(+), 53 deletions(-) diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 5f5238f..297e566 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -195,7 +195,7 @@ makeShaped("of_processing_array", , B : }); //dataorb // Titanium Ingot * 26 -.findRecipe(30, [], [ * 381]).remove(); +.findRecipe(30, [], [ * 3102]).remove(); // Titanium Dust * 26 .findRecipe(8, [], null).remove(); @@ -280,15 +280,15 @@ recipes.removeByRecipeName("gregtech:gregtech.machine.world_accelerator.zpm"); recipes.removeByRecipeName("gregtech:gregtech.machine.world_accelerator.uv"); // Mercury Barium Calcium Cuprate Ingot * 32 -.findRecipe(30, [], [ * 357]).remove(); +.findRecipe(30, [], [ * 3896]).remove(); // Mercury Barium Calcium Cuprate Dust * 32 .findRecipe(32, [], null).remove(); // Uranium Triplatinum Ingot * 32 -.findRecipe(30, [], [ * 474]).remove(); +.findRecipe(30, [], [ * 9149]).remove(); // Uranium Triplatinum Dust * 32 .findRecipe(32, [], null).remove(); // Tungstensteel Ingot * 32 -.findRecipe(30, [], [ * 568]).remove(); +.findRecipe(30, [], [ * 7502]).remove(); // Tungstensteel Dust * 32 .findRecipe(32, [], null).remove(); diff --git a/overrides/scripts/common.zs b/overrides/scripts/common.zs index 7ea18b0..9c3bda6 100644 --- a/overrides/scripts/common.zs +++ b/overrides/scripts/common.zs @@ -269,21 +269,7 @@ function removeMaterialSolid(materialId as int) { "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" + "meta_turbine_blade" ]; val materialWireCableParts as string[] = [ "wire_single", @@ -356,21 +342,7 @@ function removeMaterialFluid(materialId as int, materialFluids as ILiquidStack[] "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" + "meta_turbine_blade" ]; val materialWireCableParts as string[] = [ "wire_single", @@ -446,21 +418,7 @@ function removeMaterial(material as Material, materialId as int, materialFluids "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" + "meta_turbine_blade" ]; val materialWireCableParts as string[] = [ "wire_single", diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index 3d67410..f1e459e 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -163,7 +163,7 @@ recipes.addShapeless( * 4,[,.findRecipe(30, [], [ * 99]).remove(); +.findRecipe(30, [], [ * 2160]).remove(); // Aluminium Dust * 21 .findRecipe(8, [], null).remove(); diff --git a/overrides/scripts/gregtech_recipemaps.zs b/overrides/scripts/gregtech_recipemaps.zs index 9bf65a3..0a77585 100644 --- a/overrides/scripts/gregtech_recipemaps.zs +++ b/overrides/scripts/gregtech_recipemaps.zs @@ -64,4 +64,40 @@ global thermal_centrifuge as RecipeMap = RecipeMap.getByName("thermal_ global thermal_sep as RecipeMap = RecipeMap.getByName("thermal_centrifuge"); global unpackager as RecipeMap = RecipeMap.getByName("unpacker"); global vacuum_freezer as RecipeMap = RecipeMap.getByName("vacuum_freezer"); -global wiremill as RecipeMap = RecipeMap.getByName("wiremill"); \ No newline at end of file +global wiremill as RecipeMap = RecipeMap.getByName("wiremill"); + + + +// Tools +// Not needed because of new GTCEu oredicts +//.addItems([ + //.withEmptyTag(), + //.withEmptyTag(), + //.withEmptyTag(), + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag(), + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag(), + //.withEmptyTag(), + //.withEmptyTag(), + //.withEmptyTag(), + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag()]); + +//.addItems([ + //.withEmptyTag()]); diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 2623675..175686d 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -644,12 +644,12 @@ recipes.addShaped(, [ ]); // Replace recycling recipes -.findRecipe(30, [], [ * 691]).remove(); +.findRecipe(30, [], [ * 1265]).remove(); .findRecipe(32, [], null).remove(); arc_furnace.recipeBuilder() .inputs([]) - .fluidInputs([ * 691]) + .fluidInputs([ * 1265]) .outputs([ * 4, * 2, * 6]) .duration(691) .EUt(30)