11485 Commits

Author SHA1 Message Date
90a8d9f6c0
Merge commit '7db4e20fd7ee7cf1c25d5c2c5e9e1b1cf97d4c97' into pullstream 2024-02-14 06:36:55 -05:00
61511fae18
Merge commit 'a819f37fa10102cbaee391841c644b3981a04ad7' into pullstream 2024-02-14 06:36:44 -05:00
fb79064926
Merge commit 'eda440e0db028587975c867dbacb513d80df4dca' into pullstream 2024-02-14 06:36:06 -05:00
29c9cbbbed
Merge commit '770d838f377b82e9fd8c490a83eee4506fedfedb' into pullstream 2024-02-14 06:35:44 -05:00
ab8aa78df1
Merge commit 'f2c41d1227eedc3b227d34c7cd57ab5a2fac8ed7' into pullstream 2024-02-14 06:33:48 -05:00
11a4662f5d
Merge commit '7e83dd073e0bc322b975df66d061a6f7fe059bf1' into pullstream 2024-02-14 06:33:17 -05:00
cbe7385a3b
Merge commit '4fe144de352434ff6e98a4269777b82e8b03f4d0' into pullstream 2024-02-14 06:32:59 -05:00
33971a83dc
Merge commit '5da44fa4b94a315ffaef94023a331aa02aa3b650' into pullstream 2024-02-14 06:32:06 -05:00
2324bc0ecb
Merge commit '26b7e5ad9edebfce0cbb51a5ba606bb0b334ad2d' into pullstream 2024-02-14 06:30:17 -05:00
87a2ad8a4a
Merge commit '20f3cb34aec0cddfe824d9cdc6696cf15b62c28b' into pullstream 2024-02-14 06:29:23 -05:00
5b536dbfbb
Merge commit '889eba1df501e190f9019cc42bad1606477c4cce' into pullstream 2024-02-14 06:25:25 -05:00
48050427b1
Merge commit 'c5412becd1243536807f1f1af4ef4d40bedd438f' into pullstream 2024-02-14 06:19:37 -05:00
8f8cfff62c
Merge commit 'a4668c000cfe1a17e457f463dd8c0ce69dc98877' into pullstream 2024-02-14 06:17:15 -05:00
d5b2bfe647
Merge commit 'd9aed92fb44261826df081a78b03083978f15503' into pullstream 2024-02-14 06:16:48 -05:00
21f58bdbcb
Merge commit 'f673e59b217471128ce66454358bd8f7c41481df' into pullstream 2024-02-14 06:16:30 -05:00
b9b2b8aaed
Merge commit '77f3cfbba80d4cef603fc644a7f3848d5249b039' into pullstream 2024-02-14 06:16:14 -05:00
81f7d5b0f5
Merge commit 'ea35d7d23ec153ee0befba594b150a9f8ea41b53' into pullstream 2024-02-14 06:15:21 -05:00
4ab992ed31
Merge commit 'd9b2833e272fa1018058786edef45a42cbe4ecc0' into pullstream 2024-02-14 06:14:52 -05:00
2c693fc44a
Merge commit '97c49c6f294a0b7e931be2692c124bd78fc79946' into pullstream 2024-02-14 06:14:19 -05:00
c74bca6c28
Merge commit 'c2e0344110c01eef33697c9611c5689e8eee0691' into pullstream 2024-02-14 06:12:23 -05:00
11c57356a4
Merge commit '800f1c0bc5bd4632bd0f246c756283cc47d31a34' into pullstream 2024-02-14 06:10:31 -05:00
3acc12b862
Merge commit 'c9522fb740200ccef6230cec452c48efb31e5394' into pullstream
Mark the commit as merged so we can easily merge newer patches.
2024-02-14 06:04:08 -05:00
a0518dc0a0
Merge commit 'c9522fb740200ccef6230cec452c48efb31e5394#diff-8d3ef4ba02861ab7342677303e0ef793dc2063ed69dbafe1a17e886b24499aab' into pullstream
This commit was done specially since it interfaces heavily with Lua.

First it was diffed out in a standard cuberite repo so we can tell what was changed,
and we apply this diff to a basic cuberite repo right before the commit was made.

