Commit graph

3812 commits

Author SHA1 Message Date
DoctorMacc
56b70927f2 Fix archiving 2020-10-07 21:05:42 -04:00
DoctorMacc
ca65f9f45a Fix ./gradlew usage 2020-10-07 20:59:09 -04:00
DoctorMacc
0e77f20f86 Specify Fabric repository 2020-10-07 20:37:23 -04:00
DoctorMacc
7b0c1e9a05 Generify Gradle 2020-10-07 20:29:39 -04:00
DoctorMacc
293f691d39 Manually define Gradle 2020-10-07 20:28:43 -04:00
DoctorMacc
f99cbfa231 Maybe this works? 2020-10-07 20:21:46 -04:00
DoctorMacc
ad42c800cd Remove erroneous line 2020-10-07 20:04:08 -04:00
DoctorMacc
9e62c6369c Jenkinsfile attempt 2020-10-07 20:01:01 -04:00
DoctorMacc
105f4f0a32 Fix console chat output 2020-10-07 19:44:13 -04:00
DoctorMacc
977ce4bbec Guess we don't need any relocations 2020-10-07 19:02:41 -04:00
Camotoy
172a5a6db8
Add Fabric as a platform type (#1376)
* PlatformType: Add Fabric as a platform

* Don't use XML reflections on Fabric
2020-10-07 18:51:36 -04:00
Camotoy
90656a9846
Jenkins improvements (#1368)
- Show changes in the Discord webhook
- Delete after 20 builds

Co-authored-by: rtm516 <ryantmilner@hotmail.co.uk>
2020-10-07 18:50:39 -04:00
DoctorMacc
b293c3478a It compiles! :D 2020-10-07 18:35:35 -04:00
DoctorMacc
7a91e0a80d Start on compiling 2020-10-06 22:45:15 -04:00
Camotoy
64d5cf51d1 Create README.md 2020-10-06 18:53:11 -04:00
DoctorMacc
c34b63c8c6 Add proper commands support 2020-10-06 18:43:02 -04:00
DoctorMacc
4b6f1a06b7 Remove unused imports 2020-10-06 14:23:55 -04:00
DoctorMacc
6ccde86057 Getting server IP now works 2020-10-06 14:11:27 -04:00
DoctorMacc
be07a47f9f Implement proper logger, shutdown, and IP checking 2020-10-06 13:41:50 -04:00
DoctorMacc
e7c00d897f Add .gitignore 2020-10-06 12:34:25 -04:00
DoctorMacc
754c2f3d78 First commit. 2020-10-06 12:15:07 -04:00
Camotoy
ba6f174058
Add support for fishing rods pulling Bedrock players (#1355)
Fishing rods pulling players is a clientside feature on Java. On Bedrock, a SetEntityMotionPacket is sent to the client. Therefore this PR implements the Java fishing rod pulling mechanics and sends it off to Bedrock, which sends MovePlayerPackets that are sent to the server.
2020-10-02 15:44:46 -04:00
Tim203
b7587e1eb1
Merge pull request #2 from DoctorMacc/floodgate-2.0
Update to latest master and fix Floodgate errors
2020-09-30 21:03:40 +02:00
Camotoy
772cb246f0
Forward keep alive packets to the client (#1344)
* Forward keep alive packets to the client

Previously, MCProtocolLib (our Java protocol library) handled keep alive packets for us. This commit disables that option and 'forwards' the keep alive packets to the client, and sending the keep alive packet back once Bedrock sends us a ping response.

* Delete DataCache

* Update to latest MCProtocolLib

* Swap values around as a sanity check
2020-09-29 14:15:11 -04:00
Camotoy
3c4cde9677
Tipped arrow translation (#1331)
* Tipped arrow translation

- Tipped arrow items are now properly translated both ways
- Tipped arrow particle effects are also translated, by having a list of all colors Java could send us and their Bedrock ID

* Remove a whitespace
2020-09-29 13:30:37 -04:00
Camotoy
aee9ccc7d2
DoorSoundInteractionHandler: ignore iron [trap]doors (#1343) 2020-09-29 13:21:43 -04:00
Camotoy
9bb52afc8a
BedrockRespawnTranslator: prevent some respawn bugs (#1346) 2020-09-29 13:21:25 -04:00
Camotoy
a5b00e09a1
Villager trade fixes (#1350)
This commit mainly focuses on fixing the crashing of villagers that occurred pre-1.14.

Co-authored-by: AJ Ferguson <AJ-Ferguson@users.noreply.github.com>
2020-09-29 13:19:37 -04:00
bundabrg
650c02ef66
Remove 'geyser' from parameters when executing a command under Spigot, Bungeecord, Sponge, Velocity (#1266)
* Remove 'geyser' from parameters when executing a command under Spigot, Bungeecode, Sponge, Velocity

Fixes https://github.com/bundabrg/GeyserReversion/issues/8

* Fix case when there are no sub commands

Co-authored-by: bundabrg <bundabrg@grieve.com.au>
2020-09-28 23:49:46 -04:00
EasyClifton
3650321576
Update README.md (#1349)
Make the server address look cool (for build 405, sorry)
2020-09-28 17:09:57 -05:00
rtm516
7c49391b9d
Fix gamemodes not fully applying on server switch (#1348)
* Fix gamemodes not fully applying on server switch

* Revert previous commit and move session flag updating to the adventure settings method
2020-09-28 17:43:50 -04:00
DoctorMacc
d75169392b
Small consistency fixes 2020-09-27 21:08:31 -04:00
DoctorMacc
0ea648b472
Merge branch 'master' of https://github.com/GeyserMC/Geyser into floodgate-2.0 2020-09-26 20:35:54 -04:00
Luke
d9b05f5b72
Update the CI link in the README (#1339) 2020-09-25 15:52:44 -04:00
Camotoy
beae39e280
Prevent Bedrock from changing gamemode client-side (#1337)
In vanilla Bedrock, if you have operator status, the client sends a packet to change gamemode without confirmation from the server. Since we have a custom server option to request the gamemode, we just reset the gamemode and ignore this packet.
2020-09-25 20:09:02 +01:00
Camotoy
fa0864b8a1
Fix picking up liquids with buckets (#1311)
* Fix picking up liquids with buckets

The last fix to prevent bucket placement upon interacting with an inventory had an oversight with empty buckets, making them unusable. This commit fixes that while keeping the previous fix.

* Remove debug line

* Fix milk drinking and visual bucket item apperance

* Comment elaboration

* Make indentiation better
2020-09-24 15:11:42 -04:00
Camotoy
1ec768d95d
Fix interaction spam bug (#1324)
* Fix interaction spam bug

This references the Nukkit 1.0 fix for the client bug of spamming to interact. Holding down still works.

* Remove interaction position set at action type 1

* Remove debug line
2020-09-24 12:54:18 -04:00
Redned
0cd43818f1
Use SERVER_READY in BedrockRespawnTranslator to fix respawn bug 2020-09-22 20:10:38 -05:00
Camotoy
b4c7682130
Implement experience sounds (#1320)
Bedrock sends a level event for the experience sound around the same time as a Java entity collect item packet is sent.
2020-09-22 14:16:57 -04:00
Camotoy
2dc7dc10ff
Remove warning about slot 50 (#1325)
We know that it occurs with console crafting.
2020-09-22 14:15:59 -04:00
Camotoy
02aeddbadd
Scoreboard: Fix various issues (#1286)
* Scoreboard: update score on UpdateType.ADD

* Actually fix

* Readd the Objective when a score changes

It looks like Objectives only update when you Remove the Objective and add it back using the SetDisplayObjective. This is hopefully a hotfix, but I think that there is no better way.

* Explain score tracking

Co-authored-by: Tim203 <mctim203@gmail.com>
2020-09-21 23:55:13 -04:00
Camotoy
2db1d16f5c
Only send the client brand on game join (#1299)
* Only send the client brand on game join

* Apply suggested changes
2020-09-21 16:06:25 -04:00
Tim203
f8939ca5de
Updated to latest Geyser 2020-09-19 14:45:36 +02:00
Tim203
5b317ec595
Merge remote-tracking branch 'origin/master' into floodgate-2.0
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java
#	bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
2020-09-19 14:40:12 +02:00
Tim203
7fbc401dfa
Added RawSkins, Toppings and renamed the Floodgate plugin name 2020-09-19 14:21:54 +02:00
Comstepr
5fafa0759e
Update pullrequest.yml (#1305) 2020-09-18 21:21:44 -04:00
Camotoy
2f2164f387
InventoryUtils: Don't send Java packet on hotbar item selection (#1301)
The Bedrock client sends a confirmation packet we translate regardless.
2020-09-17 23:07:20 -04:00
rtm516
99e72f35b3
Add support for manually supplying Bedrock resource packs (#1076)
* send resource packs

A lot of this code is nukkit-credits in the classes

* send resource packs

A lot of this code is nukkit-credits in the classes

* Remove unnecessary code/debugs

* use separately generated hashes

* Updated mappings and added .mcpack support

* "packs" directory auto-create (#484)

* "packs" directory auto-create

* cleaned indentation in ResourcePack.java

* Cleaned ResourcePack.java

* Another cleanup

I hate editor on github.

* Yet another

* Another indentation cleanup

* Fix resource pack loading

(cherry picked from commit f93b07491e)

* Move back to internal sha256 hashing

(cherry picked from commit 812a3d82b2)

* Add resource pack loading back after merge

* Add comments, config option and removed unused files

* Fix packs folder location and cleanup code

* Move to better options for the client

* Fix typos in comments

* Fix pack loading

* Try to make it compile

* Final touches?

* Add Javadoc for MathUtils#constrain

Co-authored-by: EOT3000 <43685885+EOT3000@users.noreply.github.com>
Co-authored-by: Vesek <61123478+Vesek@users.noreply.github.com>
Co-authored-by: Heath123 <heath.mitchell27@gmail.com>
Co-authored-by: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
2020-09-16 20:08:26 -04:00
rtm516
1a49e882d3
[Android] Remove usage of MCProtocolLib Base64 in SkinUtils + more (#1237)
* Remove usage of MCProtocolLib Base64 in SkinUtils

* Fix path resolution for downloading locales
2020-09-16 11:33:59 -04:00
Camotoy
3c1d4aae93
Fix inconsistencies with players and the player list (#1298)
* Fix inconsistencies with players and the player list

This commit makes the player list entry packet control the player cache, fixing inconsistencies that appeared when removing the override on despawning the player.

* Update comments
2020-09-16 00:18:18 -04:00