Commit graph

286 commits

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