TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Finally fix all ct errors

Browse Source 
Tested on both NM and HM.
This commit is contained in:
IntegerLimit 2023-01-11 11:59:42 +11:00
parent f494434f9a
commit a23f8d6a2c
5 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
overrides/scripts/Endgame.zs
View File

@ -195,7 +195,7 @@ makeShaped("of_processing_array", <metaitem:processing_array>,
B : <metaitem:tool.dataorb>}); //dataorb
// Titanium Ingot * 26
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:processing_array>], [<liquid:oxygen> * 381]).remove();
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:processing_array>], [<liquid:oxygen> * 3102]).remove();
// Titanium Dust * 26
<recipemap:macerator>.findRecipe(8, [<metaitem:processing_array>], 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
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:world_accelerator.hv>], [<liquid:oxygen> * 357]).remove();
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:world_accelerator.hv>], [<liquid:oxygen> * 3896]).remove();
// Mercury Barium Calcium Cuprate Dust * 32
<recipemap:macerator>.findRecipe(32, [<metaitem:world_accelerator.hv>], null).remove();
// Uranium Triplatinum Ingot * 32
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:world_accelerator.ev>], [<liquid:oxygen> * 474]).remove();
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:world_accelerator.ev>], [<liquid:oxygen> * 9149]).remove();
// Uranium Triplatinum Dust * 32
<recipemap:macerator>.findRecipe(32, [<metaitem:world_accelerator.ev>], null).remove();
// Tungstensteel Ingot * 32
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:world_accelerator.iv>], [<liquid:oxygen> * 568]).remove();
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:world_accelerator.iv>], [<liquid:oxygen> * 7502]).remove();
// Tungstensteel Dust * 32
<recipemap:macerator>.findRecipe(32, [<metaitem:world_accelerator.iv>], null).remove();

48
overrides/scripts/common.zs
View File

@ -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",

2
overrides/scripts/electronics.zs
View File

@ -163,7 +163,7 @@ recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<ore:craftingToolMor
//Pyrolyse Oven
recipes.removeByRecipeName("gregtech:pyrolyse_oven");
// Aluminium Ingot * 21
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:pyrolyse_oven>], [<liquid:oxygen> * 99]).remove();
<recipemap:arc_furnace>.findRecipe(30, [<metaitem:pyrolyse_oven>], [<liquid:oxygen> * 2160]).remove();
// Aluminium Dust * 21
<recipemap:macerator>.findRecipe(8, [<metaitem:pyrolyse_oven>], null).remove();

38
overrides/scripts/gregtech_recipemaps.zs
View File

@ -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");
global wiremill as RecipeMap = RecipeMap.getByName("wiremill");
// Tools
// Not needed because of new GTCEu oredicts
//<ore:gtceWrenches>.addItems([
//<gregtech:meta_tool:8>.withEmptyTag(),
//<gregtech:meta_tool:28>.withEmptyTag(),
//<gregtech:meta_tool:29>.withEmptyTag(),
//<gregtech:meta_tool:30>.withEmptyTag()]);
//<ore:gtceScrewdrivers>.addItems([
//<gregtech:meta_tool:11>.withEmptyTag(),
//<gregtech:meta_tool:31>.withEmptyTag()]);
//<ore:gtceHardHammers>.addItems([
//<gregtech:meta_tool:6>.withEmptyTag()]);
//<ore:gtceSaws>.addItems([
//<gregtech:meta_tool:5>.withEmptyTag(),
//<gregtech:meta_tool:25>.withEmptyTag(),
//<gregtech:meta_tool:26>.withEmptyTag(),
//<gregtech:meta_tool:27>.withEmptyTag(),
//<gregtech:meta_tool:32>.withEmptyTag()]);
//<ore:gtceFiles>.addItems([
//<gregtech:meta_tool:9>.withEmptyTag()]);
//<ore:gtceWireCutters>.addItems([
//<gregtech:meta_tool:13>.withEmptyTag()]);
//<ore:gtceSoftHammers>.addItems([
//<gregtech:meta_tool:7>.withEmptyTag()]);
//<ore:gtceMortars>.addItems([
//<gregtech:meta_tool:12>.withEmptyTag()]);

4
overrides/scripts/normalmode.zs
View File

@ -644,12 +644,12 @@ recipes.addShaped(<gregtech:cleanroom_casing:2>, [
]);
// Replace recycling recipes
<recipemap:arc_furnace>.findRecipe(30, [<gregtech:cleanroom_casing:2>], [<liquid:oxygen> * 691]).remove();
<recipemap:arc_furnace>.findRecipe(30, [<gregtech:cleanroom_casing:2>], [<liquid:oxygen> * 1265]).remove();
<recipemap:macerator>.findRecipe(32, [<gregtech:cleanroom_casing:2>], null).remove();
arc_furnace.recipeBuilder()
.inputs([<gregtech:cleanroom_casing:2>])
.fluidInputs([<liquid:oxygen> * 691])
.fluidInputs([<liquid:oxygen> * 1265])
.outputs([<metaitem:ingotIridium> * 4, <metaitem:ingotBlackSteel> * 2, <metaitem:dustSmallAsh> * 6])
.duration(691)
.EUt(30)