Commit graph

422 commits

Author SHA1 Message Date
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