From 228ae0e1f500d073164f8f98263248a565b403c6 Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 13:06:54 -0400 Subject: [PATCH 01/11] Remove package Microsoft.Windows.Compatibility --- BaseHandlers/BaseHandlers.csproj | 1 - ComponentTester/ComponentTester.csproj | 1 - LuaList/LuaList.csproj | 1 - PVSFormat/PVSFormat.csproj | 1 - VaultFormat/VaultFormat.csproj | 1 - VehicleList/VehicleList.csproj | 1 - WorldCollisionHandler/WorldCollisionHandler.csproj | 1 - 7 files changed, 7 deletions(-) diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj index 927fd93..c35f581 100644 --- a/BaseHandlers/BaseHandlers.csproj +++ b/BaseHandlers/BaseHandlers.csproj @@ -24,7 +24,6 @@ all - diff --git a/ComponentTester/ComponentTester.csproj b/ComponentTester/ComponentTester.csproj index 8d17d77..6035900 100644 --- a/ComponentTester/ComponentTester.csproj +++ b/ComponentTester/ComponentTester.csproj @@ -16,6 +16,5 @@ all - \ No newline at end of file diff --git a/LuaList/LuaList.csproj b/LuaList/LuaList.csproj index 01e207b..ed6ceb8 100644 --- a/LuaList/LuaList.csproj +++ b/LuaList/LuaList.csproj @@ -21,7 +21,6 @@ all - diff --git a/PVSFormat/PVSFormat.csproj b/PVSFormat/PVSFormat.csproj index 8a5529d..8ec2ecd 100644 --- a/PVSFormat/PVSFormat.csproj +++ b/PVSFormat/PVSFormat.csproj @@ -23,7 +23,6 @@ all - diff --git a/VaultFormat/VaultFormat.csproj b/VaultFormat/VaultFormat.csproj index b01a16c..633f342 100644 --- a/VaultFormat/VaultFormat.csproj +++ b/VaultFormat/VaultFormat.csproj @@ -18,7 +18,6 @@ all - diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj index 4d7db80..fbf0847 100644 --- a/VehicleList/VehicleList.csproj +++ b/VehicleList/VehicleList.csproj @@ -17,7 +17,6 @@ all - diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj index ad62123..b05d7aa 100644 --- a/WorldCollisionHandler/WorldCollisionHandler.csproj +++ b/WorldCollisionHandler/WorldCollisionHandler.csproj @@ -22,7 +22,6 @@ all - From 126eba8dd2ac70fd1cacc27e742dc65014ca1069 Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 13:19:42 -0400 Subject: [PATCH 02/11] Remove package System.Data.DataSetExtensions --- BaseHandlers/BaseHandlers.csproj | 1 - BundleFormat/BundleFormat.csproj | 1 - BundleManager/BundleManager.csproj | 4 +--- BundleUtilities/BundleUtilities.csproj | 2 -- BurnoutImage/BurnoutImage.csproj | 1 - ComponentTester/ComponentTester.csproj | 1 - HexEditor/HexEditor.csproj | 2 -- IconLibrary/IconLibrary.csproj | 2 -- LangEditor/LangEditor.csproj | 1 - LuaList/LuaList.csproj | 1 - MathLib/MathLib.csproj | 2 -- ModelViewer/ModelViewer.csproj | 1 - PVSFormat/PVSFormat.csproj | 1 - PluginAPI/PluginAPI.csproj | 1 - PluginSystem/PluginSystem.csproj | 1 - StandardExtension/StandardExtension.csproj | 1 - VaultFormat/VaultFormat.csproj | 1 - VehicleList/VehicleList.csproj | 1 - WorldCollisionHandler/WorldCollisionHandler.csproj | 1 - 19 files changed, 1 insertion(+), 25 deletions(-) diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj index c35f581..d28efdd 100644 --- a/BaseHandlers/BaseHandlers.csproj +++ b/BaseHandlers/BaseHandlers.csproj @@ -20,7 +20,6 @@ - all diff --git a/BundleFormat/BundleFormat.csproj b/BundleFormat/BundleFormat.csproj index 4972afb..a02e4d9 100644 --- a/BundleFormat/BundleFormat.csproj +++ b/BundleFormat/BundleFormat.csproj @@ -11,7 +11,6 @@ - all diff --git a/BundleManager/BundleManager.csproj b/BundleManager/BundleManager.csproj index 17256e2..8fe16ca 100644 --- a/BundleManager/BundleManager.csproj +++ b/BundleManager/BundleManager.csproj @@ -70,13 +70,11 @@ - all - + \ No newline at end of file diff --git a/BundleUtilities/BundleUtilities.csproj b/BundleUtilities/BundleUtilities.csproj index e165ccf..bb92308 100644 --- a/BundleUtilities/BundleUtilities.csproj +++ b/BundleUtilities/BundleUtilities.csproj @@ -8,10 +8,8 @@ - all - \ No newline at end of file diff --git a/BurnoutImage/BurnoutImage.csproj b/BurnoutImage/BurnoutImage.csproj index 03b7f16..199405b 100644 --- a/BurnoutImage/BurnoutImage.csproj +++ b/BurnoutImage/BurnoutImage.csproj @@ -19,7 +19,6 @@ - all diff --git a/ComponentTester/ComponentTester.csproj b/ComponentTester/ComponentTester.csproj index 6035900..3a7b00d 100644 --- a/ComponentTester/ComponentTester.csproj +++ b/ComponentTester/ComponentTester.csproj @@ -12,7 +12,6 @@ - all diff --git a/HexEditor/HexEditor.csproj b/HexEditor/HexEditor.csproj index b9dc868..94154b5 100644 --- a/HexEditor/HexEditor.csproj +++ b/HexEditor/HexEditor.csproj @@ -13,10 +13,8 @@ - all - \ No newline at end of file diff --git a/IconLibrary/IconLibrary.csproj b/IconLibrary/IconLibrary.csproj index e165ccf..bb92308 100644 --- a/IconLibrary/IconLibrary.csproj +++ b/IconLibrary/IconLibrary.csproj @@ -8,10 +8,8 @@ - all - \ No newline at end of file diff --git a/LangEditor/LangEditor.csproj b/LangEditor/LangEditor.csproj index fbf0847..8aa9bdf 100644 --- a/LangEditor/LangEditor.csproj +++ b/LangEditor/LangEditor.csproj @@ -13,7 +13,6 @@ - all diff --git a/LuaList/LuaList.csproj b/LuaList/LuaList.csproj index ed6ceb8..b65c283 100644 --- a/LuaList/LuaList.csproj +++ b/LuaList/LuaList.csproj @@ -17,7 +17,6 @@ - all diff --git a/MathLib/MathLib.csproj b/MathLib/MathLib.csproj index 11b90bc..76cbb36 100644 --- a/MathLib/MathLib.csproj +++ b/MathLib/MathLib.csproj @@ -8,11 +8,9 @@ - all - \ No newline at end of file diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index 515997d..5441473 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -19,7 +19,6 @@ - all diff --git a/PVSFormat/PVSFormat.csproj b/PVSFormat/PVSFormat.csproj index 8ec2ecd..94eda71 100644 --- a/PVSFormat/PVSFormat.csproj +++ b/PVSFormat/PVSFormat.csproj @@ -19,7 +19,6 @@ - all diff --git a/PluginAPI/PluginAPI.csproj b/PluginAPI/PluginAPI.csproj index bf7387a..b120f6f 100644 --- a/PluginAPI/PluginAPI.csproj +++ b/PluginAPI/PluginAPI.csproj @@ -12,7 +12,6 @@ - all diff --git a/PluginSystem/PluginSystem.csproj b/PluginSystem/PluginSystem.csproj index 67a0272..e385148 100644 --- a/PluginSystem/PluginSystem.csproj +++ b/PluginSystem/PluginSystem.csproj @@ -10,7 +10,6 @@ - all diff --git a/StandardExtension/StandardExtension.csproj b/StandardExtension/StandardExtension.csproj index d4142b6..4ffc9e4 100644 --- a/StandardExtension/StandardExtension.csproj +++ b/StandardExtension/StandardExtension.csproj @@ -6,7 +6,6 @@ - all diff --git a/VaultFormat/VaultFormat.csproj b/VaultFormat/VaultFormat.csproj index 633f342..8b98a92 100644 --- a/VaultFormat/VaultFormat.csproj +++ b/VaultFormat/VaultFormat.csproj @@ -14,7 +14,6 @@ - all diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj index fbf0847..8aa9bdf 100644 --- a/VehicleList/VehicleList.csproj +++ b/VehicleList/VehicleList.csproj @@ -13,7 +13,6 @@ - all diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj index b05d7aa..b7ecaf0 100644 --- a/WorldCollisionHandler/WorldCollisionHandler.csproj +++ b/WorldCollisionHandler/WorldCollisionHandler.csproj @@ -17,7 +17,6 @@ - all From dd72775f8d060b8d322b8ae6349e00941af952de Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 13:35:49 -0400 Subject: [PATCH 03/11] Remove StandardExtension and package Microsoft.CSharp --- BaseHandlers/BaseHandlers.csproj | 2 - BundleFormat/BundleFormat.csproj | 1 - BundleManager.sln | 47 ++++++++----------- BundleManager/BundleManager.csproj | 2 - BundleUtilities/BundleUtilities.csproj | 1 - BurnoutImage/BurnoutImage.csproj | 1 - ComponentTester/ComponentTester.csproj | 2 - ComponentTester/Tester.cs | 3 +- HexEditor/HexEditor.csproj | 1 - IconLibrary/IconLibrary.csproj | 1 - LangEditor/LangEditor.csproj | 1 - LuaList/LuaList.csproj | 1 - MathLib/MathLib.csproj | 1 - ModelViewer/ModelViewer.csproj | 1 - PVSFormat/PVSFormat.csproj | 1 - PluginAPI/PluginAPI.csproj | 1 - PluginSystem/PluginSystem.csproj | 1 - StandardExtension/StandardExtension.csproj | 1 - VaultFormat/VaultFormat.csproj | 1 - VehicleList/VehicleList.csproj | 1 - WorldCollisionHandler/PolygonSoupList.cs | 1 - .../WorldCollisionHandler.csproj | 2 - 22 files changed, 21 insertions(+), 53 deletions(-) diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj index d28efdd..c62c914 100644 --- a/BaseHandlers/BaseHandlers.csproj +++ b/BaseHandlers/BaseHandlers.csproj @@ -13,12 +13,10 @@ - - all diff --git a/BundleFormat/BundleFormat.csproj b/BundleFormat/BundleFormat.csproj index a02e4d9..741acb8 100644 --- a/BundleFormat/BundleFormat.csproj +++ b/BundleFormat/BundleFormat.csproj @@ -10,7 +10,6 @@ - all diff --git a/BundleManager.sln b/BundleManager.sln index 17495f6..2f45a98 100644 --- a/BundleManager.sln +++ b/BundleManager.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29306.81 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33627.172 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BundleManager", "BundleManager\BundleManager.csproj", "{F11A0DF0-A25C-4E94-AA54-D0DD51F15A8E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BundleManager", "BundleManager\BundleManager.csproj", "{F11A0DF0-A25C-4E94-AA54-D0DD51F15A8E}" ProjectSection(ProjectDependencies) = postProject {754DDA1C-8F2F-4F6C-8BC0-D6553A9A7451} = {754DDA1C-8F2F-4F6C-8BC0-D6553A9A7451} {7743D330-6A1A-496C-872B-E36C9EB38CE7} = {7743D330-6A1A-496C-872B-E36C9EB38CE7} @@ -13,37 +13,35 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BundleManager", "BundleMana {20E7A1C4-AFCD-4B8A-8AEF-06B0C27E72B7} = {20E7A1C4-AFCD-4B8A-8AEF-06B0C27E72B7} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BundleFormat", "BundleFormat\BundleFormat.csproj", "{49B81828-760C-42DB-9FAD-96755597C871}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BundleFormat", "BundleFormat\BundleFormat.csproj", "{49B81828-760C-42DB-9FAD-96755597C871}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BurnoutImage", "BurnoutImage\BurnoutImage.csproj", "{DB46CA66-275C-40CB-AB0B-06DA7973BA69}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnoutImage", "BurnoutImage\BurnoutImage.csproj", "{DB46CA66-275C-40CB-AB0B-06DA7973BA69}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "HexEditor\HexEditor.csproj", "{586C3542-1C47-46A6-81F3-323BCFED9A9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HexEditor", "HexEditor\HexEditor.csproj", "{586C3542-1C47-46A6-81F3-323BCFED9A9A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentTester", "ComponentTester\ComponentTester.csproj", "{E43A8CFE-7AED-43AE-B2B9-A67B81B1694A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentTester", "ComponentTester\ComponentTester.csproj", "{E43A8CFE-7AED-43AE-B2B9-A67B81B1694A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardExtension", "StandardExtension\StandardExtension.csproj", "{1D9C18C6-B506-4CB7-9E3E-E22FBB24AC3B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VehicleList", "VehicleList\VehicleList.csproj", "{557FC08F-7ACD-44D7-AC1F-FB815A267A36}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VehicleList", "VehicleList\VehicleList.csproj", "{557FC08F-7ACD-44D7-AC1F-FB815A267A36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VaultFormat", "VaultFormat\VaultFormat.csproj", "{47381AB0-8EEC-49E2-AC2F-D8AD2AC0F2DC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VaultFormat", "VaultFormat\VaultFormat.csproj", "{47381AB0-8EEC-49E2-AC2F-D8AD2AC0F2DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PVSFormat", "PVSFormat\PVSFormat.csproj", "{07E80234-B95F-42DC-99A3-A89A929DDDBF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PVSFormat", "PVSFormat\PVSFormat.csproj", "{07E80234-B95F-42DC-99A3-A89A929DDDBF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathLib", "MathLib\MathLib.csproj", "{E9E7FFA3-84AE-42AF-BFE3-C50D2B034C28}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MathLib", "MathLib\MathLib.csproj", "{E9E7FFA3-84AE-42AF-BFE3-C50D2B034C28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BundleUtilities", "BundleUtilities\BundleUtilities.csproj", "{34471573-F236-4A7C-ABD9-C1FE4686B37E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BundleUtilities", "BundleUtilities\BundleUtilities.csproj", "{34471573-F236-4A7C-ABD9-C1FE4686B37E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconLibrary", "IconLibrary\IconLibrary.csproj", "{A56B769D-941F-4B1E-9905-F5A981FA6EAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconLibrary", "IconLibrary\IconLibrary.csproj", "{A56B769D-941F-4B1E-9905-F5A981FA6EAD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModelViewer", "ModelViewer\ModelViewer.csproj", "{463D5389-3704-473E-B4C3-B334474CEFDE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelViewer", "ModelViewer\ModelViewer.csproj", "{463D5389-3704-473E-B4C3-B334474CEFDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LangEditor", "LangEditor\LangEditor.csproj", "{20E7A1C4-AFCD-4B8A-8AEF-06B0C27E72B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LangEditor", "LangEditor\LangEditor.csproj", "{20E7A1C4-AFCD-4B8A-8AEF-06B0C27E72B7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginAPI", "PluginAPI\PluginAPI.csproj", "{757F0204-F091-464D-AA42-FE8919FF73BB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginAPI", "PluginAPI\PluginAPI.csproj", "{757F0204-F091-464D-AA42-FE8919FF73BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginSystem", "PluginSystem\PluginSystem.csproj", "{4FC1C1EE-618A-4B65-A103-A51568A01629}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginSystem", "PluginSystem\PluginSystem.csproj", "{4FC1C1EE-618A-4B65-A103-A51568A01629}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseHandlers", "BaseHandlers\BaseHandlers.csproj", "{7743D330-6A1A-496C-872B-E36C9EB38CE7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseHandlers", "BaseHandlers\BaseHandlers.csproj", "{7743D330-6A1A-496C-872B-E36C9EB38CE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{60F98E02-807F-4EDC-8747-147C365606B1}" EndProject @@ -53,9 +51,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{DA4D9C10-E153-4D48-8369-4BE4168BACDB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorldCollisionHandler", "WorldCollisionHandler\WorldCollisionHandler.csproj", "{754DDA1C-8F2F-4F6C-8BC0-D6553A9A7451}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorldCollisionHandler", "WorldCollisionHandler\WorldCollisionHandler.csproj", "{754DDA1C-8F2F-4F6C-8BC0-D6553A9A7451}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaList", "LuaList\LuaList.csproj", "{D1395FDE-6A64-4D9F-9DCA-60825BD0A43C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuaList", "LuaList\LuaList.csproj", "{D1395FDE-6A64-4D9F-9DCA-60825BD0A43C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -83,10 +81,6 @@ Global {E43A8CFE-7AED-43AE-B2B9-A67B81B1694A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E43A8CFE-7AED-43AE-B2B9-A67B81B1694A}.Release|Any CPU.ActiveCfg = Release|Any CPU {E43A8CFE-7AED-43AE-B2B9-A67B81B1694A}.Release|Any CPU.Build.0 = Release|Any CPU - {1D9C18C6-B506-4CB7-9E3E-E22FBB24AC3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D9C18C6-B506-4CB7-9E3E-E22FBB24AC3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D9C18C6-B506-4CB7-9E3E-E22FBB24AC3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D9C18C6-B506-4CB7-9E3E-E22FBB24AC3B}.Release|Any CPU.Build.0 = Release|Any CPU {557FC08F-7ACD-44D7-AC1F-FB815A267A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {557FC08F-7ACD-44D7-AC1F-FB815A267A36}.Debug|Any CPU.Build.0 = Debug|Any CPU {557FC08F-7ACD-44D7-AC1F-FB815A267A36}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -149,7 +143,6 @@ Global {DB46CA66-275C-40CB-AB0B-06DA7973BA69} = {3BA7CE56-4E22-418F-9D13-F2189413D30B} {586C3542-1C47-46A6-81F3-323BCFED9A9A} = {3BA7CE56-4E22-418F-9D13-F2189413D30B} {E43A8CFE-7AED-43AE-B2B9-A67B81B1694A} = {47FF0AEF-B4E1-4795-B14C-836461DA2922} - {1D9C18C6-B506-4CB7-9E3E-E22FBB24AC3B} = {3BA7CE56-4E22-418F-9D13-F2189413D30B} {557FC08F-7ACD-44D7-AC1F-FB815A267A36} = {60F98E02-807F-4EDC-8747-147C365606B1} {47381AB0-8EEC-49E2-AC2F-D8AD2AC0F2DC} = {60F98E02-807F-4EDC-8747-147C365606B1} {07E80234-B95F-42DC-99A3-A89A929DDDBF} = {60F98E02-807F-4EDC-8747-147C365606B1} diff --git a/BundleManager/BundleManager.csproj b/BundleManager/BundleManager.csproj index 8fe16ca..36f5d87 100644 --- a/BundleManager/BundleManager.csproj +++ b/BundleManager/BundleManager.csproj @@ -50,7 +50,6 @@ - @@ -69,7 +68,6 @@ - all diff --git a/BundleUtilities/BundleUtilities.csproj b/BundleUtilities/BundleUtilities.csproj index bb92308..55d4efe 100644 --- a/BundleUtilities/BundleUtilities.csproj +++ b/BundleUtilities/BundleUtilities.csproj @@ -7,7 +7,6 @@ true - all diff --git a/BurnoutImage/BurnoutImage.csproj b/BurnoutImage/BurnoutImage.csproj index 199405b..3eca1ad 100644 --- a/BurnoutImage/BurnoutImage.csproj +++ b/BurnoutImage/BurnoutImage.csproj @@ -18,7 +18,6 @@ - all diff --git a/ComponentTester/ComponentTester.csproj b/ComponentTester/ComponentTester.csproj index 3a7b00d..a0a3a20 100644 --- a/ComponentTester/ComponentTester.csproj +++ b/ComponentTester/ComponentTester.csproj @@ -8,10 +8,8 @@ - - all diff --git a/ComponentTester/Tester.cs b/ComponentTester/Tester.cs index ce9812a..e0f9d35 100644 --- a/ComponentTester/Tester.cs +++ b/ComponentTester/Tester.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -8,7 +8,6 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using StandardExtension; namespace ComponentTester { diff --git a/HexEditor/HexEditor.csproj b/HexEditor/HexEditor.csproj index 94154b5..4e5bae1 100644 --- a/HexEditor/HexEditor.csproj +++ b/HexEditor/HexEditor.csproj @@ -12,7 +12,6 @@ - all diff --git a/IconLibrary/IconLibrary.csproj b/IconLibrary/IconLibrary.csproj index bb92308..55d4efe 100644 --- a/IconLibrary/IconLibrary.csproj +++ b/IconLibrary/IconLibrary.csproj @@ -7,7 +7,6 @@ true - all diff --git a/LangEditor/LangEditor.csproj b/LangEditor/LangEditor.csproj index 8aa9bdf..48c29fa 100644 --- a/LangEditor/LangEditor.csproj +++ b/LangEditor/LangEditor.csproj @@ -12,7 +12,6 @@ - all diff --git a/LuaList/LuaList.csproj b/LuaList/LuaList.csproj index b65c283..443198e 100644 --- a/LuaList/LuaList.csproj +++ b/LuaList/LuaList.csproj @@ -16,7 +16,6 @@ - all diff --git a/MathLib/MathLib.csproj b/MathLib/MathLib.csproj index 76cbb36..6a9187d 100644 --- a/MathLib/MathLib.csproj +++ b/MathLib/MathLib.csproj @@ -7,7 +7,6 @@ true - all diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index 5441473..c43a7dc 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -17,7 +17,6 @@ - all diff --git a/PVSFormat/PVSFormat.csproj b/PVSFormat/PVSFormat.csproj index 94eda71..141210d 100644 --- a/PVSFormat/PVSFormat.csproj +++ b/PVSFormat/PVSFormat.csproj @@ -18,7 +18,6 @@ - all diff --git a/PluginAPI/PluginAPI.csproj b/PluginAPI/PluginAPI.csproj index b120f6f..556aa25 100644 --- a/PluginAPI/PluginAPI.csproj +++ b/PluginAPI/PluginAPI.csproj @@ -11,7 +11,6 @@ - all diff --git a/PluginSystem/PluginSystem.csproj b/PluginSystem/PluginSystem.csproj index e385148..eb40af5 100644 --- a/PluginSystem/PluginSystem.csproj +++ b/PluginSystem/PluginSystem.csproj @@ -9,7 +9,6 @@ - all diff --git a/StandardExtension/StandardExtension.csproj b/StandardExtension/StandardExtension.csproj index 4ffc9e4..b7cd4d3 100644 --- a/StandardExtension/StandardExtension.csproj +++ b/StandardExtension/StandardExtension.csproj @@ -5,7 +5,6 @@ false - all diff --git a/VaultFormat/VaultFormat.csproj b/VaultFormat/VaultFormat.csproj index 8b98a92..acf271c 100644 --- a/VaultFormat/VaultFormat.csproj +++ b/VaultFormat/VaultFormat.csproj @@ -13,7 +13,6 @@ - all diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj index 8aa9bdf..48c29fa 100644 --- a/VehicleList/VehicleList.csproj +++ b/VehicleList/VehicleList.csproj @@ -12,7 +12,6 @@ - all diff --git a/WorldCollisionHandler/PolygonSoupList.cs b/WorldCollisionHandler/PolygonSoupList.cs index 44161be..9787d5e 100644 --- a/WorldCollisionHandler/PolygonSoupList.cs +++ b/WorldCollisionHandler/PolygonSoupList.cs @@ -15,7 +15,6 @@ using OpenTK; using OpenTK.Graphics.OpenGL; using PluginAPI; -using StandardExtension; namespace WorldCollisionHandler { diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj index b7ecaf0..6c3454b 100644 --- a/WorldCollisionHandler/WorldCollisionHandler.csproj +++ b/WorldCollisionHandler/WorldCollisionHandler.csproj @@ -12,11 +12,9 @@ - - all From ec35c3ba4167fcaeacb14e11002c15e4f4ca1aa1 Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 13:38:38 -0400 Subject: [PATCH 04/11] Update OpenTK --- MathLib/MathLib.csproj | 2 +- ModelViewer/ModelViewer.csproj | 2 +- WorldCollisionHandler/WorldCollisionHandler.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MathLib/MathLib.csproj b/MathLib/MathLib.csproj index 6a9187d..1515617 100644 --- a/MathLib/MathLib.csproj +++ b/MathLib/MathLib.csproj @@ -10,6 +10,6 @@ all - + \ No newline at end of file diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index c43a7dc..cc24994 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -17,7 +17,7 @@ - + all diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj index 6c3454b..018ddc5 100644 --- a/WorldCollisionHandler/WorldCollisionHandler.csproj +++ b/WorldCollisionHandler/WorldCollisionHandler.csproj @@ -18,7 +18,7 @@ all - + From 366c8ae82cb1ffae0cd03aec13f35bb330f23349 Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 13:55:39 -0400 Subject: [PATCH 05/11] Fix OpenTK --- BaseHandlers/AptData.cs | 4 ++-- BaseHandlers/InstanceList.cs | 4 ++-- BaseHandlers/Renderable.cs | 4 ++-- BaseHandlers/StreetData.cs | 4 ++-- MathLib/BoxF.cs | 4 ++-- MathLib/IOExtensions.cs | 2 +- MathLib/MathUtils.cs | 2 +- MathLib/Vector2i.cs | 4 ++-- MathLib/Vector3i.cs | 4 ++-- MathLib/Vector3s.cs | 4 ++-- ModelViewer/GenericMesh.cs | 4 ++-- ModelViewer/GraphicsScene.cs | 4 ++-- ModelViewer/ICamera.cs | 4 ++-- ModelViewer/ModelViewer.csproj | 1 + ModelViewer/OBJImporter.cs | 4 ++-- ModelViewer/OrbitCamera.cs | 4 ++-- ModelViewer/SceneData/Mesh.cs | 4 ++-- ModelViewer/SceneData/Model.cs | 4 ++-- ModelViewer/SceneData/Scene.cs | 4 ++-- ModelViewer/SceneData/SceneObject.cs | 4 ++-- ModelViewer/StaticCamera.cs | 4 ++-- ModelViewer/ThirdPersonCamera.cs | 4 ++-- WorldCollisionHandler/PolygonSoupList.cs | 2 +- 23 files changed, 42 insertions(+), 41 deletions(-) diff --git a/BaseHandlers/AptData.cs b/BaseHandlers/AptData.cs index bac6d0e..fc907bb 100644 --- a/BaseHandlers/AptData.cs +++ b/BaseHandlers/AptData.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -9,7 +9,7 @@ using BundleFormat; using BundleUtilities; using MathLib; -using OpenTK; +using OpenTK.Mathematics; using OpenTK.Graphics.OpenGL; using PluginAPI; diff --git a/BaseHandlers/InstanceList.cs b/BaseHandlers/InstanceList.cs index de57181..5981835 100644 --- a/BaseHandlers/InstanceList.cs +++ b/BaseHandlers/InstanceList.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -7,7 +7,7 @@ using MathLib; using ModelViewer; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; using PluginAPI; namespace BaseHandlers diff --git a/BaseHandlers/Renderable.cs b/BaseHandlers/Renderable.cs index 500e670..fbeff7e 100644 --- a/BaseHandlers/Renderable.cs +++ b/BaseHandlers/Renderable.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -10,7 +10,7 @@ using MathLib; using ModelViewer; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; using PluginAPI; namespace BaseHandlers diff --git a/BaseHandlers/StreetData.cs b/BaseHandlers/StreetData.cs index 4e1ba50..2de0eaf 100644 --- a/BaseHandlers/StreetData.cs +++ b/BaseHandlers/StreetData.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -7,7 +7,7 @@ using BundleFormat; using BundleUtilities; using MathLib; -using OpenTK; +using OpenTK.Mathematics; using PluginAPI; namespace BaseHandlers diff --git a/MathLib/BoxF.cs b/MathLib/BoxF.cs index 1dd2f00..01e4538 100644 --- a/MathLib/BoxF.cs +++ b/MathLib/BoxF.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace MathLib { diff --git a/MathLib/IOExtensions.cs b/MathLib/IOExtensions.cs index 5bdf58b..3ec2f3b 100644 --- a/MathLib/IOExtensions.cs +++ b/MathLib/IOExtensions.cs @@ -1,4 +1,4 @@ -using OpenTK; +using OpenTK.Mathematics; using System; using System.Collections.Generic; using System.IO; diff --git a/MathLib/MathUtils.cs b/MathLib/MathUtils.cs index c116c81..e8713a2 100644 --- a/MathLib/MathUtils.cs +++ b/MathLib/MathUtils.cs @@ -1,4 +1,4 @@ -using OpenTK; +using OpenTK.Mathematics; using System; using System.Collections.Generic; using System.Linq; diff --git a/MathLib/Vector2i.cs b/MathLib/Vector2i.cs index afff2ef..622e07a 100644 --- a/MathLib/Vector2i.cs +++ b/MathLib/Vector2i.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.CodeDom; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace MathLib { diff --git a/MathLib/Vector3i.cs b/MathLib/Vector3i.cs index 1ab7de6..712721e 100644 --- a/MathLib/Vector3i.cs +++ b/MathLib/Vector3i.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.CodeDom; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace MathLib { diff --git a/MathLib/Vector3s.cs b/MathLib/Vector3s.cs index 1cb6d38..1230e9a 100644 --- a/MathLib/Vector3s.cs +++ b/MathLib/Vector3s.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace MathLib { diff --git a/ModelViewer/GenericMesh.cs b/ModelViewer/GenericMesh.cs index daf798a..875fb60 100644 --- a/ModelViewer/GenericMesh.cs +++ b/ModelViewer/GenericMesh.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer { diff --git a/ModelViewer/GraphicsScene.cs b/ModelViewer/GraphicsScene.cs index ab27972..b2deea1 100644 --- a/ModelViewer/GraphicsScene.cs +++ b/ModelViewer/GraphicsScene.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Drawing; @@ -8,7 +8,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; using OpenTK.Graphics.OpenGL; namespace ModelViewer diff --git a/ModelViewer/ICamera.cs b/ModelViewer/ICamera.cs index 09f290f..4c42fb4 100644 --- a/ModelViewer/ICamera.cs +++ b/ModelViewer/ICamera.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer { diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index cc24994..b358a29 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -17,6 +17,7 @@ + all diff --git a/ModelViewer/OBJImporter.cs b/ModelViewer/OBJImporter.cs index de143ec..5375e12 100644 --- a/ModelViewer/OBJImporter.cs +++ b/ModelViewer/OBJImporter.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -7,7 +7,7 @@ using System.Threading.Tasks; using BundleUtilities; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer { diff --git a/ModelViewer/OrbitCamera.cs b/ModelViewer/OrbitCamera.cs index ec815a1..b7840b0 100644 --- a/ModelViewer/OrbitCamera.cs +++ b/ModelViewer/OrbitCamera.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer { diff --git a/ModelViewer/SceneData/Mesh.cs b/ModelViewer/SceneData/Mesh.cs index b91b3a5..105ff4d 100644 --- a/ModelViewer/SceneData/Mesh.cs +++ b/ModelViewer/SceneData/Mesh.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using OpenTK; +using OpenTK.Mathematics; using OpenTK.Graphics.OpenGL; using PixelFormat = OpenTK.Graphics.OpenGL.PixelFormat; diff --git a/ModelViewer/SceneData/Model.cs b/ModelViewer/SceneData/Model.cs index 0e480e8..a52df46 100644 --- a/ModelViewer/SceneData/Model.cs +++ b/ModelViewer/SceneData/Model.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer.SceneData { diff --git a/ModelViewer/SceneData/Scene.cs b/ModelViewer/SceneData/Scene.cs index 155e9ed..b9aa6e3 100644 --- a/ModelViewer/SceneData/Scene.cs +++ b/ModelViewer/SceneData/Scene.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Drawing; @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Windows.Forms.VisualStyles; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer.SceneData { diff --git a/ModelViewer/SceneData/SceneObject.cs b/ModelViewer/SceneData/SceneObject.cs index f64e643..3c0f866 100644 --- a/ModelViewer/SceneData/SceneObject.cs +++ b/ModelViewer/SceneData/SceneObject.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer.SceneData { diff --git a/ModelViewer/StaticCamera.cs b/ModelViewer/StaticCamera.cs index ff0a3db..f5b7a5e 100644 --- a/ModelViewer/StaticCamera.cs +++ b/ModelViewer/StaticCamera.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer { diff --git a/ModelViewer/ThirdPersonCamera.cs b/ModelViewer/ThirdPersonCamera.cs index 4ba14ba..1aed9af 100644 --- a/ModelViewer/ThirdPersonCamera.cs +++ b/ModelViewer/ThirdPersonCamera.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; namespace ModelViewer { diff --git a/WorldCollisionHandler/PolygonSoupList.cs b/WorldCollisionHandler/PolygonSoupList.cs index 9787d5e..7bb2937 100644 --- a/WorldCollisionHandler/PolygonSoupList.cs +++ b/WorldCollisionHandler/PolygonSoupList.cs @@ -12,7 +12,7 @@ using MathLib; using ModelViewer; using ModelViewer.SceneData; -using OpenTK; +using OpenTK.Mathematics; using OpenTK.Graphics.OpenGL; using PluginAPI; From 66983761f8b8ae916fbff154056d54fdd00c5128 Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 14:04:33 -0400 Subject: [PATCH 06/11] Remove upgrade assistant-related package --- BaseHandlers/BaseHandlers.csproj | 3 --- BundleFormat/BundleFormat.csproj | 5 ----- BundleManager/BundleManager.csproj | 3 --- BundleUtilities/BundleUtilities.csproj | 5 ----- BurnoutImage/BurnoutImage.csproj | 3 --- ComponentTester/ComponentTester.csproj | 5 ----- HexEditor/HexEditor.csproj | 5 ----- IconLibrary/IconLibrary.csproj | 5 ----- LangEditor/LangEditor.csproj | 5 ----- LuaList/LuaList.csproj | 5 ----- MathLib/MathLib.csproj | 3 --- ModelViewer/ModelViewer.csproj | 3 --- PVSFormat/PVSFormat.csproj | 5 ----- PluginAPI/PluginAPI.csproj | 5 ----- PluginSystem/PluginSystem.csproj | 5 ----- VaultFormat/VaultFormat.csproj | 5 ----- VehicleList/VehicleList.csproj | 5 ----- WorldCollisionHandler/WorldCollisionHandler.csproj | 3 --- 18 files changed, 78 deletions(-) diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj index c62c914..9f7346b 100644 --- a/BaseHandlers/BaseHandlers.csproj +++ b/BaseHandlers/BaseHandlers.csproj @@ -18,9 +18,6 @@ - - all - diff --git a/BundleFormat/BundleFormat.csproj b/BundleFormat/BundleFormat.csproj index 741acb8..2e31359 100644 --- a/BundleFormat/BundleFormat.csproj +++ b/BundleFormat/BundleFormat.csproj @@ -9,11 +9,6 @@ - - - all - - diff --git a/BundleManager/BundleManager.csproj b/BundleManager/BundleManager.csproj index 36f5d87..b88a7b9 100644 --- a/BundleManager/BundleManager.csproj +++ b/BundleManager/BundleManager.csproj @@ -68,9 +68,6 @@ - - all - diff --git a/BundleUtilities/BundleUtilities.csproj b/BundleUtilities/BundleUtilities.csproj index 55d4efe..8edd2e9 100644 --- a/BundleUtilities/BundleUtilities.csproj +++ b/BundleUtilities/BundleUtilities.csproj @@ -6,9 +6,4 @@ true true - - - all - - \ No newline at end of file diff --git a/BurnoutImage/BurnoutImage.csproj b/BurnoutImage/BurnoutImage.csproj index 3eca1ad..5dcaecf 100644 --- a/BurnoutImage/BurnoutImage.csproj +++ b/BurnoutImage/BurnoutImage.csproj @@ -18,8 +18,5 @@ - - all - \ No newline at end of file diff --git a/ComponentTester/ComponentTester.csproj b/ComponentTester/ComponentTester.csproj index a0a3a20..98a626a 100644 --- a/ComponentTester/ComponentTester.csproj +++ b/ComponentTester/ComponentTester.csproj @@ -9,9 +9,4 @@ - - - all - - \ No newline at end of file diff --git a/HexEditor/HexEditor.csproj b/HexEditor/HexEditor.csproj index 4e5bae1..e5b8dfb 100644 --- a/HexEditor/HexEditor.csproj +++ b/HexEditor/HexEditor.csproj @@ -11,9 +11,4 @@ UserControl - - - all - - \ No newline at end of file diff --git a/IconLibrary/IconLibrary.csproj b/IconLibrary/IconLibrary.csproj index 55d4efe..8edd2e9 100644 --- a/IconLibrary/IconLibrary.csproj +++ b/IconLibrary/IconLibrary.csproj @@ -6,9 +6,4 @@ true true - - - all - - \ No newline at end of file diff --git a/LangEditor/LangEditor.csproj b/LangEditor/LangEditor.csproj index 48c29fa..6e1bfe7 100644 --- a/LangEditor/LangEditor.csproj +++ b/LangEditor/LangEditor.csproj @@ -11,11 +11,6 @@ - - - all - - diff --git a/LuaList/LuaList.csproj b/LuaList/LuaList.csproj index 443198e..e6f9f2e 100644 --- a/LuaList/LuaList.csproj +++ b/LuaList/LuaList.csproj @@ -15,11 +15,6 @@ - - - all - - diff --git a/MathLib/MathLib.csproj b/MathLib/MathLib.csproj index 1515617..6767ce5 100644 --- a/MathLib/MathLib.csproj +++ b/MathLib/MathLib.csproj @@ -7,9 +7,6 @@ true - - all - \ No newline at end of file diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index b358a29..f578c9a 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -19,8 +19,5 @@ - - all - \ No newline at end of file diff --git a/PVSFormat/PVSFormat.csproj b/PVSFormat/PVSFormat.csproj index 141210d..57a61d9 100644 --- a/PVSFormat/PVSFormat.csproj +++ b/PVSFormat/PVSFormat.csproj @@ -17,11 +17,6 @@ - - - all - - diff --git a/PluginAPI/PluginAPI.csproj b/PluginAPI/PluginAPI.csproj index 556aa25..f8a1ba5 100644 --- a/PluginAPI/PluginAPI.csproj +++ b/PluginAPI/PluginAPI.csproj @@ -10,9 +10,4 @@ - - - all - - \ No newline at end of file diff --git a/PluginSystem/PluginSystem.csproj b/PluginSystem/PluginSystem.csproj index eb40af5..9f7f854 100644 --- a/PluginSystem/PluginSystem.csproj +++ b/PluginSystem/PluginSystem.csproj @@ -8,9 +8,4 @@ - - - all - - \ No newline at end of file diff --git a/VaultFormat/VaultFormat.csproj b/VaultFormat/VaultFormat.csproj index acf271c..07f073d 100644 --- a/VaultFormat/VaultFormat.csproj +++ b/VaultFormat/VaultFormat.csproj @@ -12,11 +12,6 @@ - - - all - - diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj index 48c29fa..6e1bfe7 100644 --- a/VehicleList/VehicleList.csproj +++ b/VehicleList/VehicleList.csproj @@ -11,11 +11,6 @@ - - - all - - diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj index 018ddc5..eccb2f7 100644 --- a/WorldCollisionHandler/WorldCollisionHandler.csproj +++ b/WorldCollisionHandler/WorldCollisionHandler.csproj @@ -15,9 +15,6 @@ - - all - From 025eadd84b77d067b5494c01f446410fa659c90a Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 16:18:38 -0400 Subject: [PATCH 07/11] Remove unused items Remove unused using declarations, properties, methods, packages, and some comments. Also update a couple variables and functions for simplicity (no real changes). --- BaseHandlers/AptData.cs | 6 - BaseHandlers/BaseHandlers.csproj | 1 - BaseHandlers/BasePlugin.cs | 112 +- BaseHandlers/GraphicsSpec.cs | 5 +- BaseHandlers/IDList.cs | 5 - BaseHandlers/InstanceList.cs | 3 - BaseHandlers/InstanceListEditor.Designer.cs | 6 +- BaseHandlers/InstanceListEditor.cs | 16 - BaseHandlers/MaterialEntry.cs | 4 - BaseHandlers/Renderable.cs | 4 - BaseHandlers/StreetData.cs | 3 - BaseHandlers/TextureState.cs | 4 - BaseHandlers/Traffic.cs | 4 - BaseHandlers/TriggerData.cs | 186 +- BaseHandlers/TriggerDataEditor.cs | 13 - BundleFormat/BundleArchive.cs | 10 +- BundleFormat/BundleCache.cs | 7 +- BundleFormat/BundleDependency.cs | 6 - BundleFormat/BundleEntry.cs | 12 - BundleFormat/EntryType.cs | 6 - BundleFormat/Extensions.cs | 39 +- BundleFormat/Util.cs | 6 +- BundleFormat/VertexDesc.cs | 6 +- BundleManager/BundleResource.cs | 5 - BundleManager/EntryEditor.cs | 469 ---- BundleManager/FileView.cs | 50 - BundleManager/MainForm.cs | 8 - BundleManager/Program.cs | 3 +- BundleManager/SaveData.cs | 6 +- BundleManager/SearchDialog.cs | 9 +- BundleUtilities/BinaryReader2.cs | 3 - BundleUtilities/BitScan.cs | 5 - BundleUtilities/Config.cs | 6 - BundleUtilities/DebugTimer.cs | 5 - BundleUtilities/EncryptedString.cs | 7 +- BundleUtilities/ILoader.cs | 6 - BundleUtilities/LoadingDialog.cs | 6 +- BundleUtilities/ReadFailedError.cs | 6 +- BundleUtilities/TextureCache.cs | 5 +- BundleUtilities/Utilities.cs | 4 - BurnoutImage/ClusterFit.cs | 4 - BurnoutImage/ColourFit.cs | 5 - BurnoutImage/ColourSet.cs | 4 - BurnoutImage/CompressionTools.cs | 4 - BurnoutImage/DirectBitmap.cs | 17 +- BurnoutImage/Extensions.cs | 6 - BurnoutImage/GameImage.cs | 5 - BurnoutImage/ImageUtil.cs | 11 - BurnoutImage/RangeFit.cs | 22 - BurnoutImage/SingleColourFit.cs | 147 -- BurnoutImage/SingleColourLookup.cs | 2080 ++++++++--------- BurnoutImage/Util.cs | 6 +- ComponentTester/Program.cs | 11 +- ComponentTester/Tester.cs | 20 - HexEditor/HexView.cs | 26 +- LangEditor/InputDialog.cs | 9 +- LangEditor/LangEdit.cs | 7 - LangEditor/LangPlugin.cs | 7 +- LangEditor/Language.cs | 4 +- LuaList/LuaListEditor.cs | 1 - LuaList/LuaListEntry.cs | 22 +- LuaList/LuaListPlugin.cs | 5 - MathLib/BoxF.cs | 6 - MathLib/IOExtensions.cs | 6 - MathLib/MathUtils.cs | 4 - MathLib/RectF.cs | 6 - MathLib/Triangle.cs | 6 - MathLib/Vector2i.cs | 5 - MathLib/Vector3i.cs | 5 - MathLib/Vector3s.cs | 4 - ModelViewer/GenericMesh.cs | 4 - ModelViewer/GenericModel.cs | 5 - ModelViewer/GraphicsScene.cs | 5 - ModelViewer/GraphicsUtil.cs | 6 - ModelViewer/ICamera.cs | 5 - ModelViewer/ModelViewerForm.cs | 11 +- ModelViewer/OBJImporter.cs | 3 - ModelViewer/OrbitCamera.cs | 5 - ModelViewer/SceneRenderControl.cs | 8 +- ModelViewer/Shader.cs | 6 +- ModelViewer/StaticCamera.cs | 5 - ModelViewer/ThirdPersonCamera.cs | 5 - PVSFormat/PVS.cs | 4 - PVSFormat/PVSEditControl.cs | 6 +- PVSFormat/PVSEditor.cs | 3 +- PVSFormat/PVSPlugin.cs | 7 +- PVSFormat/Polygon.cs | 4 - PluginAPI/EntryTypeRegistry.cs | 5 +- PluginAPI/IEntryData.cs | 8 +- PluginAPI/IEntryEditor.cs | 5 - PluginAPI/Plugin.cs | 6 - PluginAPI/PluginCommand.cs | 7 +- PluginAPI/PluginCommandRegistry.cs | 4 +- PluginSystem/PluginLoader.cs | 6 - PluginSystem/Util/AssemblyUtil.cs | 5 +- VaultFormat/AttribSys.cs | 72 +- VaultFormat/AttribSysPlugin.cs | 7 +- VaultFormat/AttribSysVaultPlugin.cs | 6 - VaultFormat/Burnoutcarasset.cs | 11 +- VaultFormat/Burnoutcargraphicsasset.cs | 26 +- VaultFormat/Camerabumperbehaviour.cs | 26 +- VaultFormat/Cameraexternalbehaviour.cs | 40 +- VaultFormat/Physicsvehiclebaseattribs.cs | 136 +- VaultFormat/Physicsvehiclebodyrollattribs.cs | 30 +- VaultFormat/Physicsvehicleboostattribs.cs | 38 +- VaultFormat/Physicsvehiclecollisionattribs.cs | 6 +- VaultFormat/Physicsvehicledriftattribs.cs | 74 +- VaultFormat/Physicsvehicleengineattribs.cs | 1 - VaultFormat/Physicsvehiclehandling.cs | 22 +- VaultFormat/Physicsvehiclesteeringattribs.cs | 32 +- .../Physicsvehiclesuspensionattribs.cs | 31 +- VaultFormat/RefSpec.cs | 22 +- VehicleList/EncryptionData.cs | 2 - VehicleList/Extensions.cs | 6 +- VehicleList/Util.cs | 11 +- VehicleList/VehicleEditor.cs | 81 +- VehicleList/VehicleListData.cs | 6 +- VehicleList/VehicleListForm.cs | 34 +- VehicleList/VehicleListPlugin.cs | 7 +- WorldCollisionHandler/PolygonSoupList.cs | 5 - WorldCollisionHandler/WorldColEditor.cs | 11 +- WorldCollisionHandler/WorldCollisionPlugin.cs | 34 +- 122 files changed, 1521 insertions(+), 2926 deletions(-) delete mode 100644 BurnoutImage/SingleColourFit.cs diff --git a/BaseHandlers/AptData.cs b/BaseHandlers/AptData.cs index fc907bb..df6442f 100644 --- a/BaseHandlers/AptData.cs +++ b/BaseHandlers/AptData.cs @@ -1,16 +1,10 @@ -using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Xml.Serialization; using BundleFormat; using BundleUtilities; using MathLib; using OpenTK.Mathematics; -using OpenTK.Graphics.OpenGL; using PluginAPI; namespace BaseHandlers diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj index 9f7346b..0d4d83d 100644 --- a/BaseHandlers/BaseHandlers.csproj +++ b/BaseHandlers/BaseHandlers.csproj @@ -17,7 +17,6 @@ - diff --git a/BaseHandlers/BasePlugin.cs b/BaseHandlers/BasePlugin.cs index ec75556..0cb132d 100644 --- a/BaseHandlers/BasePlugin.cs +++ b/BaseHandlers/BasePlugin.cs @@ -1,14 +1,5 @@ -using BundleFormat; -using BundleUtilities; -using ModelViewer.SceneData; +using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace BaseHandlers { @@ -37,106 +28,5 @@ public override string GetName() { return "Base Resource Handlers"; } - - #region Extra Tools - - /*public void ConvertImagesFromPS3ToPC_old(IWin32Window window, BundleArchive archive) - { - if (archive == null) - { - MessageBox.Show(window, "No Archive Open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return; - } - if (archive.Console) - { - for (int i = 0; i < archive.Entries.Count; i++) - { - BundleEntry entry = archive.Entries[i]; - if (entry.EntryBlocks[0].Data.Length == 48 && entry.EntryBlocks[1].Data != null && entry.EntryBlocks[1].Data.Length > 0) - { - MemoryStream ms = new MemoryStream(entry.EntryBlocks[0].Data); - BinaryReader2 br = new BinaryReader2(ms); - br.BigEndian = entry.Console; - - byte compression = br.ReadByte(); - byte[] unknown1 = br.ReadBytes(3); - byte[] type = Encoding.ASCII.GetBytes("DXT1"); - if (compression == 0x85) - { - type = new byte[] { 0x15, 0x00, 0x00, 0x00 }; - } - else if (compression == 0x86) - { - type = Encoding.ASCII.GetBytes("DXT1"); - } - else if (compression == 0x88) - { - type = Encoding.ASCII.GetBytes("DXT5"); - } - int unknown2 = Util.ReverseBytes(br.ReadInt32()); - int width = Util.ReverseBytes(br.ReadInt16()); - int height = Util.ReverseBytes(br.ReadInt16()); - br.Close(); - - MemoryStream msx = new MemoryStream(); - BinaryWriter bw = new BinaryWriter(msx); - - bw.Write((int)0); - bw.Write((int)0); - bw.Write((int)0); - bw.Write((int)1); - - bw.Write(type); - bw.Write((short)width); - bw.Write((short)height); - bw.Write((int)0x15); - bw.Write((int)0); - - bw.Flush(); - - byte[] Data = msx.ToArray(); - - bw.Close(); - - entry.EntryBlocks[0].Data = Data; - - entry.Dirty = true; - } - } - } - else - { - MessageBox.Show(window, "This feature only works on PS3 Bundle Files", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - } - - public void ConvertToPC(IWin32Window window, BundleArchive archive) - { - // TODO: Support everything - - for (int i = 0; i < archive.Entries.Count; i++) - { - BundleEntry entry = archive.Entries[i]; - - if (entry.Type == EntryType.IDList) - { - IDList list = new IDList(); - list.Read(entry); - list.Write(entry); - } - else if (entry.Type == EntryType.PolygonSoupListResourceType) - { - PolygonSoupList list = new PolygonSoupList(); - list.Read(entry); - list.Write(entry); - } - } - - //PatchImages(); - - archive.Platform = BundlePlatform.PC; - }*/ - - #endregion } } diff --git a/BaseHandlers/GraphicsSpec.cs b/BaseHandlers/GraphicsSpec.cs index cd9d7eb..9aa1660 100644 --- a/BaseHandlers/GraphicsSpec.cs +++ b/BaseHandlers/GraphicsSpec.cs @@ -1,11 +1,8 @@ -using System.Collections.Generic; -using System.IO; +using System.Collections.Generic; using BundleFormat; using BundleUtilities; -using MathLib; using ModelViewer; using ModelViewer.SceneData; -using OpenTK; using PluginAPI; namespace BaseHandlers diff --git a/BaseHandlers/IDList.cs b/BaseHandlers/IDList.cs index 02d7b96..25aa408 100644 --- a/BaseHandlers/IDList.cs +++ b/BaseHandlers/IDList.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using PluginAPI; diff --git a/BaseHandlers/InstanceList.cs b/BaseHandlers/InstanceList.cs index 5981835..afb274c 100644 --- a/BaseHandlers/InstanceList.cs +++ b/BaseHandlers/InstanceList.cs @@ -1,11 +1,8 @@ -using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using BundleFormat; using BundleUtilities; using MathLib; -using ModelViewer; using ModelViewer.SceneData; using OpenTK.Mathematics; using PluginAPI; diff --git a/BaseHandlers/InstanceListEditor.Designer.cs b/BaseHandlers/InstanceListEditor.Designer.cs index 5ac45e5..602ccd5 100644 --- a/BaseHandlers/InstanceListEditor.Designer.cs +++ b/BaseHandlers/InstanceListEditor.Designer.cs @@ -1,4 +1,4 @@ -namespace BaseHandlers +namespace BaseHandlers { partial class InstanceListEditor { @@ -90,8 +90,6 @@ private void InitializeComponent() this.lstMain.TabIndex = 2; this.lstMain.UseCompatibleStateImageBehavior = false; this.lstMain.View = System.Windows.Forms.View.Details; - this.lstMain.ColumnWidthChanged += new System.Windows.Forms.ColumnWidthChangedEventHandler(this.LstMain_ColumnWidthChanged); - this.lstMain.ColumnWidthChanging += new System.Windows.Forms.ColumnWidthChangingEventHandler(this.LstMain_ColumnWidthChanging); this.lstMain.SizeChanged += new System.EventHandler(this.LstMain_SizeChanged); this.lstMain.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.LstMain_MouseDoubleClick); // @@ -145,4 +143,4 @@ private void InitializeComponent() private System.Windows.Forms.ColumnHeader colRotation; private System.Windows.Forms.ColumnHeader colScale; } -} \ No newline at end of file +} diff --git a/BaseHandlers/InstanceListEditor.cs b/BaseHandlers/InstanceListEditor.cs index aa51e1e..59d0bbd 100644 --- a/BaseHandlers/InstanceListEditor.cs +++ b/BaseHandlers/InstanceListEditor.cs @@ -6,13 +6,7 @@ using PluginAPI; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms; namespace BaseHandlers @@ -254,15 +248,5 @@ private void LstMain_MouseDoubleClick(object sender, MouseEventArgs e) { ViewSelectedModel(); } - - private void LstMain_ColumnWidthChanging(object sender, ColumnWidthChangingEventArgs e) - { - //e.Cancel = true; - } - - private void LstMain_ColumnWidthChanged(object sender, ColumnWidthChangedEventArgs e) - { - //UpdateColumnWidth(); - } } } diff --git a/BaseHandlers/MaterialEntry.cs b/BaseHandlers/MaterialEntry.cs index b229fd8..4c69f9f 100644 --- a/BaseHandlers/MaterialEntry.cs +++ b/BaseHandlers/MaterialEntry.cs @@ -1,10 +1,6 @@ -using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; diff --git a/BaseHandlers/Renderable.cs b/BaseHandlers/Renderable.cs index fbeff7e..dd07fc7 100644 --- a/BaseHandlers/Renderable.cs +++ b/BaseHandlers/Renderable.cs @@ -1,10 +1,6 @@ -using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using MathLib; diff --git a/BaseHandlers/StreetData.cs b/BaseHandlers/StreetData.cs index 2de0eaf..2480306 100644 --- a/BaseHandlers/StreetData.cs +++ b/BaseHandlers/StreetData.cs @@ -1,9 +1,6 @@ -using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using MathLib; diff --git a/BaseHandlers/TextureState.cs b/BaseHandlers/TextureState.cs index 47802a3..53b018e 100644 --- a/BaseHandlers/TextureState.cs +++ b/BaseHandlers/TextureState.cs @@ -1,10 +1,6 @@ -using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using BurnoutImage; diff --git a/BaseHandlers/Traffic.cs b/BaseHandlers/Traffic.cs index 8fdfa36..93a2d06 100644 --- a/BaseHandlers/Traffic.cs +++ b/BaseHandlers/Traffic.cs @@ -1,9 +1,5 @@ -using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using PluginAPI; diff --git a/BaseHandlers/TriggerData.cs b/BaseHandlers/TriggerData.cs index 22ec201..4ddee9f 100644 --- a/BaseHandlers/TriggerData.cs +++ b/BaseHandlers/TriggerData.cs @@ -7,7 +7,6 @@ using System.ComponentModel.Design; using System.Drawing.Design; using System.IO; -using System.Linq; using System.Windows.Forms; namespace BaseHandlers @@ -72,13 +71,6 @@ public override string ToString() return string.Format("{0:X16}", m_id); } } - public enum RegionType - { - E_TYPE_LANDMARK = 0, - E_TYPE_BLACKSPOT = 1, - E_TYPE_GENERIC_REGION = 2, - E_TYPE_VFXBOX_REGION = 3 - } public class StartingGrid { @@ -167,6 +159,14 @@ public void Write(BinaryWriter writer) public class TriggerRegion { + public enum RegionType + { + E_TYPE_LANDMARK = 0, + E_TYPE_BLACKSPOT = 1, + E_TYPE_GENERIC_REGION = 2, + E_TYPE_VFXBOX_REGION = 3 + } + [TypeConverter(typeof(ExpandableObjectConverter))] public BoxRegion mBoxRegion { get; set; } = new BoxRegion(); public int mId { get; set; } = 0; @@ -210,7 +210,7 @@ public Landmark() : base() public byte muDistrict { get; set; } = 0; public byte mu8Flags { get; set; } = 0; - public void Read(BinaryReader reader) + public new void Read(BinaryReader reader) { base.Read(reader); long startingGridOffset = reader.ReadUInt32(); @@ -232,7 +232,7 @@ public void Read(BinaryReader reader) } - public void Write(BinaryWriter writer) + public new void Write(BinaryWriter writer) { base.Write(writer); startingGridOffsetPosition = writer.BaseStream.Position; @@ -255,54 +255,54 @@ public void WriteStartingGrid(BinaryWriter writer){ } } - public enum GenericRegionStuntCameraType - { - E_STUNT_CAMERA_TYPE_NO_CUTS = 0, - E_STUNT_CAMERA_TYPE_CUSTOM = 1, - E_STUNT_CAMERA_TYPE_NORMAL = 2 - } - - public enum GenericRegionType - { - E_TYPE_JUNK_YARD = 0, - E_TYPE_BIKE_SHOP = 1, - E_TYPE_GAS_STATION = 2, - E_TYPE_BODY_SHOP = 3, - E_TYPE_PAINT_SHOP = 4, - E_TYPE_CAR_PARK = 5, - E_TYPE_SIGNATURE_TAKEDOWN = 6, - E_TYPE_KILLZONE = 7, - E_TYPE_JUMP = 8, - E_TYPE_SMASH = 9, - E_TYPE_SIGNATURE_CRASH = 10, - E_TYPE_SIGNATURE_CRASH_CAMERA = 11, - E_TYPE_ROAD_LIMIT = 12, - E_TYPE_OVERDRIVE_BOOST = 13, - E_TYPE_OVERDRIVE_STRENGTH = 14, - E_TYPE_OVERDRIVE_SPEED = 15, - E_TYPE_OVERDRIVE_CONTROL = 16, - E_TYPE_TIRE_SHOP = 17, - E_TYPE_TUNING_SHOP = 18, - E_TYPE_PICTURE_PARADISE = 19, - E_TYPE_TUNNEL = 20, - E_TYPE_OVERPASS = 21, - E_TYPE_BRIDGE = 22, - E_TYPE_WAREHOUSE = 23, - E_TYPE_LARGE_OVERHEAD_OBJECT = 24, - E_TYPE_NARROW_ALLEY = 25, - E_TYPE_PASS_TUNNEL = 26, - E_TYPE_PASS_OVERPASS = 27, - E_TYPE_PASS_BRIDGE = 28, - E_TYPE_PASS_WAREHOUSE = 29, - E_TYPE_PASS_LARGEOVERHEADOBJECT = 30, - E_TYPE_PASS_NARROWALLEY = 31, - E_TYPE_RAMP = 32, - E_TYPE_GOLD = 33, - E_TYPE_ISLAND_ENTITLEMENT = 34 - } - public class GenericRegion : TriggerRegion { + public enum StuntCameraType + { + E_STUNT_CAMERA_TYPE_NO_CUTS = 0, + E_STUNT_CAMERA_TYPE_CUSTOM = 1, + E_STUNT_CAMERA_TYPE_NORMAL = 2 + } + + public enum Type + { + E_TYPE_JUNK_YARD = 0, + E_TYPE_BIKE_SHOP = 1, + E_TYPE_GAS_STATION = 2, + E_TYPE_BODY_SHOP = 3, + E_TYPE_PAINT_SHOP = 4, + E_TYPE_CAR_PARK = 5, + E_TYPE_SIGNATURE_TAKEDOWN = 6, + E_TYPE_KILLZONE = 7, + E_TYPE_JUMP = 8, + E_TYPE_SMASH = 9, + E_TYPE_SIGNATURE_CRASH = 10, + E_TYPE_SIGNATURE_CRASH_CAMERA = 11, + E_TYPE_ROAD_LIMIT = 12, + E_TYPE_OVERDRIVE_BOOST = 13, + E_TYPE_OVERDRIVE_STRENGTH = 14, + E_TYPE_OVERDRIVE_SPEED = 15, + E_TYPE_OVERDRIVE_CONTROL = 16, + E_TYPE_TIRE_SHOP = 17, + E_TYPE_TUNING_SHOP = 18, + E_TYPE_PICTURE_PARADISE = 19, + E_TYPE_TUNNEL = 20, + E_TYPE_OVERPASS = 21, + E_TYPE_BRIDGE = 22, + E_TYPE_WAREHOUSE = 23, + E_TYPE_LARGE_OVERHEAD_OBJECT = 24, + E_TYPE_NARROW_ALLEY = 25, + E_TYPE_PASS_TUNNEL = 26, + E_TYPE_PASS_OVERPASS = 27, + E_TYPE_PASS_BRIDGE = 28, + E_TYPE_PASS_WAREHOUSE = 29, + E_TYPE_PASS_LARGEOVERHEADOBJECT = 30, + E_TYPE_PASS_NARROWALLEY = 31, + E_TYPE_RAMP = 32, + E_TYPE_GOLD = 33, + E_TYPE_ISLAND_ENTITLEMENT = 34 + } + public GenericRegion() : base() { // Set meType to E_TYPE_GENERIC_REGION @@ -312,24 +312,24 @@ public GenericRegion() : base() public int GroupID { get; set; } = 0; public short CameraCut1 { get; set; } = 0; public short CameraCut2 { get; set; } = 0; - public GenericRegionStuntCameraType CameraType1 { get; set; } = 0; - public GenericRegionStuntCameraType CameraType2 { get; set; } = 0; - public GenericRegionType Type { get; set; } = GenericRegionType.E_TYPE_JUNK_YARD; + public StuntCameraType CameraType1 { get; set; } = 0; + public StuntCameraType CameraType2 { get; set; } = 0; + public Type GenericRegionType { get; set; } = Type.E_TYPE_JUNK_YARD; public sbyte IsOneWay { get; set; } = 0; - public void Read(BinaryReader reader) + public new void Read(BinaryReader reader) { base.Read(reader); GroupID = reader.ReadInt32(); CameraCut1 = reader.ReadInt16(); CameraCut2 = reader.ReadInt16(); - CameraType1 = (GenericRegionStuntCameraType)reader.ReadSByte(); - CameraType2 = (GenericRegionStuntCameraType)reader.ReadSByte(); - Type = (GenericRegionType)reader.ReadByte(); + CameraType1 = (StuntCameraType)reader.ReadSByte(); + CameraType2 = (StuntCameraType)reader.ReadSByte(); + GenericRegionType = (Type)reader.ReadByte(); IsOneWay = reader.ReadSByte(); } - public void Write(BinaryWriter writer) + public new void Write(BinaryWriter writer) { base.Write(writer); writer.Write(GroupID); @@ -337,33 +337,33 @@ public void Write(BinaryWriter writer) writer.Write(CameraCut2); writer.Write((sbyte)CameraType1); writer.Write((sbyte)CameraType2); - writer.Write((byte)Type); + writer.Write((byte)GenericRegionType); writer.Write(IsOneWay); } } - public enum BlackspotScoreType - { - E_SCORE_TYPE_DISTANCE = 0, - E_SCORE_TYPE_CAR_COUNT = 1 - } - public class Blackspot : TriggerRegion { + public enum ScoreType + { + E_SCORE_TYPE_DISTANCE = 0, + E_SCORE_TYPE_CAR_COUNT = 1 + } + public Blackspot() : base() { // Set meType to E_TYPE_BLACKSPOT meType = RegionType.E_TYPE_BLACKSPOT; } - public BlackspotScoreType muScoreType { get; set; } = BlackspotScoreType.E_SCORE_TYPE_DISTANCE; + public ScoreType muScoreType { get; set; } = ScoreType.E_SCORE_TYPE_DISTANCE; public int miScoreAmount { get; set; } = 0; public override void Read(BinaryReader reader) { base.Read(reader); - muScoreType = (BlackspotScoreType) reader.ReadByte(); + muScoreType = (ScoreType)reader.ReadByte(); reader.ReadBytes(3); // Padding miScoreAmount = reader.ReadInt32(); } @@ -466,10 +466,7 @@ public void WritePointerStuff(BinaryWriter writer, Dictionary generic for (int i = 0; i < paddingCount; i++) writer.Write((byte)0); } - } - - } public class SignatureStunt @@ -529,7 +526,6 @@ public void WriteStuntElements(BinaryWriter writer, Dictionary generi writer.Write(genericRegionOffsets[trigger]); } } - } public class RoamingLocation @@ -538,12 +534,13 @@ public class RoamingLocation public Vector3I Position { get; set; } = new Vector3I(0,0,0,0); public byte DistrictIndex { get; set; } = 0; - public void Read(BinaryReader reader) { - + public void Read(BinaryReader reader) + { Position = new Vector3I( - reader.ReadSingle(), - reader.ReadSingle(), - reader.ReadSingle(), reader.ReadSingle()); + reader.ReadSingle(), + reader.ReadSingle(), + reader.ReadSingle(), + reader.ReadSingle()); DistrictIndex = reader.ReadByte(); // Read and discard padding reader.ReadBytes(15); @@ -581,23 +578,23 @@ public override void Write(BinaryWriter writer) } } - public enum SpawnLocationType - { - E_TYPE_PLAYER_SPAWN = 0, - E_TYPE_CAR_SELECT_LEFT = 1, - E_TYPE_CAR_SELECT_RIGHT = 2, - E_TYPE_CAR_UNLOCK = 3 - } - public class SpawnLocation { + public enum Type + { + E_TYPE_PLAYER_SPAWN = 0, + E_TYPE_CAR_SELECT_LEFT = 1, + E_TYPE_CAR_SELECT_RIGHT = 2, + E_TYPE_CAR_UNLOCK = 3 + } + [TypeConverter(typeof(ExpandableObjectConverter))] public Vector3I mPosition { get; set; } = new Vector3I(0, 0, 0, 0); [TypeConverter(typeof(ExpandableObjectConverter))] public Vector3I mDirection { get; set; } = new Vector3I(0, 0, 0, 0); [TypeConverter(typeof(ExpandableObjectConverter))] public CgsID mJunkyardId { get; set; } = new CgsID(); - public SpawnLocationType muType { get; set; } = 0; + public Type muType { get; set; } = 0; private byte[] padding = new byte[7]; public void Read(BinaryReader reader) @@ -606,7 +603,7 @@ public void Read(BinaryReader reader) mDirection = new Vector3I(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle()); mJunkyardId = new CgsID(); mJunkyardId.Read(reader); - muType = (SpawnLocationType)reader.ReadByte(); + muType = (Type)reader.ReadByte(); padding = reader.ReadBytes(7); } @@ -624,11 +621,9 @@ public void Write(BinaryWriter writer) writer.Write((byte)muType); writer.Write(padding); } - } - -public class TriggerData : IEntryData + public class TriggerData : IEntryData { public int miVersionNumber { get; set; } public uint muSize { get; set; } @@ -647,7 +642,6 @@ public class TriggerData : IEntryData public List mpSpawnLocations { get; set; } private List TriggerOffsets { get; set; } - public bool Read(BundleEntry entry, ILoader loader = null) { MemoryStream ms = entry.MakeStream(); diff --git a/BaseHandlers/TriggerDataEditor.cs b/BaseHandlers/TriggerDataEditor.cs index b70299f..348296c 100644 --- a/BaseHandlers/TriggerDataEditor.cs +++ b/BaseHandlers/TriggerDataEditor.cs @@ -1,17 +1,9 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using PluginAPI; namespace BaseHandlers { - public delegate void Notify(); // delegate public partial class TriggerDataEditor : Form, IEntryEditor { @@ -47,10 +39,5 @@ private void propertyGrid1_PropertyValueChanged(object s, PropertyValueChangedEv { EditEvent?.Invoke(); } - - private void propertyChanged() { - EditEvent?.Invoke(); - } - } } diff --git a/BundleFormat/BundleArchive.cs b/BundleFormat/BundleArchive.cs index 79a2b10..e18847f 100644 --- a/BundleFormat/BundleArchive.cs +++ b/BundleFormat/BundleArchive.cs @@ -1,14 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; -using System.Drawing; using System.Globalization; using System.IO; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using System.Xml; using BundleUtilities; @@ -573,8 +567,6 @@ private bool ReadBND2(BinaryReader2 br) public void Write(string path) { - //if (Console) - // ConvertToPC(); Stream s = File.Open(path, FileMode.Create); BinaryWriter bw = new BinaryWriter(s); diff --git a/BundleFormat/BundleCache.cs b/BundleFormat/BundleCache.cs index 6aabba3..ffbe8f3 100644 --- a/BundleFormat/BundleCache.cs +++ b/BundleFormat/BundleCache.cs @@ -1,9 +1,4 @@ -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace BundleFormat { @@ -42,7 +37,7 @@ public static string GetEntryNameByID(ulong entryID) public static string GetRelativePath(string path) { - string file = path.Replace('\\', '/').Replace(BundleCache.CurrentPath.Replace('\\', '/'), ""); + string file = path.Replace('\\', '/').Replace(CurrentPath.Replace('\\', '/'), ""); if (file.StartsWith("/")) file = file.Substring(1); diff --git a/BundleFormat/BundleDependency.cs b/BundleFormat/BundleDependency.cs index c2b4283..ccdbd84 100644 --- a/BundleFormat/BundleDependency.cs +++ b/BundleFormat/BundleDependency.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BundleFormat { public struct BundleDependency diff --git a/BundleFormat/BundleEntry.cs b/BundleFormat/BundleEntry.cs index 428caf8..0ebaff9 100644 --- a/BundleFormat/BundleEntry.cs +++ b/BundleFormat/BundleEntry.cs @@ -1,13 +1,7 @@ -using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; using BundleUtilities; -using Microsoft.SqlServer.Server; namespace BundleFormat { @@ -71,12 +65,6 @@ public struct DebugInfo public string TypeName; } - /*public struct BundleReference - { - public string Path; - public uint EntryCount; - }*/ - public class BundleEntry { public BundleArchive Archive; diff --git a/BundleFormat/EntryType.cs b/BundleFormat/EntryType.cs index 813c86d..355956a 100644 --- a/BundleFormat/EntryType.cs +++ b/BundleFormat/EntryType.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BundleFormat { public enum EntryType diff --git a/BundleFormat/Extensions.cs b/BundleFormat/Extensions.cs index 1ae066a..45535ed 100644 --- a/BundleFormat/Extensions.cs +++ b/BundleFormat/Extensions.cs @@ -1,12 +1,7 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Runtime.InteropServices; -using BundleUtilities; using Ionic.Zlib; namespace BundleFormat @@ -66,26 +61,6 @@ public static byte[] Decompress(this byte[] self, int uncompressedSize) return uncompressedData; } - /*public static byte[] Decompress(this byte[] self) - { - MemoryStream ms = new MemoryStream(self); - int cmagic1 = ms.ReadByte(); - int cmagic2 = ms.ReadByte(); - - if (cmagic1 != 0x78 || cmagic2 != 0xDA) - return null; - - DeflateStream ds = new DeflateStream(ms, CompressionMode.Decompress); - - MemoryStream ms2 = new MemoryStream(); - ds.CopyTo(ms2); - ds.Close(); - - byte[] result = ms2.ToArray(); - ms2.Close(); - return result; - }*/ - public static bool Matches(this byte[] self, byte[] other) { if (self == null || other == null) @@ -119,17 +94,11 @@ public static bool VerifyMagic(this BinaryReader self, byte[] magic) public static void Align(this BinaryWriter self, byte alignment) { - long originalPosition = self.BaseStream.Position; + if (self.BaseStream.Position % alignment == 0) + return; self.BaseStream.Position = alignment * ((self.BaseStream.Position + (alignment - 1)) / alignment); - if (self.BaseStream.Position != originalPosition) - { - self.BaseStream.Position--; - self.Write((byte)0); - } - - /*long currentOffset = self.BaseStream.Position; - for (int i = 0; i < (alignment - (currentOffset % alignment)); i++) - self.Write((byte)0);*/ + self.BaseStream.Position--; + self.Write((byte)0); } } } diff --git a/BundleFormat/Util.cs b/BundleFormat/Util.cs index 8fe6c3c..962a349 100644 --- a/BundleFormat/Util.cs +++ b/BundleFormat/Util.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; namespace BundleFormat { diff --git a/BundleFormat/VertexDesc.cs b/BundleFormat/VertexDesc.cs index 70d8b27..ff21784 100644 --- a/BundleFormat/VertexDesc.cs +++ b/BundleFormat/VertexDesc.cs @@ -1,11 +1,7 @@ -using System; +using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using BundleFormat; using BundleUtilities; namespace BundleFormat diff --git a/BundleManager/BundleResource.cs b/BundleManager/BundleResource.cs index ad04f7c..5b57cd3 100644 --- a/BundleManager/BundleResource.cs +++ b/BundleManager/BundleResource.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using BundleFormat; using BundleUtilities; diff --git a/BundleManager/EntryEditor.cs b/BundleManager/EntryEditor.cs index 8146554..05a090b 100644 --- a/BundleManager/EntryEditor.cs +++ b/BundleManager/EntryEditor.cs @@ -88,76 +88,6 @@ private void FocusTab() } } - private delegate byte[] GetDataHex(); - private delegate void SetDataHex(byte[] hex); - private byte[] DataHex - { - get - { - if (hexData.InvokeRequired) - { - GetDataHex method = () => - { - return hexData.HexData; - }; - return (byte[])Invoke(method); - } - else - { - return hexData.HexData; - } - } - set - { - if (hexData.InvokeRequired) - { - SetDataHex method = (byte[] hex) => - { - hexData.HexData = hex; - }; - Invoke(method, value); - } - else - { - hexData.HexData = value; - } - } - } - - private byte[] ExtraDataHex - { - get - { - if (hexExtraData.InvokeRequired) - { - GetDataHex method = () => - { - return hexExtraData.HexData; - }; - return (byte[])Invoke(method); - } - else - { - return hexExtraData.HexData; - } - } - set - { - if (hexExtraData.InvokeRequired) - { - SetDataHex method = (byte[] hex) => - { - hexExtraData.HexData = hex; - }; - Invoke(method, value); - } - else - { - hexExtraData.HexData = value; - } - } - } - private delegate Image GetImage(); private delegate void SetImage(Image img); private Image Image @@ -235,53 +165,6 @@ private bool ImageVisible } } - /*private bool ImageVisible - { - get - { - if (tabList.InvokeRequired) - { - GetBool method = () => - { - return tabList.TabPages.Contains(tabImage); - }; - return (bool)Invoke(method); - } - else - { - return tabList.TabPages.Contains(tabImage); - } - } - set - { - if (tabList.InvokeRequired) - { - SetBool method = (bool visible) => - { - if (visible && !tabList.TabPages.Contains(tabImage)) - { - tabList.TabPages.Add(tabImage); - } else if (!visible && tabList.TabPages.Contains(tabImage)) - { - tabList.TabPages.Remove(tabImage); - } - }; - Invoke(method, value); - } - else - { - if (value && !tabList.TabPages.Contains(tabImage)) - { - tabList.TabPages.Add(tabImage); - } - else if (!value && tabList.TabPages.Contains(tabImage)) - { - tabList.TabPages.Remove(tabImage); - } - } - } - }*/ - private delegate void SetTitleText(string val); private string Title { @@ -302,40 +185,6 @@ private string Title } } - private bool TabsEnabled - { - get - { - if (tabList.InvokeRequired) - { - GetBool method = () => - { - return tabList.Enabled; - }; - return (bool)Invoke(method); - } - else - { - return tabList.Enabled; - } - } - set - { - if (tabList.InvokeRequired) - { - SetBool method = (bool enabled) => - { - tabList.Enabled = enabled; - }; - Invoke(method, value); - } - else - { - tabList.Enabled = value; - } - } - } - private bool TabsVisible { get @@ -370,40 +219,6 @@ private bool TabsVisible } } - /*private bool ModelMenuVisible - { - get - { - if (mnuBar.InvokeRequired) - { - GetBool method = () => - { - return modelToolStripMenuItem.Visible; - }; - return (bool)Invoke(method); - } - else - { - return modelToolStripMenuItem.Visible; - } - } - set - { - if (mnuBar.InvokeRequired) - { - SetBool method = (bool enabled) => - { - modelToolStripMenuItem.Visible = enabled; - }; - Invoke(method, value); - } - else - { - modelToolStripMenuItem.Visible = value; - } - } - }*/ - private bool ImageMenuVisible { get @@ -506,112 +321,6 @@ private bool MenuVisible } } - /*private bool BodyTabVisible - { - get - { - if (tabBody.InvokeRequired) - { - GetBool method = () => - { - return tabBody.Enabled; - }; - return (bool)Invoke(method); - } - else - { - return tabBody.Enabled; - } - } - set - { - if (tabBody.InvokeRequired) - { - SetBool method = (bool visible) => - { - tabBody.Enabled = visible; - }; - Invoke(method, value); - } - else - { - tabBody.Enabled = value; - } - } - } - - private bool HeaderTabVisible - { - get - { - if (tabHeader.InvokeRequired) - { - GetBool method = () => - { - return tabHeader.Enabled; - }; - return (bool)Invoke(method); - } - else - { - return tabHeader.Enabled; - } - } - set - { - if (tabHeader.InvokeRequired) - { - SetBool method = (bool visible) => - { - tabHeader.Enabled = visible; - }; - Invoke(method, value); - } - else - { - tabHeader.Enabled = value; - } - } - }*/ - - /*private TabControl TabList - { - get - { - if (tabList.InvokeRequired) - { - GetTabControl method = () => - { - return tabList; - }; - return (TabControl)tabList.Invoke(method); - } - else - { - return tabList; - } - } - } - - private TabPage TabBody - { - get - { - if (tabBody.InvokeRequired) - { - GetTabPage method = () => - { - return tabBody; - }; - return (TabPage)tabBody.Invoke(method); - } - else - { - return tabBody; - } - } - }*/ - private string InfoText { get @@ -692,32 +401,11 @@ private void UpdateDisplay() } TabsVisible = !ImageVisible; - //} ImageMenuVisible = ImageVisible; BinaryMenuVisible = TabsVisible; - //ModelMenuVisible = _entry.Type == EntryType.RwRenderableResourceType; - - if (TabsVisible) - { - DataHex = _entry.EntryBlocks[0].Data;//.AsString(); - ExtraDataHex = _entry.EntryBlocks[1].Data;//.AsString(); - } - MenuVisible = true; - /*try - { - if (_entry.HasBody && !TabList.TabPages.Contains(TabBody)) - TabList.TabPages.Add(TabBody); - else if (!_entry.HasBody && TabList.TabPages.Contains(TabBody)) - TabList.TabPages.Remove(TabBody); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message + "\n\n" + ex.StackTrace); - }*/ - InfoText = GetInfo(); } @@ -929,53 +617,6 @@ private struct Vertex public float X, Y, Z; } - /*private int GetVertexSize() - { - List vertexSizes = new List(); - foreach (BundleEntry entry in Entry.Archive.Entries) - { - if (entry.Type != EntryType.RwVertexDescResourceType) - continue; - - byte[] entryData = entry.EntryBlocks[0].Data; - - MemoryStream ems = new MemoryStream(entryData); - BinaryReader2 ebr = new BinaryReader2(ems); - ebr.BigEndian = entry.Console; - - ebr.BaseStream.Position += 17; - int vSize = ebr.ReadByte(); - - ebr.Close(); - ems.Close(); - - if (!vertexSizes.Contains(vSize)) - vertexSizes.Add(vSize); - } - - vertexSizes.Reverse(); - - int vertexSize; - - if (vertexSizes.Count > 1) - { - VertexSizePicker picker = new VertexSizePicker(); - picker.VertexSizeList = vertexSizes; - picker.ShowDialog(this); - vertexSize = picker.VertexSize; - } - else if (vertexSizes.Count == 1) - { - vertexSize = vertexSizes[0]; - } - else - { - vertexSize = -1; - } - - return vertexSize; - }*/ - private void infoToolStripMenuItem_Click(object sender, EventArgs e) { if (Entry.Type != EntryType.Renderable) @@ -1020,115 +661,5 @@ private void infoToolStripMenuItem_Click(object sender, EventArgs e) MessageBox.Show(this, modelInfo, "DEBUG", MessageBoxButtons.OK, MessageBoxIcon.Error); } - - /*private void exportObjToolStripMenuItem_Click(object sender, EventArgs e) - { - if (Entry.Type != EntryType.RwRenderableResourceType) - return; - - int vertexSize = GetVertexSize(); - if (vertexSize == -1) - { - MessageBox.Show(this, "No VertexDesc was found", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - - byte[] header = Entry.EntryBlocks[0].Data; - - MemoryStream ms = new MemoryStream(header); - BinaryReader2 br = new BinaryReader2(ms); - br.BigEndian = Entry.Console; - - br.BaseStream.Position = 0x24; - int offset = br.ReadInt32(); - br.BaseStream.Position = offset; - - int vertexBlockOff = br.ReadInt32(); - int dummy = br.ReadInt32(); - int vertexBlockSize = br.ReadInt32(); - - long paddingCount = 16 - (br.BaseStream.Position % 16); - br.BaseStream.Position += paddingCount; - - long blablaOff = br.BaseStream.Position; - - br.BaseStream.Position = blablaOff + 0x4C; - int vertexCount = br.ReadInt32(); - br.BaseStream.Position = blablaOff + 0x54; - int polyCount = br.ReadInt32(); - int indexCount = polyCount * 3; - - br.Close(); - ms.Close(); - - try - { - - byte[] data = Entry.EntryBlocks[1].Data; - ms = new MemoryStream(data); - br = new BinaryReader2(ms); - br.BigEndian = Entry.Console; - - List indices = new List(); - - for (int i = 0; i < indexCount; i++) - { - indices.Add((short)(br.ReadInt16() + 1)); - } - - br.BaseStream.Position = vertexBlockOff; - - List vertices = new List(); - - for (int i = 0; i < vertexCount; i++) - { - br.BaseStream.Position = vertexBlockOff + vertexSize * i; - Vertex vertex = new Vertex(); - vertex.X = br.ReadSingle(); - vertex.Y = br.ReadSingle(); - vertex.Z = br.ReadSingle(); - vertices.Add(vertex); - } - - br.Close(); - ms.Close(); - - SaveFileDialog sfd = new SaveFileDialog(); - sfd.Filter = "Wavefront OBJ|*.obj|All Files|*.*"; - DialogResult result = sfd.ShowDialog(this); - if (result == DialogResult.OK) - { - Stream s = File.Open(sfd.FileName, FileMode.Create); - StreamWriter sw = new StreamWriter(s); - - for (int i = 0; i < vertices.Count; i++) - { - Vertex v = vertices[i]; - sw.WriteLine("v " + v.X + " " + v.Y + " " + v.Z); - } - - sw.WriteLine(); - sw.WriteLine("g submesh_0"); - - for (int i = 0; i < indices.Count; i += 3) - { - int index1 = indices[i + 0]; - int index2 = indices[i + 1]; - int index3 = indices[i + 2]; - sw.WriteLine("f " + index1 + " " + index2 + " " + index3); - } - - sw.WriteLine(); - - sw.Flush(); - sw.Close(); - sw.Close(); - } - } - catch (IOException ex) - { - MessageBox.Show(this, "Error: " + ex.Message + "\n\n" + ex.StackTrace, "DEBUG", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - }*/ } } diff --git a/BundleManager/FileView.cs b/BundleManager/FileView.cs index 99630bb..a2d6d3a 100644 --- a/BundleManager/FileView.cs +++ b/BundleManager/FileView.cs @@ -10,8 +10,6 @@ namespace BundleManager { public partial class FileView : Form { - private static FileView _instance; - private static bool _loadMaterials; public static bool LoadMaterials { @@ -38,7 +36,6 @@ public FileView() { InitializeComponent(); - _instance = this; LoadMaterials = true; UpdateRecentFiles(); @@ -354,33 +351,6 @@ public void Open(string path = "") private void OpenBundle(int index) { string file = BundleCache.Paths[index]; - /*List entryIDs = BundleArchive.GetEntryInfos(file, false); - bool ignoreAllConflicts = false; - foreach (EntryInfo info in entryIDs) - { - uint entryID = info.ID; - if (BundleCache.Files.ContainsKey(entryID)) - { - if (ignoreAllConflicts) - continue; - int index1 = BundleCache.Files[entryID]; - string otherFile = BundleCache.Paths[index1]; - ConflictChoice choice = ResolveConflict(entryID, file, otherFile); - if (choice.Cancel) - { - break; - } - if (choice.IgnoreAll) - ignoreAllConflicts = true; - continue; - } - - if (!BundleCache.EntryInfos.ContainsKey(entryID)) - { - BundleCache.EntryInfos.Add(entryID, info); - BundleCache.Files.Add(entryID, index); - } - }*/ MainForm form = new MainForm(); form.SubForm = true; form.Open(file); @@ -428,26 +398,6 @@ private void lstMain_DoubleClick(object sender, EventArgs e) } } - private List ScanTest(BundleArchive archive) - { - List referenceList = new List(); - foreach (BundleEntry entry in archive.Entries) - { - if (entry.Type != EntryType.TextureState) - continue; - - List dependencies = entry.GetDependencies(); - foreach (BundleDependency dependency in dependencies) - { - ulong id = dependency.EntryID; - string entryFile = BundleCache.GetFileByEntryID(id); - if (entryFile.ToUpper().Contains("WORLDTEX4")) - referenceList.Add(Path.GetFileName(archive.Path)); - } - } - return referenceList; - } - private void ignoreIDConflictsToolStripMenuItem_Click(object sender, EventArgs e) { if (ignoreIDConflictsToolStripMenuItem.CheckState == CheckState.Checked) diff --git a/BundleManager/MainForm.cs b/BundleManager/MainForm.cs index 34ced3d..b7f6b02 100644 --- a/BundleManager/MainForm.cs +++ b/BundleManager/MainForm.cs @@ -1,12 +1,5 @@ using System; using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Drawing; -using System.Globalization; -using System.IO; -using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; @@ -14,7 +7,6 @@ using BundleUtilities; using DebugHelper; using PluginAPI; -using Util = BundleFormat.Util; namespace BundleManager { diff --git a/BundleManager/Program.cs b/BundleManager/Program.cs index 1ca5a84..361c58d 100644 --- a/BundleManager/Program.cs +++ b/BundleManager/Program.cs @@ -1,6 +1,5 @@ -using PluginSystem; +using PluginSystem; using System; -using System.Diagnostics; using System.Globalization; using System.IO; using System.Windows.Forms; diff --git a/BundleManager/SaveData.cs b/BundleManager/SaveData.cs index 021c3c7..951d67d 100644 --- a/BundleManager/SaveData.cs +++ b/BundleManager/SaveData.cs @@ -1,10 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace BundleManager { diff --git a/BundleManager/SearchDialog.cs b/BundleManager/SearchDialog.cs index 1d52106..3644e44 100644 --- a/BundleManager/SearchDialog.cs +++ b/BundleManager/SearchDialog.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; +using System; using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using BundleUtilities; diff --git a/BundleUtilities/BinaryReader2.cs b/BundleUtilities/BinaryReader2.cs index 8be95de..26fa220 100644 --- a/BundleUtilities/BinaryReader2.cs +++ b/BundleUtilities/BinaryReader2.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace BundleUtilities { @@ -159,7 +157,6 @@ public void SkipPadding() }; } - public Vector3I ReadVector3I() { float x = base.ReadSingle(); diff --git a/BundleUtilities/BitScan.cs b/BundleUtilities/BitScan.cs index 6bf0965..7e4a510 100644 --- a/BundleUtilities/BitScan.cs +++ b/BundleUtilities/BitScan.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace BundleUtilities { diff --git a/BundleUtilities/Config.cs b/BundleUtilities/Config.cs index f293deb..b3d1def 100644 --- a/BundleUtilities/Config.cs +++ b/BundleUtilities/Config.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BundleUtilities { public static class Config diff --git a/BundleUtilities/DebugTimer.cs b/BundleUtilities/DebugTimer.cs index d35c4c2..60f6771 100644 --- a/BundleUtilities/DebugTimer.cs +++ b/BundleUtilities/DebugTimer.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace BundleUtilities { diff --git a/BundleUtilities/EncryptedString.cs b/BundleUtilities/EncryptedString.cs index 0906b06..52d1130 100644 --- a/BundleUtilities/EncryptedString.cs +++ b/BundleUtilities/EncryptedString.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; +using System; using System.Text; -using System.Threading.Tasks; namespace BundleUtilities { @@ -100,7 +96,6 @@ private byte[] DecryptString(ulong val) buf[--index + 1] = c; } while (index >= 0); - //buf[12] = 0; // Not required in C# return buf; } diff --git a/BundleUtilities/ILoader.cs b/BundleUtilities/ILoader.cs index 838b3df..a5ebbf4 100644 --- a/BundleUtilities/ILoader.cs +++ b/BundleUtilities/ILoader.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BundleUtilities { public interface ILoader diff --git a/BundleUtilities/LoadingDialog.cs b/BundleUtilities/LoadingDialog.cs index 159aa5c..7b47ad4 100644 --- a/BundleUtilities/LoadingDialog.cs +++ b/BundleUtilities/LoadingDialog.cs @@ -1,4 +1,4 @@ -using BundleUtilities; +using BundleUtilities; using System; using System.Windows.Forms; @@ -69,10 +69,6 @@ public LoadingDialog() private void btnCancel_Click(object sender, EventArgs e) { - /*if (Done != null) - { - Done(shouldCancel); - }*/ Close(); } diff --git a/BundleUtilities/ReadFailedError.cs b/BundleUtilities/ReadFailedError.cs index a293964..5b322ad 100644 --- a/BundleUtilities/ReadFailedError.cs +++ b/BundleUtilities/ReadFailedError.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; namespace BundleUtilities { diff --git a/BundleUtilities/TextureCache.cs b/BundleUtilities/TextureCache.cs index d1bf04d..50c029d 100644 --- a/BundleUtilities/TextureCache.cs +++ b/BundleUtilities/TextureCache.cs @@ -1,9 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace BundleUtilities { diff --git a/BundleUtilities/Utilities.cs b/BundleUtilities/Utilities.cs index c2b2760..155220d 100644 --- a/BundleUtilities/Utilities.cs +++ b/BundleUtilities/Utilities.cs @@ -1,12 +1,8 @@ using System; -using System.CodeDom; using System.Collections.Generic; using System.ComponentModel; -using System.Globalization; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Reflection; namespace BundleUtilities diff --git a/BurnoutImage/ClusterFit.cs b/BurnoutImage/ClusterFit.cs index e2003b0..dfa2638 100644 --- a/BurnoutImage/ClusterFit.cs +++ b/BurnoutImage/ClusterFit.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BCnEncoder.Shared; namespace BurnoutImage diff --git a/BurnoutImage/ColourFit.cs b/BurnoutImage/ColourFit.cs index 1b6603c..ed3d8ab 100644 --- a/BurnoutImage/ColourFit.cs +++ b/BurnoutImage/ColourFit.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BCnEncoder.Shared; namespace BurnoutImage diff --git a/BurnoutImage/ColourSet.cs b/BurnoutImage/ColourSet.cs index 9a593d2..fb68491 100644 --- a/BurnoutImage/ColourSet.cs +++ b/BurnoutImage/ColourSet.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BCnEncoder.Shared; namespace BurnoutImage diff --git a/BurnoutImage/CompressionTools.cs b/BurnoutImage/CompressionTools.cs index d24849d..5f0d81b 100644 --- a/BurnoutImage/CompressionTools.cs +++ b/BurnoutImage/CompressionTools.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Runtime.InteropServices; using System.IO; using BCnEncoder.Decoder; using BCnEncoder.Encoder; diff --git a/BurnoutImage/DirectBitmap.cs b/BurnoutImage/DirectBitmap.cs index 119b4a9..3817bb2 100644 --- a/BurnoutImage/DirectBitmap.cs +++ b/BurnoutImage/DirectBitmap.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Drawing; using System.Drawing.Imaging; using System.Runtime.InteropServices; @@ -29,30 +29,15 @@ public DirectBitmap(int width, int height) public void SetPixel(int x, int y, Color colour) { int index = x + (y * Width); - - /*Bits[index + 0] = colour.A; - Bits[index + 1] = colour.R; - Bits[index + 2] = colour.G; - Bits[index + 3] = colour.B;*/ - int col = colour.ToArgb(); - Bits[index] = col; } public Color GetPixel(int x, int y) { int index = x + (y * Width); - - /*byte alpha = Bits[index + 0]; - byte red = Bits[index + 1]; - byte green = Bits[index + 2]; - byte blue = Bits[index + 3]; - Color result = Color.FromArgb(alpha, red, green, blue);*/ - int col = Bits[index]; Color result = Color.FromArgb(col); - return result; } diff --git a/BurnoutImage/Extensions.cs b/BurnoutImage/Extensions.cs index 35fa21c..80c9dfd 100644 --- a/BurnoutImage/Extensions.cs +++ b/BurnoutImage/Extensions.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BurnoutImage { internal static class Extensions diff --git a/BurnoutImage/GameImage.cs b/BurnoutImage/GameImage.cs index b60b321..b343b72 100644 --- a/BurnoutImage/GameImage.cs +++ b/BurnoutImage/GameImage.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Drawing; using System.IO; -using System.Runtime.InteropServices; using System.Windows.Forms; -using BundleUtilities; using BCnEncoder.Shared; namespace BurnoutImage diff --git a/BurnoutImage/ImageUtil.cs b/BurnoutImage/ImageUtil.cs index 39ec6fd..00c53fa 100644 --- a/BurnoutImage/ImageUtil.cs +++ b/BurnoutImage/ImageUtil.cs @@ -1,14 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Drawing; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.IO; -using System.Drawing.Imaging; -using System.Windows.Forms; using BCnEncoder.Shared; namespace BurnoutImage diff --git a/BurnoutImage/RangeFit.cs b/BurnoutImage/RangeFit.cs index 091ade3..7b89570 100644 --- a/BurnoutImage/RangeFit.cs +++ b/BurnoutImage/RangeFit.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BCnEncoder.Shared; namespace BurnoutImage @@ -35,24 +31,6 @@ public RangeFit(ColourSet colours, CompressionFormat compression) : base(colours int count = Colours.Count; Vec3[] values = Colours.Points; float[] weights = Colours.Weights; - - // get the covariance matrix - /*Sym3x3 covariance = ComputeWeightedCovariance(count, values, weights); - - // compute the principle components - Vec3 principle = ComputePrincipleComponent(covariance); - - // get the min and max range as the codebook endpoints - Vec3 start = new Vec3(0.0f); - Vec3 end = new Vec3(0.0f); - if (count > 0) - { - float min, max; - - // compute the range - start = end = values[0]; - - }*/ } protected override void Compress3(byte[] block, int offset) diff --git a/BurnoutImage/SingleColourFit.cs b/BurnoutImage/SingleColourFit.cs deleted file mode 100644 index e627e3c..0000000 --- a/BurnoutImage/SingleColourFit.cs +++ /dev/null @@ -1,147 +0,0 @@ -/*using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BurnoutImage -{ - internal class SingleColourFit : ColourFit - { - - public byte[] Colour; - public Vec3 Start; - public Vec3 End; - public byte Index; - public int Error; - public int BestError; - - public byte[] IndexP - { - get - { - MemoryStream ms = new MemoryStream(); - BinaryWriter bw = new BinaryWriter(ms); - bw.Write(Index); - bw.Write(Error); - bw.Write(BestError); - byte[] result = ms.ToArray(); - bw.Close(); - return result; - } - } - - public SingleColourFit(ColourSet colours, DXTCompression compression) : base(colours, compression) - { - Colour = new byte[3]; - - // grab the single colour - Vec3 values = colours.Points[0]; - Colour[0] = (byte)Util.FloatToInt(255.0f / values.X, 255); - Colour[1] = (byte)Util.FloatToInt(255.0f / values.Y, 255); - Colour[2] = (byte)Util.FloatToInt(255.0f / values.Z, 255); - - // initialize the best error - BestError = int.MaxValue; - } - - protected override void Compress3(byte[] block, int offset) - { - // build the table of lookups - SingleColourLookup[][] lookups = new SingleColourLookup[][] - { - SingleColourLookups.lookup_5_3, - SingleColourLookups.lookup_6_3, - SingleColourLookups.lookup_5_3 - }; - - // find the best end-points and index - ComputeEndPoints(lookups); - - // build the block if we win - if (Error < BestError) - { - // Remap the indices - byte[] indices = new byte[16]; - Colours.RemapIndices(IndexP, indices); - - // save the block - ImageUtil.WriteColourBlock3(Start, End, indices, block, offset); - - // save the error - BestError = Error; - } - } - - protected override void Compress4(byte[] block, int offset) - { - // build the table of lookups - SingleColourLookup[][] lookups = new SingleColourLookup[][] - { - SingleColourLookups.lookup_5_4, - SingleColourLookups.lookup_6_4, - SingleColourLookups.lookup_5_4 - }; - - // find the best end-points and index - ComputeEndPoints(lookups); - - // build the block if we win - if (Error < BestError) - { - // Remap the indices - byte[] indices = new byte[16]; - Colours.RemapIndices(IndexP, indices); - - // save the block - ImageUtil.WriteColourBlock4(Start, End, indices, block, offset); - - // save the error - BestError = Error; - } - } - - protected void ComputeEndPoints(SingleColourLookup[][] lookups) - { - // check each index combination (endpoint or intermediate) - Error = int.MaxValue; - for (int index = 0; index < 2; ++index) - { - // check the error for this codebook index - SourceBlock[] sources = new SourceBlock[3]; - int error = 0; - - for (int channel = 0; channel < 3; ++channel) - { - // grab the lookup table and index for this channel - SingleColourLookup[] lookup = lookups[channel]; - int target = Colour[channel]; - - // store a pointer to the source for this channel - sources[channel] = lookup[target].sources[index]; - - // accumulate the error - int diff = sources[channel].Error; - error += diff * diff; - - } - - // keep it if the error is lower - if (error < Error) - { - Start = new Vec3((float)sources[0].Start / 31.0f, - (float)sources[1].Start / 63.0f, - (float)sources[2].Start / 31.0f); - - End = new Vec3((float)sources[0].End / 31.0f, - (float)sources[1].End / 63.0f, - (float)sources[2].End / 31.0f); - Index = (byte)(2 * index); - Error = error; - } - } - } - } -} -*/ \ No newline at end of file diff --git a/BurnoutImage/SingleColourLookup.cs b/BurnoutImage/SingleColourLookup.cs index b922017..e8136e2 100644 --- a/BurnoutImage/SingleColourLookup.cs +++ b/BurnoutImage/SingleColourLookup.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace BurnoutImage { internal struct SourceBlock @@ -34,1046 +28,1044 @@ public SingleColourLookup(SourceBlock src1, SourceBlock src2) internal class SingleColourLookups { - public static SingleColourLookup[] lookup_5_3 = new SingleColourLookup[] { - new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 0, 1 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 0, 2 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 3 ), new SourceBlock( 0, 1, 1 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 4 ), new SourceBlock( 0, 1, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 1, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 1, 2 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 2, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 2, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 2, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 2, 2 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 3, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 4 ), new SourceBlock( 0, 3, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 3, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 3, 2 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 4, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 4, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 4, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 4, 2 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 5, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 4 ), new SourceBlock( 0, 5, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 0, 5, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 5, 2 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 6, 2 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 0, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 4 ), new SourceBlock( 0, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 0, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 0, 7, 2 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 1, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 1, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 8, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 8, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 2, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 2, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 0, 9, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 9, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 3, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 3, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 10, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 10, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 0, 10, 2 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 11, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 4 ), new SourceBlock( 0, 11, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 11, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 11, 2 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 12, 2 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 13, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 4 ), new SourceBlock( 0, 13, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 0, 13, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 13, 2 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 14, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 14, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 14, 2 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 0, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 4 ), new SourceBlock( 0, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 0, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 0, 15, 2 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 1, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 1, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 16, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 16, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 2, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 2, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 0, 17, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 17, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 3, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 3, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 18, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 0, 18, 2 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 19, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 4 ), new SourceBlock( 0, 19, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 19, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 19, 2 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 20, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 20, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 20, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 20, 2 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 21, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 4 ), new SourceBlock( 0, 21, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 0, 21, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 21, 2 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 22, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 0, 22, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 22, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 22, 2 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 0, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 4 ), new SourceBlock( 0, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 0, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 0, 23, 2 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 1, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 1, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 24, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 2, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 2, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 0, 25, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 0, 25, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 3, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 3, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 0, 26, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 26, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 0, 26, 2 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 0, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 4 ), new SourceBlock( 0, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 0, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 27, 2 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 0, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 28, 2 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 0, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 4 ), new SourceBlock( 0, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 0, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 29, 2 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 30, 2 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 0, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 4 ), new SourceBlock( 0, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 0, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 0, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 1, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 1, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 4, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 4, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 2, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 2, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 4, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 4, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 3, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 3, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 4, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 4, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 4, 30, 2 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 4, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 4 ), new SourceBlock( 4, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 4, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 4, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 5, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 5, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 5, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 5, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 6, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 4 ), new SourceBlock( 6, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 6, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 6, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 7, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 7, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 8, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 4 ), new SourceBlock( 8, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 8, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 8, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 9, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 9, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 12, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 12, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 10, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 10, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 12, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 12, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 11, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 11, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 12, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 12, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 12, 30, 2 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 12, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 4 ), new SourceBlock( 12, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 12, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 12, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 13, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 13, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 14, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 4 ), new SourceBlock( 14, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 14, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 14, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 15, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 15, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 15, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 15, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 16, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 4 ), new SourceBlock( 16, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 16, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 16, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 17, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 17, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 20, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 20, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 18, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 18, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 20, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 20, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 19, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 19, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 20, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 20, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 20, 30, 2 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 20, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 4 ), new SourceBlock( 20, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 20, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 20, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 21, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 21, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 21, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 21, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 22, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 4 ), new SourceBlock( 22, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 22, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 22, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 23, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 23, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 23, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 23, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 24, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 4 ), new SourceBlock( 24, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 24, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 24, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 25, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 25, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 28, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 28, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 26, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 26, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 28, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 28, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 27, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 27, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 28, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 28, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 28, 30, 2 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 28, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 4 ), new SourceBlock( 28, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 28, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 28, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 29, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 29, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 29, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 29, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 30, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 4 ), new SourceBlock( 30, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 3 ), new SourceBlock( 30, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 30, 31, 2 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 31, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 31, 31, 0 ) ) -}; - - public static SingleColourLookup[] lookup_6_3 = new SingleColourLookup[] - { - new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 1, 1 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 1, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 2, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 2, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 3, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 3, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 4, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 4, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 5, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 5, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 8, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 8, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 0, 9, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 10, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 10, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 11, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 0, 11, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 13, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 13, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 14, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 16, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 16, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 17, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 0, 17, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 18, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 19, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 0, 19, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 20, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 20, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 21, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 21, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 22, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 0, 22, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 24, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 25, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 0, 25, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 26, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 0, 26, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 0, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 28, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 0, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 1, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 1, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 0, 32, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 2, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 0, 33, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 3, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 0, 34, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 4, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 0, 35, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 5, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 0, 36, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 6, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 0, 37, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 7, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 0, 38, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 8, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 0, 39, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 9, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 0, 40, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 10, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 0, 41, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 11, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 0, 42, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 12, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 0, 43, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 13, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 0, 44, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 14, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 0, 45, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 15, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 0, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 0, 47, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 0, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 0, 48, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 0, 48, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 0, 49, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 0, 49, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 0, 50, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 0, 50, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 0, 51, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 0, 51, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 0, 52, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 0, 52, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 0, 53, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 0, 53, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 0, 54, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 0, 54, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 0, 55, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 0, 55, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 0, 56, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 0, 56, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 0, 57, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 0, 57, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 0, 58, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 0, 58, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 0, 59, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 0, 59, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 0, 60, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 0, 60, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 0, 61, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 0, 61, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 0, 62, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 0, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 0, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 0, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 1, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 1, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 0 ), new SourceBlock( 16, 48, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 2, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 16, 49, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 3, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 0 ), new SourceBlock( 16, 50, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 4, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 2 ), new SourceBlock( 16, 51, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 5, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 0 ), new SourceBlock( 16, 52, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 6, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 2 ), new SourceBlock( 16, 53, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 7, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 0 ), new SourceBlock( 16, 54, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 8, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 2 ), new SourceBlock( 16, 55, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 9, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 0 ), new SourceBlock( 16, 56, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 10, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 2 ), new SourceBlock( 16, 57, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 11, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 0 ), new SourceBlock( 16, 58, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 12, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 2 ), new SourceBlock( 16, 59, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 13, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 0 ), new SourceBlock( 16, 60, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 14, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 2 ), new SourceBlock( 16, 61, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 15, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 0 ), new SourceBlock( 16, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 16, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 2 ), new SourceBlock( 16, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 17, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 0 ), new SourceBlock( 17, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 18, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 2 ), new SourceBlock( 18, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 19, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 0 ), new SourceBlock( 19, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 20, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 2 ), new SourceBlock( 20, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 21, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 0 ), new SourceBlock( 21, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 22, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 2 ), new SourceBlock( 22, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 23, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 0 ), new SourceBlock( 23, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 24, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 2 ), new SourceBlock( 24, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 25, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 0 ), new SourceBlock( 25, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 26, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 2 ), new SourceBlock( 26, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 27, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 0 ), new SourceBlock( 27, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 28, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 2 ), new SourceBlock( 28, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 29, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 0 ), new SourceBlock( 29, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 30, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 2 ), new SourceBlock( 30, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 31, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 0 ), new SourceBlock( 31, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 32, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 2 ), new SourceBlock( 32, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 33, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 33, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 0 ), new SourceBlock( 48, 48, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 34, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 48, 49, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 35, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 0 ), new SourceBlock( 48, 50, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 36, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 2 ), new SourceBlock( 48, 51, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 37, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 0 ), new SourceBlock( 48, 52, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 38, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 2 ), new SourceBlock( 48, 53, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 39, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 0 ), new SourceBlock( 48, 54, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 40, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 2 ), new SourceBlock( 48, 55, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 41, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 0 ), new SourceBlock( 48, 56, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 42, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 2 ), new SourceBlock( 48, 57, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 43, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 0 ), new SourceBlock( 48, 58, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 44, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 2 ), new SourceBlock( 48, 59, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 45, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 0 ), new SourceBlock( 48, 60, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 46, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 2 ), new SourceBlock( 48, 61, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 47, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 0 ), new SourceBlock( 48, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 48, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 2 ), new SourceBlock( 48, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 49, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 0 ), new SourceBlock( 49, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 50, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 2 ), new SourceBlock( 50, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 51, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 0 ), new SourceBlock( 51, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 52, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 2 ), new SourceBlock( 52, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 53, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 0 ), new SourceBlock( 53, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 54, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 2 ), new SourceBlock( 54, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 55, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 0 ), new SourceBlock( 55, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 56, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 2 ), new SourceBlock( 56, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 57, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 0 ), new SourceBlock( 57, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 58, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 2 ), new SourceBlock( 58, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 59, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 0 ), new SourceBlock( 59, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 60, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 2 ), new SourceBlock( 60, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 61, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 0 ), new SourceBlock( 61, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 62, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 2 ), new SourceBlock( 62, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 63, 0, 1 ), new SourceBlock( 63, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 63, 0, 0 ), new SourceBlock( 63, 63, 0 ) ) + new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 0, 1 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 0, 2 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 3 ), new SourceBlock( 0, 1, 1 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 4 ), new SourceBlock( 0, 1, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 1, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 1, 2 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 2, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 2, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 2, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 2, 2 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 3, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 4 ), new SourceBlock( 0, 3, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 3, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 3, 2 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 4, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 4, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 4, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 4, 2 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 5, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 4 ), new SourceBlock( 0, 5, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 0, 5, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 5, 2 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 6, 2 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 0, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 4 ), new SourceBlock( 0, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 0, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 0, 7, 2 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 1, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 1, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 8, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 8, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 2, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 2, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 0, 9, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 9, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 3, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 3, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 10, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 10, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 0, 10, 2 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 11, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 4 ), new SourceBlock( 0, 11, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 11, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 11, 2 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 12, 2 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 13, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 4 ), new SourceBlock( 0, 13, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 0, 13, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 13, 2 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 14, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 14, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 14, 2 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 0, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 4 ), new SourceBlock( 0, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 0, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 0, 15, 2 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 1, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 1, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 16, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 16, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 2, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 2, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 0, 17, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 17, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 3, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 3, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 18, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 0, 18, 2 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 19, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 4 ), new SourceBlock( 0, 19, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 19, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 19, 2 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 20, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 20, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 20, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 20, 2 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 21, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 4 ), new SourceBlock( 0, 21, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 0, 21, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 21, 2 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 22, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 0, 22, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 22, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 22, 2 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 0, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 4 ), new SourceBlock( 0, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 0, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 0, 23, 2 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 1, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 1, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 24, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 2, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 2, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 0, 25, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 0, 25, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 3, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 3, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 0, 26, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 26, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 0, 26, 2 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 0, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 4 ), new SourceBlock( 0, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 0, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 27, 2 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 0, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 28, 2 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 0, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 4 ), new SourceBlock( 0, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 0, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 29, 2 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 30, 2 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 0, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 4 ), new SourceBlock( 0, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 0, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 0, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 1, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 1, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 4, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 4, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 2, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 2, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 4, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 4, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 3, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 3, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 4, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 4, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 4, 30, 2 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 4, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 4 ), new SourceBlock( 4, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 4, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 4, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 5, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 5, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 5, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 5, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 6, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 4 ), new SourceBlock( 6, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 6, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 6, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 7, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 7, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 8, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 4 ), new SourceBlock( 8, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 8, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 8, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 9, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 9, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 12, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 12, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 10, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 10, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 12, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 12, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 11, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 11, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 12, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 12, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 12, 30, 2 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 12, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 4 ), new SourceBlock( 12, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 12, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 12, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 13, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 13, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 14, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 4 ), new SourceBlock( 14, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 14, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 14, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 15, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 15, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 15, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 15, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 16, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 4 ), new SourceBlock( 16, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 16, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 16, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 17, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 17, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 20, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 20, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 18, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 18, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 20, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 20, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 19, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 19, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 20, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 20, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 20, 30, 2 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 20, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 4 ), new SourceBlock( 20, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 20, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 20, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 21, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 21, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 21, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 21, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 22, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 4 ), new SourceBlock( 22, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 22, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 22, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 23, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 23, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 23, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 23, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 24, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 4 ), new SourceBlock( 24, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 24, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 24, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 25, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 25, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 28, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 28, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 26, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 26, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 28, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 28, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 27, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 27, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 28, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 28, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 28, 30, 2 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 28, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 4 ), new SourceBlock( 28, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 28, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 28, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 29, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 29, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 29, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 29, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 30, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 4 ), new SourceBlock( 30, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 3 ), new SourceBlock( 30, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 30, 31, 2 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 31, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 31, 31, 0 ) ) +}; + + public static SingleColourLookup[] lookup_6_3 = new SingleColourLookup[] + { + new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 1, 1 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 1, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 2, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 2, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 3, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 3, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 4, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 4, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 5, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 5, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 8, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 8, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 0, 9, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 10, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 10, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 11, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 0, 11, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 13, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 13, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 14, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 16, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 16, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 17, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 0, 17, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 18, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 19, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 0, 19, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 20, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 20, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 21, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 21, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 22, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 0, 22, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 24, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 25, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 0, 25, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 26, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 0, 26, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 0, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 28, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 0, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 1, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 1, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 0, 32, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 2, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 0, 33, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 3, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 0, 34, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 4, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 0, 35, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 5, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 0, 36, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 6, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 0, 37, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 7, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 0, 38, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 8, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 0, 39, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 9, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 0, 40, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 10, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 0, 41, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 11, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 0, 42, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 12, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 0, 43, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 13, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 0, 44, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 14, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 0, 45, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 15, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 0, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 0, 47, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 0, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 0, 48, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 0, 48, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 0, 49, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 0, 49, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 0, 50, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 0, 50, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 0, 51, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 0, 51, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 0, 52, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 0, 52, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 0, 53, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 0, 53, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 0, 54, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 0, 54, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 0, 55, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 0, 55, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 0, 56, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 0, 56, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 0, 57, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 0, 57, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 0, 58, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 0, 58, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 0, 59, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 0, 59, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 0, 60, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 0, 60, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 0, 61, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 0, 61, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 0, 62, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 0, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 0, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 0, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 1, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 1, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 0 ), new SourceBlock( 16, 48, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 2, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 16, 49, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 3, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 0 ), new SourceBlock( 16, 50, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 4, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 2 ), new SourceBlock( 16, 51, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 5, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 0 ), new SourceBlock( 16, 52, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 6, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 2 ), new SourceBlock( 16, 53, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 7, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 0 ), new SourceBlock( 16, 54, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 8, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 2 ), new SourceBlock( 16, 55, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 9, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 0 ), new SourceBlock( 16, 56, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 10, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 2 ), new SourceBlock( 16, 57, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 11, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 0 ), new SourceBlock( 16, 58, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 12, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 2 ), new SourceBlock( 16, 59, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 13, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 0 ), new SourceBlock( 16, 60, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 14, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 2 ), new SourceBlock( 16, 61, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 15, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 0 ), new SourceBlock( 16, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 16, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 2 ), new SourceBlock( 16, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 17, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 0 ), new SourceBlock( 17, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 18, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 2 ), new SourceBlock( 18, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 19, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 0 ), new SourceBlock( 19, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 20, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 2 ), new SourceBlock( 20, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 21, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 0 ), new SourceBlock( 21, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 22, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 2 ), new SourceBlock( 22, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 23, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 0 ), new SourceBlock( 23, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 24, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 2 ), new SourceBlock( 24, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 25, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 0 ), new SourceBlock( 25, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 26, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 2 ), new SourceBlock( 26, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 27, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 0 ), new SourceBlock( 27, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 28, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 2 ), new SourceBlock( 28, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 29, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 0 ), new SourceBlock( 29, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 30, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 2 ), new SourceBlock( 30, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 31, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 0 ), new SourceBlock( 31, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 32, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 2 ), new SourceBlock( 32, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 33, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 33, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 0 ), new SourceBlock( 48, 48, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 34, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 48, 49, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 35, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 0 ), new SourceBlock( 48, 50, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 36, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 2 ), new SourceBlock( 48, 51, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 37, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 0 ), new SourceBlock( 48, 52, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 38, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 2 ), new SourceBlock( 48, 53, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 39, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 0 ), new SourceBlock( 48, 54, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 40, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 2 ), new SourceBlock( 48, 55, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 41, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 0 ), new SourceBlock( 48, 56, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 42, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 2 ), new SourceBlock( 48, 57, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 43, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 0 ), new SourceBlock( 48, 58, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 44, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 2 ), new SourceBlock( 48, 59, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 45, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 0 ), new SourceBlock( 48, 60, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 46, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 2 ), new SourceBlock( 48, 61, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 47, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 0 ), new SourceBlock( 48, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 48, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 2 ), new SourceBlock( 48, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 49, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 0 ), new SourceBlock( 49, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 50, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 2 ), new SourceBlock( 50, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 51, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 0 ), new SourceBlock( 51, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 52, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 2 ), new SourceBlock( 52, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 53, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 0 ), new SourceBlock( 53, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 54, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 2 ), new SourceBlock( 54, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 55, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 0 ), new SourceBlock( 55, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 56, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 2 ), new SourceBlock( 56, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 57, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 0 ), new SourceBlock( 57, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 58, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 2 ), new SourceBlock( 58, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 59, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 0 ), new SourceBlock( 59, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 60, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 2 ), new SourceBlock( 60, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 61, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 0 ), new SourceBlock( 61, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 62, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 2 ), new SourceBlock( 62, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 63, 0, 1 ), new SourceBlock( 63, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 63, 0, 0 ), new SourceBlock( 63, 63, 0 ) ) + }; + + public static SingleColourLookup[] lookup_5_4 = new SingleColourLookup[] + { + new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 1, 1 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 1, 0 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 3 ), new SourceBlock( 0, 1, 1 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 4 ), new SourceBlock( 0, 2, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 2, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 2, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 3, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 3, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 1, 2, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 1, 2, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 4, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 4 ), new SourceBlock( 0, 5, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 5, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 5, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 2, 3, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 2, 3, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 4 ), new SourceBlock( 1, 6, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 1, 6, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 8, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 9, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 10, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 0, 10, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 4 ), new SourceBlock( 2, 7, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 2, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 0, 11, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 1, 10, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 1, 10, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 13, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 0, 13, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 0, 13, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 0, 14, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 2, 11, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 2, 11, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 1, 14, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 1, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 16, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 4 ), new SourceBlock( 0, 17, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 17, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 17, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 18, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 2, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 2, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 19, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 4 ), new SourceBlock( 1, 18, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 1, 18, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 20, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 21, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 21, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 21, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 22, 1 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 0, 22, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 4 ), new SourceBlock( 2, 19, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 2, 19, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 0, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 1, 22, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 1, 22, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 25, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 0, 25, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 0, 25, 1 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 0, 26, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 26, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 2, 23, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 2, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 1, 26, 1 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 1, 26, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 4 ), new SourceBlock( 0, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 29, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 2, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 2, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 4 ), new SourceBlock( 1, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 1, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 4, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 1, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 1, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 1, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 2, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 2, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 4 ), new SourceBlock( 2, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 2, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 4, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 3, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 3, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 4, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 3, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 3, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 3, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 4, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 4, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 6, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 6, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 4, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 5, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 5, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 8, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 4 ), new SourceBlock( 5, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 5, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 5, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 6, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 6, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 6, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 6, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 8, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 4 ), new SourceBlock( 7, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 7, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 8, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 7, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 8, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 8, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 4 ), new SourceBlock( 10, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 10, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 8, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 9, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 9, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 12, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 9, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 9, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 9, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 10, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 10, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 10, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 10, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 12, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 11, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 11, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 12, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 4 ), new SourceBlock( 11, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 11, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 11, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 12, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 12, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 14, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 14, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 12, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 4 ), new SourceBlock( 13, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 13, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 16, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 13, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 14, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 14, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 4 ), new SourceBlock( 14, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 14, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 16, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 15, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 15, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 16, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 15, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 15, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 15, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 16, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 16, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 18, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 18, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 16, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 17, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 17, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 20, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 4 ), new SourceBlock( 17, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 17, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 17, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 18, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 18, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 18, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 18, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 20, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 4 ), new SourceBlock( 19, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 19, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 20, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 19, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 19, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 19, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 20, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 20, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 4 ), new SourceBlock( 22, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 22, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 20, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 21, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 21, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 24, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 21, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 21, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 21, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 22, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 22, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 22, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 22, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 24, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 23, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 23, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 24, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 4 ), new SourceBlock( 23, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 23, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 23, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 24, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 24, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 26, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 26, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 24, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 4 ), new SourceBlock( 25, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 25, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 28, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 25, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 25, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 25, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 26, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 26, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 4 ), new SourceBlock( 26, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 26, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 28, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 27, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 27, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 28, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 27, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 27, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 27, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 28, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 28, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 30, 27, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 30, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 28, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 29, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 29, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 29, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 4 ), new SourceBlock( 29, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 29, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 29, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 30, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 30, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 30, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 30, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 30, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 4 ), new SourceBlock( 31, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 3 ), new SourceBlock( 31, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 31, 30, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 31, 31, 1 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 31, 31, 0 ) ) + }; + + public static SingleColourLookup[] lookup_6_4 = new SingleColourLookup[] + { + new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 1, 0 ) ), + new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 2, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 3, 1 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 3, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 4, 0 ) ), + new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 5, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 7, 0 ) ), + new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 8, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 9, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 10, 0 ) ), + new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 11, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 13, 0 ) ), + new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 0, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 15, 1 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 16, 0 ) ), + new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 1, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 17, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 19, 0 ) ), + new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 3, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 20, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 21, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 22, 0 ) ), + new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 4, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 23, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 25, 0 ) ), + new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 6, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 26, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 27, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 28, 0 ) ), + new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 7, 15, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 29, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 9, 14, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 32, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 0, 33, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 2, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 34, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 35, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 0, 36, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 3, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 0, 37, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 38, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 0, 39, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 5, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 0, 40, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 41, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 0, 42, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 6, 31, 0 ) ), + new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 43, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 44, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 0, 45, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 8, 30, 0 ) ), + new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 0, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 1, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 0, 48, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 0, 49, 0 ) ), + new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 0, 50, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 2, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 0, 51, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 0, 52, 0 ) ), + new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 0, 53, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 4, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 0, 54, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 0, 55, 0 ) ), + new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 0, 56, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 5, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 0, 57, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 0, 58, 0 ) ), + new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 0, 59, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 7, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 0, 60, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 0, 61, 0 ) ), + new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 0, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 8, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 0, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 1, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 1, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 10, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 2, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 2, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 3, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 11, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 3, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 4, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 4, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 13, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 5, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 5, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 6, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 14, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 6, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 7, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 7, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 16, 45, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 8, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 8, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 9, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 16, 48, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 9, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 10, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 10, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 16, 51, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 11, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 11, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 12, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 16, 54, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 12, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 13, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 13, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 16, 57, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 14, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 14, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 15, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 16, 60, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 15, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 24, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 16, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 16, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 17, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 0 ), new SourceBlock( 25, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 17, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 18, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 18, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 0 ), new SourceBlock( 27, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 19, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 33, 0, 2 ), new SourceBlock( 19, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 20, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 0 ), new SourceBlock( 28, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 20, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 34, 0, 2 ), new SourceBlock( 21, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 21, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 0 ), new SourceBlock( 30, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 22, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 35, 0, 2 ), new SourceBlock( 22, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 23, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 0 ), new SourceBlock( 31, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 23, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 36, 0, 2 ), new SourceBlock( 24, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 24, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 0 ), new SourceBlock( 32, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 25, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 37, 0, 2 ), new SourceBlock( 25, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 26, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 0 ), new SourceBlock( 32, 50, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 26, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 38, 0, 2 ), new SourceBlock( 27, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 27, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 0 ), new SourceBlock( 32, 53, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 28, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 39, 0, 2 ), new SourceBlock( 28, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 29, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 0 ), new SourceBlock( 32, 56, 0 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 29, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 40, 0, 2 ), new SourceBlock( 30, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 30, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 0 ), new SourceBlock( 32, 59, 0 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 31, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 41, 0, 2 ), new SourceBlock( 31, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 32, 61, 0 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 0 ), new SourceBlock( 32, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 32, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 42, 0, 2 ), new SourceBlock( 41, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 33, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 0 ), new SourceBlock( 33, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 34, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 43, 0, 2 ), new SourceBlock( 42, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 34, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 0 ), new SourceBlock( 35, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 35, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 44, 0, 2 ), new SourceBlock( 44, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 36, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 0 ), new SourceBlock( 36, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 37, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 45, 0, 2 ), new SourceBlock( 45, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 37, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 0 ), new SourceBlock( 38, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 38, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 46, 0, 2 ), new SourceBlock( 47, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 39, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 0 ), new SourceBlock( 39, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 40, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 47, 0, 2 ), new SourceBlock( 48, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 40, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 41, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 0 ), new SourceBlock( 41, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 48, 49, 0 ) ), + new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 42, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 42, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 0 ), new SourceBlock( 43, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 48, 52, 0 ) ), + new SingleColourLookup( new SourceBlock( 49, 0, 2 ), new SourceBlock( 43, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 44, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 0 ), new SourceBlock( 44, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 48, 55, 0 ) ), + new SingleColourLookup( new SourceBlock( 50, 0, 2 ), new SourceBlock( 45, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 45, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 0 ), new SourceBlock( 46, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 48, 58, 0 ) ), + new SingleColourLookup( new SourceBlock( 51, 0, 2 ), new SourceBlock( 46, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 47, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 0 ), new SourceBlock( 47, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 48, 61, 0 ) ), + new SingleColourLookup( new SourceBlock( 52, 0, 2 ), new SourceBlock( 48, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 56, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 0 ), new SourceBlock( 48, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 49, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 53, 0, 2 ), new SourceBlock( 49, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 58, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 0 ), new SourceBlock( 50, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 50, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 54, 0, 2 ), new SourceBlock( 51, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 59, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 0 ), new SourceBlock( 51, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 52, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 55, 0, 2 ), new SourceBlock( 52, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 61, 46, 0 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 0 ), new SourceBlock( 53, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 53, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 56, 0, 2 ), new SourceBlock( 54, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 62, 47, 0 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 0 ), new SourceBlock( 54, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 55, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 57, 0, 2 ), new SourceBlock( 55, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 56, 62, 1 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 0 ), new SourceBlock( 56, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 56, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 58, 0, 2 ), new SourceBlock( 57, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 57, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 0 ), new SourceBlock( 57, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 58, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 59, 0, 2 ), new SourceBlock( 58, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 59, 62, 1 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 0 ), new SourceBlock( 59, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 59, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 60, 0, 2 ), new SourceBlock( 60, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 60, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 0 ), new SourceBlock( 60, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 61, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 61, 0, 2 ), new SourceBlock( 61, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 62, 62, 1 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 0 ), new SourceBlock( 62, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 62, 63, 0 ) ), + new SingleColourLookup( new SourceBlock( 62, 0, 2 ), new SourceBlock( 63, 62, 0 ) ), + new SingleColourLookup( new SourceBlock( 63, 0, 1 ), new SourceBlock( 63, 63, 1 ) ), + new SingleColourLookup( new SourceBlock( 63, 0, 0 ), new SourceBlock( 63, 63, 0 ) ) }; - - public static SingleColourLookup[] lookup_5_4 = new SingleColourLookup[] - { - new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 1, 1 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 1, 0 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 3 ), new SourceBlock( 0, 1, 1 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 4 ), new SourceBlock( 0, 2, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 2, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 2, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 3, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 3, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 1, 2, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 1, 2, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 3 ), new SourceBlock( 0, 4, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 4 ), new SourceBlock( 0, 5, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 5, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 5, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 2, 3, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 2, 3, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 3 ), new SourceBlock( 0, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 4 ), new SourceBlock( 1, 6, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 1, 6, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 8, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 9, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 10, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 3 ), new SourceBlock( 0, 10, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 4 ), new SourceBlock( 2, 7, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 2, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 0, 11, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 1, 10, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 1, 10, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 13, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 0, 13, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 3 ), new SourceBlock( 0, 13, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 4 ), new SourceBlock( 0, 14, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 2, 11, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 2, 11, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 1, 14, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 1, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 3 ), new SourceBlock( 0, 16, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 4 ), new SourceBlock( 0, 17, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 17, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 0, 17, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 18, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 2, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 2, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 3 ), new SourceBlock( 0, 19, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 4 ), new SourceBlock( 1, 18, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 1, 18, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 20, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 21, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 21, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 21, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 0, 22, 1 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 3 ), new SourceBlock( 0, 22, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 4 ), new SourceBlock( 2, 19, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 2, 19, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 0, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 1, 22, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 1, 22, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 25, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 0, 25, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 3 ), new SourceBlock( 0, 25, 1 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 4 ), new SourceBlock( 0, 26, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 26, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 2, 23, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 2, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 1, 26, 1 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 1, 26, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 3 ), new SourceBlock( 0, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 4 ), new SourceBlock( 0, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 0, 29, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 2, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 2, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 3 ), new SourceBlock( 0, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 4 ), new SourceBlock( 1, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 1, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 4, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 1, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 1, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 1, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 2, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 3 ), new SourceBlock( 2, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 4 ), new SourceBlock( 2, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 2, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 4, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 3, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 3, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 4, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 3, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 3, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 3 ), new SourceBlock( 3, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 4 ), new SourceBlock( 4, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 4, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 6, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 6, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 4, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 5, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 5, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 3 ), new SourceBlock( 8, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 4 ), new SourceBlock( 5, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 5, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 5, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 6, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 6, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 6, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 6, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 3 ), new SourceBlock( 8, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 4 ), new SourceBlock( 7, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 7, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 8, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 7, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 7, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 8, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 3 ), new SourceBlock( 8, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 4 ), new SourceBlock( 10, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 10, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 8, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 9, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 9, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 12, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 9, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 9, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 3 ), new SourceBlock( 9, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 4 ), new SourceBlock( 10, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 10, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 10, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 10, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 12, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 11, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 11, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 3 ), new SourceBlock( 12, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 4 ), new SourceBlock( 11, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 11, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 11, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 12, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 12, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 14, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 14, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 3 ), new SourceBlock( 12, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 4 ), new SourceBlock( 13, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 13, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 16, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 13, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 13, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 14, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 3 ), new SourceBlock( 14, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 4 ), new SourceBlock( 14, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 14, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 16, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 15, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 15, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 16, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 15, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 15, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 3 ), new SourceBlock( 15, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 4 ), new SourceBlock( 16, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 16, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 18, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 18, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 16, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 17, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 17, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 3 ), new SourceBlock( 20, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 4 ), new SourceBlock( 17, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 17, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 17, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 18, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 18, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 18, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 18, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 3 ), new SourceBlock( 20, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 4 ), new SourceBlock( 19, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 19, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 20, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 19, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 19, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 19, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 20, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 3 ), new SourceBlock( 20, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 4 ), new SourceBlock( 22, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 22, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 20, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 21, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 21, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 24, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 21, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 21, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 3 ), new SourceBlock( 21, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 4 ), new SourceBlock( 22, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 22, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 22, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 22, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 24, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 23, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 23, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 3 ), new SourceBlock( 24, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 4 ), new SourceBlock( 23, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 23, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 23, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 24, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 24, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 26, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 26, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 3 ), new SourceBlock( 24, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 4 ), new SourceBlock( 25, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 25, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 28, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 25, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 25, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 25, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 26, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 3 ), new SourceBlock( 26, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 4 ), new SourceBlock( 26, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 26, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 28, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 27, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 27, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 28, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 27, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 27, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 3 ), new SourceBlock( 27, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 4 ), new SourceBlock( 28, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 28, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 30, 27, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 30, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 28, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 29, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 29, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 3 ), new SourceBlock( 29, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 4 ), new SourceBlock( 29, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 29, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 29, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 30, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 30, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 30, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 30, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 3 ), new SourceBlock( 30, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 4 ), new SourceBlock( 31, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 3 ), new SourceBlock( 31, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 31, 30, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 31, 31, 1 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 31, 31, 0 ) ) - }; - - public static SingleColourLookup[] lookup_6_4 = new SingleColourLookup[] - { - new SingleColourLookup( new SourceBlock( 0, 0, 0 ), new SourceBlock( 0, 0, 0 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 1 ), new SourceBlock( 0, 1, 0 ) ), - new SingleColourLookup( new SourceBlock( 0, 0, 2 ), new SourceBlock( 0, 2, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 3, 1 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 0 ), new SourceBlock( 0, 3, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 1 ), new SourceBlock( 0, 4, 0 ) ), - new SingleColourLookup( new SourceBlock( 1, 0, 2 ), new SourceBlock( 0, 5, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 6, 1 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 0 ), new SourceBlock( 0, 6, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 1 ), new SourceBlock( 0, 7, 0 ) ), - new SingleColourLookup( new SourceBlock( 2, 0, 2 ), new SourceBlock( 0, 8, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 9, 1 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 0 ), new SourceBlock( 0, 9, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 1 ), new SourceBlock( 0, 10, 0 ) ), - new SingleColourLookup( new SourceBlock( 3, 0, 2 ), new SourceBlock( 0, 11, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 12, 1 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 0 ), new SourceBlock( 0, 12, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 1 ), new SourceBlock( 0, 13, 0 ) ), - new SingleColourLookup( new SourceBlock( 4, 0, 2 ), new SourceBlock( 0, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 15, 1 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 0 ), new SourceBlock( 0, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 1 ), new SourceBlock( 0, 16, 0 ) ), - new SingleColourLookup( new SourceBlock( 5, 0, 2 ), new SourceBlock( 1, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 17, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 0 ), new SourceBlock( 0, 18, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 1 ), new SourceBlock( 0, 19, 0 ) ), - new SingleColourLookup( new SourceBlock( 6, 0, 2 ), new SourceBlock( 3, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 20, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 0 ), new SourceBlock( 0, 21, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 1 ), new SourceBlock( 0, 22, 0 ) ), - new SingleColourLookup( new SourceBlock( 7, 0, 2 ), new SourceBlock( 4, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 23, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 0 ), new SourceBlock( 0, 24, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 1 ), new SourceBlock( 0, 25, 0 ) ), - new SingleColourLookup( new SourceBlock( 8, 0, 2 ), new SourceBlock( 6, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 26, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 0 ), new SourceBlock( 0, 27, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 1 ), new SourceBlock( 0, 28, 0 ) ), - new SingleColourLookup( new SourceBlock( 9, 0, 2 ), new SourceBlock( 7, 15, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 29, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 0 ), new SourceBlock( 0, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 1 ), new SourceBlock( 0, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 10, 0, 2 ), new SourceBlock( 9, 14, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 0, 32, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 0 ), new SourceBlock( 0, 33, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 1 ), new SourceBlock( 2, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 11, 0, 2 ), new SourceBlock( 0, 34, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 0, 35, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 0 ), new SourceBlock( 0, 36, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 1 ), new SourceBlock( 3, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 12, 0, 2 ), new SourceBlock( 0, 37, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 0, 38, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 0 ), new SourceBlock( 0, 39, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 1 ), new SourceBlock( 5, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 13, 0, 2 ), new SourceBlock( 0, 40, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 0, 41, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 0 ), new SourceBlock( 0, 42, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 1 ), new SourceBlock( 6, 31, 0 ) ), - new SingleColourLookup( new SourceBlock( 14, 0, 2 ), new SourceBlock( 0, 43, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 0, 44, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 0 ), new SourceBlock( 0, 45, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 1 ), new SourceBlock( 8, 30, 0 ) ), - new SingleColourLookup( new SourceBlock( 15, 0, 2 ), new SourceBlock( 0, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 0, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 1, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 0 ), new SourceBlock( 0, 48, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 1 ), new SourceBlock( 0, 49, 0 ) ), - new SingleColourLookup( new SourceBlock( 16, 0, 2 ), new SourceBlock( 0, 50, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 2, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 0 ), new SourceBlock( 0, 51, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 1 ), new SourceBlock( 0, 52, 0 ) ), - new SingleColourLookup( new SourceBlock( 17, 0, 2 ), new SourceBlock( 0, 53, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 4, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 0 ), new SourceBlock( 0, 54, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 1 ), new SourceBlock( 0, 55, 0 ) ), - new SingleColourLookup( new SourceBlock( 18, 0, 2 ), new SourceBlock( 0, 56, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 5, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 0 ), new SourceBlock( 0, 57, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 1 ), new SourceBlock( 0, 58, 0 ) ), - new SingleColourLookup( new SourceBlock( 19, 0, 2 ), new SourceBlock( 0, 59, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 7, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 0 ), new SourceBlock( 0, 60, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 1 ), new SourceBlock( 0, 61, 0 ) ), - new SingleColourLookup( new SourceBlock( 20, 0, 2 ), new SourceBlock( 0, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 8, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 0 ), new SourceBlock( 0, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 1 ), new SourceBlock( 1, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 21, 0, 2 ), new SourceBlock( 1, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 10, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 0 ), new SourceBlock( 2, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 1 ), new SourceBlock( 2, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 22, 0, 2 ), new SourceBlock( 3, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 11, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 0 ), new SourceBlock( 3, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 1 ), new SourceBlock( 4, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 23, 0, 2 ), new SourceBlock( 4, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 13, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 0 ), new SourceBlock( 5, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 1 ), new SourceBlock( 5, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 24, 0, 2 ), new SourceBlock( 6, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 14, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 0 ), new SourceBlock( 6, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 1 ), new SourceBlock( 7, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 25, 0, 2 ), new SourceBlock( 7, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 16, 45, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 0 ), new SourceBlock( 8, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 1 ), new SourceBlock( 8, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 26, 0, 2 ), new SourceBlock( 9, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 16, 48, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 0 ), new SourceBlock( 9, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 1 ), new SourceBlock( 10, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 27, 0, 2 ), new SourceBlock( 10, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 16, 51, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 0 ), new SourceBlock( 11, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 1 ), new SourceBlock( 11, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 28, 0, 2 ), new SourceBlock( 12, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 16, 54, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 0 ), new SourceBlock( 12, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 1 ), new SourceBlock( 13, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 29, 0, 2 ), new SourceBlock( 13, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 16, 57, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 0 ), new SourceBlock( 14, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 1 ), new SourceBlock( 14, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 30, 0, 2 ), new SourceBlock( 15, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 16, 60, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 0 ), new SourceBlock( 15, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 1 ), new SourceBlock( 24, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 31, 0, 2 ), new SourceBlock( 16, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 16, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 17, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 0 ), new SourceBlock( 25, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 1 ), new SourceBlock( 17, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 32, 0, 2 ), new SourceBlock( 18, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 18, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 0 ), new SourceBlock( 27, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 1 ), new SourceBlock( 19, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 33, 0, 2 ), new SourceBlock( 19, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 20, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 0 ), new SourceBlock( 28, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 1 ), new SourceBlock( 20, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 34, 0, 2 ), new SourceBlock( 21, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 21, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 0 ), new SourceBlock( 30, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 1 ), new SourceBlock( 22, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 35, 0, 2 ), new SourceBlock( 22, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 23, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 0 ), new SourceBlock( 31, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 1 ), new SourceBlock( 23, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 36, 0, 2 ), new SourceBlock( 24, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 24, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 0 ), new SourceBlock( 32, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 1 ), new SourceBlock( 25, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 37, 0, 2 ), new SourceBlock( 25, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 26, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 0 ), new SourceBlock( 32, 50, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 1 ), new SourceBlock( 26, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 38, 0, 2 ), new SourceBlock( 27, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 27, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 0 ), new SourceBlock( 32, 53, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 1 ), new SourceBlock( 28, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 39, 0, 2 ), new SourceBlock( 28, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 29, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 0 ), new SourceBlock( 32, 56, 0 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 1 ), new SourceBlock( 29, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 40, 0, 2 ), new SourceBlock( 30, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 30, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 0 ), new SourceBlock( 32, 59, 0 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 1 ), new SourceBlock( 31, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 41, 0, 2 ), new SourceBlock( 31, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 32, 61, 0 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 0 ), new SourceBlock( 32, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 1 ), new SourceBlock( 32, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 42, 0, 2 ), new SourceBlock( 41, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 33, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 0 ), new SourceBlock( 33, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 1 ), new SourceBlock( 34, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 43, 0, 2 ), new SourceBlock( 42, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 34, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 0 ), new SourceBlock( 35, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 1 ), new SourceBlock( 35, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 44, 0, 2 ), new SourceBlock( 44, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 36, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 0 ), new SourceBlock( 36, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 1 ), new SourceBlock( 37, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 45, 0, 2 ), new SourceBlock( 45, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 37, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 0 ), new SourceBlock( 38, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 1 ), new SourceBlock( 38, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 46, 0, 2 ), new SourceBlock( 47, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 39, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 0 ), new SourceBlock( 39, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 1 ), new SourceBlock( 40, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 47, 0, 2 ), new SourceBlock( 48, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 40, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 41, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 0 ), new SourceBlock( 41, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 1 ), new SourceBlock( 48, 49, 0 ) ), - new SingleColourLookup( new SourceBlock( 48, 0, 2 ), new SourceBlock( 42, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 42, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 0 ), new SourceBlock( 43, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 1 ), new SourceBlock( 48, 52, 0 ) ), - new SingleColourLookup( new SourceBlock( 49, 0, 2 ), new SourceBlock( 43, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 44, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 0 ), new SourceBlock( 44, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 1 ), new SourceBlock( 48, 55, 0 ) ), - new SingleColourLookup( new SourceBlock( 50, 0, 2 ), new SourceBlock( 45, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 45, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 0 ), new SourceBlock( 46, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 1 ), new SourceBlock( 48, 58, 0 ) ), - new SingleColourLookup( new SourceBlock( 51, 0, 2 ), new SourceBlock( 46, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 47, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 0 ), new SourceBlock( 47, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 1 ), new SourceBlock( 48, 61, 0 ) ), - new SingleColourLookup( new SourceBlock( 52, 0, 2 ), new SourceBlock( 48, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 56, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 0 ), new SourceBlock( 48, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 1 ), new SourceBlock( 49, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 53, 0, 2 ), new SourceBlock( 49, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 58, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 0 ), new SourceBlock( 50, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 1 ), new SourceBlock( 50, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 54, 0, 2 ), new SourceBlock( 51, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 59, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 0 ), new SourceBlock( 51, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 1 ), new SourceBlock( 52, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 55, 0, 2 ), new SourceBlock( 52, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 61, 46, 0 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 0 ), new SourceBlock( 53, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 1 ), new SourceBlock( 53, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 56, 0, 2 ), new SourceBlock( 54, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 62, 47, 0 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 0 ), new SourceBlock( 54, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 1 ), new SourceBlock( 55, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 57, 0, 2 ), new SourceBlock( 55, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 56, 62, 1 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 0 ), new SourceBlock( 56, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 1 ), new SourceBlock( 56, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 58, 0, 2 ), new SourceBlock( 57, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 57, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 0 ), new SourceBlock( 57, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 1 ), new SourceBlock( 58, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 59, 0, 2 ), new SourceBlock( 58, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 59, 62, 1 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 0 ), new SourceBlock( 59, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 1 ), new SourceBlock( 59, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 60, 0, 2 ), new SourceBlock( 60, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 60, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 0 ), new SourceBlock( 60, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 1 ), new SourceBlock( 61, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 61, 0, 2 ), new SourceBlock( 61, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 62, 62, 1 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 0 ), new SourceBlock( 62, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 1 ), new SourceBlock( 62, 63, 0 ) ), - new SingleColourLookup( new SourceBlock( 62, 0, 2 ), new SourceBlock( 63, 62, 0 ) ), - new SingleColourLookup( new SourceBlock( 63, 0, 1 ), new SourceBlock( 63, 63, 1 ) ), - new SingleColourLookup( new SourceBlock( 63, 0, 0 ), new SourceBlock( 63, 63, 0 ) ) - }; - } } diff --git a/BurnoutImage/Util.cs b/BurnoutImage/Util.cs index c2a984b..0c5df37 100644 --- a/BurnoutImage/Util.cs +++ b/BurnoutImage/Util.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; namespace BurnoutImage { diff --git a/ComponentTester/Program.cs b/ComponentTester/Program.cs index 1d9b3a7..8c64f6e 100644 --- a/ComponentTester/Program.cs +++ b/ComponentTester/Program.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using System; using System.Windows.Forms; namespace ComponentTester @@ -19,11 +15,6 @@ static void Main() Application.SetHighDpiMode(HighDpiMode.SystemAware); Application.SetCompatibleTextRenderingDefault(false); - /*if (!File.Exists("test.bin")) - { - MessageBox.Show("Missing test.bin!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - }*/ Application.Run(new Tester()); } } diff --git a/ComponentTester/Tester.cs b/ComponentTester/Tester.cs index e0f9d35..65525f9 100644 --- a/ComponentTester/Tester.cs +++ b/ComponentTester/Tester.cs @@ -1,12 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; -using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace ComponentTester @@ -66,21 +61,6 @@ private void Exit() Application.Exit(); } - /*private void Tester_Load(object sender, EventArgs e) - { - if (!File.Exists("test.bin")) - { - //byte[] msg = Encoding.ASCII.GetBytes("Missing Data!"); - return; - }*/ - /*Stream s = File.Open("test.bin", FileMode.Open); - BinaryReader br = new BinaryReader(s); - byte[] data = br.ReadToEnd(); - br.Close(); - - hexView1.HexData = data; - }*/ - private void newToolStripMenuItem_Click(object sender, EventArgs e) { New(); diff --git a/HexEditor/HexView.cs b/HexEditor/HexView.cs index 7910aa7..9d1c6eb 100644 --- a/HexEditor/HexView.cs +++ b/HexEditor/HexView.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; +using System; using System.Drawing; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace HexEditor @@ -23,7 +19,6 @@ public byte[] HexData _hexData = value; if (_hexData != null) { - //Height = (_hexData.Length / 16) * 23 + 5; vScroll.Minimum = 0; vScroll.Maximum = _hexData.Length / 16; } @@ -31,19 +26,6 @@ public byte[] HexData } } - /*[Browsable(false)] - private Rectangle VisibleRect - { - get - { - int left = 0; - int right = Width; - int top = Height - vScroll.Value; - int bottom = top + Height; - return Rectangle.FromLTRB(left, top, right, bottom); - } - }*/ - private VScrollBar vScroll; public HexView() @@ -87,7 +69,6 @@ protected override void OnMouseWheel(MouseEventArgs e) val += 1; else if (delta > 0) val -= 1; - //val -= delta; if (val < 0) val = 0; else if (val > max) @@ -104,8 +85,6 @@ protected override void OnPaint(PaintEventArgs e) Graphics g = e.Graphics; - //g.DrawLine(Pens.DarkGray, Width - 100, 0, Width - 100, Height); - if (HexData == null) return; @@ -131,9 +110,6 @@ protected override void OnPaint(PaintEventArgs e) float xP = x * stringWidth + padding; float yP = (y * stringHeight + padding) - vScroll.Value * stringHeight; - //if (yP > Height || yP < 0) - // continue; - PointF point = new PointF(xP, yP); g.DrawString(byteString, Font, Brushes.Black, point); diff --git a/LangEditor/InputDialog.cs b/LangEditor/InputDialog.cs index f8044fd..dbe9dd2 100644 --- a/LangEditor/InputDialog.cs +++ b/LangEditor/InputDialog.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; using System.Windows.Forms; namespace LangEditor diff --git a/LangEditor/LangEdit.cs b/LangEditor/LangEdit.cs index 11be5d2..3159e75 100644 --- a/LangEditor/LangEdit.cs +++ b/LangEditor/LangEdit.cs @@ -1,14 +1,7 @@ -using BundleFormat; using PluginAPI; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace LangEditor diff --git a/LangEditor/LangPlugin.cs b/LangEditor/LangPlugin.cs index cbd3463..e4ed3da 100644 --- a/LangEditor/LangPlugin.cs +++ b/LangEditor/LangPlugin.cs @@ -1,10 +1,5 @@ -using BundleFormat; +using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LangEditor { diff --git a/LangEditor/Language.cs b/LangEditor/Language.cs index 9e5766b..bd0e546 100644 --- a/LangEditor/Language.cs +++ b/LangEditor/Language.cs @@ -1,9 +1,7 @@ -using System; +using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using PluginAPI; diff --git a/LuaList/LuaListEditor.cs b/LuaList/LuaListEditor.cs index a56b6ff..68e30bf 100644 --- a/LuaList/LuaListEditor.cs +++ b/LuaList/LuaListEditor.cs @@ -1,4 +1,3 @@ -using System; using System.Windows.Forms; using PluginAPI; diff --git a/LuaList/LuaListEntry.cs b/LuaList/LuaListEntry.cs index 54aa17d..5eabf36 100644 --- a/LuaList/LuaListEntry.cs +++ b/LuaList/LuaListEntry.cs @@ -33,16 +33,18 @@ public class LuaListEntry public int Variables { get; set; } = 0; public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(CgsId.Encrypted)); - bytes.Add(Encoding.ASCII.GetBytes((Name.PadRight(128, '\0').Substring(0, 128).ToCharArray()))); - bytes.Add(Encoding.ASCII.GetBytes((Goal.PadRight(128, '\0').Substring(0, 128).ToCharArray()))); - bytes.Add(Encoding.ASCII.GetBytes((Description.PadRight(256, '\0').Substring(0, 256).ToCharArray()))); - bytes.Add(BitConverter.GetBytes((int)ScoreMultiplier)); - bytes.Add(BitConverter.GetBytes((int)ScoringMethod)); - bytes.Add(BitConverter.GetBytes((int)Type)); - bytes.Add(BitConverter.GetBytes((int)Variables)); - bytes.Add(new byte[8]); + List bytes = new List + { + BitConverter.GetBytes(CgsId.Encrypted), + Encoding.ASCII.GetBytes((Name.PadRight(128, '\0').Substring(0, 128).ToCharArray())), + Encoding.ASCII.GetBytes((Goal.PadRight(128, '\0').Substring(0, 128).ToCharArray())), + Encoding.ASCII.GetBytes((Description.PadRight(256, '\0').Substring(0, 256).ToCharArray())), + BitConverter.GetBytes((int)ScoreMultiplier), + BitConverter.GetBytes((int)ScoringMethod), + BitConverter.GetBytes((int)Type), + BitConverter.GetBytes((int)Variables), + new byte[8] + }; return bytes.SelectMany(i => i).Count(); } diff --git a/LuaList/LuaListPlugin.cs b/LuaList/LuaListPlugin.cs index bfd89dc..8ef9667 100644 --- a/LuaList/LuaListPlugin.cs +++ b/LuaList/LuaListPlugin.cs @@ -1,10 +1,5 @@ using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; namespace LuaList { diff --git a/MathLib/BoxF.cs b/MathLib/BoxF.cs index 01e4538..bcab9ba 100644 --- a/MathLib/BoxF.cs +++ b/MathLib/BoxF.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace MathLib diff --git a/MathLib/IOExtensions.cs b/MathLib/IOExtensions.cs index 3ec2f3b..4706da4 100644 --- a/MathLib/IOExtensions.cs +++ b/MathLib/IOExtensions.cs @@ -1,11 +1,5 @@ using OpenTK.Mathematics; -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Security.Policy; -using System.Text; -using System.Threading.Tasks; namespace MathLib { diff --git a/MathLib/MathUtils.cs b/MathLib/MathUtils.cs index e8713a2..bf047e0 100644 --- a/MathLib/MathUtils.cs +++ b/MathLib/MathUtils.cs @@ -1,9 +1,5 @@ using OpenTK.Mathematics; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace MathLib { diff --git a/MathLib/RectF.cs b/MathLib/RectF.cs index 584ea78..6dfe997 100644 --- a/MathLib/RectF.cs +++ b/MathLib/RectF.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace MathLib { public class RectF diff --git a/MathLib/Triangle.cs b/MathLib/Triangle.cs index ef4021d..2ef0c29 100644 --- a/MathLib/Triangle.cs +++ b/MathLib/Triangle.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace MathLib { public class Triangle diff --git a/MathLib/Vector2i.cs b/MathLib/Vector2i.cs index 622e07a..dd76145 100644 --- a/MathLib/Vector2i.cs +++ b/MathLib/Vector2i.cs @@ -1,9 +1,4 @@ using System; -using System.CodeDom; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace MathLib diff --git a/MathLib/Vector3i.cs b/MathLib/Vector3i.cs index 712721e..5185cc3 100644 --- a/MathLib/Vector3i.cs +++ b/MathLib/Vector3i.cs @@ -1,9 +1,4 @@ using System; -using System.CodeDom; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace MathLib diff --git a/MathLib/Vector3s.cs b/MathLib/Vector3s.cs index 1230e9a..16c42bb 100644 --- a/MathLib/Vector3s.cs +++ b/MathLib/Vector3s.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace MathLib diff --git a/ModelViewer/GenericMesh.cs b/ModelViewer/GenericMesh.cs index 875fb60..8f19b69 100644 --- a/ModelViewer/GenericMesh.cs +++ b/ModelViewer/GenericMesh.cs @@ -1,8 +1,4 @@ -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using ModelViewer.SceneData; using OpenTK.Mathematics; diff --git a/ModelViewer/GenericModel.cs b/ModelViewer/GenericModel.cs index 710f2d1..fab2fa3 100644 --- a/ModelViewer/GenericModel.cs +++ b/ModelViewer/GenericModel.cs @@ -1,9 +1,4 @@ -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OpenTK; namespace ModelViewer { diff --git a/ModelViewer/GraphicsScene.cs b/ModelViewer/GraphicsScene.cs index b2deea1..30ea339 100644 --- a/ModelViewer/GraphicsScene.cs +++ b/ModelViewer/GraphicsScene.cs @@ -1,12 +1,7 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using ModelViewer.SceneData; using OpenTK.Mathematics; using OpenTK.Graphics.OpenGL; diff --git a/ModelViewer/GraphicsUtil.cs b/ModelViewer/GraphicsUtil.cs index 20d1ffd..97d14ea 100644 --- a/ModelViewer/GraphicsUtil.cs +++ b/ModelViewer/GraphicsUtil.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OpenTK.Graphics.OpenGL; namespace ModelViewer { diff --git a/ModelViewer/ICamera.cs b/ModelViewer/ICamera.cs index 4c42fb4..578de79 100644 --- a/ModelViewer/ICamera.cs +++ b/ModelViewer/ICamera.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace ModelViewer diff --git a/ModelViewer/ModelViewerForm.cs b/ModelViewer/ModelViewerForm.cs index 2e7541b..6b1d794 100644 --- a/ModelViewer/ModelViewerForm.cs +++ b/ModelViewer/ModelViewerForm.cs @@ -1,15 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; using System.Windows.Forms; -using BundleFormat; using ModelViewer.SceneData; -using OpenTK.Graphics.OpenGL; using PluginAPI; namespace ModelViewer diff --git a/ModelViewer/OBJImporter.cs b/ModelViewer/OBJImporter.cs index 5375e12..0551794 100644 --- a/ModelViewer/OBJImporter.cs +++ b/ModelViewer/OBJImporter.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleUtilities; using ModelViewer.SceneData; using OpenTK.Mathematics; diff --git a/ModelViewer/OrbitCamera.cs b/ModelViewer/OrbitCamera.cs index b7840b0..2179a28 100644 --- a/ModelViewer/OrbitCamera.cs +++ b/ModelViewer/OrbitCamera.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using ModelViewer.SceneData; using OpenTK.Mathematics; diff --git a/ModelViewer/SceneRenderControl.cs b/ModelViewer/SceneRenderControl.cs index a214aa0..255d5d4 100644 --- a/ModelViewer/SceneRenderControl.cs +++ b/ModelViewer/SceneRenderControl.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; +using System; using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using ModelViewer.SceneData; diff --git a/ModelViewer/Shader.cs b/ModelViewer/Shader.cs index 58875cb..5586e83 100644 --- a/ModelViewer/Shader.cs +++ b/ModelViewer/Shader.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; +using System; using System.Diagnostics; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Graphics.OpenGL; namespace ModelViewer diff --git a/ModelViewer/StaticCamera.cs b/ModelViewer/StaticCamera.cs index f5b7a5e..8d22ec4 100644 --- a/ModelViewer/StaticCamera.cs +++ b/ModelViewer/StaticCamera.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace ModelViewer diff --git a/ModelViewer/ThirdPersonCamera.cs b/ModelViewer/ThirdPersonCamera.cs index 1aed9af..d10bef5 100644 --- a/ModelViewer/ThirdPersonCamera.cs +++ b/ModelViewer/ThirdPersonCamera.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using ModelViewer.SceneData; using OpenTK.Mathematics; diff --git a/PVSFormat/PVS.cs b/PVSFormat/PVS.cs index 7a248e8..f5e7e4d 100644 --- a/PVSFormat/PVS.cs +++ b/PVSFormat/PVS.cs @@ -1,10 +1,6 @@ -using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using BurnoutImage; diff --git a/PVSFormat/PVSEditControl.cs b/PVSFormat/PVSEditControl.cs index 0740622..1c48678 100644 --- a/PVSFormat/PVSEditControl.cs +++ b/PVSFormat/PVSEditControl.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; +using System; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace PVSFormat diff --git a/PVSFormat/PVSEditor.cs b/PVSFormat/PVSEditor.cs index 9091a78..a5c0591 100644 --- a/PVSFormat/PVSEditor.cs +++ b/PVSFormat/PVSEditor.cs @@ -1,6 +1,5 @@ -using System.Drawing; +using System.Drawing; using System.Windows.Forms; -using BundleFormat; using DebugHelper; using PluginAPI; diff --git a/PVSFormat/PVSPlugin.cs b/PVSFormat/PVSPlugin.cs index d134037..069575e 100644 --- a/PVSFormat/PVSPlugin.cs +++ b/PVSFormat/PVSPlugin.cs @@ -1,10 +1,5 @@ -using BundleFormat; +using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PVSFormat { diff --git a/PVSFormat/Polygon.cs b/PVSFormat/Polygon.cs index d4e5a4a..8688817 100644 --- a/PVSFormat/Polygon.cs +++ b/PVSFormat/Polygon.cs @@ -1,9 +1,5 @@ -using System; using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PVSFormat { diff --git a/PluginAPI/EntryTypeRegistry.cs b/PluginAPI/EntryTypeRegistry.cs index a4c4be6..533de0d 100644 --- a/PluginAPI/EntryTypeRegistry.cs +++ b/PluginAPI/EntryTypeRegistry.cs @@ -1,9 +1,6 @@ -using BundleFormat; +using BundleFormat; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PluginAPI { diff --git a/PluginAPI/IEntryData.cs b/PluginAPI/IEntryData.cs index cbee6a5..e3a1bf2 100644 --- a/PluginAPI/IEntryData.cs +++ b/PluginAPI/IEntryData.cs @@ -1,11 +1,5 @@ -using BundleFormat; +using BundleFormat; using BundleUtilities; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PluginAPI { diff --git a/PluginAPI/IEntryEditor.cs b/PluginAPI/IEntryEditor.cs index 92e0769..dce6e70 100644 --- a/PluginAPI/IEntryEditor.cs +++ b/PluginAPI/IEntryEditor.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace PluginAPI diff --git a/PluginAPI/Plugin.cs b/PluginAPI/Plugin.cs index 63305aa..01bf23b 100644 --- a/PluginAPI/Plugin.cs +++ b/PluginAPI/Plugin.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace PluginAPI { public abstract class Plugin diff --git a/PluginAPI/PluginCommand.cs b/PluginAPI/PluginCommand.cs index 1042836..838136a 100644 --- a/PluginAPI/PluginCommand.cs +++ b/PluginAPI/PluginCommand.cs @@ -1,9 +1,4 @@ -using BundleFormat; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using BundleFormat; using System.Windows.Forms; namespace PluginAPI diff --git a/PluginAPI/PluginCommandRegistry.cs b/PluginAPI/PluginCommandRegistry.cs index 4fa263f..4c14430 100644 --- a/PluginAPI/PluginCommandRegistry.cs +++ b/PluginAPI/PluginCommandRegistry.cs @@ -1,8 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PluginAPI { diff --git a/PluginSystem/PluginLoader.cs b/PluginSystem/PluginLoader.cs index 113334a..e7a43a5 100644 --- a/PluginSystem/PluginLoader.cs +++ b/PluginSystem/PluginLoader.cs @@ -2,12 +2,6 @@ using PluginSystem.Util; using System; using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; using BundleUtilities; namespace PluginSystem diff --git a/PluginSystem/Util/AssemblyUtil.cs b/PluginSystem/Util/AssemblyUtil.cs index 9151bde..36c297a 100644 --- a/PluginSystem/Util/AssemblyUtil.cs +++ b/PluginSystem/Util/AssemblyUtil.cs @@ -1,9 +1,6 @@ -using System; +using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace PluginSystem.Util { diff --git a/VaultFormat/AttribSys.cs b/VaultFormat/AttribSys.cs index 22f5e36..f3217b7 100644 --- a/VaultFormat/AttribSys.cs +++ b/VaultFormat/AttribSys.cs @@ -360,9 +360,11 @@ public int addPadding(List bytes) private int getSizeOfStrE() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("StrE"))); - bytes.Add(BitConverter.GetBytes(16)); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("StrE")), + BitConverter.GetBytes(16) + }; foreach (string String in Strings) { byte[] nullterminating = { (byte)0 }; @@ -373,26 +375,30 @@ private int getSizeOfStrE() private int getSizeOfVers() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("Vers"))); - bytes.Add(BitConverter.GetBytes(16)); - bytes.Add(BitConverter.GetBytes(VersionHash)); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("Vers")), + BitConverter.GetBytes(16), + BitConverter.GetBytes(VersionHash) + }; return addPadding(bytes); } private int getSizeOfDepN() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("DepN"))); - bytes.Add(BitConverter.GetBytes(96)); - bytes.Add(BitConverter.GetBytes((UInt64)Dependencies.Count())); - bytes.Add(BitConverter.GetBytes(DepHash1)); - bytes.Add(BitConverter.GetBytes(DepHash2)); - bytes.Add(BitConverter.GetBytes(DepNop)); - bytes.Add(BitConverter.GetBytes(Dependencies[0].Length + 1)); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("DepN")), + BitConverter.GetBytes(96), + BitConverter.GetBytes((UInt64)Dependencies.Count()), + BitConverter.GetBytes(DepHash1), + BitConverter.GetBytes(DepHash2), + BitConverter.GetBytes(DepNop), + BitConverter.GetBytes(Dependencies[0].Length + 1) + }; foreach (string d in Dependencies) { - byte[] nullterminating = { (byte)0 }; + byte[] nullterminating = { 0 }; bytes.Add(Encoding.ASCII.GetBytes(d).Concat(nullterminating).ToArray()); } return addPadding(bytes); @@ -400,8 +406,10 @@ private int getSizeOfDepN() private int getSizeOfDatN() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("DatN"))); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("DatN")) + }; foreach (AttributeHeader dataChunk in Attributes.Select(x => x.getHeader())) { bytes.Add(BitConverter.GetBytes(dataChunk.CollectionHash)); @@ -433,10 +441,12 @@ private int getSizeOfDatN() private int getSizeOfExpN() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("ExpN"))); - bytes.Add(BitConverter.GetBytes(16)); - bytes.Add(BitConverter.GetBytes((UInt64)Attributes.Select(x => x.getInfo()).Count())); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("ExpN")), + BitConverter.GetBytes(16), + BitConverter.GetBytes((UInt64)Attributes.Select(x => x.getInfo()).Count()) + }; foreach (SizeAndPositionInformation chunk in Attributes.Select(x => x.getInfo())) { bytes.Add(BitConverter.GetBytes(chunk.Hash)); @@ -449,18 +459,22 @@ private int getSizeOfExpN() private int getSizeOfStrN() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("StrN"))); - bytes.Add(BitConverter.GetBytes(16)); - bytes.Add(BitConverter.GetBytes(StrUnknown1)); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("StrN")), + BitConverter.GetBytes(16), + BitConverter.GetBytes(StrUnknown1) + }; return addPadding(bytes); } private int getSizeOfPtrN() { - List bytes = new List(); - bytes.Add(Utilities.Flip(Encoding.ASCII.GetBytes("PtrN"))); - bytes.Add(BitConverter.GetBytes(16)); + List bytes = new List + { + Utilities.Flip(Encoding.ASCII.GetBytes("PtrN")), + BitConverter.GetBytes(16) + }; foreach (PtrChunkData data in PtrN.allData) { bytes.Add(BitConverter.GetBytes(data.Ptr)); diff --git a/VaultFormat/AttribSysPlugin.cs b/VaultFormat/AttribSysPlugin.cs index 4508410..4a44da1 100644 --- a/VaultFormat/AttribSysPlugin.cs +++ b/VaultFormat/AttribSysPlugin.cs @@ -1,10 +1,5 @@ -using BundleFormat; +using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace VaultFormat { diff --git a/VaultFormat/AttribSysVaultPlugin.cs b/VaultFormat/AttribSysVaultPlugin.cs index 978cf2c..d0efab5 100644 --- a/VaultFormat/AttribSysVaultPlugin.cs +++ b/VaultFormat/AttribSysVaultPlugin.cs @@ -1,11 +1,5 @@ using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using VaultFormat; namespace VaultFormat { diff --git a/VaultFormat/Burnoutcarasset.cs b/VaultFormat/Burnoutcarasset.cs index 39781b4..9c9e08e 100644 --- a/VaultFormat/Burnoutcarasset.cs +++ b/VaultFormat/Burnoutcarasset.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using BundleUtilities; namespace VaultFormat @@ -73,10 +72,12 @@ public int getDataSize() private byte[] AddPadding(List bytes) { - List padding = new List(); - padding.Add((byte)0); - padding.Add((byte)0); - padding.Add((byte)0); + List padding = new List + { + 0, + 0, + 0 + }; bytes.Add(padding.ToArray()); return bytes.SelectMany(i => i).ToArray(); } diff --git a/VaultFormat/Burnoutcargraphicsasset.cs b/VaultFormat/Burnoutcargraphicsasset.cs index c7ab0f4..3fde1e0 100644 --- a/VaultFormat/Burnoutcargraphicsasset.cs +++ b/VaultFormat/Burnoutcargraphicsasset.cs @@ -31,18 +31,20 @@ public Burnoutcargraphicsasset(SizeAndPositionInformation chunk, AttributeHeader public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(PlayerPalletteIndex)); - bytes.Add(BitConverter.GetBytes(PlayerColourIndex)); - bytes.Add(BitConverter.GetBytes(Alloc)); - bytes.Add(BitConverter.GetBytes(Num_RandomTrafficColours)); - bytes.Add(BitConverter.GetBytes(Size)); - bytes.Add(BitConverter.GetBytes(EncodedTypePad)); - bytes.Add(BitConverter.GetBytes(RandomTrafficColours)); - bytes.Add(BitConverter.GetBytes(Alloc_Offences)); - bytes.Add(BitConverter.GetBytes(Num_Offences)); - bytes.Add(BitConverter.GetBytes(Size_Offences)); - bytes.Add(BitConverter.GetBytes(EncodedTypePad_Offences)); + List bytes = new List + { + BitConverter.GetBytes(PlayerPalletteIndex), + BitConverter.GetBytes(PlayerColourIndex), + BitConverter.GetBytes(Alloc), + BitConverter.GetBytes(Num_RandomTrafficColours), + BitConverter.GetBytes(Size), + BitConverter.GetBytes(EncodedTypePad), + BitConverter.GetBytes(RandomTrafficColours), + BitConverter.GetBytes(Alloc_Offences), + BitConverter.GetBytes(Num_Offences), + BitConverter.GetBytes(Size_Offences), + BitConverter.GetBytes(EncodedTypePad_Offences) + }; Console.Write("Lenght:" + bytes.SelectMany(i => i).Count()); // 28 bytes but not padding... return bytes.SelectMany(i => i).Count(); diff --git a/VaultFormat/Camerabumperbehaviour.cs b/VaultFormat/Camerabumperbehaviour.cs index 1de5061..58239fc 100644 --- a/VaultFormat/Camerabumperbehaviour.cs +++ b/VaultFormat/Camerabumperbehaviour.cs @@ -30,18 +30,20 @@ public Camerabumperbehaviour(SizeAndPositionInformation chunk, AttributeHeader d public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(ZOffset)); - bytes.Add(BitConverter.GetBytes(YOffset)); - bytes.Add(BitConverter.GetBytes(YawSpring)); - bytes.Add(BitConverter.GetBytes(RollSpring)); - bytes.Add(BitConverter.GetBytes(PitchSpring)); - bytes.Add(BitConverter.GetBytes(FieldOfView)); - bytes.Add(BitConverter.GetBytes(BoostFieldOfView)); - bytes.Add(BitConverter.GetBytes(BodyRollScale)); - bytes.Add(BitConverter.GetBytes(BodyPitchScale)); - bytes.Add(BitConverter.GetBytes(AccelerationResponse)); - bytes.Add(BitConverter.GetBytes(AccelerationDampening)); + List bytes = new List + { + BitConverter.GetBytes(ZOffset), + BitConverter.GetBytes(YOffset), + BitConverter.GetBytes(YawSpring), + BitConverter.GetBytes(RollSpring), + BitConverter.GetBytes(PitchSpring), + BitConverter.GetBytes(FieldOfView), + BitConverter.GetBytes(BoostFieldOfView), + BitConverter.GetBytes(BodyRollScale), + BitConverter.GetBytes(BodyPitchScale), + BitConverter.GetBytes(AccelerationResponse), + BitConverter.GetBytes(AccelerationDampening) + }; //To-Do: again here we have not padding, but usually we should have it return bytes.SelectMany(i => i).Count(); } diff --git a/VaultFormat/Cameraexternalbehaviour.cs b/VaultFormat/Cameraexternalbehaviour.cs index 220348c..6b6995a 100644 --- a/VaultFormat/Cameraexternalbehaviour.cs +++ b/VaultFormat/Cameraexternalbehaviour.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -35,24 +35,26 @@ public Cameraexternalbehaviour(SizeAndPositionInformation chunk, AttributeHeader public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(ZDistanceScale)); - bytes.Add(BitConverter.GetBytes(ZAndTiltCutoffSpeedMPH)); - bytes.Add(BitConverter.GetBytes(YawSpring)); - bytes.Add(BitConverter.GetBytes(TiltCameraScale)); - bytes.Add(BitConverter.GetBytes(TiltAroundCar)); - bytes.Add(BitConverter.GetBytes(SlideZOffsetMax)); - bytes.Add(BitConverter.GetBytes(SlideYScale)); - bytes.Add(BitConverter.GetBytes(SlideXScale)); - bytes.Add(BitConverter.GetBytes(PivotZOffset)); - bytes.Add(BitConverter.GetBytes(PivotLength)); - bytes.Add(BitConverter.GetBytes(PivotHeight)); - bytes.Add(BitConverter.GetBytes(PitchSpring)); - bytes.Add(BitConverter.GetBytes(FieldOfView)); - bytes.Add(BitConverter.GetBytes(DriftYawSpring)); - bytes.Add(BitConverter.GetBytes(DownAngle)); - bytes.Add(BitConverter.GetBytes(BoostFieldOfViewZoom)); - bytes.Add(BitConverter.GetBytes(BoostFieldOfView)); + List bytes = new List + { + BitConverter.GetBytes(ZDistanceScale), + BitConverter.GetBytes(ZAndTiltCutoffSpeedMPH), + BitConverter.GetBytes(YawSpring), + BitConverter.GetBytes(TiltCameraScale), + BitConverter.GetBytes(TiltAroundCar), + BitConverter.GetBytes(SlideZOffsetMax), + BitConverter.GetBytes(SlideYScale), + BitConverter.GetBytes(SlideXScale), + BitConverter.GetBytes(PivotZOffset), + BitConverter.GetBytes(PivotLength), + BitConverter.GetBytes(PivotHeight), + BitConverter.GetBytes(PitchSpring), + BitConverter.GetBytes(FieldOfView), + BitConverter.GetBytes(DriftYawSpring), + BitConverter.GetBytes(DownAngle), + BitConverter.GetBytes(BoostFieldOfViewZoom), + BitConverter.GetBytes(BoostFieldOfView) + }; return bytes.SelectMany(i => i).Count(); } diff --git a/VaultFormat/Physicsvehiclebaseattribs.cs b/VaultFormat/Physicsvehiclebaseattribs.cs index 4fb0438..23a3965 100644 --- a/VaultFormat/Physicsvehiclebaseattribs.cs +++ b/VaultFormat/Physicsvehiclebaseattribs.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -84,72 +84,74 @@ public Physicsvehiclebaseattribs(SizeAndPositionInformation chunk, AttributeHead public int getDataSize() { - List bytes = new List(); - bytes.Add(RearRightWheelPosition.toBytes()); - bytes.Add(FrontRightWheelPosition.toBytes()); - bytes.Add(CoMOffset.toBytes()); - bytes.Add(BrakeScaleToFactor.toBytes()); - bytes.Add(BitConverter.GetBytes(YawDampingOnTakeOff)); - bytes.Add(BitConverter.GetBytes(TractionLineLength)); - bytes.Add(BitConverter.GetBytes(TimeForFullBrake)); - bytes.Add(BitConverter.GetBytes(SurfaceRoughnessFactor)); - bytes.Add(BitConverter.GetBytes(SurfaceRearGripFactor)); - bytes.Add(BitConverter.GetBytes(SurfaceFrontGripFactor)); - bytes.Add(BitConverter.GetBytes(SurfaceDragFactor)); - bytes.Add(BitConverter.GetBytes(RollLimitOnTakeOff)); - bytes.Add(BitConverter.GetBytes(RollDampingOnTakeOff)); - bytes.Add(BitConverter.GetBytes(RearWheelMass)); - bytes.Add(BitConverter.GetBytes(RearTireStaticFrictionCoefficient)); - bytes.Add(BitConverter.GetBytes(RearTireLongForceBias)); - bytes.Add(BitConverter.GetBytes(RearTireDynamicFrictionCoefficient)); - bytes.Add(BitConverter.GetBytes(RearTireAdhesiveLimit)); - bytes.Add(BitConverter.GetBytes(RearLongGripCurvePeakSlipRatio)); - bytes.Add(BitConverter.GetBytes(RearLongGripCurvePeakCoefficient)); - bytes.Add(BitConverter.GetBytes(RearLongGripCurveFloorSlipRatio)); - bytes.Add(BitConverter.GetBytes(RearLongGripCurveFallCoefficient)); - bytes.Add(BitConverter.GetBytes(RearLatGripCurvePeakSlipRatio)); - bytes.Add(BitConverter.GetBytes(RearLatGripCurvePeakCoefficient)); - bytes.Add(BitConverter.GetBytes(RearLatGripCurveFloorSlipRatio)); - bytes.Add(BitConverter.GetBytes(RearLatGripCurveFallCoefficient)); - bytes.Add(BitConverter.GetBytes(RearLatGripCurveDriftPeakSlipRatio)); - bytes.Add(BitConverter.GetBytes(PowerToRear)); - bytes.Add(BitConverter.GetBytes(PowerToFront)); - bytes.Add(BitConverter.GetBytes(PitchDampingOnTakeOff)); - bytes.Add(BitConverter.GetBytes(MaxSpeed)); - bytes.Add(BitConverter.GetBytes(MagicBrakeFactorTurning)); - bytes.Add(BitConverter.GetBytes(MagicBrakeFactorStraightLine)); - bytes.Add(BitConverter.GetBytes(LowSpeedTyreFrictionTractionControl)); - bytes.Add(BitConverter.GetBytes(LowSpeedThrottleTractionControl)); - bytes.Add(BitConverter.GetBytes(LowSpeedDrivingSpeed)); - bytes.Add(BitConverter.GetBytes(LockBrakeScale)); - bytes.Add(BitConverter.GetBytes(LinearDrag)); - bytes.Add(BitConverter.GetBytes(HighSpeedAngularDamping)); - bytes.Add(BitConverter.GetBytes(FrontWheelMass)); - bytes.Add(BitConverter.GetBytes(FrontTireStaticFrictionCoefficient)); - bytes.Add(BitConverter.GetBytes(FrontTireLongForceBias)); - bytes.Add(BitConverter.GetBytes(FrontTireDynamicFrictionCoefficient)); - bytes.Add(BitConverter.GetBytes(FrontTireAdhesiveLimit)); - bytes.Add(BitConverter.GetBytes(FrontLongGripCurvePeakSlipRatio)); - bytes.Add(BitConverter.GetBytes(FrontLongGripCurvePeakCoefficient)); - bytes.Add(BitConverter.GetBytes(FrontLongGripCurveFloorSlipRatio)); - bytes.Add(BitConverter.GetBytes(FrontLongGripCurveFallCoefficient)); - bytes.Add(BitConverter.GetBytes(FrontLatGripCurvePeakSlipRatio)); - bytes.Add(BitConverter.GetBytes(FrontLatGripCurvePeakCoefficient)); - bytes.Add(BitConverter.GetBytes(FrontLatGripCurveFloorSlipRatio)); - bytes.Add(BitConverter.GetBytes(FrontLatGripCurveFallCoefficient)); - bytes.Add(BitConverter.GetBytes(FrontLatGripCurveDriftPeakSlipRatio)); - bytes.Add(BitConverter.GetBytes(DrivingMass)); - bytes.Add(BitConverter.GetBytes(DriveTimeDeformLimitX)); - bytes.Add(BitConverter.GetBytes(DriveTimeDeformLimitPosZ)); - bytes.Add(BitConverter.GetBytes(DriveTimeDeformLimitNegZ)); - bytes.Add(BitConverter.GetBytes(DriveTimeDeformLimitNegY)); - bytes.Add(BitConverter.GetBytes(DownForceZOffset)); - bytes.Add(BitConverter.GetBytes(DownForce)); - bytes.Add(BitConverter.GetBytes(CrashExtraYawVelocityFactor)); - bytes.Add(BitConverter.GetBytes(CrashExtraRollVelocityFactor)); - bytes.Add(BitConverter.GetBytes(CrashExtraPitchVelocityFactor)); - bytes.Add(BitConverter.GetBytes(CrashExtraLinearVelocityFactor)); - bytes.Add(BitConverter.GetBytes(AngularDrag)); + List bytes = new List + { + RearRightWheelPosition.toBytes(), + FrontRightWheelPosition.toBytes(), + CoMOffset.toBytes(), + BrakeScaleToFactor.toBytes(), + BitConverter.GetBytes(YawDampingOnTakeOff), + BitConverter.GetBytes(TractionLineLength), + BitConverter.GetBytes(TimeForFullBrake), + BitConverter.GetBytes(SurfaceRoughnessFactor), + BitConverter.GetBytes(SurfaceRearGripFactor), + BitConverter.GetBytes(SurfaceFrontGripFactor), + BitConverter.GetBytes(SurfaceDragFactor), + BitConverter.GetBytes(RollLimitOnTakeOff), + BitConverter.GetBytes(RollDampingOnTakeOff), + BitConverter.GetBytes(RearWheelMass), + BitConverter.GetBytes(RearTireStaticFrictionCoefficient), + BitConverter.GetBytes(RearTireLongForceBias), + BitConverter.GetBytes(RearTireDynamicFrictionCoefficient), + BitConverter.GetBytes(RearTireAdhesiveLimit), + BitConverter.GetBytes(RearLongGripCurvePeakSlipRatio), + BitConverter.GetBytes(RearLongGripCurvePeakCoefficient), + BitConverter.GetBytes(RearLongGripCurveFloorSlipRatio), + BitConverter.GetBytes(RearLongGripCurveFallCoefficient), + BitConverter.GetBytes(RearLatGripCurvePeakSlipRatio), + BitConverter.GetBytes(RearLatGripCurvePeakCoefficient), + BitConverter.GetBytes(RearLatGripCurveFloorSlipRatio), + BitConverter.GetBytes(RearLatGripCurveFallCoefficient), + BitConverter.GetBytes(RearLatGripCurveDriftPeakSlipRatio), + BitConverter.GetBytes(PowerToRear), + BitConverter.GetBytes(PowerToFront), + BitConverter.GetBytes(PitchDampingOnTakeOff), + BitConverter.GetBytes(MaxSpeed), + BitConverter.GetBytes(MagicBrakeFactorTurning), + BitConverter.GetBytes(MagicBrakeFactorStraightLine), + BitConverter.GetBytes(LowSpeedTyreFrictionTractionControl), + BitConverter.GetBytes(LowSpeedThrottleTractionControl), + BitConverter.GetBytes(LowSpeedDrivingSpeed), + BitConverter.GetBytes(LockBrakeScale), + BitConverter.GetBytes(LinearDrag), + BitConverter.GetBytes(HighSpeedAngularDamping), + BitConverter.GetBytes(FrontWheelMass), + BitConverter.GetBytes(FrontTireStaticFrictionCoefficient), + BitConverter.GetBytes(FrontTireLongForceBias), + BitConverter.GetBytes(FrontTireDynamicFrictionCoefficient), + BitConverter.GetBytes(FrontTireAdhesiveLimit), + BitConverter.GetBytes(FrontLongGripCurvePeakSlipRatio), + BitConverter.GetBytes(FrontLongGripCurvePeakCoefficient), + BitConverter.GetBytes(FrontLongGripCurveFloorSlipRatio), + BitConverter.GetBytes(FrontLongGripCurveFallCoefficient), + BitConverter.GetBytes(FrontLatGripCurvePeakSlipRatio), + BitConverter.GetBytes(FrontLatGripCurvePeakCoefficient), + BitConverter.GetBytes(FrontLatGripCurveFloorSlipRatio), + BitConverter.GetBytes(FrontLatGripCurveFallCoefficient), + BitConverter.GetBytes(FrontLatGripCurveDriftPeakSlipRatio), + BitConverter.GetBytes(DrivingMass), + BitConverter.GetBytes(DriveTimeDeformLimitX), + BitConverter.GetBytes(DriveTimeDeformLimitPosZ), + BitConverter.GetBytes(DriveTimeDeformLimitNegZ), + BitConverter.GetBytes(DriveTimeDeformLimitNegY), + BitConverter.GetBytes(DownForceZOffset), + BitConverter.GetBytes(DownForce), + BitConverter.GetBytes(CrashExtraYawVelocityFactor), + BitConverter.GetBytes(CrashExtraRollVelocityFactor), + BitConverter.GetBytes(CrashExtraPitchVelocityFactor), + BitConverter.GetBytes(CrashExtraLinearVelocityFactor), + BitConverter.GetBytes(AngularDrag) + }; // No padding needed return bytes.SelectMany(i => i).Count(); } diff --git a/VaultFormat/Physicsvehiclebodyrollattribs.cs b/VaultFormat/Physicsvehiclebodyrollattribs.cs index fba3a5b..c0ff815 100644 --- a/VaultFormat/Physicsvehiclebodyrollattribs.cs +++ b/VaultFormat/Physicsvehiclebodyrollattribs.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -29,19 +29,21 @@ public Physicsvehiclebodyrollattribs(SizeAndPositionInformation chunk, Attribute public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(WheelLongForceHeightOffset)); - bytes.Add(BitConverter.GetBytes(WheelLatForceHeightOffset)); - bytes.Add(BitConverter.GetBytes(WeightTransferDecayZ)); - bytes.Add(BitConverter.GetBytes(WeightTransferDecayX)); - bytes.Add(BitConverter.GetBytes(RollSpringStiffness)); - bytes.Add(BitConverter.GetBytes(RollSpringDampening)); - bytes.Add(BitConverter.GetBytes(PitchSpringStiffness)); - bytes.Add(BitConverter.GetBytes(PitchSpringDampening)); - bytes.Add(BitConverter.GetBytes(FactorOfWeightZ)); - bytes.Add(BitConverter.GetBytes(FactorOfWeightX)); - //4 bytes padding is Wrong! - bytes.Add(BitConverter.GetBytes((float)0)); + List bytes = new List + { + BitConverter.GetBytes(WheelLongForceHeightOffset), + BitConverter.GetBytes(WheelLatForceHeightOffset), + BitConverter.GetBytes(WeightTransferDecayZ), + BitConverter.GetBytes(WeightTransferDecayX), + BitConverter.GetBytes(RollSpringStiffness), + BitConverter.GetBytes(RollSpringDampening), + BitConverter.GetBytes(PitchSpringStiffness), + BitConverter.GetBytes(PitchSpringDampening), + BitConverter.GetBytes(FactorOfWeightZ), + BitConverter.GetBytes(FactorOfWeightX), + //4 bytes padding is Wrong! + BitConverter.GetBytes((float)0) + }; return bytes.SelectMany(i => i).Count(); } diff --git a/VaultFormat/Physicsvehicleboostattribs.cs b/VaultFormat/Physicsvehicleboostattribs.cs index 46aecc7..854ef16 100644 --- a/VaultFormat/Physicsvehicleboostattribs.cs +++ b/VaultFormat/Physicsvehicleboostattribs.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -35,23 +35,25 @@ public Physicsvehicleboostattribs(SizeAndPositionInformation chunk, AttributeHea public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(MaxBoostSpeed)); - bytes.Add(BitConverter.GetBytes(BoostRule)); - bytes.Add(BitConverter.GetBytes(BoostKickTime)); - bytes.Add(BitConverter.GetBytes(BoostKickMinTime)); - bytes.Add(BitConverter.GetBytes(BoostKickMaxTime)); - bytes.Add(BitConverter.GetBytes(BoostKickMaxStartSpeed)); - bytes.Add(BitConverter.GetBytes(BoostKickHeightOffset)); - bytes.Add(BitConverter.GetBytes(BoostKickAcceleration)); - bytes.Add(BitConverter.GetBytes(BoostKick)); - bytes.Add(BitConverter.GetBytes(BoostHeightOffset)); - bytes.Add(BitConverter.GetBytes(BoostBase)); - bytes.Add(BitConverter.GetBytes(BoostAcceleration)); - bytes.Add(BitConverter.GetBytes(BlueMaxBoostSpeed)); - bytes.Add(BitConverter.GetBytes(BlueBoostKickTime)); - bytes.Add(BitConverter.GetBytes(BlueBoostKick)); - bytes.Add(BitConverter.GetBytes(BlueBoostBase)); + List bytes = new List + { + BitConverter.GetBytes(MaxBoostSpeed), + BitConverter.GetBytes(BoostRule), + BitConverter.GetBytes(BoostKickTime), + BitConverter.GetBytes(BoostKickMinTime), + BitConverter.GetBytes(BoostKickMaxTime), + BitConverter.GetBytes(BoostKickMaxStartSpeed), + BitConverter.GetBytes(BoostKickHeightOffset), + BitConverter.GetBytes(BoostKickAcceleration), + BitConverter.GetBytes(BoostKick), + BitConverter.GetBytes(BoostHeightOffset), + BitConverter.GetBytes(BoostBase), + BitConverter.GetBytes(BoostAcceleration), + BitConverter.GetBytes(BlueMaxBoostSpeed), + BitConverter.GetBytes(BlueBoostKickTime), + BitConverter.GetBytes(BlueBoostKick), + BitConverter.GetBytes(BlueBoostBase) + }; Console.WriteLine(bytes.SelectMany(i => i).Count()); return CountingUtilities.AddPadding(bytes); } diff --git a/VaultFormat/Physicsvehiclecollisionattribs.cs b/VaultFormat/Physicsvehiclecollisionattribs.cs index 0579ad2..af89053 100644 --- a/VaultFormat/Physicsvehiclecollisionattribs.cs +++ b/VaultFormat/Physicsvehiclecollisionattribs.cs @@ -20,8 +20,10 @@ public Physicsvehiclecollisionattribs(SizeAndPositionInformation chunk, Attribut public int getDataSize() { - List bytes = new List(); - bytes.Add(BodyBox.toBytes()); + List bytes = new List + { + BodyBox.toBytes() + }; Console.WriteLine(bytes.SelectMany(i => i).Count()); return CountingUtilities.AddPadding(bytes); } diff --git a/VaultFormat/Physicsvehicledriftattribs.cs b/VaultFormat/Physicsvehicledriftattribs.cs index 19d4216..1091d29 100644 --- a/VaultFormat/Physicsvehicledriftattribs.cs +++ b/VaultFormat/Physicsvehicledriftattribs.cs @@ -55,42 +55,44 @@ public Physicsvehicledriftattribs(SizeAndPositionInformation chunk, AttributeHea public int getDataSize() { - List bytes = new List(); - bytes.Add(DriftScaleToYawTorque.toBytes()); - bytes.Add(BitConverter.GetBytes(WheelSlip)); - bytes.Add(BitConverter.GetBytes(TimeToCapScale)); - bytes.Add(BitConverter.GetBytes(TimeForNaturalDrift)); - bytes.Add(BitConverter.GetBytes(SteeringDriftScaleFactor)); - bytes.Add(BitConverter.GetBytes(SideForcePeakDriftAngle)); - bytes.Add(BitConverter.GetBytes(SideForceMagnitude)); - bytes.Add(BitConverter.GetBytes(SideForceDriftSpeedCutOff)); - bytes.Add(BitConverter.GetBytes(SideForceDriftAngleCutOff)); - bytes.Add(BitConverter.GetBytes(SideForceDirftScaleCutOff)); - bytes.Add(BitConverter.GetBytes(NeutralTimeToReduceDrift)); - bytes.Add(BitConverter.GetBytes(NaturalYawTorqueCutOffAngle)); - bytes.Add(BitConverter.GetBytes(NaturalYawTorque)); - bytes.Add(BitConverter.GetBytes(NaturalDriftTimeToReachBaseSlip)); - bytes.Add(BitConverter.GetBytes(NaturalDriftStartSlip)); - bytes.Add(BitConverter.GetBytes(NaturalDriftScaleDecay)); - bytes.Add(BitConverter.GetBytes(MinSpeedForDrift)); - bytes.Add(BitConverter.GetBytes(InitialDriftPushTime)); - bytes.Add(BitConverter.GetBytes(InitialDriftPushScaleLimit)); - bytes.Add(BitConverter.GetBytes(InitialDriftPushDynamicInc)); - bytes.Add(BitConverter.GetBytes(InitialDriftPushBaseInc)); - bytes.Add(BitConverter.GetBytes(GripFromSteering)); - bytes.Add(BitConverter.GetBytes(GripFromGasLetOff)); - bytes.Add(BitConverter.GetBytes(GripFromBrake)); - bytes.Add(BitConverter.GetBytes(GasDriftScaleFactor)); - bytes.Add(BitConverter.GetBytes(ForcedDriftTimeToReachBaseSlip)); - bytes.Add(BitConverter.GetBytes(ForcedDriftStartSlip)); - bytes.Add(BitConverter.GetBytes(DriftTorqueFallOff)); - bytes.Add(BitConverter.GetBytes(DriftSidewaysDamping)); - bytes.Add(BitConverter.GetBytes(DriftMaxAngle)); - bytes.Add(BitConverter.GetBytes(DriftAngularDamping)); - bytes.Add(BitConverter.GetBytes(CounterSteeringDriftScaleFactor)); - bytes.Add(BitConverter.GetBytes(CappedScale)); - bytes.Add(BitConverter.GetBytes(BrakingDriftScaleFactor)); - bytes.Add(BitConverter.GetBytes(BaseCounterSteeringDriftScaleFactor)); + List bytes = new List + { + DriftScaleToYawTorque.toBytes(), + BitConverter.GetBytes(WheelSlip), + BitConverter.GetBytes(TimeToCapScale), + BitConverter.GetBytes(TimeForNaturalDrift), + BitConverter.GetBytes(SteeringDriftScaleFactor), + BitConverter.GetBytes(SideForcePeakDriftAngle), + BitConverter.GetBytes(SideForceMagnitude), + BitConverter.GetBytes(SideForceDriftSpeedCutOff), + BitConverter.GetBytes(SideForceDriftAngleCutOff), + BitConverter.GetBytes(SideForceDirftScaleCutOff), + BitConverter.GetBytes(NeutralTimeToReduceDrift), + BitConverter.GetBytes(NaturalYawTorqueCutOffAngle), + BitConverter.GetBytes(NaturalYawTorque), + BitConverter.GetBytes(NaturalDriftTimeToReachBaseSlip), + BitConverter.GetBytes(NaturalDriftStartSlip), + BitConverter.GetBytes(NaturalDriftScaleDecay), + BitConverter.GetBytes(MinSpeedForDrift), + BitConverter.GetBytes(InitialDriftPushTime), + BitConverter.GetBytes(InitialDriftPushScaleLimit), + BitConverter.GetBytes(InitialDriftPushDynamicInc), + BitConverter.GetBytes(InitialDriftPushBaseInc), + BitConverter.GetBytes(GripFromSteering), + BitConverter.GetBytes(GripFromGasLetOff), + BitConverter.GetBytes(GripFromBrake), + BitConverter.GetBytes(GasDriftScaleFactor), + BitConverter.GetBytes(ForcedDriftTimeToReachBaseSlip), + BitConverter.GetBytes(ForcedDriftStartSlip), + BitConverter.GetBytes(DriftTorqueFallOff), + BitConverter.GetBytes(DriftSidewaysDamping), + BitConverter.GetBytes(DriftMaxAngle), + BitConverter.GetBytes(DriftAngularDamping), + BitConverter.GetBytes(CounterSteeringDriftScaleFactor), + BitConverter.GetBytes(CappedScale), + BitConverter.GetBytes(BrakingDriftScaleFactor), + BitConverter.GetBytes(BaseCounterSteeringDriftScaleFactor) + }; Console.WriteLine(bytes.SelectMany(i => i).Count()); return CountingUtilities.AddPadding(bytes); } diff --git a/VaultFormat/Physicsvehicleengineattribs.cs b/VaultFormat/Physicsvehicleengineattribs.cs index 5d22d2d..6ec538a 100644 --- a/VaultFormat/Physicsvehicleengineattribs.cs +++ b/VaultFormat/Physicsvehicleengineattribs.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using BundleUtilities; namespace VaultFormat diff --git a/VaultFormat/Physicsvehiclehandling.cs b/VaultFormat/Physicsvehiclehandling.cs index bfe9be3..46e2302 100644 --- a/VaultFormat/Physicsvehiclehandling.cs +++ b/VaultFormat/Physicsvehiclehandling.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -26,15 +26,17 @@ public Physicsvehiclehandling(SizeAndPositionInformation chunk, AttributeHeader public int getDataSize() { - List bytes = new List(); - bytes.Add(PhysicsVehicleSuspensionAttribs.ToBytes()); - bytes.Add(PhysicsVehicleSteeringAttribs.ToBytes()); - bytes.Add(PhysicsVehicleEngineAttribs.ToBytes()); - bytes.Add(PhysicsVehicleDriftAttribs.ToBytes()); - bytes.Add(PhysicsVehicleCollisionAttribs.ToBytes()); - bytes.Add(PhysicsVehicleBoostAttribs.ToBytes()); - bytes.Add(PhysicsVehicleBodyRollAttribs.ToBytes()); - bytes.Add(PhysicsVehicleBaseAttribs.ToBytes()); + List bytes = new List + { + PhysicsVehicleSuspensionAttribs.ToBytes(), + PhysicsVehicleSteeringAttribs.ToBytes(), + PhysicsVehicleEngineAttribs.ToBytes(), + PhysicsVehicleDriftAttribs.ToBytes(), + PhysicsVehicleCollisionAttribs.ToBytes(), + PhysicsVehicleBoostAttribs.ToBytes(), + PhysicsVehicleBodyRollAttribs.ToBytes(), + PhysicsVehicleBaseAttribs.ToBytes() + }; Console.WriteLine(bytes.SelectMany(i => i).Count()); return CountingUtilities.AddPadding(bytes); } diff --git a/VaultFormat/Physicsvehiclesteeringattribs.cs b/VaultFormat/Physicsvehiclesteeringattribs.cs index c863e65..ba8d98b 100644 --- a/VaultFormat/Physicsvehiclesteeringattribs.cs +++ b/VaultFormat/Physicsvehiclesteeringattribs.cs @@ -33,21 +33,23 @@ public Physicsvehiclesteeringattribs(SizeAndPositionInformation chunk, Attribute public int getDataSize() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(TimeForLock)); - bytes.Add(BitConverter.GetBytes(StraightReactionBias)); - bytes.Add(BitConverter.GetBytes(SpeedForMinAngle)); - bytes.Add(BitConverter.GetBytes(SpeedForMaxAngle)); - bytes.Add(BitConverter.GetBytes(MinAngle)); - bytes.Add(BitConverter.GetBytes(MaxAngle)); - bytes.Add(BitConverter.GetBytes(AiPidCoefficientP)); - bytes.Add(BitConverter.GetBytes(AiPidCoefficientI)); - bytes.Add(BitConverter.GetBytes(AiPidCoefficientDriftP)); - bytes.Add(BitConverter.GetBytes(AiPidCoefficientDriftI)); - bytes.Add(BitConverter.GetBytes(AiPidCoefficientDriftD)); - bytes.Add(BitConverter.GetBytes(AiPidCoefficientD)); - bytes.Add(BitConverter.GetBytes(AiMinLookAheadDistanceForDrift)); - bytes.Add(BitConverter.GetBytes(AiLookAheadTimeForDrift)); + List bytes = new List + { + BitConverter.GetBytes(TimeForLock), + BitConverter.GetBytes(StraightReactionBias), + BitConverter.GetBytes(SpeedForMinAngle), + BitConverter.GetBytes(SpeedForMaxAngle), + BitConverter.GetBytes(MinAngle), + BitConverter.GetBytes(MaxAngle), + BitConverter.GetBytes(AiPidCoefficientP), + BitConverter.GetBytes(AiPidCoefficientI), + BitConverter.GetBytes(AiPidCoefficientDriftP), + BitConverter.GetBytes(AiPidCoefficientDriftI), + BitConverter.GetBytes(AiPidCoefficientDriftD), + BitConverter.GetBytes(AiPidCoefficientD), + BitConverter.GetBytes(AiMinLookAheadDistanceForDrift), + BitConverter.GetBytes(AiLookAheadTimeForDrift) + }; // Hack, because of weird padding of suspension attribs bytes.AddRange(Physicsvehiclesuspensionattribs.getDefaultBytes()); Console.WriteLine(bytes.SelectMany(i => i).Count()); diff --git a/VaultFormat/Physicsvehiclesuspensionattribs.cs b/VaultFormat/Physicsvehiclesuspensionattribs.cs index ab63596..8b5627f 100644 --- a/VaultFormat/Physicsvehiclesuspensionattribs.cs +++ b/VaultFormat/Physicsvehiclesuspensionattribs.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using BundleUtilities; namespace VaultFormat @@ -34,20 +33,22 @@ public Physicsvehiclesuspensionattribs(SizeAndPositionInformation chunk, Attribu // Hack, because of weird padding of suspension attribs public static byte[][] getDefaultBytes() { float value = 0; - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(value)); // UpwardMovement - bytes.Add(BitConverter.GetBytes(0)); // TimeToDampAfterLanding - bytes.Add(BitConverter.GetBytes(0)); // Strength - bytes.Add(BitConverter.GetBytes(0)); // etc - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); - bytes.Add(BitConverter.GetBytes(0)); + List bytes = new List + { + BitConverter.GetBytes(value), // UpwardMovement + BitConverter.GetBytes(0), // TimeToDampAfterLanding + BitConverter.GetBytes(0), // Strength + BitConverter.GetBytes(0), // etc + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0), + BitConverter.GetBytes(0) + }; return bytes.ToArray(); } diff --git a/VaultFormat/RefSpec.cs b/VaultFormat/RefSpec.cs index 9c18e8e..c8a8667 100644 --- a/VaultFormat/RefSpec.cs +++ b/VaultFormat/RefSpec.cs @@ -23,20 +23,24 @@ public RefSpec(ILoader loader, BinaryReader2 br) public byte[] ToBytes() { - List bytes = new List(); - bytes.Add(BitConverter.GetBytes(ClassKey)); - bytes.Add(BitConverter.GetBytes(CollectionKey)); - bytes.Add(BitConverter.GetBytes(CollectionPtr)); + List bytes = new List + { + BitConverter.GetBytes(ClassKey), + BitConverter.GetBytes(CollectionKey), + BitConverter.GetBytes(CollectionPtr) + }; return AddPadding(bytes); } private byte[] AddPadding(List bytes) { - List padding = new List(); - padding.Add((byte)0); - padding.Add((byte)0); - padding.Add((byte)0); - padding.Add((byte)0); + List padding = new List + { + 0, + 0, + 0, + 0 + }; bytes.Add(padding.ToArray()); return bytes.SelectMany(i => i).ToArray(); } diff --git a/VehicleList/EncryptionData.cs b/VehicleList/EncryptionData.cs index 43a0b02..d50905e 100644 --- a/VehicleList/EncryptionData.cs +++ b/VehicleList/EncryptionData.cs @@ -1,5 +1,3 @@ -using System; - namespace VehicleList { public static class EncryptionData diff --git a/VehicleList/Extensions.cs b/VehicleList/Extensions.cs index 56852c9..666352d 100644 --- a/VehicleList/Extensions.cs +++ b/VehicleList/Extensions.cs @@ -1,10 +1,6 @@ -using BundleUtilities; -using System; -using System.Collections.Generic; +using BundleUtilities; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace VehicleList { diff --git a/VehicleList/Util.cs b/VehicleList/Util.cs index cf2345b..22a1fa3 100644 --- a/VehicleList/Util.cs +++ b/VehicleList/Util.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; +using System; using System.IO; -using System.Linq; -using System.Net.NetworkInformation; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; namespace VehicleList { @@ -62,7 +55,7 @@ public static Int64 ReverseBytes(Int64 value) // reverse byte order (32-bit) public static float ReverseBytes(float value) { - return intToFloat(Util.ReverseBytes(floatToInt(value))); + return intToFloat(ReverseBytes(floatToInt(value))); } public static byte[] ReverseBytes(byte[] value) diff --git a/VehicleList/VehicleEditor.cs b/VehicleList/VehicleEditor.cs index 18011b8..289f7fb 100644 --- a/VehicleList/VehicleEditor.cs +++ b/VehicleList/VehicleEditor.cs @@ -1,14 +1,5 @@ using BundleUtilities; using System; -using System.CodeDom.Compiler; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace VehicleList @@ -239,8 +230,7 @@ private Vehicle GetModifiedVehicle() } // Damage limit - float damageLimit; - if (float.TryParse(txtDamageLimit.Text, out damageLimit)) + if (float.TryParse(txtDamageLimit.Text, out float damageLimit)) { result.DamageLimit = damageLimit; } @@ -272,8 +262,7 @@ private Vehicle GetModifiedVehicle() } // Boost length - byte boostLength; - if (byte.TryParse(txtBoostLength.Text, out boostLength)) + if (byte.TryParse(txtBoostLength.Text, out byte boostLength)) { result.BoostLength = boostLength; } @@ -284,8 +273,7 @@ private Vehicle GetModifiedVehicle() } // Rank - byte rank; - if (byte.TryParse(cboRank.SelectedIndex.ToString(), out rank)) + if (byte.TryParse(cboRank.SelectedIndex.ToString(), out byte rank)) { result.VehicleRank = (VehicleRank)rank; } @@ -296,8 +284,7 @@ private Vehicle GetModifiedVehicle() } // Boost capacity - byte boostCapacity; - if (byte.TryParse(txtBoostCapacity.Text, out boostCapacity)) + if (byte.TryParse(txtBoostCapacity.Text, out byte boostCapacity)) { result.BoostCapacity = boostCapacity; } @@ -308,8 +295,7 @@ private Vehicle GetModifiedVehicle() } // Strength stat - byte displayStrength; - if (byte.TryParse(txtStrengthStat.Text, out displayStrength)) + if (byte.TryParse(txtStrengthStat.Text, out byte displayStrength)) { result.DisplayStrength = displayStrength; } @@ -320,8 +306,7 @@ private Vehicle GetModifiedVehicle() } // AttribSys ID - long attribsysId; - if (long.TryParse(txtAttribSysCollectionKey.Text, out attribsysId)) + if (long.TryParse(txtAttribSysCollectionKey.Text, out long attribsysId)) { result.AttribSysCollectionKey = attribsysId; } @@ -349,8 +334,7 @@ private Vehicle GetModifiedVehicle() } // Exhaust ID - long group1; - if (long.TryParse(txtExhaustID.Text, out group1)) + if (long.TryParse(txtExhaustID.Text, out long group1)) { result.ExhaustID = group1; } @@ -361,8 +345,7 @@ private Vehicle GetModifiedVehicle() } // Engine ID - long group2; - if (long.TryParse(txtEngineID.Text, out group2)) + if (long.TryParse(txtEngineID.Text, out long group2)) { result.EngineID = group2; } @@ -390,8 +373,7 @@ private Vehicle GetModifiedVehicle() } // Class unlock stream hash - uint classUnlock; - if (uint.TryParse(cboClassUnlock.SelectedIndex.ToString(), out classUnlock)) + if (uint.TryParse(cboClassUnlock.SelectedIndex.ToString(), out uint classUnlock)) { switch (classUnlock) { @@ -423,8 +405,7 @@ private Vehicle GetModifiedVehicle() } // Car won stream ID - long carWon; - if (long.TryParse(txtCarWon.Text, out carWon)) + if (long.TryParse(txtCarWon.Text, out long carWon)) { result.CarShutdownStreamID = carWon; } @@ -435,8 +416,7 @@ private Vehicle GetModifiedVehicle() } // Car released stream ID - long carReleased; - if (long.TryParse(txtCarReleased.Text, out carReleased)) + if (long.TryParse(txtCarReleased.Text, out long carReleased)) { result.CarReleasedStreamID = carReleased; } @@ -447,8 +427,7 @@ private Vehicle GetModifiedVehicle() } // AI music loop stream hash - uint aiMusic; - if (uint.TryParse(cboAIMusic.SelectedIndex.ToString(), out aiMusic)) + if (uint.TryParse(cboAIMusic.SelectedIndex.ToString(), out uint aiMusic)) { switch (aiMusic) { @@ -483,8 +462,7 @@ private Vehicle GetModifiedVehicle() } // AI exhuast index - byte aiEx1; - if (byte.TryParse(cboAIExhaust1.SelectedIndex.ToString(), out aiEx1)) + if (byte.TryParse(cboAIExhaust1.SelectedIndex.ToString(), out byte aiEx1)) { result.AIExhaustIndex = (AIExhaustIndex)aiEx1; } @@ -495,8 +473,7 @@ private Vehicle GetModifiedVehicle() } // AI exhuast index 2 - byte aiEx2; - if (byte.TryParse(cboAIExhaust2.SelectedIndex.ToString(), out aiEx2)) + if (byte.TryParse(cboAIExhaust2.SelectedIndex.ToString(), out byte aiEx2)) { result.AIExhaustIndex2 = (AIExhaustIndex)aiEx2; } @@ -507,8 +484,7 @@ private Vehicle GetModifiedVehicle() } // AI exhuast index 3 - byte aiEx3; - if (byte.TryParse(cboAIExhaust3.SelectedIndex.ToString(), out aiEx3)) + if (byte.TryParse(cboAIExhaust3.SelectedIndex.ToString(), out byte aiEx3)) { result.AIExhaustIndex3 = (AIExhaustIndex)aiEx3; } @@ -538,8 +514,7 @@ private Vehicle GetModifiedVehicle() } // Vehicle type - int vehType; - if (int.TryParse(cboVehicleType.SelectedIndex.ToString(), out vehType)) + if (int.TryParse(cboVehicleType.SelectedIndex.ToString(), out int vehType)) { result.VehicleType = (VehicleType)vehType; } @@ -550,8 +525,7 @@ private Vehicle GetModifiedVehicle() } // Boost type - byte boostType; - if (byte.TryParse(cboBoostType.SelectedIndex.ToString(), out boostType)) + if (byte.TryParse(cboBoostType.SelectedIndex.ToString(), out byte boostType)) { result.BoostType = (BoostType)boostType; } @@ -562,8 +536,7 @@ private Vehicle GetModifiedVehicle() } // Finish type - byte finishType; - if (byte.TryParse(cboFinishType.SelectedIndex.ToString(), out finishType)) + if (byte.TryParse(cboFinishType.SelectedIndex.ToString(), out byte finishType)) { result.FinishType = (FinishType)cboFinishType.SelectedIndex; } @@ -574,8 +547,7 @@ private Vehicle GetModifiedVehicle() } // Max speed - byte maxSpeed; - if (byte.TryParse(txtMaxSpeed.Text, out maxSpeed)) + if (byte.TryParse(txtMaxSpeed.Text, out byte maxSpeed)) { result.MaxSpeedNoBoost = maxSpeed; } @@ -586,8 +558,7 @@ private Vehicle GetModifiedVehicle() } // Max boost speed - byte maxBoostSpeed; - if (byte.TryParse(txtMaxBoostSpeed.Text, out maxBoostSpeed)) + if (byte.TryParse(txtMaxBoostSpeed.Text, out byte maxBoostSpeed)) { result.MaxSpeedBoost = maxBoostSpeed; } @@ -598,8 +569,7 @@ private Vehicle GetModifiedVehicle() } // Speed stat - byte displaySpeed; - if (byte.TryParse(txtSpeedStat.Text, out displaySpeed)) + if (byte.TryParse(txtSpeedStat.Text, out byte displaySpeed)) { result.DisplaySpeed = displaySpeed; } @@ -610,8 +580,7 @@ private Vehicle GetModifiedVehicle() } // Boost stat - byte displayBoost; - if (byte.TryParse(txtBoostStat.Text, out displayBoost)) + if (byte.TryParse(txtBoostStat.Text, out byte displayBoost)) { result.DisplayBoost = displayBoost; } @@ -622,8 +591,7 @@ private Vehicle GetModifiedVehicle() } // Color index - byte color; - if (byte.TryParse(txtColor.Text, out color)) + if (byte.TryParse(txtColor.Text, out byte color)) { result.Color = color; } @@ -634,8 +602,7 @@ private Vehicle GetModifiedVehicle() } // Color type - byte colorType; - if (byte.TryParse(cboColorType.SelectedIndex.ToString(), out colorType)) + if (byte.TryParse(cboColorType.SelectedIndex.ToString(), out byte colorType)) { result.ColorType = (ColorType)colorType; } diff --git a/VehicleList/VehicleListData.cs b/VehicleList/VehicleListData.cs index cd4a3c0..769adf6 100644 --- a/VehicleList/VehicleListData.cs +++ b/VehicleList/VehicleListData.cs @@ -1,12 +1,10 @@ -using BundleFormat; +using BundleFormat; using BundleUtilities; using PluginAPI; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace VehicleList { @@ -394,4 +392,4 @@ public Vehicle(Vehicle copy) padding3 = copy.padding3; } } -} \ No newline at end of file +} diff --git a/VehicleList/VehicleListForm.cs b/VehicleList/VehicleListForm.cs index 42c8353..6fb7bf0 100644 --- a/VehicleList/VehicleListForm.cs +++ b/VehicleList/VehicleListForm.cs @@ -1,19 +1,9 @@ using System; using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Globalization; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using BundleFormat; using BundleUtilities; using PluginAPI; -using Util = BundleFormat.Util; namespace VehicleList { @@ -99,8 +89,7 @@ private void EditSelectedEntry() if (List == null || lstVehicles.SelectedIndices.Count <= 0) return; - int index; - if (!int.TryParse(lstVehicles.SelectedItems[0].Text, out index)) + if (!int.TryParse(lstVehicles.SelectedItems[0].Text, out int index)) return; Vehicle vehicle = List.Entries[index]; @@ -133,8 +122,7 @@ private void CopyItem() || lstVehicles.SelectedIndices.Count <= 0) return; - int index; - if (!int.TryParse(lstVehicles.SelectedItems[0].Text, out index)) + if (!int.TryParse(lstVehicles.SelectedItems[0].Text, out int index)) return; Vehicle vehicle = new Vehicle(List.Entries[index]); vehicle.Index = List.Entries.Count; @@ -227,8 +215,8 @@ private class VehicleSorter : IComparer public VehicleSorter(int column) { - this.Column = column; - this.Direction = false; + Column = column; + Direction = false; } public int Compare(object x, object y) @@ -238,7 +226,7 @@ public int Compare(object x, object y) if (Column > itemX.SubItems.Count || Column > itemY.SubItems.Count) { - if (this.Direction) + if (Direction) return -1; return 1; } @@ -246,12 +234,10 @@ public int Compare(object x, object y) string iX = itemX.SubItems[Column].Text; string iY = itemY.SubItems[Column].Text; - int iXint; - int iYint; - if (int.TryParse(iX, NumberStyles.HexNumber, CultureInfo.CurrentCulture, out iXint)) + if (int.TryParse(iX, NumberStyles.HexNumber, CultureInfo.CurrentCulture, out int iXint)) { - if (int.TryParse(iY, NumberStyles.HexNumber, CultureInfo.CurrentCulture, out iYint)) + if (int.TryParse(iY, NumberStyles.HexNumber, CultureInfo.CurrentCulture, out int iYint)) { int val2 = iXint.CompareTo(iYint); if (this.Direction) @@ -260,15 +246,15 @@ public int Compare(object x, object y) } } - int val = String.CompareOrdinal(iX, iY); - if (this.Direction) + int val = string.CompareOrdinal(iX, iY); + if (Direction) return val * -1; return val; } public void Swap() { - this.Direction = !this.Direction; + Direction = !Direction; } } diff --git a/VehicleList/VehicleListPlugin.cs b/VehicleList/VehicleListPlugin.cs index 70a6d25..fac4ef8 100644 --- a/VehicleList/VehicleListPlugin.cs +++ b/VehicleList/VehicleListPlugin.cs @@ -1,10 +1,5 @@ -using BundleFormat; +using BundleFormat; using PluginAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace VehicleList { diff --git a/WorldCollisionHandler/PolygonSoupList.cs b/WorldCollisionHandler/PolygonSoupList.cs index 7bb2937..1f633fe 100644 --- a/WorldCollisionHandler/PolygonSoupList.cs +++ b/WorldCollisionHandler/PolygonSoupList.cs @@ -1,19 +1,14 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Drawing; -using System.Globalization; using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; using BundleFormat; using BundleUtilities; using MathLib; using ModelViewer; using ModelViewer.SceneData; using OpenTK.Mathematics; -using OpenTK.Graphics.OpenGL; using PluginAPI; namespace WorldCollisionHandler diff --git a/WorldCollisionHandler/WorldColEditor.cs b/WorldCollisionHandler/WorldColEditor.cs index bfd0e34..f3a9d03 100644 --- a/WorldCollisionHandler/WorldColEditor.cs +++ b/WorldCollisionHandler/WorldColEditor.cs @@ -1,16 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; using System.Windows.Forms; -using BundleFormat; using BundleUtilities; using DebugHelper; -using ModelViewer.SceneData; using PluginAPI; namespace WorldCollisionHandler diff --git a/WorldCollisionHandler/WorldCollisionPlugin.cs b/WorldCollisionHandler/WorldCollisionPlugin.cs index bd88e12..62051e0 100644 --- a/WorldCollisionHandler/WorldCollisionPlugin.cs +++ b/WorldCollisionHandler/WorldCollisionPlugin.cs @@ -1,13 +1,8 @@ -using BundleFormat; +using BundleFormat; using BundleUtilities; using ModelViewer.SceneData; using PluginAPI; -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace WorldCollisionHandler @@ -112,33 +107,6 @@ private void RemoveWreckSurfaces(IWin32Window window, BundleArchive archive) } } - /*public void ConvertToPC(IWin32Window window, BundleArchive archive) - { - // TODO: Support everything - - for (int i = 0; i < archive.Entries.Count; i++) - { - BundleEntry entry = archive.Entries[i]; - - if (entry.Type == EntryType.IDList) - { - IDList list = new IDList(); - list.Read(entry); - list.Write(entry); - } - else if (entry.Type == EntryType.PolygonSoupListResourceType) - { - PolygonSoupList list = new PolygonSoupList(); - list.Read(entry); - list.Write(entry); - } - } - - //PatchImages(); - - archive.Platform = BundlePlatform.PC; - }*/ - #endregion } } From 42410758e1b7669e7d0e4a183935ab7f91b9ebba Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 16:30:21 -0400 Subject: [PATCH 08/11] Remove StandardExtension --- StandardExtension/IOExtensions.cs | 27 --------------- StandardExtension/Properties/AssemblyInfo.cs | 36 -------------------- StandardExtension/StandardExtension.csproj | 12 ------- 3 files changed, 75 deletions(-) delete mode 100644 StandardExtension/IOExtensions.cs delete mode 100644 StandardExtension/Properties/AssemblyInfo.cs delete mode 100644 StandardExtension/StandardExtension.csproj diff --git a/StandardExtension/IOExtensions.cs b/StandardExtension/IOExtensions.cs deleted file mode 100644 index b0c55cd..0000000 --- a/StandardExtension/IOExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StandardExtension -{ - public static class IOExtensions - { - public static bool EOF(this Stream self) - { - return self.Position >= self.Length; - } - - public static byte[] ReadToEnd(this BinaryReader self) - { - List result = new List(); - while (!self.BaseStream.EOF()) - { - result.Add(self.ReadByte()); - } - return result.ToArray(); - } - } -} diff --git a/StandardExtension/Properties/AssemblyInfo.cs b/StandardExtension/Properties/AssemblyInfo.cs deleted file mode 100644 index 71dd460..0000000 --- a/StandardExtension/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("StandardExtension")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("StandardExtension")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1d9c18c6-b506-4cb7-9e3e-e22fbb24ac3b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/StandardExtension/StandardExtension.csproj b/StandardExtension/StandardExtension.csproj deleted file mode 100644 index b7cd4d3..0000000 --- a/StandardExtension/StandardExtension.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - netstandard2.0 - Library - false - - - - all - - - \ No newline at end of file From 8f42f0ce09eb9c0476fff9bdfb168350e484f9b4 Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 18:01:49 -0400 Subject: [PATCH 09/11] Attempt to fix OpenTK issues --- ModelViewer/GraphicsScene.cs | 4 +++- ModelViewer/ModelViewer.csproj | 3 ++- ModelViewer/OpenTKCompat.cs | 25 ++++++++++++++++++++++ ModelViewer/SceneData/Mesh.cs | 4 +++- ModelViewer/SceneRenderControl.Designer.cs | 9 ++++---- 5 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 ModelViewer/OpenTKCompat.cs diff --git a/ModelViewer/GraphicsScene.cs b/ModelViewer/GraphicsScene.cs index 30ea339..d1cf6ca 100644 --- a/ModelViewer/GraphicsScene.cs +++ b/ModelViewer/GraphicsScene.cs @@ -103,7 +103,9 @@ public void Render() { _shader.Bind(); - GL.UniformMatrix4(20, false, ref _projection); + OpenTK.Matrix4 projectionOTK3 = OpenTKCompat.ToOTK3Matrix4(_projection); + GL.UniformMatrix4(20, false, ref projectionOTK3); + _projection = OpenTKCompat.ToOTK4Matrix4(projectionOTK3); Scene?.Render(_camera); } diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index f578c9a..e053b80 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -17,7 +17,8 @@ - + + \ No newline at end of file diff --git a/ModelViewer/OpenTKCompat.cs b/ModelViewer/OpenTKCompat.cs new file mode 100644 index 0000000..0bdb85e --- /dev/null +++ b/ModelViewer/OpenTKCompat.cs @@ -0,0 +1,25 @@ +namespace ModelViewer +{ + public static class OpenTKCompat + { + public static OpenTK.Matrix4 ToOTK3Matrix4(OpenTK.Mathematics.Matrix4 matrix) + { + return new OpenTK.Matrix4( + matrix.M11, matrix.M12, matrix.M13, matrix.M14, + matrix.M21, matrix.M22, matrix.M23, matrix.M24, + matrix.M31, matrix.M32, matrix.M33, matrix.M34, + matrix.M41, matrix.M42, matrix.M43, matrix.M44 + ); + } + + public static OpenTK.Mathematics.Matrix4 ToOTK4Matrix4(OpenTK.Matrix4 matrix) + { + return new OpenTK.Mathematics.Matrix4( + matrix.M11,matrix.M12,matrix.M13,matrix.M14, + matrix.M21,matrix.M22,matrix.M23,matrix.M24, + matrix.M31,matrix.M32,matrix.M33,matrix.M34, + matrix.M41,matrix.M42,matrix.M43,matrix.M44 + ); + } + } +} diff --git a/ModelViewer/SceneData/Mesh.cs b/ModelViewer/SceneData/Mesh.cs index 105ff4d..262fd86 100644 --- a/ModelViewer/SceneData/Mesh.cs +++ b/ModelViewer/SceneData/Mesh.cs @@ -347,7 +347,9 @@ public void Render(ICamera camera, Matrix4 transform) if (camera != null) modelView *= camera.LookAtMatrix; - GL.UniformMatrix4(21, false, ref modelView); + OpenTK.Matrix4 modelViewOTK3 = OpenTKCompat.ToOTK3Matrix4(modelView); + GL.UniformMatrix4(21, false, ref modelViewOTK3); + modelView = OpenTKCompat.ToOTK4Matrix4(modelViewOTK3); GL.BindVertexArray(_vertexArray); //GL.PointSize(4.0f); diff --git a/ModelViewer/SceneRenderControl.Designer.cs b/ModelViewer/SceneRenderControl.Designer.cs index 12b84c0..0411cd6 100644 --- a/ModelViewer/SceneRenderControl.Designer.cs +++ b/ModelViewer/SceneRenderControl.Designer.cs @@ -1,4 +1,6 @@ -namespace ModelViewer +using OpenTK; + +namespace ModelViewer { partial class SceneRenderControl { @@ -29,7 +31,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.glcMain = new OpenTK.GLControl(); + this.glcMain = new GLControl(); this.tmrUpdate = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); // @@ -56,12 +58,11 @@ private void InitializeComponent() this.Controls.Add(this.glcMain); this.Name = "SceneRenderControl"; this.ResumeLayout(false); - } #endregion - private OpenTK.GLControl glcMain; + private GLControl glcMain; private System.Windows.Forms.Timer tmrUpdate; } } From afadd7db0bb700ab9c95263ceb5f216b6994b38b Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 18:09:59 -0400 Subject: [PATCH 10/11] Fix OpenTK --- MathLib/MathLib.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MathLib/MathLib.csproj b/MathLib/MathLib.csproj index 6767ce5..5e0b62e 100644 --- a/MathLib/MathLib.csproj +++ b/MathLib/MathLib.csproj @@ -7,6 +7,6 @@ true - + \ No newline at end of file From fd81894e80774893cfbee533a6a3aacaafde323c Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Wed, 3 May 2023 18:21:09 -0400 Subject: [PATCH 11/11] Remove more unused using declarations --- ModelViewer/SceneData/Material.cs | 5 ----- ModelViewer/SceneData/Mesh.cs | 4 ---- ModelViewer/SceneData/Model.cs | 4 ---- ModelViewer/SceneData/Scene.cs | 3 --- ModelViewer/SceneData/SceneObject.cs | 5 ----- 5 files changed, 21 deletions(-) diff --git a/ModelViewer/SceneData/Material.cs b/ModelViewer/SceneData/Material.cs index 5073c9f..5c76dc0 100644 --- a/ModelViewer/SceneData/Material.cs +++ b/ModelViewer/SceneData/Material.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModelViewer.SceneData { diff --git a/ModelViewer/SceneData/Mesh.cs b/ModelViewer/SceneData/Mesh.cs index 262fd86..6478497 100644 --- a/ModelViewer/SceneData/Mesh.cs +++ b/ModelViewer/SceneData/Mesh.cs @@ -2,10 +2,6 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using OpenTK.Mathematics; using OpenTK.Graphics.OpenGL; using PixelFormat = OpenTK.Graphics.OpenGL.PixelFormat; diff --git a/ModelViewer/SceneData/Model.cs b/ModelViewer/SceneData/Model.cs index a52df46..c5c14f4 100644 --- a/ModelViewer/SceneData/Model.cs +++ b/ModelViewer/SceneData/Model.cs @@ -1,8 +1,4 @@ -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace ModelViewer.SceneData diff --git a/ModelViewer/SceneData/Scene.cs b/ModelViewer/SceneData/Scene.cs index b9aa6e3..713eade 100644 --- a/ModelViewer/SceneData/Scene.cs +++ b/ModelViewer/SceneData/Scene.cs @@ -4,11 +4,8 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Windows.Forms.VisualStyles; using OpenTK.Mathematics; namespace ModelViewer.SceneData diff --git a/ModelViewer/SceneData/SceneObject.cs b/ModelViewer/SceneData/SceneObject.cs index 3c0f866..bde5be8 100644 --- a/ModelViewer/SceneData/SceneObject.cs +++ b/ModelViewer/SceneData/SceneObject.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using OpenTK.Mathematics; namespace ModelViewer.SceneData