Tim203
d14a20845d
Some additional merge changes
2023-05-05 18:22:31 +02:00
Tim203
6ca53f5bf3
Merge remote-tracking branch 'origin/feature/floodgate-merge'
...
# Conflicts:
# bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
# bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricMod.java
# bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
# bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java
# bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
# bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
# core/build.gradle.kts
# core/src/main/java/org/geysermc/geyser/GeyserImpl.java
# core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
# core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
# core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java
# core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
# core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockNetworkStackLatencyTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockUpdateTranslator.java
# gradle/libs.versions.toml
2023-05-05 12:09:20 +02:00
rtm516
cb440b65ad
Fix events not being included
2023-04-22 19:53:46 +01:00
Camotoy
d9811d08e3
Merge remote-tracking branch 'origin/master' into feature/protocol-3.0
2023-04-06 13:26:28 -04:00
Camotoy
e2535108e6
Folia support and preparations for future changes
2023-03-30 15:44:55 -04:00
Camotoy
b3f1c64249
Base changes for Java 1.19.4 support
2023-03-10 20:51:51 -05:00
SupremeMortal
1769f2a85c
Merge branch 'master' into feature/protocol-3.0
2023-02-14 22:09:48 +00:00
Tim203
ed36adec56
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# api/src/main/java/org/geysermc/geyser/api/GeyserApi.java
# api/src/main/java/org/geysermc/geyser/api/command/Command.java
# api/src/main/java/org/geysermc/geyser/api/command/CommandExecutor.java
# api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
# api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
# api/src/main/java/org/geysermc/geyser/api/event/EventBus.java
# api/src/main/java/org/geysermc/geyser/api/event/EventRegistrar.java
# api/src/main/java/org/geysermc/geyser/api/event/EventSubscriber.java
# api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventBus.java
# api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventSubscriber.java
# api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCommandsEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomItemsEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPostInitializeEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPreInitializeEvent.java
# api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserShutdownEvent.java
# api/src/main/java/org/geysermc/geyser/api/extension/Extension.java
# api/src/main/java/org/geysermc/geyser/api/extension/ExtensionDescription.java
# api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLoader.java
# api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLogger.java
# api/src/main/java/org/geysermc/geyser/api/extension/ExtensionManager.java
# api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidDescriptionException.java
# api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidExtensionException.java
# api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemData.java
# api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemOptions.java
# api/src/main/java/org/geysermc/geyser/api/item/custom/CustomRenderOffsets.java
# api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java
# api/src/main/java/org/geysermc/geyser/api/network/AuthType.java
# api/src/main/java/org/geysermc/geyser/api/network/BedrockListener.java
# api/src/main/java/org/geysermc/geyser/api/network/RemoteServer.java
# api/src/main/java/org/geysermc/geyser/api/util/TriState.java
# core/build.gradle.kts
# gradle/libs.versions.toml
# settings.gradle.kts
2023-02-09 17:34:27 +01:00
Tim203
21885949c7
Moved the base api to a separate repo
2023-02-09 17:31:00 +01:00
Tim203
ca7d57e541
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
2023-02-08 13:57:30 +01:00
Tim203
3ac931e11b
Moved the APIs to a dedicated repo
...
They can now be found at https://github.com/GeyserMC/api
2023-01-07 14:29:33 +01:00
Tim203
1d2103f265
Allow Floodgate to be run in Geyser Velocity
2022-11-10 21:14:07 +01:00
Camotoy
1c49036e3a
Proof-of-concept for Geyser-Floodgate merge
2022-11-06 21:32:55 -05:00
RednedEpic
18e7db8c30
Start on update to Protocol 3.0
2022-10-29 19:23:21 -05:00
Camotoy
ca7799d984
Add core Gradle Adventure change
2022-10-24 13:26:28 -04:00
SupremeMortal
e491cf8a17
Use Gradle's dependency catalogue feature ( #3305 )
...
Move all of our dependencies to a single catalogue file to make maintenance of them easier.
2022-09-26 11:43:17 -04:00
Kevin Ludwig
2c5c72f85f
Replace particle explosion with particle block explosion in JavaExplodePacket ( #3301 )
2022-09-23 10:04:15 -04:00
Camotoy
50b99d70a1
Return to using NBT dependency provided by Protocol
2022-09-21 13:39:06 -04:00
Camotoy
98cfdb0b33
Fix epoll on at least standalone
2022-09-20 14:25:39 -04:00
Camotoy
f31b183a33
Rename Geyser standalone jar to Geyser-Standalone.jar
2022-09-19 11:26:47 -04:00
Konicai
c84d53c827
Re-add git.properties ( #3287 )
...
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2022-09-19 11:22:09 -04:00
Camotoy
9791e7b544
One more try on branch name
2022-09-18 16:29:44 -04:00
Camotoy
f11dc6d03d
A better educated guess to fix the git branch
2022-09-18 15:56:46 -04:00
Camotoy
44e60b7ad8
An educated guess to fix Git branch
2022-09-18 15:40:44 -04:00
Camotoy
bb2f4644be
Fix IO_Uring being included in builds
2022-09-18 15:11:18 -04:00
Camotoy
c8a51d7834
Update to release protocol 1.19.30
2022-09-17 16:37:30 -04:00
Konicai
0aa7411d02
Fix git branch on Jenkins ( #3286 )
2022-09-15 20:32:38 -04:00
Camotoy
27b948a09b
Use Indra to get branch name
2022-09-14 21:22:34 -04:00
Camotoy
e64e12ff98
Initial support for 1.19.30 Bedrock
2022-09-14 21:17:08 -04:00
Camotoy
a99afe4418
Remove usage of Fastutil Object2Reference maps
...
These are only beneficial for containsValue checks.
2022-09-13 16:24:08 -04:00
Camotoy
2d7a463089
Make Geyser dumps backwards compatible
2022-09-11 19:26:22 -04:00
Tim203
13046a8602
Fixed building and switched event library
2022-08-13 22:48:12 +02:00
Konicai
ee5e916112
Merge remote-tracking branch 'upstream/master' into ext-1.19.20
...
# Conflicts:
# core/pom.xml
2022-08-09 14:36:54 -04:00
Kas-tle
bca6359f7e
1.19.10 fallout
2022-07-12 05:29:39 +00:00
ImDaBigBoss
4e2f74481b
Updated to 1.19
2022-06-08 14:09:14 +02:00
RednedEpic
7f0e5b409f
Optimizations to extension loading
2022-04-24 14:53:47 -05:00
RednedEpic
766f28ec60
Publishing seems to work locally now(?)
2022-04-24 14:07:39 -05:00
RednedEpic
3091d27e0e
i think i fixed it?
2022-04-24 13:35:49 -05:00
RednedEpic
463fc83f78
Publishing changes
2022-04-24 13:16:39 -05:00
rtm516
0163e33693
Re-arrange groups and artefacts when publishing ( #2899 )
...
* Re-arrange groups and artefacts when publishing
* Publish core jar
2022-04-24 12:02:02 -05:00
Konicai
03b067e23e
Merge master into extensions ( #2941 )
...
* Don't always store cert/client data used for skin uploaded
This takes up a decent 30K of memory that we don't use after the skin is uploaded. The GameProfileTranslator cannot be run more than once per session.
* Make all moon phases visible
The fix to prevent integer overflows also prevented moon phases from being visible until now.
Fixes #2927
* SetTimeTranslator: cast from long on the entire modulus
This should fix some inaccuracies with time on older worlds.
* Bump version; drop 1.17.40; support 1.18.30
* Actually bump to 2.0.3-SNAPSHOT
* Fix message being sent still if a single escape character is sent
* Replace instances of configs using `generateduuid` for Metrics
* Fix some merge mistakes
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2022-04-20 21:37:50 -04:00
Camotoy
1ebc3fd8f6
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/extensions
2022-04-07 19:22:46 -04:00
RednedEpic
1232c02c8e
Do not compile ap into jar
2022-03-19 21:13:37 -05:00
RednedEpic
f53c3b71c0
Update dependencies
2022-03-19 20:46:30 -05:00
RednedEpic
2a667ed096
Use System.getenv instead of System.getProperty
2022-02-27 23:11:27 -06:00
RednedEpic
e1e4b5059c
Try command line
2022-02-27 23:01:24 -06:00
RednedEpic
28dca21892
Try this for branch name
2022-02-27 22:54:56 -06:00
RednedEpic
9bcd62937d
Handle null better
2022-02-27 22:49:27 -06:00
RednedEpic
7428998d71
Fix variable replacement by using Indra
2022-02-27 22:43:06 -06:00
RednedEpic
12b3bcd6b8
Use api for the time being since that worked locally
2022-02-27 17:26:50 -06:00