I then promptly reverted lua changes that would conflict with applying
the patch. I also had to remove whole sections from the patchfile
afterwards but it was made easier having the actual repo with the
patches applied able to remake the diff as needed before i removed the
bigger sections.

Somehow it all worked out.
2024-02-14 05:48:18 -05:00
5c84a7cf90
Merge commit '15513578c485cac0eeed51621f897ef78588e361' into pullstream 2024-02-13 19:58:04 -05:00
107e02155b
Merge commit '669392d44a0f74e83b2702fa64d4f8bfb2ec643c' into pullstream 2024-02-13 19:57:27 -05:00
e2b11db644
Merge commit 'dcad86e776a37d402aab5a8146829578c358c701' into pullstream 2024-02-13 19:56:39 -05:00
651b4ab127
Merge commit 'ceaebd00d88fe70516c7b4ef1fa84d2f5f10d736' into pullstream 2024-02-13 19:56:11 -05:00
9bba8698f8
Merge commit 'fddbf65e2819d487021946a51722d23565bdd561' into pullstream 2024-02-13 19:55:38 -05:00
0b758cb225
Merge commit 'c747b4911ed4b1833d7f400d62d1835aba704278' into pullstream 2024-02-13 19:55:05 -05:00
aad94db77c
Better Clang Format
This new format aligns better with whats in place for this currently. My
IDE wants to auto sort it, mind as well but it needs a clang-format that
matches this. Was having issues for me with the old one.
I used the libpdw one since it works already for me and appears to
replace it nicely.
2024-02-13 10:53:28 -05:00
d8b5b2e876
New Easy Build scripts for linux.
I want to go fast, these allow you to simply run the script and it goes.
2024-02-13 10:52:22 -05:00
0606ca3008
Initial Client Implimented in GUI.
The code is implimented in this commit and is launchable with the BUILD_CLIENT compile option.
Everything should be launchable by running the one function within
src/nyqubel-client/client.hpp: start_nyqubel_client()
2024-02-13 10:47:58 -05:00
88809475cc
Fix a missing include failing to build with a non-unity build 2024-02-13 10:33:47 -05:00
Debucquoy Anthony tonitch
7db4e20fd7
adding endermite (#5460)
* First Draft of adding endermite

* Update src/Mobs/Endermite.h

Co-authored-by: x12xx12x <44411062+12xx12@users.noreply.github.com>

* Adding Protocols + SpawnEgg

TODO: don't forget to put the endermite in core plugin for the summon
command

* Adding endermite to monster.ini

* Adding 5% change of spawning endermite when throwing enderpearl

* Spawn endermite at last position instead of Hit Position + .cache to .gitignore

* fixup! Spawn endermite at last position instead of Hit Position + .cache to .gitignore

* destroy endermite if 2 min, not if name is set

* Syntax

* Adding Enderman targeting endermite + fixing syntax

* Fixing compile error + return error [but crash on enderman spawn]

* Fix crash but enderman doesn't target

* Enderman targeting endermite finished

* checking style because i'm a noob at git...

* fixup! checking style because i'm a noob at git...

* Added endermite egg meta to docs

* Final touches

Removed unnecesary imports
fixed callback to run only in sight distance and actually check sigtlines

* Fixed error after not pulling branch

---------

Co-authored-by: x12xx12x <44411062+12xx12@users.noreply.github.com>
Co-authored-by: Debucquoy <debucqquoy.anthony@gmail.com>
2023-09-26 21:54:37 +00:00
Mat
a819f37fa1 Update Core 2023-09-26 21:11:04 +03:00
bariscodefx
eda440e0db
Update MCS_CLIENT_VERSIONS (#5529)
* Update MCS_CLIENT_VERSIONS

* Update remaining protocol version macros.

---------

Co-authored-by: Alexander Harkness <me@bearbin.net>
2023-08-21 13:49:46 +02:00
x12xx12x
770d838f37
Added that ds_store file to gitignore (#5521)
* Added that ds_store file to gitignore

* Update .gitignore

Co-authored-by: Janmm14 <Janmm14@users.noreply.github.com>

---------

Co-authored-by: Alexander Harkness <me@bearbin.net>
Co-authored-by: Janmm14 <Janmm14@users.noreply.github.com>
2023-08-15 07:52:42 +00:00
Bond-009
f2c41d1227
Fix tools build on FreeBSD (#5525)
Regession from #5085

```
[ 79%] Building CXX object Tools/ProtoProxy/CMakeFiles/ProtoProxy.dir/Connection.cpp.o
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:337:26: error: use of undeclared identifier 'AF_INET'
        m_ServerSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
                                ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:337:35: error: use of undeclared identifier 'SOCK_STREAM'
        m_ServerSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
                                         ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:337:48: error: use of undeclared identifier 'IPPROTO_TCP'
        m_ServerSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
                                                      ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:342:2: error: unknown type name 'sockaddr_in'
        sockaddr_in localhost;
        ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:343:25: error: use of undeclared identifier 'AF_INET'
        localhost.sin_family = AF_INET;
                               ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:346:53: error: unknown type name 'sockaddr'
        if (connect(m_ServerSocket, reinterpret_cast<const sockaddr *>(&localhost), sizeof(localhost)) != 0)
                                                           ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:362:29: error: use of undeclared identifier 'recv'
        int res = static_cast<int>(recv(m_ServerSocket, Buffer, sizeof(Buffer), 0));  // recv returns int on windows, ssize_t on linux
                                   ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:402:29: error: use of undeclared identifier 'recv'
        int res = static_cast<int>(recv(m_ClientSocket, Buffer, sizeof(Buffer), 0));  // recv returns int on Windows, ssize_t on Linux
                                   ^
/home/bond/dev/cuberite/Tools/ProtoProxy/Connection.cpp:451:29: error: use of undeclared identifier 'send'
        int res = static_cast<int>(send(a_Socket, reinterpret_cast<const char *>(a_Data.data()), a_Data.size(), 0));  // Windows uses int for a_Size, Linux uses size_t; but Windows doesn't complain. Return type is int on Windows and ssize_t on Linux
                                   ^
[ 79%] Building CXX object CMakeFiles/Cuberite.dir/Unity/unity_38_cxx.cxx.o
9 errors generated.
```
2023-08-12 14:41:52 +00:00
Mattes D
7e83dd073e Fixed a wrong format string.
Thanks to dyexlzc for noticing.
2023-06-21 12:08:14 +02:00
Seppe Degryse
4fe144de35
Replaced hand-escaped JSON (#5508) 2023-06-08 08:13:08 +02:00
x12xx12x
5da44fa4b9
Update clang-tidy.sh (#5477) 2023-06-05 20:37:47 +00:00
x12xx12x
26b7e5ad9e
Add Class and Function Identifier Macro (#5481)
This adds a Macro which simply identifies the function and class name for error messages. Examples taken from the MojangAPI class [Choosen because I worked on that]

processing is done during compile time. Should be cross compatible
2023-05-29 16:31:18 +02:00
Mattes D
20f3cb34ae Anvil: Refactored to use shared_ptr. 2023-05-26 23:00:17 +02:00
Mattes D
889eba1df5 Anvil: Allow loading chunks without HeightMap. 2023-05-26 23:00:17 +02:00
Mattes D
c5412becd1 Added cChunkCoords fmtlib formatter. 2023-05-26 23:00:17 +02:00
NiLSPACE
17d5278d59
Added a warning if the webadmin is enabled without any users. (#5499) 2023-05-25 09:34:39 +02:00
x12xx12x
a4668c000c
Updated LTO Check to new standard. (#5476)
The due to LTO the Release build didn't link. The official cmake page suggest it to do it like this
https://cmake.org/cmake/help/latest/module/CheckIPOSupported.html
2023-05-19 16:52:35 +02:00
Niels Breuker
d9aed92fb4 UrlClient: Fixed invalid Content-Length header. 2023-05-19 16:25:12 +02:00
Mattes D
f673e59b21 UrlClientTest: Added tests for root CA verification. 2023-05-19 16:25:12 +02:00
Mattes D
77f3cfbba8 UrlClient: Fixed blocking request's error return value. 2023-05-19 16:25:12 +02:00