3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-11-09 17:50:20 +01:00
Commit graph

383 Commits

Autor SHA1 Nachricht Datum
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
9c21bcc9e8
Add back target fixes. 2019-12-06 11:08:25 +00: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
Redned
70fa3476a3
Merge pull request #102 from GeyserMC/update-protocol-lib
Bump Protocol Lib to 2.4.2
2019-12-05 08:38:47 -06:00
SupremeMortal
a639d141e7
Bump Protocol lib to 2.4.2 2019-12-05 14:32:39 +00:00
RednedEpic
855a253894 Add cat entity 2019-12-04 22:42:20 -06:00
Redned
8fbca5771d
Bump Protocol Lib to 2.4.1 (#101)
- Bump Protocol Lib to 2.4.1
- Fix typo from protocol lib
2019-12-04 13:59:11 -06:00
SupremeMortal
6e8a0847b4
Fix typo from protocol lib 2019-12-04 18:13:49 +00:00
SupremeMortal
8389cab95c
Bump Protocol Lib to 1.4.1 2019-12-04 18:02:27 +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
Redned
37a7744173
Include submodules in pull request build action 2019-11-30 20:56:39 -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
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
50d680762d Merge remote-tracking branch 'origin/master' 2019-11-30 13:27:28 -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
Redned
5dad988c2b
Attempt to update/include submodules in final jar on Jenkins 2019-11-29 21:05:04 -06:00
RednedEpic
c91e8e1958 Update mappings to use new submodule 2019-11-29 20:34:51 -06:00
Redned
f4a88bb4e1
Merge pull request #93 from AJ-Ferguson/master
Fix dropped items
2019-11-29 20:22:33 -06:00
AJ Ferguson
8c297990a9 Fix dropped items 2019-11-29 17:18:03 -09:00
Redned
f29d11fc68
Merge pull request #92 from AJ-Ferguson/master
Update stonecutter mappings
2019-11-29 19:49:05 -06: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
Redned
db03e1f777
Merge pull request #91 from SupremeMortal/fix-netty-deps
Fix overlapping Netty dependency when shading.
2019-11-28 17:52:22 -06:00
Redned
cb0d0796fe
Merge pull request #90 from SupremeMortal/feature/build-prs
Use new GitHub Actions to build PRs
2019-11-28 17:31:35 -06:00
SupremeMortal
e70ac021af
Fix overlapping netty dependency when shading.
Why does this protocol library even include the entirety of netty?!?
2019-11-28 23:27:43 +00:00
SupremeMortal
406eff3f03
We don't need this action anymore.
Jenkins builds all local branches whilst GitHub Actions builds all PRs.
2019-11-28 23:15:53 +00:00
SupremeMortal
8fb2807c46
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/build-prs 2019-11-28 23:14:04 +00:00
SupremeMortal
726aea53cd
Use new GitHub Actions to build PRs 2019-11-28 23:05:33 +00:00
Redned
89cfbdcdfd
Update workflows to build PRs 2019-11-28 15:13:58 -06:00
Redned
28693ff829
Add maven workflow 2019-11-28 15:06:09 -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
Redned
e6cd58c867
Merge pull request #86 from alissonlauffer/master
Do not set logo height in README
2019-11-27 22:30:40 -06:00
AJ Ferguson
489c39e900 Start adding support for crafting
Expect bugs
2019-11-27 18:55:58 -09:00