diff --git a/OC2Modding/OC2Modding.csproj.epic b/OC2Modding/OC2Modding.csproj.epic index eb42e68..6eae4f8 100644 --- a/OC2Modding/OC2Modding.csproj.epic +++ b/OC2Modding/OC2Modding.csproj.epic @@ -3,7 +3,7 @@ net46 com.github.toasterparty.oc2modding.epic Overcooked! 2 Modding - 1.9.1 + 1.9.2 true latest diff --git a/OC2Modding/OC2Modding.csproj.steam b/OC2Modding/OC2Modding.csproj.steam index 680ae79..109bca5 100644 --- a/OC2Modding/OC2Modding.csproj.steam +++ b/OC2Modding/OC2Modding.csproj.steam @@ -3,7 +3,7 @@ net35 com.github.toasterparty.oc2modding.steam Overcooked! 2 Modding - 1.9.1 + 1.9.2 true latest diff --git a/dist/c-wspp-LICENSE.txt b/dist/c-wspp-websocket-v0.4.1/win32/c-wspp-LICENSE.txt similarity index 100% rename from dist/c-wspp-LICENSE.txt rename to dist/c-wspp-websocket-v0.4.1/win32/c-wspp-LICENSE.txt diff --git a/dist/c-wspp.dll b/dist/c-wspp-websocket-v0.4.1/win32/c-wspp.dll similarity index 99% rename from dist/c-wspp.dll rename to dist/c-wspp-websocket-v0.4.1/win32/c-wspp.dll index 370faa2..db6a49f 100644 Binary files a/dist/c-wspp.dll and b/dist/c-wspp-websocket-v0.4.1/win32/c-wspp.dll differ diff --git a/dist/websocket-sharp.dll b/dist/c-wspp-websocket-v0.4.1/win32/websocket-sharp.dll similarity index 100% rename from dist/websocket-sharp.dll rename to dist/c-wspp-websocket-v0.4.1/win32/websocket-sharp.dll diff --git a/dist/c-wspp-websocket-v0.4.1/win64/c-wspp-LICENSE.txt b/dist/c-wspp-websocket-v0.4.1/win64/c-wspp-LICENSE.txt new file mode 100644 index 0000000..80672a8 --- /dev/null +++ b/dist/c-wspp-websocket-v0.4.1/win64/c-wspp-LICENSE.txt @@ -0,0 +1,186 @@ +MIT License + +Copyright (c) 2023 black-sliver + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Binary distributions may contain parts of OpenSSL and other software. +For OpenSSL see https://www.openssl.org/source/apache-license-2.0.txt +See subprojects on https://github.com/black-sliver/c-wspp/ +for more details and individual licenses. +Or read below. + +--- + +ASIO + +Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) + +Distributed under the Boost Software License, Version 1.0. (See accompanying +file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +--- + +WebSocket++ + +Main Library: + +Copyright (c) 2014, Peter Thorson. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the WebSocket++ Project nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Bundled Libraries: + +****** Base 64 Library (base64/base64.hpp) ****** +base64.hpp is a repackaging of the base64.cpp and base64.h files into a +single header suitable for use as a header only library. This conversion was +done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to +the code are redistributed under the same license as the original, which is +listed below. + +base64.cpp and base64.h + +Copyright (C) 2004-2008 René Nyffenegger + +This source code is provided 'as-is', without any express or implied +warranty. In no event will the author be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this source code must not be misrepresented; you must not + claim that you wrote the original source code. If you use this source code + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original source code. + +3. This notice may not be removed or altered from any source distribution. + +René Nyffenegger rene.nyffenegger@adp-gmbh.ch + +****** SHA1 Library (sha1/sha1.hpp) ****** +sha1.hpp is a repackaging of the sha1.cpp and sha1.h files from the shallsha1 +library (http://code.google.com/p/smallsha1/) into a single header suitable for +use as a header only library. This conversion was done by Peter Thorson +(webmaster@zaphoyd.com) in 2013. All modifications to the code are redistributed +under the same license as the original, which is listed below. + + Copyright (c) 2011, Micael Hildenborg + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Micael Hildenborg nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +****** MD5 Library (common/md5.hpp) ****** +md5.hpp is a reformulation of the md5.h and md5.c code from +http://www.opensource.apple.com/source/cups/cups-59/cups/md5.c to allow it to +function as a component of a header only library. This conversion was done by +Peter Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The +changes are released under the same license as the original (listed below) + +Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +L. Peter Deutsch +ghost@aladdin.com + +****** UTF8 Validation logic (utf8_validation.hpp) ****** +utf8_validation.hpp is adapted from code originally written by Bjoern Hoehrmann +. See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for +details. + +The original license: + +Copyright (c) 2008-2009 Bjoern Hoehrmann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/dist/c-wspp-websocket-v0.4.1/win64/c-wspp.dll b/dist/c-wspp-websocket-v0.4.1/win64/c-wspp.dll new file mode 100644 index 0000000..5f479e1 Binary files /dev/null and b/dist/c-wspp-websocket-v0.4.1/win64/c-wspp.dll differ diff --git a/dist/c-wspp-websocket-v0.4.1/win64/websocket-sharp.dll b/dist/c-wspp-websocket-v0.4.1/win64/websocket-sharp.dll new file mode 100644 index 0000000..5860a3d Binary files /dev/null and b/dist/c-wspp-websocket-v0.4.1/win64/websocket-sharp.dll differ diff --git a/dist/oc2-modding-install.bat b/dist/oc2-modding-install.bat index 2dbec42..3e76b54 100644 --- a/dist/oc2-modding-install.bat +++ b/dist/oc2-modding-install.bat @@ -9,6 +9,8 @@ set NO_PAUSE=%~1 set STEAM_BEPINEX_VER=BepInEx_x86_5.4.21.0 set EPIC_BEPINEX_VER=BepInEx_UnityMono_x64_6.0.0-pre.1 +set STEAM_C_WSPP_WEBSOCKET_PATH=c-wspp-websocket-v0.4.1\win32 +set EPIC_C_WSPP_WEBSOCKET_PATH=c-wspp-websocket-v0.4.1\win64 echo. echo Overcooked! 2 Mod Installer @@ -20,6 +22,8 @@ if not exist %DIST_DIR%\leaderboard_scores.csv goto fail if not exist %DIST_DIR%\curl\curl\curl.exe goto fail if not exist %DIST_DIR%\%STEAM_BEPINEX_VER% goto fail if not exist %DIST_DIR%\%EPIC_BEPINEX_VER% goto fail +if not exist %DIST_DIR%\%STEAM_C_WSPP_WEBSOCKET_PATH% goto fail +if not exist %DIST_DIR%\%EPIC_C_WSPP_WEBSOCKET_PATH% goto fail goto check_params @@ -61,6 +65,10 @@ if exist "%~dp1\UnityCrashHandler64.exe" xcopy %DIST_DIR%\%EPIC_BEPINEX_VER% if not exist "%~dp1\UnityCrashHandler64.exe" xcopy %DIST_DIR%\%STEAM_BEPINEX_VER% %GAME_DIR% /y /q /s /e xcopy %DIST_DIR%\*.dll %PLUGINS_DIR% /y /q + +if exist "%~dp1\UnityCrashHandler64.exe" xcopy %DIST_DIR%\%EPIC_C_WSPP_WEBSOCKET_PATH% %PLUGINS_DIR% /y /q /s /e +if not exist "%~dp1\UnityCrashHandler64.exe" xcopy %DIST_DIR%\%STEAM_C_WSPP_WEBSOCKET_PATH% %PLUGINS_DIR% /y /q /s /e + xcopy %DIST_DIR%\oc2-modding-uninstall.bat %GAME_DIR% /y /q xcopy %DIST_DIR%\leaderboard_scores.csv %GAME_DIR% /y /q xcopy %DIST_DIR%\curl %GAME_DIR% /y /q /s /e