GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity
3,678 Commits 14 Branches 0 Tags 88 MiB
Commit Graph

3678 Commits

Author SHA1 Message Date
RednedEpic 313228abde Bump NukkitX protocol lib from merge 2019-12-21 10:07: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
Redned dae4bbbd44
Merge pull request #113 from GeyserMC/feature/1.15-je-1.14-be 
Merge 1.15 Java and 1.14 Bedrock changes into master
 2019-12-18 08:28:59 -06:00
RednedEpic de66b3405d Add support for 1.15.1 2019-12-17 18:00:24 -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
Redned e933ed12a8
Update Discord badge 2019-12-15 14:57:56 -06: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 2c4612db80 Build against 1.15 version of MCProtocolLib 2019-12-10 17:36:06 -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
RednedEpic f59e4672a0 Exclude dependencies already present in servers (only affects plugin) 2019-12-08 22:41:50 -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 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
RednedEpic 6f5fc4c85c Fix JNI overlap with BungeeCord module 2019-12-04 18:56:51 -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
EOT3000 1e12f5eac9
May or may not work.... again 2019-12-02 11:54:07 -05:00
EOT3000 90419fc692
May or may not work 
@LegacyGamerHD
 2019-12-02 11:51:48 -05:00
Redned 433a3b4713
Fix compile error 2019-12-02 08:45:51 -06:00
Redned 5552f34871
Fix NPE if config was null in BungeeCord module 2019-12-02 08:27:45 -06: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