GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity
1001 commits 19 branches 0 tags 84 MiB
Commit graph

751 commits

Author SHA1 Message Date
William Johnstone
a00cf75bc7 Fix waterlogged blocks 2020-03-27 23:23:26 +00:00
Redned
00b93c5527
Merge pull request #243 from DoctorMacc/inventory 
Implement bed colors (Closes #222)
 2020-03-27 15:20:00 -05:00
BuildTools
7cbb0388e2 Update mappings submodule 2020-03-27 16:16:33 -04:00
BuildTools
7b5bb22321 Rename BEDCOLORS to BED_COLORS 2020-03-27 14:21:34 -04:00
BuildTools
17258dcaf6 Remove debugging code 2020-03-27 13:09:40 -04:00
BuildTools
7a402c40b3 Use mappings to generate bed colors 2020-03-27 13:08:21 -04:00
RednedEpic
03e11df58b Fix null potion type message in console (Addresses #227) 2020-03-26 23:29:16 -05:00
RednedEpic
5222232e72 Add rest of fixes for operator bug 2020-03-26 23:00:52 -05:00
BuildTools
e5766ef96a Store bed colors in Object2ByteOpenHashMap 2020-03-26 18:34:54 -04:00
BuildTools
22908c4de7 Remove whitespace 2020-03-26 10:31:57 -04:00
BuildTools
545ab0f268 Move bed-specific code to BedBlockEntityTranslator.java 2020-03-26 10:22:44 -04:00
BuildTools
5301c8c3f6 Implement bed colors 
Java Edition includes the bed color in the namespaced ID; in Bedrock edition it's one of the tag values as a block entity. This code involves creating a table between block states and bed color numbers and looking that up on chunk load or block update.
 2020-03-25 22:03:46 -04:00
Redned
bb601daf26
Merge pull request #239 from e3ndr/master 
Make translators annotation based.
 2020-03-25 01:01:37 -05:00
Ender
f8407eeb5a Add requested changes to PR 2020-03-25 00:55:09 -05:00
Ender
bbf6683bd8 Make all translators annotation based 2020-03-23 23:24:17 -05:00
Ender
13a58dc825 Begin making translators annotation based 
Also, rename TranslatorsInit to Translators; makes alot more sense.
 2020-03-23 23:03:33 -05:00
DoctorMacc
a821312f7e
Add switch for dealing with ChatColor.NONE 
In-game chat uses ChatColor.NONE for handling reset of text.
 2020-03-23 15:13:45 -04:00
William Johnstone
60662ae06c Moved break time checks to BlockUtils class, Created ItemUtils and added helper function to get enchantment levels on items, implemented a entity effect cache, added haste and mining fatigue check for block breaking animations, fixed block breaking animations for blocks with speeds that are not affected by tools. 2020-03-22 22:59:34 +00:00
William Johnstone
a0884596e3 Fix issue with players being able to update their own gamemode 2020-03-21 22:59:16 +00:00
William Johnstone
4b40b07bf8 Refactor code and improve sword breaking 2020-03-21 21:37:55 +00:00
William Johnstone
09cdcbdf94 Add block breaking animations that actually work (still incomplete, doesn't take enchantments or player effects into account, also doesn't account for being in the air or underwater) 2020-03-21 20:14:09 +00:00
William Johnstone
350bb28c7c revert last commit as I'm starting over 2020-03-20 21:28:20 +00:00
William Johnstone
650a1e2ab1 Start block breaking animations (inventory is broken) 2020-03-20 20:34:16 +00:00
Tim203
8b824cccf7
Added VR as InputMode (fixes #219) 2020-03-19 12:51:14 +01:00
RednedEpic
0a3a4a9ee1 Merge remote-tracking branch 'origin/master' 2020-03-18 16:10:45 -05:00
Redned
62b183a387 Update bedrock protocol lib and remove trove 2020-03-18 16:10:28 -05:00
Ender
1f8a2c5765 Make the passthrough motd display correctly on clients 
Before: https://i.e3ndr.xyz/?i=W63C
After: https://i.e3ndr.xyz/?i=SGKS
 2020-03-17 17:55:11 -05:00
RednedEpic
51050e3868 Merge remote-tracking branch 'origin/master' 2020-03-17 11:43:28 -05:00
RednedEpic
21dc2e8362 Add Geyser reload command and commands for platforms (Closes #141) 2020-03-17 11:43:09 -05:00
RednedEpic
1bcee8d36f Merge branch 'master' into inventory 2020-03-15 13:21:37 -05:00
RednedEpic
16c9317a36 Fix flickering sky if time is too high (Closes #200) 
This was caused because the max int size is 2,147,483,647, which is what Minecraft: Bedrock Edition uses in the time packet. In Minecraft: Java Edition, a long is used which has a max length of 9,223,372,036,854,775,807, thus causing the sky to bug out.

This commit uses the modulus operator with the max time value per-day of 24,000 to retrieve the remainder.
 2020-03-15 13:20:55 -05:00
RednedEpic
e203cfd4a7 Move back to XUID for Floodgate 
The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4.
 2020-03-14 14:03:44 -05:00
RednedEpic
105ce2b3b5 Add effect translations 2020-03-10 19:40:51 -05:00
RednedEpic
6eac178305 Merge branch 'master' into inventory 2020-03-10 18:46:27 -05:00
Tim203
37d377b483
Floodgate now uses identity instead of xuid 2020-03-09 21:32:19 +01:00
RednedEpic
acc30f2432 Move DeviceOS to common module 2020-03-08 11:45:00 -05:00
RednedEpic
9e203d48aa Fix running Geyser commands ingame 2020-03-06 19:37:35 -06:00
RednedEpic
0e355c1a95 Fix natural creeper explosion animation not showing up 2020-03-06 19:27:12 -06:00
RednedEpic
70d6a28c22 Merge branch 'master' into inventory 2020-03-06 17:30:46 -06:00
RednedEpic
7bd53c95c3 Work on a lot more entity flags 2020-03-06 17:29:11 -06:00
RednedEpic
e4c2f79bc5 Fix a couple minor entity bugs 2020-03-06 15:56:48 -06:00
RednedEpic
119f35b690 Fix chat getting cut off (Closes #188) 2020-03-06 15:44:49 -06:00
AJ Ferguson
f71c70224b Only translate full chunks 2020-03-05 17:55:22 -09:00
RednedEpic
b2d611e24c Fix some problems brought from merge conflicts 2020-03-05 20:53:58 -06:00
RednedEpic
418026dbe6 Merge branch 'block-entities' into inventory 2020-03-05 20:00:14 -06:00
AJ Ferguson
eaf45ff6f7 Fix chunk view position bugs on some servers 2020-03-05 16:26:36 -09:00
AJ Ferguson
223e94a31d Revert non-full chunk fix 
This fix causes far too much lag on big non-full chunk updates
 2020-03-05 10:45:50 -09:00
RednedEpic
6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic
1670c77672 Only allow console to shut down Geyser with a command 2020-03-04 20:44:42 -06:00
RednedEpic
936cbad67d Get log4j2 working and fix commands 2020-03-04 20:35:23 -06:00
RednedEpic
f9a1656b8e Merge remote-tracking branch 'origin/plugin' into plugin 2020-02-26 19:31:45 -06:00
RednedEpic
2bdf3d4d7f Merge branch 'master' into plugin 2020-02-26 19:31:19 -06:00
Tim203
b97fa2b1c8 Added a response to the PluginMessage packet in the Login state 2020-02-26 23:53:26 +01:00
AJ Ferguson
bfca25bbe3 Fix compile errors 2020-02-25 22:31:55 -09:00
AJ Ferguson
bc3992f775 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java
 2020-02-25 22:12:39 -09:00
RednedEpic
09e4bbd8ca Make sure scale is not null when setting armor stand as baby 
If it's null, it's invisible.
 2020-02-25 19:52:27 -06:00
RednedEpic
4c87a13e25 Snap height only if on ground 
(Original commit 2dc6ab453f931ac2083a6d142e963beb0a101b94)
 2020-02-25 19:36:36 -06:00
RednedEpic
f5bc328737 Merge branch 'master' into feature/new-protocol-lib 2020-02-25 18:54:31 -06:00
RednedEpic
f0e01ab1c9 Fix getting stuck in wall bug 
Due to java doubles being somewhat more "precise" and bedrock positions being sent in floats instead, this caused bedrock players to get stuck in blocks when jumping or running near them in a certain way, thus causing the server to try and correct their position, potentially flagging anticheats and causing the server to print a "moved wrongly" message in console.

See: https://stackoverflow.com/questions/322749/retain-precision-with-double-in-java
 2020-02-25 18:50:09 -06:00
RednedEpic
1af4d71bd1 Remove extra height added to position when server corrects movement 
This should fix the bug where you can "climb" up blocks. Although this doesn't fix the random spasm the client gets, it should prevent players from climbing up blocks (and getting stuck in them), thus preventing anticheats from going crazy.
 2020-02-24 20:04:18 -06:00
Redned
b41d66dd19
Set can climb for entity back to true 
This has nothing to do with the bug where players can "climb" up blocks, but rather disabling this feature disables the ability to climb up vines and ladders. This commit reverts that.
 2020-02-23 18:02:54 -06:00
Redned
35ed1ec916
Merge pull request #156 from AJ-Ferguson/chunk-fix 
Chunk fixes
 2020-02-23 14:38:20 -06:00
RednedEpic
720f69d913 Set can climb for entity to false 2020-02-16 14:07:40 -06:00
RednedEpic
41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
RednedEpic
f87ff70369 Update to NukkitX Protocol Lib 2.5.1 2020-02-16 13:07:35 -06:00
RednedEpic
9ffec0021c Fix movement bugs *and* allow for teleportation 2020-02-16 12:40:54 -06:00
OnlyBMan
18a50d4e3e Fix baby armorstands showing even when invisible 2020-02-15 21:35:05 -05:00
RednedEpic
f52684f0dd Fix teleportation 2020-02-15 19:06:18 -06:00
RednedEpic
ee85abf34c Fix player movement not being visible, movement bugs and laggy entities 
(Addresses #74, #109)
 2020-02-15 17:39:34 -06:00
AJ Ferguson
2d0a584106 Fix swimming 2020-02-15 01:18:41 -09:00
RednedEpic
e6d166d4d4 Merge branch 'master' into feature/new-protocol-lib 2020-02-14 17:58:53 -06:00
RednedEpic
4bb34cdcce Merge branch 'master' into feature/new-protocol-lib 2020-02-14 17:57:28 -06:00
RednedEpic
4186715083 Update to NukkitX Protocol Lib 2.5.0 release 2020-02-14 17:39:26 -06:00
RednedEpic
bf90b803ca Fix interact and attack in interact translator 2020-02-14 17:27:08 -06:00
AJ Ferguson
35bf1b455e Fix new player entity data getting lost while loading skin 2020-02-13 17:45:15 -09:00
AJ Ferguson
fa7324e1f5 Add support for offhand 2020-02-13 17:45:14 -09:00
AJ Ferguson
b18b83fd9a Fix armor not showing if partially armored 2020-02-13 17:45:14 -09:00
AJ Ferguson
276a8d6485 Fix hotbar slot changing when the player's hand is updated 
The default value is 0.
-1 seems to leave the selected hotbar slot unchanged.
 2020-02-13 17:45:14 -09:00
AJ Ferguson
bf1835e691 Fix Block IDs 
Quick fix. Might have a different method for getting block IDs in the future
 2020-02-12 22:29:44 -09:00
AJ Ferguson
b1a0ed3e91 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-12 21:58:09 -09:00
AJ Ferguson
7f194b2d54 Increase render distance instead of chunkpublisher radius 2020-02-11 13:42:02 -09:00
AJ Ferguson
3615ec2b90 Fix ChunkPosition 2020-02-10 18:24:09 -09:00
AJ Ferguson
9008036ee4 Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-10 17:38:56 -09:00
SupremeMortal
c70cf0bb47
Make biomes tag final 2020-02-09 22:55:07 +00:00
SupremeMortal
f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping 
 Conflicts:
	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-09 22:53:57 +00:00
SupremeMortal
9594b42523
Add waterlogging support 2020-02-09 22:06:22 +00:00
SupremeMortal
c9f33f8344
Pull in new submodule changes 2020-02-09 21:22:39 +00:00
RednedEpic
e8a1e0dae1 Add velocity platform support 2020-02-08 13:43:50 -06:00
AJ Ferguson
516fc51162 Small changes 2020-02-05 20:23:06 -09:00
AJ Ferguson
e4ab4b336c Chunk fixes 2020-02-05 19:32:33 -09:00
AJ Ferguson
e0a1435d51 Send confirmation packet when spawning 
Fixes some chunk bugs
 2020-02-05 19:23:08 -09:00
AJ Ferguson
13f198845c Fix bugs when rapidly switching dimensions 2020-02-05 19:21:09 -09:00
OnlyBMan
0bb18d26b0 Load biome definitions only once instead of everytime a new player joins 2020-02-05 22:02:23 -05:00
OnlyBMan
4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
RednedEpic
0cf574ddcb Merge branch 'master' into feature/direct-block-mapping 2020-02-05 18:59:20 -06:00
RednedEpic
4f461bf374 Start on converting to the new NukkitX protocol library updates 2020-02-05 18:55:34 -06:00
AJ Ferguson
3d61b3ce28 Bump OpenNBT lib to 1.4-SNAPSHOT 
This fixes the NPE when sending an ItemStack with a null NBT tag.
This also fixes some item movement bugs on pure vanilla servers.
 2020-01-30 23:15:18 -09:00
AJ Ferguson
1a9aa4255f Some refactoring and bug fixes 
Still much to do.
Inventory desyncing when crafting will be fixed soon.
 2020-01-30 16:05:57 -09:00
AJ Ferguson
5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
AJ Ferguson
3e4fd618e5
Fix offline auth bug 
Handled in GeyserSession#connect
 2020-01-28 23:28:23 -09:00
RednedEpic
240f41ff03 Use Path instead of File for floodgate key file in config 
...and fix related issues with the file not being found.
 2020-01-26 11:22:21 -06:00
RednedEpic
989312835f Fix custom name visible flag (Closes #137) 2020-01-26 00:05:05 -06:00
RednedEpic
e0f6c8a170 Fix chests and potentially other block entities 2020-01-25 23:51:29 -06:00
Redned
c4857c6a54 Merge branch 'master' into plugin 2020-01-25 23:03:47 -06:00
RednedEpic
cc3cf70257 Search for key in Geyser plugin folder in plugin versions 2020-01-25 22:59:00 -06:00
Tim203
ba724bb7d6 Added the Nintendo Switch as DeviceOS 2020-01-25 13:10:58 +01:00
RednedEpic
6bb478bda4 Merge branch 'master' into block-entities 2020-01-19 22:35:33 -06:00
RednedEpic
ed322029f3 Update hybrid mode reference to 'floodgate' in config.yml 2020-01-18 17:53:56 -06:00
RednedEpic
6702c59a15 Fix auth type check from merge conflict 2020-01-18 16:50:17 -06:00
RednedEpic
88fc3cf843 Fix building 2020-01-18 16:48:46 -06:00
RednedEpic
52b23950ea Merge branch 'master' into plugin (should fix building) 2020-01-18 16:46:07 -06:00
RednedEpic
5c7755b772 Shade netty into Bukkit jar 2020-01-18 16:38:40 -06:00
RednedEpic
843c7a3047 Add support for showing item in hand for entities (Closes #106) 2020-01-11 13:05:43 -06:00
AJ Ferguson
9f7cba1915 Fix build error caused by mappings submodule 2020-01-08 19:48:03 -09:00
RednedEpic
dc594ee22c Update license headers 
Certain headers for classes that are to be removed (e.g. plugin api) were not updated to prevent merge conflicts.
 2020-01-08 21:05:42 -06:00
RednedEpic
b1d93fb633 Organize entity packages a bit more 2020-01-08 20:35:00 -06:00
RednedEpic
814da2453c Implement sheep colors and shearing (Closes #126) 2020-01-08 20:26:44 -06:00
Tim203
c5205cc873 Added a simple way to identify Geyser players. 
Keep in mind that using this to identify players is less secure than using Floodgate
 2020-01-07 22:29:49 +01:00
AJ Ferguson
66f5ed9495 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java
 2020-01-04 14:39:01 -09:00
RednedEpic
2fc591e341 Merge Floodgate changes 2020-01-03 23:58:58 -06:00
RednedEpic
0c24ffc629 Merge branch 'master' into plugin 2020-01-03 23:25:00 -06:00
RednedEpic
7d14d079ef Fix NPE with ServerInfo being null for ping passthrough 2020-01-02 12:37:30 -06:00
AJ Ferguson
8a19e35342 Update mappings submodule 2019-12-31 16:49:30 -09:00
SupremeMortal
d686a009d1
Fix most block palette issues. Others are due to the mappings 2019-12-31 23:24:54 +00:00
RednedEpic
0eb182d0da Add block value translator 
You can now see chest opening/closing animations :)
 2019-12-31 13:24:59 -06:00
RednedEpic
a59e330db9 Add default tags for campfire block entity 2019-12-31 12:33:42 -06:00
RednedEpic
da645abec4 Add support for banner block entities 
Colored banners still need to be implemented. The color for banners themselves is set as part of the block entity on bedrock meanwhile in java edition its set as part of the block state.
 2019-12-31 12:31:04 -06:00
RednedEpic
bc2df705ef Fix campfires 2019-12-31 11:53:42 -06:00
AJ Ferguson
cc4cfd020e Support end credits 2019-12-30 19:26:11 -09:00
AJ Ferguson
423d02306c Fix compass 2019-12-30 19:24:21 -09:00
RednedEpic
da8bd8a659 Actually fix signs and start on campfire/container translators 
Since signs are not sent as block (tile) entities in chunks when it comes to later Minecraft versions, caching and sending the signs after the chunk packet has been sent was the only way to fix this. Sign data sending has intentionally been delayed in JavaUpdateTileEntityTranslator in the event that a chunk takes a long time to send and the block entity data is sent first.
 2019-12-30 21:55:17 -06:00
SupremeMortal
94851ef4b8
Move all block related code into BlockTranslator 
It makes more sense.
 2019-12-31 00:14:38 +00:00
SupremeMortal
2e46ecf28f
Rename map and use correct ID when entering. 2019-12-30 23:37:30 +00:00
SupremeMortal
6599aefc43
Use correct ID for duplicates 2019-12-30 23:35:28 +00:00
SupremeMortal
b96ef99beb
Start working on direct block mapping. 
This will not work
 2019-12-30 23:33:27 +00:00
AJ Ferguson
377a87f7e3 Fix health edge case 
If the java server sent a health value between 0 and 1, the player would die in the bedrock client
 2019-12-29 01:45:57 -09:00
AJ Ferguson
4153e98134 Change lighting fix method 2019-12-28 23:20:48 -09:00
AJ Ferguson
c4658ecdae Small changes 2019-12-28 21:45:41 -09:00
AJ Ferguson
6635241526 Fix rare slow dimension switching 2019-12-28 21:15:12 -09:00
AJ Ferguson
782feed641 Fix lighting when reloading world 2019-12-28 18:17:00 -09:00
AJ Ferguson
b2f86ec20b Rewrite dimension code 
New code does not rely on pausing the thread
 2019-12-28 04:35:21 -09:00
AJ Ferguson
8efeb3fe25 Fix exception when removing all entities 2019-12-27 03:03:12 -09:00
AJ Ferguson
cc0b3293bf Start fixing dimension switching and respawning 2019-12-27 02:29:46 -09:00
Redned
2ed492edb8
Merge pull request #116 from OnlyBMan/master 
Fix baby animal sizes
 2019-12-24 17:08:50 -06:00
OnlyBMan
0f70ad087c Added scaling for Zombies, Villagers, and Armor Stands 
Fixed code a bit and added support for new mobs.
 2019-12-24 11:07:36 -05:00
AJ Ferguson
46205600dd Fix block ids 2019-12-23 17:00:31 -09:00
AJ Ferguson
8061e2d76d Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2019-12-23 16:58:59 -09:00
RednedEpic
e1ba1fa3e8 Merge remote-tracking branch 'origin/master' into block-entities 2019-12-23 13:49:20 -06:00
Redned
97d8b8db68
Merge pull request #115 from AJ-Ferguson/master 
Block states and fix waterlogged blocks
 2019-12-23 12:03:15 -06:00
LegacyGamerHD
1f7b8ba5d5 Update Nukkit Protocol Library to 1.14 (#117) 
* Update nukkit protocolib to 1.14

* Fixes

* Remove debug
 2019-12-23 11:47:31 -06:00
OnlyBMan
efd5bae13b Fix baby animal sizes 
This should fix most baby animal sizes including Rabbits and their adult sizes!
 2019-12-22 12:35:22 -05:00
AJ Ferguson
776d4c6585 Optimize waterlogged check 2019-12-22 00:32:49 -09:00
AJ Ferguson
a4279d1f34 Fix bubble columns 2019-12-21 14:14:20 -09:00
RednedEpic
b70edac3cc Update Geyser help command message on startup 2019-12-21 16:19:32 -06:00
RednedEpic
70fd9867f5 Add Sponge platform bootstrap 2019-12-21 16:18:34 -06:00
RednedEpic
1fbbb87689 Add PlatformType enum and add bStats platform chart 2019-12-21 11:53:19 -06:00
RednedEpic
0960ab2365 Close bedrock server upon shutdown 2019-12-21 11:38:45 -06:00
RednedEpic
e38322a3ec Nuke plugin API 
https://media.giphy.com/media/oe33xf3B50fsc/giphy.gif
 2019-12-21 11:35:48 -06:00
RednedEpic
d062e36fae Merge branch 'master' into plugin 2019-12-21 10:05:21 -06:00
AJ Ferguson
20595a6e03 Exclude Edu items from creative 2019-12-21 01:35:34 -09:00
AJ Ferguson
9a9695ead7 Handle new creative_items.json format 2019-12-21 01:32:49 -09:00
AJ Ferguson
b222b05348 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2019-12-21 00:49:16 -09:00
AJ Ferguson
d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
RednedEpic
49caffc73e Remove comment in AgeableEntity as it no longer true 
This was due to the wrong entity IDs in MCProtocolLib, which have since been patched.
 2019-12-18 20:53:30 -06:00
Redned
42ac37fe40
Merge pull request #112 from OnlyBMan/master 
Update SkinProvider.java
 2019-12-18 20:43:32 -06:00
Tim203
64b04330c3 Added the player his IP to the transferable data 2019-12-17 23:27:29 +01:00
OnlyBMan
afab21695a Update SkinProvider.java 
Remove duplicate code
 2019-12-16 22:26:35 -05:00
OnlyBMan
203b3b9d46 Update SkinProvider.java 
Instead of calling the scale method 3 times, just used a cached scaled image
 2019-12-15 19:24:00 -05:00
OnlyBMan
16950bf8f2 Update SkinProvider.java 
Fix OptiFine capes and downscales banner capes so they work on PE too.
 2019-12-14 21:12:12 -05:00
RednedEpic
76e80df94c Add trader llama entity 2019-12-14 11:40:04 -06:00
RednedEpic
3cc2d4775e Update bedrock assets 
1.14 blocks are still somewhat buggy and break with the latest runtime_block_states file, so the old one is being used for the time being. Bedrock players should have no problems joining java servers in 1.15, but new blocks won't show up for now.
 2019-12-10 21:01:56 -06:00
RednedEpic
bb4dfeadf6 Update item and block mappings for 1.15 2019-12-10 20:42:51 -06:00
RednedEpic
8aaf411473 Add bee EntityType 2019-12-10 19:07:52 -06:00
RednedEpic
f0e02aad32 Initial 1.14 Bedrock support 2019-12-10 19:06:18 -06:00
Tim203
9527709c59 Merge branch 'master' of https://github.com/GeyserMC/Geyser 
 Conflicts:
	common/pom.xml
	connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
 2019-12-10 20:52:42 +01:00
RednedEpic
5e8a3d2ca9 Add support for 1.15-pre6 
Merely just a protocol change, nothing new has been implemented (such as bees) and won't be until bedrock 1.14 is released.
 2019-12-09 20:19:09 -06:00
AJ Ferguson
f524407c1d Fix brewing 2019-12-07 15:06:56 -09:00
AJ Ferguson
cdab1ce5ec Translate window properties 
Furnace and brewing stand
 2019-12-07 14:56:00 -09:00
AJ Ferguson
211436c1e0 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
 2019-12-06 14:06:24 -09:00
Tim203
7ff4e509ee You can see signs now 2019-12-06 19:32:10 +01:00
Redned
374436172a
Merge pull request #104 from GeyserMC/pr/pom-cleanup 
General pom cleanup
 2019-12-06 08:36:35 -06:00
Redned
30717a227a
Merge pull request #103 from AJ-Ferguson/master 
Slightly improve movement
 2019-12-06 08:35:30 -06:00
SupremeMortal
f5923d8e2e
General pom cleanup. 2019-12-06 11:02:31 +00:00
AJ Ferguson
fd95b8b36a Slightly improve movement 
A lot more work is needed to fix movement.
 2019-12-05 21:54:29 -09:00
RednedEpic
855a253894 Add cat entity 2019-12-04 22:42:20 -06:00
RednedEpic
6f5fc4c85c Fix JNI overlap with BungeeCord module 2019-12-04 18:56:51 -06:00
SupremeMortal
6e8a0847b4
Fix typo from protocol lib 2019-12-04 18:13:49 +00:00
RednedEpic
83d943e426 Only set variant for actual horses (Fixes #99) 2019-12-03 18:49:13 -06:00
RednedEpic
fe6b0e8afa Update mappings submodule 2019-12-03 18:43:52 -06:00
AJ Ferguson
0720e18015 Default bedrock enchantment level to 1 2019-12-02 16:07:44 -09:00
AJ Ferguson
1b37a19280 Translate bedrock enchantments to java 2019-12-02 15:55:45 -09:00
AJ Ferguson
7a58840821 Fix NoClassDefFoundError in Java 9+ 2019-12-02 14:22:13 -09:00
AJ Ferguson
4eeadc6d21 Start working on translating enchantments and potions 
Translation is only (java -> bedrock) for now.

Only regular potions will translate correctly. More work will be needed to translate custom potions.
 2019-12-02 01:46:07 -09:00
AJ Ferguson
d07404406b Cleanup and fixes 2019-12-01 16:28:09 -09:00
RednedEpic
3e7e34dfb9 Move command reader into standalone module 2019-12-01 18:28:36 -06:00
RednedEpic
1c2ef99a54 Separate bootstrap and allow for Geyser to run on Bukkit (Addresses #54) 2019-12-01 15:16:52 -06:00
AJ Ferguson
ba0b898da9 Fix anvils 2019-11-30 17:22:14 -09:00
AJ Ferguson
db0e506e3b Merge branch 'master' into inventory 2019-11-30 15:25:18 -09:00
AJ Ferguson
8c93ca65f5 Update JavaDeclareRecipesTranslator.java 2019-11-30 15:24:01 -09:00
AJ Ferguson
8bb8208a46 Merge branch 'master' into inventory 2019-11-30 15:22:50 -09:00
RednedEpic
ebf6050d44 Start work on block entities (partially-functioning) 
Most block entities should now *show up*. Some like signs will not as of yet, however when another player places one, they will display. Block entities are not yet fully functional and may only just be visible for the time being.
 2019-11-30 18:22:11 -06:00
RednedEpic
2c10274fc3 Break entities into separate classes and add equipment translator 
This should make the process of translating entity metadata a whole lot easier and more organized. Future features involving entities and checking if they're capable of doing certain things should also be much easier now.
 2019-11-30 18:19:03 -06:00
RednedEpic
cd17dc5f4c Use FastUtil over Trove for maps/collections to reduce memory usage 
This should significantly decrease the amount of RAM being used by Geyser. Previously it was using 300mb - 400mb on average. This has dropped it down to 80mb - 120mb. Ideally I'd like to decrease this value further, but that will require some more work.
 2019-11-30 13:26:51 -06:00
Tim203
f1b19fc04e Little changes 2019-11-30 19:10:29 +01:00
Tim203
1c48279a9f Little changes 2019-11-30 18:38:09 +01:00
Tim203
b12256bc1e Changed a method name 2019-11-30 15:32:13 +01:00
Tim203
7d645fbf16 First Flootgate commit 2019-11-30 13:34:45 +01:00
RednedEpic
c91e8e1958 Update mappings to use new submodule 2019-11-29 20:34:51 -06:00
AJ Ferguson
8c297990a9 Fix dropped items 2019-11-29 17:18:03 -09:00
AJ Ferguson
02569ea9d8 Update stonecutter mappings 2019-11-29 16:43:55 -09:00
AJ Ferguson
24e5d34ce9 Cleanup 2019-11-29 15:49:29 -09:00
AJ Ferguson
8a589129f0 Update crafting recipe combinations calculation 2019-11-29 02:16:52 -09:00
AJ Ferguson
e7a1063ee2 Merge branch 'master' into inventory 2019-11-29 02:15:35 -09:00
RednedEpic
98cb8f406d Suppress "could not submit stats" warning 
This error usually means nothing (as said by Bastian himself) and it can be ignored. This does not appear to cause issues with displaying information on bStats itself.
 2019-11-28 20:54:47 -06:00
RednedEpic
1cfeb01e38 Update wood mappings 2019-11-28 10:35:06 -06:00
RednedEpic
faffa07e89 Fix flying in creative mode 
Flying with commands such as /fly will not work for now (it didn't in the first place). This will need to be addressed later.
 2019-11-28 10:11:50 -06:00
Redned
7a4621cf51
Fix 'version' typo in startup message 2019-11-27 22:33:45 -06:00
AJ Ferguson
489c39e900 Start adding support for crafting 
Expect bugs
 2019-11-27 18:55:58 -09:00
AJ Ferguson
af85d6e4d2 Merge branch 'master' into 1.13-inventory 2019-11-27 18:39:52 -09:00
RednedEpic
ee4a01e304 (Actually) fix offline mode skins 2019-11-27 21:22:27 -06:00
Redned
0e7fff0b9b
Fix permissions 2019-11-27 20:58:58 -06:00
RednedEpic
9875d204e3 Add more entity metadata translations and fix autojump (Closes #73) 2019-11-27 19:30:30 -06:00
Redned
2e90759f40
Merge pull request #87 from GeyserMC/feature/1.13-bedrock 
1.13 Support
 2019-11-27 10:09:58 -06:00
RednedEpic
5c7ecbd203 Fix end crystal entity 2019-11-26 21:12:35 -06:00
RednedEpic
c67630dfb1 Update to latest NukkitX Protocol changes 2019-11-26 20:03:23 -06:00
RednedEpic
ca9fc4e64c Merge remote-tracking branch 'origin/feature/1.13-bedrock' into feature/1.13-bedrock 2019-11-26 19:53:29 -06:00
RednedEpic
8725dba69c Fix offline mode console spam for skins 2019-11-26 19:52:13 -06:00
Redned
beda8f24b4
Merge pull request #84 from Tim203/feature/1.13-bedrock 
Fixes errors related to skins
 2019-11-26 19:45:43 -06:00
Redned
d7568ef523
Fix entity types with wrong names 2019-11-22 17:54:36 -06:00
AJ Ferguson
0fe1a302a3 Update mappings 2019-11-20 17:28:40 -09:00
Tim203
068033aeaa Fixes errors related to skins 2019-11-19 21:31:24 +01:00
RednedEpic
577aa6c8fc Add unload chunk translator 2019-11-17 15:40:13 -06:00
RednedEpic
d203485418 Add entity status translator 2019-11-17 15:29:49 -06:00
RednedEpic
51c1792d67 Only send one empty chunk upon login 2019-11-15 22:21:26 -06:00
RednedEpic
73c9ee313c Add fox entity type 2019-11-15 22:10:23 -06:00
RednedEpic
3e8ab6ca83 Fix players not showing up 
Skins still need some work as it applies to every player online rather than a specific player; however, players are now visible regardless.
 2019-11-15 21:25:43 -06:00
AJ Ferguson
ce7237392b Merge branch 'feature/1.13-bedrock' into 1.13-inventory 2019-11-15 14:55:15 -09:00
Redned
68b9f66e88
Fix tabs in formatting from previous commit 2019-11-14 21:07:22 -06:00
LegacyGamerHD
38ae400d0c add phew entity flags (#79) 
* Add some entity flags
* goddangit stupid web editor
* whoops

(Some information pulled from BMan's pull request for flags)
 2019-11-14 21:04:30 -06:00
AJ Ferguson
7d4cb06fbe Fix crash on login 2019-11-13 17:26:45 -09:00
RednedEpic
cfdaacf017 Minor cleanup 2019-11-12 22:28:47 -06:00
RednedEpic
3ffaf5c0e5 Attempt to fix crashes on login 2019-11-10 16:53:01 -06:00
AJ Ferguson
1c0c8e58c2 Merge branch 'master' into inventory 2019-11-10 03:46:03 -09:00
AJ Ferguson
e676a428fb Fix dropped items 2019-11-10 03:41:39 -09:00
AJ Ferguson
2d36a8b43b Begin adding support for creative 
Still need to complete item mappings
 2019-11-09 17:20:47 -09:00
RednedEpic
21ddf8af1e Update block palette 2019-11-09 11:14:31 -06:00
AJ Ferguson
659d52d18a Merge branch 'master' into inventory 2019-11-07 23:20:19 -09:00
RednedEpic
90e6ebc1be More work on 1.13 2019-11-05 18:55:59 -06:00
AJ Ferguson
625817c282 Implement some more windows 
anvil, brewing stand, crafting table (still no crafting yet), shulker box
 2019-11-05 14:17:22 -09:00
RednedEpic
18c13067b8 Set version for ResourcePackStackPacket 2019-11-02 16:14:28 -05:00
Redned
a4b2a016f8 Set version for pong and StartGamePacket from bedrock packet codec 2019-11-02 15:58:50 -05:00
Redned
5fee344743 Fix block palette 2019-11-02 15:50:04 -05:00
AJ Ferguson
5797dc2c7e Add inventory names 
Some translation identifiers such as "container.blast_furnace" are not being translated yet
 2019-11-01 01:07:13 -08:00
RednedEpic
9b7fe5c879 Remove init method from previous testing 2019-10-30 21:27:34 -05:00
RednedEpic
0e2f64b95a Start on 1.13 changes (not functional yet) 
Cached palette still needs fixing, therefore this build actually does nothing yet.
 2019-10-30 21:14:23 -05:00
AJ Ferguson
a65a14c2f2 Fix block breaking in creative 2019-10-27 01:56:47 -08:00
AJ Ferguson
24c27a03a9 Various fixes 
Fix offhand, use AtomicInteger for transaction id, send null stack instead of air, and clear open inventory on dimension change
 2019-10-22 15:31:03 -08:00
Redned
6b0c45b6c1
Set 'auth-type' to online by default 2019-10-21 19:23:39 -05:00
AJ Ferguson
38fd5376e7 Revert storing chunks in chunk cache 2019-10-21 16:07:07 -08:00
AJ Ferguson
12c049709a Fix item nbt translator 
Mineplex server seemed to be sensitive about quotes in string tags
 2019-10-21 03:16:02 -08:00
AJ Ferguson
08357ed8b2 Uncache chunks 2019-10-21 00:12:27 -08:00
AJ Ferguson
4074582059 Close open inventory before opening a new one 2019-10-20 19:41:46 -08:00
AJ Ferguson
06358b2449 Update JavaSetSlotTranslator.java 2019-10-20 15:24:29 -08:00
AJ Ferguson
8ae803b9a5 Add delay when reopening inventory 2019-10-20 13:52:21 -08:00
AJ Ferguson
3812712a06 Remove debug messages 2019-10-20 13:29:21 -08:00
AJ Ferguson
88648f705e Work on inventory transactions 
work in progress
 2019-10-20 13:25:41 -08:00
AJ Ferguson
3067c72746 Use chunk cache and fix ChunkPosition 
getChunkBlock() in ChunkPosition returned incorrect values when negative numbers were inputted.

ChunkPosition did not function correctly when used as a key for maps because it did not override equals() and hashCode()
 2019-10-19 23:54:30 -08:00
AJ Ferguson
2bab0d1d19 Calculate attribute modifiers and fix sprinting/sneaking 2019-10-17 23:54:20 -08:00
RednedEpic
a45fdc508d Fix fishing bobbers 2019-10-16 16:26:41 -05:00
RednedEpic
298b5e7a53 Fix colored titles 2019-10-16 16:16:58 -05:00
RednedEpic
d548647367 Fix/implement entity interaction and fix sprinting 2019-10-16 15:32:53 -05:00
RednedEpic
7571df9903 Attempt to reduce memory usage and fix not being disconnected from Java 2019-10-16 13:55:05 -05:00
RednedEpic
20dda985bc Comment out unneeded collision code 
This may be handy in the future, but right now it serves no purpose.
 2019-10-16 13:10:27 -05:00
RednedEpic
eabbacaaad Remove unnecessary null checks for missing mappings 
"Missing mappings" are given placeholder values upon startup, so these null checks are pointless.
 2019-10-15 22:21:44 -05:00
RednedEpic
0ac89f4880 Implement dimension changing and debugize 'moved too quickly' messages 2019-10-15 21:47:28 -05:00
RednedEpic
f6ab70cabb Remove empty Remapper class from merge conflict 2019-10-13 15:28:46 -05:00
RednedEpic
5cf96ec5be Update to latest MCProtocolLib version 2019-10-13 15:28:03 -05:00
RednedEpic
e815f58265 Fix sprinting (for now) 2019-10-13 14:41:49 -05:00
RednedEpic
3c9fab9fc4 Merge branch 'remapper' into master 2019-10-11 19:24:08 -05:00
RednedEpic
7c3a38698d Fix compile error 2019-10-11 18:58:40 -05:00
Redned
30d15707a6
Merge pull request #41 from Tim203/master 
Players spawn, skins and capes, scoreboard, bossbar, fixes and updated protocol lib
 2019-10-11 18:56:32 -05:00
RednedEpic
8c541304a6 Convert item and block maps in Toolbox to TIntObjectMaps 2019-10-11 18:38:34 -05:00
Tim203
c462017149 Improved remapper performance 2019-10-11 00:15:23 +02:00
Tim203
0e97e52337 Only notify debuggers that parsing GameProfile data failed and use the default skin and cape 2019-10-10 23:27:30 +02:00
Tim203
46cb14fc0a Removed unused class and made PlayerList show every player again 2019-10-10 23:16:07 +02:00
AJ Ferguson
2261cfe76a Update blocks.json 2019-10-10 12:49:18 -08:00
AJ Ferguson
c0c9fe95fb Also fix digging acknowledgement block update 2019-10-09 17:41:41 -08:00
RednedEpic
2da7709cd1 Fix block updates (and add support for neighboring blocks) 2019-10-09 20:03:18 -05:00
RednedEpic
a125967ec3 Implement new remapper 2019-10-09 19:11:50 -05:00
EOT3000
c556fa94ea Fix red sand/regular sand mix 2019-10-09 17:07:56 -04:00
Tim203
15506cf5b4 Edited PlayerInit behavior and updated protocol lib to 2.3.0 2019-10-09 20:39:38 +02:00
EOT3000
d99c285676 Entity interact? 2019-10-07 14:30:08 -04:00
Tim203
a7bd9da644 Bugfixes 2019-10-05 00:29:33 +02:00
Tim203
89550a5ecb Bugfixes 2019-10-04 19:25:08 +02:00
Tim203
ee97585036
Merge branch 'master' into master 2019-10-03 19:09:59 +02:00
Tim203
5eb7565b0a Third party capes, rotation fixed, wait for the client and updated protocol lib 2019-10-02 22:45:29 +02:00
Redned
91a80f7dee
Fix crash after first disconnect (#48) (Closes #10) 
Fix crash after first disconnect
 2019-10-01 20:08:59 -05:00
AJ Ferguson
4b0d777128 Fix crash after first disconnect 2019-10-01 15:36:33 -08:00
Redned
fe567bb3cc
Merge pull request #47 from LoudSoftware/missing-mobs 
Added some missing mobs
 2019-09-30 21:02:42 -05:00
Nicolas Znamenski
0a961fd2f7 Added parameters on dolphin and added support for Drowned, Pandas and Turtles 2019-09-30 20:40:07 -04:00
AJ Ferguson
ac8fd0cde8 Handle digging acknowledgement from server 2019-09-30 14:18:29 -08:00
AJ Ferguson
fe845710b6 Fix for block breaking 2019-09-30 14:17:36 -08:00
EOT3000
da0c59446f Try fixing block break (didn't work). Also add more metrics 2019-09-30 12:44:25 -04:00
AJ Ferguson
6fa25aa264 Only send release packet if action type is 0 
Needed for eating to work correctly
 2019-09-29 15:39:03 -08:00
AJ Ferguson
1364eb1df7 Add ability to use items 
Now able to use bows, eat food, throw ender pearls, etc.
 2019-09-29 15:25:42 -08:00
WesleyVanNeck
c8404d15c1
fix that unknown Configuration crashes geyser 2019-09-29 20:05:41 +02:00
Redned
a18bbaf9ea
Break all the bedrock action switch cases 2019-09-27 18:04:58 -05:00
EOT3000
792adb3447 Block break supported. Ignore the exceptions 2019-09-27 17:38:52 -04:00
EOT3000
3d986c47fa Block place supported 2019-09-27 16:50:48 -04:00
Tim203
0b193c04e7 Players spawn, player skins, scoreboard, bossbar and updated protocol lib 2019-09-25 23:52:28 +02:00
Nicolas Znamenski
1d4837f5e0 Finished moving thread pool size to config 2019-09-22 18:15:27 -04:00
Nicolas Znamenski
550d94c4c3 Changed the thread pool size to be part of the config. 2019-09-22 18:08:12 -04:00
RednedEpic
0bcf4aa7ec Fix metrics, remove JSONSimple dependency 2019-09-21 11:00:13 -05:00
Tim203
069bb778ac Merge branch 'master' of https://github.com/GeyserMC/Geyser 2019-09-21 09:59:35 +02:00
Tim203
cbdf4f7633 Made paintings not crash the client, bugfixes and improvements 2019-09-21 09:42:44 +02:00
Redned
2502879bde Add difficulty translator 2019-09-20 23:11:17 -05:00
RednedEpic
b6d4bf5147 Fix most all metadatable items not showing up (for the most part) 
The actual block data translation (like stair rotation) all needs to be done still, but this is a huge step toward getting that complete.
 2019-09-17 21:15:34 -05:00
Tim203
30b9caf5fa Corrected some stuff 2019-09-17 00:45:39 +02:00
Tim203
1c74a6252a Some fixes, added playerlist. Entity spawning doesn't work yet 2019-09-17 00:28:29 +02:00
Redned
4b3dfc09f9 Fix gamemode changing 2019-09-15 20:34:57 -05:00
Redned
fac7093bff Add position checker to prevent false movements 
Sometimes this caused bugs on servers and made anticheats go wild. This should resolve most of the movement issues regarding that.
 2019-09-15 20:25:16 -05:00
Redned
ef7800a739 Move block translations to separate class 
This is to be expanded upon further at a later date
 2019-09-15 19:04:54 -05:00
Redned
5d87b7ccab Cleanup startup messages 2019-09-15 18:46:05 -05:00
Redned
7f051bd6bc Start work on a basic chunk cache and block collision detection 2019-09-15 18:34:14 -05:00
Tim203
0690b30c02 Made logging a bit more useful 2019-09-15 09:57:02 +02:00
Redned
21ddc83da8 Implement multi-block chunk updates 2019-09-14 23:23:14 -05:00
Redned
c606119c1d Fix entities glitching out and teleporting to the wrong location 2019-09-14 23:19:13 -05:00
EOT3000
3f45b21689 Block changes work (again) 2019-09-14 19:21:55 -04:00
EOT3000
074442aac9 Block changes work (again) 2019-09-14 11:33:58 -04:00
EOT3000
77c8acefdb Block changes work 2019-09-14 11:26:49 -04:00
EOT3000
eb00721f3d Merge remote-tracking branch 'origin/chunks' into chunks 2019-09-13 22:53:39 -04:00
EOT3000
26a043fd0a null is probably solid! Like dirt! 2019-09-13 22:53:16 -04:00
RednedEpic
061642f9ab Fix bug where player was spawned inside of a block upon joining 2019-09-13 20:22:00 -05:00
RednedEpic
1bf4e5289a Implement more player actions 2019-09-13 20:12:36 -05:00
RednedEpic
664723a768 Update default movement speed value 2019-09-13 19:38:06 -05:00
RednedEpic
a69aa8ebdb Implement player movement 2019-09-13 19:37:06 -05:00
RednedEpic
03bf12ee65 Implement more block mappings 2019-09-13 18:49:46 -05:00
SupremeMortal
c9be13d487
Fix AIOOBE and remove PlayerSession usage. 2019-09-13 15:45:55 +01:00
SupremeMortal
ab55050d11
Close remote java connection when bedrock player leaves. 2019-09-13 14:37:31 +01:00
SupremeMortal
9a9f67b45f
Get chunks working to some degree. 2019-09-13 11:49:18 +01:00
SupremeMortal
ed7213d7c7
Remove IntelliJ files @EOT3000 added... and more chunk changes. 2019-09-13 10:39:38 +01:00
SupremeMortal
d8388d0315
Merge remote-tracking branch 'upstream/chunks' into chunks 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
 2019-09-13 10:15:43 +01:00
SupremeMortal
7a6d3f4604
Various chunk tweaks. 2019-09-13 10:08:48 +01:00
Redned
7bda95cfb2
Set non-air blocks on the block layer 2019-09-11 22:22:46 -05:00
EOT3000
db864b7e51 try more chunk stuff 2019-09-11 18:54:51 -04:00
EOT3000
59e0aff289 Hybrid mode start + try fixing chunks (hashcodes, etc.) 2019-09-11 16:28:48 -04:00
RednedEpic
6cb80dea28 Minor cleanup upon initial block remap 2019-09-10 18:45:46 -05:00
SupremeMortal
72589fabcd
Rename palette to BitArray and fix various chunk issues. 
No idea if this works since I have no Java Edition server to test on.
 2019-09-10 22:50:34 +01:00
RednedEpic
383429d71b Fix a few chunk errors 
This does not fix chunks on its own, they're still very much a work in progress, however this commit should hopefully resolve a few issues. The client might still crash due to some invalid mappings (most likely), but this should bring us one step closer.

With hardcoded values for the chunks, the client wouldn't crash (which leads me to the conclusion stated above) and on the occasions that it would not time out, the chunks were empty.

Co-authored-by: SupremeMortal <suprememortal@users.noreply.github.com>
 2019-09-08 15:46:10 -05:00
RednedEpic
bd8a00b5eb Merge branch 'master' into chunks 2019-08-30 16:56:34 -05:00