CPU
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
911 Commits 7 Branches 0 Tags 53 MiB
Commit Graph

70 Commits

Author SHA1 Message Date
RednedEpic 3e15d21931 Merge branch 'master' into sound-master 2020-04-22 18:18:13 -05:00
RednedEpic 987edbb217 Nitpicks and add serverbound sound packet translator 2020-04-22 18:17:34 -05:00
Redned 7ca1d1bea6
Merge pull request #398 from GeyserMC/inventory 
Merges branch 'inventory' into master
 2020-04-22 00:49:48 -05:00
rtm516 1b15f3058f
Javadoc a bit of Geyser (#392) 
* A bunch of javadoc comments

* Cleaned up javadocs
 2020-04-21 00:28:44 -05:00
Jason 12b99c5b1b
Merge branch 'master' into master 2020-04-19 14:09:36 -07:00
RednedEpic 605c9ef4db Merge branch 'master' into inventory 2020-04-11 22:46:25 -05:00
rtm516 2cd5472ff0 Started work on the locale fetching and loading system 2020-04-08 21:11:56 +01:00
rtm516 c809ddb618 Renamed translation method and cleaned up variable declaration 2020-04-05 10:13:47 +01:00
rtm516 845c914492 Moved loading and added default locale config option 2020-04-05 02:58:23 +01:00
rtm516 b5ce83bbe2 Missed changes 2020-04-05 02:37:39 +01:00
RednedEpic e76b67265a Rebase 2020-04-02 17:53:45 -05:00
RednedEpic be9396f585 Merge branch 'master' into inventory 2020-04-02 17:01:17 -05:00
Jason Ho 3721cc084e Add packet translators for Play, Stop, and Builtin sounds 2020-03-28 16:50:50 -07:00
William Johnstone 4b40b07bf8 Refactor code and improve sword breaking 2020-03-21 21:37:55 +00:00
William Johnstone 09cdcbdf94 Add block breaking animations that actually work (still incomplete, doesn't take enchantments or player effects into account, also doesn't account for being in the air or underwater) 2020-03-21 20:14:09 +00:00
William Johnstone 350bb28c7c revert last commit as I'm starting over 2020-03-20 21:28:20 +00:00
William Johnstone 650a1e2ab1 Start block breaking animations (inventory is broken) 2020-03-20 20:34:16 +00:00
Redned 62b183a387 Update bedrock protocol lib and remove trove 2020-03-18 16:10:28 -05:00
RednedEpic 6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic 41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
AJ Ferguson b1a0ed3e91 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-12 21:58:09 -09:00
SupremeMortal c70cf0bb47
Make biomes tag final 2020-02-09 22:55:07 +00:00
SupremeMortal f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping 
 Conflicts:
	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-09 22:53:57 +00:00
OnlyBMan 0bb18d26b0 Load biome definitions only once instead of everytime a new player joins 2020-02-05 22:02:23 -05:00
RednedEpic 0cf574ddcb Merge branch 'master' into feature/direct-block-mapping 2020-02-05 18:59:20 -06:00
AJ Ferguson 1a9aa4255f Some refactoring and bug fixes 
Still much to do.
Inventory desyncing when crafting will be fixed soon.
 2020-01-30 16:05:57 -09:00
AJ Ferguson 5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
RednedEpic 52b23950ea Merge branch 'master' into plugin (should fix building) 2020-01-18 16:46:07 -06:00
AJ Ferguson 9f7cba1915 Fix build error caused by mappings submodule 2020-01-08 19:48:03 -09:00
RednedEpic dc594ee22c Update license headers 
Certain headers for classes that are to be removed (e.g. plugin api) were not updated to prevent merge conflicts.
 2020-01-08 21:05:42 -06:00
RednedEpic 0c24ffc629 Merge branch 'master' into plugin 2020-01-03 23:25:00 -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 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 e38322a3ec Nuke plugin API 
https://media.giphy.com/media/oe33xf3B50fsc/giphy.gif
 2019-12-21 11:35:48 -06:00
AJ Ferguson 9a9695ead7 Handle new creative_items.json format 2019-12-21 01:32:49 -09:00
AJ Ferguson d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
AJ Ferguson 7a58840821 Fix NoClassDefFoundError in Java 9+ 2019-12-02 14:22:13 -09:00
AJ Ferguson 8bb8208a46 Merge branch 'master' into inventory 2019-11-30 15:22:50 -09: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 ce7237392b Merge branch 'feature/1.13-bedrock' into 1.13-inventory 2019-11-15 14:55:15 -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
RednedEpic 90e6ebc1be More work on 1.13 2019-11-05 18:55:59 -06:00
Redned 5fee344743 Fix block palette 2019-11-02 15:50:04 -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
RednedEpic 8c541304a6 Convert item and block maps in Toolbox to TIntObjectMaps 2019-10-11 18:38:34 -05:00