120b367a41
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
...
# Conflicts:
# core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
2024-03-18 16:38:52 +01:00
1df63c6de8
Support Bedrock 1.20.70 ( #4477 )
...
* Support 1.20.70
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Update readme
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Use 1.20.70 mappings
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Creative lectern drops work but not survival yet
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix lectern book pickup in survival
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Add copyright notices to new files
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Temp fix for incorrect creative_items from Cloudburst/Data
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix item frame breaking in creative
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Clarify what to remove when 1.20.60 support is dropped
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Don't use dim change enum pre 1.20.70
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
---------
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2024-03-11 00:29:27 -07:00
4afef52928
Some minor changes
2024-02-25 22:59:41 +01:00
a4681ca77c
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
...
# Conflicts:
# bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java
# build-logic/build.gradle.kts
# build.gradle.kts
# core/src/main/java/org/geysermc/geyser/GeyserImpl.java
# settings.gradle.kts
2024-02-25 20:12:43 +01:00
d44b523acb
Isolated Velocity
2024-02-25 20:00:03 +01:00
97fc2de42f
NeoForge Platform Support ( #3781 )
...
* Initial work on Forge platform
* Rework modded platforms to use a common module
* Add support for integrated worlds on modded platforms
* Fix classload errors and move mixins to shared module
* Fix Fabric mixins and check min height in mod world manager
* Add Forge command support
* Add back modrinth publishing
* Don't apply application plugin to shared mod sources
* Fix docs
* Delete unused class
* Clean up repositories
* - Update to 1.20.2
- set custom refmap name
- fixed console commands crashing the server (hasPermission now accepts CommandSourceStack instead of Player)
- Forge wants fastutil relocated, so be it
Current issues:
- ClassNotFound exceptions with classes that are clearly present
* - Fix ClassNotFound errors on Forge due to weird Classloader
- Dont relocate gson
* merge upstream
* oh no
* Bump lombok, architectury-loom
* init: neoforge 1.20.4 support
* NeoForge builds
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Archive neoforge artifacts
* transformForge -> transformNeoForge
* Neoforge boots!
* Fix mixins on neoforge
* Update build/pr file names
* Update mods.toml to new neoforge standard
* Fix refmap naming
* more fixes
- no need to include gson
- cleanup nullable/nonnull annotations
- add more info to geyser dumps on neoforge
* yeet platform executor
* yet another temp branch to figure out the runServer task
* yeet transitive dependency, that cant be right
* Attempt at getting the runServer task to work, part two
* Revert the changes for the runServer task, try and shut down the injector
* Remove spigot weird bug workaround, shut down properly
Also add a compileOnly dependency for the mod module to get rid of spammy false warnings
* Update to latest restart changes
- fix duplicate nodes crashing neoforge
- connector -> geyser in GeyserModCommandExecutor
- create command manager early to fix issues with permission gather event
* Consistent NeoForge spelling, move some dependencies to the version toml
* Add lombok to version catalogue
* Add plugins to version catalogue
* revert move to buildSrc
* Create `assets/geyser/icon.png` to reference icon from a single file on standalone/neoforge/fabric
* add fabric permissions api to libs.versions.toml
---------
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
Co-authored-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2024-02-23 17:58:39 +01:00
a894ce9824
Updated Gradle to 8.3 and made Geyser work with latest Floodgate
2023-09-30 19:41:35 +02:00
05eb054559
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
2023-09-24 10:44:56 +02:00
9a8015e8b6
Support Bedrock 1.20.30 ( #4115 )
2023-09-11 22:22:50 -04:00
903e61f1a3
Exposing resourcepack loading to api ( #3696 )
...
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
Co-authored-by: RednedEpic <redned235@gmail.com>
2023-06-16 20:39:53 -05:00
246ebddc78
Remove accessor from previous commit
2023-05-27 14:12:20 +01:00
f2d83c4ed1
Fixed GitHub Action run numbers
2023-05-27 14:05:41 +01:00
d14a20845d
Some additional merge changes
2023-05-05 18:22:31 +02:00
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
cb440b65ad
Fix events not being included
2023-04-22 19:53:46 +01:00
d9811d08e3
Merge remote-tracking branch 'origin/master' into feature/protocol-3.0
2023-04-06 13:26:28 -04:00
e2535108e6
Folia support and preparations for future changes
2023-03-30 15:44:55 -04:00
b3f1c64249
Base changes for Java 1.19.4 support
2023-03-10 20:51:51 -05:00
1769f2a85c
Merge branch 'master' into feature/protocol-3.0
2023-02-14 22:09:48 +00:00
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
21885949c7
Moved the base api to a separate repo
2023-02-09 17:31:00 +01:00
ca7d57e541
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
2023-02-08 13:57:30 +01:00
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
1d2103f265
Allow Floodgate to be run in Geyser Velocity
2022-11-10 21:14:07 +01:00
1c49036e3a
Proof-of-concept for Geyser-Floodgate merge
2022-11-06 21:32:55 -05:00
18e7db8c30
Start on update to Protocol 3.0
2022-10-29 19:23:21 -05:00
ca7799d984
Add core Gradle Adventure change
2022-10-24 13:26:28 -04:00
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
2c5c72f85f
Replace particle explosion with particle block explosion in JavaExplodePacket ( #3301 )
2022-09-23 10:04:15 -04:00
50b99d70a1
Return to using NBT dependency provided by Protocol
2022-09-21 13:39:06 -04:00
98cfdb0b33
Fix epoll on at least standalone
2022-09-20 14:25:39 -04:00
f31b183a33
Rename Geyser standalone jar to Geyser-Standalone.jar
2022-09-19 11:26:47 -04:00
c84d53c827
Re-add git.properties ( #3287 )
...
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2022-09-19 11:22:09 -04:00
9791e7b544
One more try on branch name
2022-09-18 16:29:44 -04:00
f11dc6d03d
A better educated guess to fix the git branch
2022-09-18 15:56:46 -04:00
44e60b7ad8
An educated guess to fix Git branch
2022-09-18 15:40:44 -04:00
bb2f4644be
Fix IO_Uring being included in builds
2022-09-18 15:11:18 -04:00
c8a51d7834
Update to release protocol 1.19.30
2022-09-17 16:37:30 -04:00
0aa7411d02
Fix git branch on Jenkins ( #3286 )
2022-09-15 20:32:38 -04:00
27b948a09b
Use Indra to get branch name
2022-09-14 21:22:34 -04:00
e64e12ff98
Initial support for 1.19.30 Bedrock
2022-09-14 21:17:08 -04:00
a99afe4418
Remove usage of Fastutil Object2Reference maps
...
These are only beneficial for containsValue checks.
2022-09-13 16:24:08 -04:00
2d7a463089
Make Geyser dumps backwards compatible
2022-09-11 19:26:22 -04:00
13046a8602
Fixed building and switched event library
2022-08-13 22:48:12 +02:00
ee5e916112
Merge remote-tracking branch 'upstream/master' into ext-1.19.20
...
# Conflicts:
# core/pom.xml
2022-08-09 14:36:54 -04:00
bca6359f7e
1.19.10 fallout
2022-07-12 05:29:39 +00:00
4e2f74481b
Updated to 1.19
2022-06-08 14:09:14 +02:00
7f0e5b409f
Optimizations to extension loading
2022-04-24 14:53:47 -05:00
766f28ec60
Publishing seems to work locally now(?)
2022-04-24 14:07:39 -05:00
3091d27e0e
i think i fixed it?
2022-04-24 13:35:49 -05:00
Tim203
Kas-tle
Redned
Konicai
chris
rtm516
rtm516
Camotoy
SupremeMortal
SupremeMortal
Kevin Ludwig
ImDaBigBoss