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
Camotoy
c8afd3436d
Fix Floodgate autodetection
2023-04-26 21:11:26 -04:00
Tim203
7c1100b830
Fixed auto-setting auth-type to Floodgate
2023-04-26 18:53:03 +02:00
Julian Vennen
f39e689b83
Implement System properties to set the udp port and address #3597 ( #3689 )
...
* System property stuff
* Add geyserUdpPort/Address system properties as overrides for pluginUdpPort/Address
* Fix formatting for if-else statements
---------
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2023-04-22 21:33:23 -04:00
SupremeMortal
27fcc932c7
Add run configuration to make things easier
2023-04-20 10:46:12 +01:00
Camotoy
b6113dfd31
Optimizations and regression fix
2023-04-06 21:47:37 -04:00
Camotoy
8083f70435
KQueue no longer needs to be shaded in on Spigot/Fabric
2023-04-06 19:54:22 -04: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
cd80ee893c
Potentially fix Modrinth token caching
2023-03-30 15:27:00 -04:00
Camotoy
323394d2b5
Clean up jar file classes a bit
2023-03-26 13:20:53 -04:00
Camotoy
05829eeed8
Upload Fabric platform to Modrinth
2023-03-20 13:04:53 -04:00
YouHaveTrouble
81f0cbe5ed
Assign permission to the command ( #3599 )
...
Assigning permission allows people to possibly deny that permission to hide the command from tab complete list.
Permission is defaulted to true, so command keeps current behavior by default.
2023-03-07 12:54:41 -05:00
SupremeMortal
1769f2a85c
Merge branch 'master' into feature/protocol-3.0
2023-02-14 22:09:48 +00:00
Tim203
ca7d57e541
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge
2023-02-08 13:57:30 +01:00
Camotoy
29f234d030
Fix /geyser reload on Spigot
...
Fixes #3478
2023-01-29 22:15:26 -05:00
Camotoy
402b3403ba
Velocity: Fix disabling compression when there is no compression to disable
2023-01-02 12:12:22 -05:00
Camotoy
3e778cdb49
Merge branch 'feature/protocol-3.0' of https://github.com/GeyserMC/Geyser into feature/protocol-3.0
2022-12-20 20:01:05 -05:00
Camotoy
4fe9aeca40
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/protocol-3.0
2022-12-20 19:47:45 -05:00
Camotoy
9656caf4cb
Merge branch 'compression' into dev
2022-12-18 13:21:07 -05:00
Camotoy
ad4424d2b6
Use server data to pick block on banners
2022-12-17 21:05:41 -05:00
Konicai
2d3dd89162
Some misc fixes
2022-12-14 17:57:08 -05:00
Konicai
a988fbf290
Update inventory translators
2022-12-14 17:23:55 -05:00
Konicai
84248fa902
Merge remote-tracking branch 'upstream/master' into feature/protocol-3.0
...
# Conflicts:
# core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EndermanEntity.java
# core/src/main/java/org/geysermc/geyser/inventory/holder/BlockInventoryHolder.java
# core/src/main/java/org/geysermc/geyser/network/ConnectorServerEventHandler.java
# core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
# core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
# core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
# core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
# core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
# core/src/main/java/org/geysermc/geyser/text/ChatTypeEntry.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaDisguisedChatTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaPlayerChatTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoTranslator.java
# core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java
# core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java
# core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java
# gradle/libs.versions.toml
2022-12-14 15:58:17 -05:00
Camotoy
7c26036906
Update adapters to support 1.19.3 and add biome command completions
2022-12-13 13:53:28 -05:00
Camotoy
95ebdb8ebf
Update BungeeCord version check
2022-12-07 11:59:20 -05:00
Camotoy
cc3037d6c5
Update to 1.19.3-rc1; various changes and fixes
2022-12-02 14:11:56 -05: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
Konicai
592b48dbf5
Simplify IP censoring in dumps ( #3330 )
2022-11-01 09:59:44 -04:00
RednedEpic
18e7db8c30
Start on update to Protocol 3.0
2022-10-29 19:23:21 -05:00
Camotoy
254f0da03c
Fabric improvements
...
Mainly in commands - the old permissions file no longer needs to exist.
2022-10-24 13:21:02 -04:00
Camotoy
730b0beb01
Consolidate CommandManager implementations
...
A lot of these just implemented the class overrode the `description` method returning nothing.
2022-10-18 16:05:55 -04:00
Camotoy
144d7b000a
Use Mojang mappings for Geyser-Fabric
2022-10-18 12:06:18 -04:00
SupremeMortal
237a69d3c2
Refactor package and cleanup dependencies for Fabric
2022-10-17 22:08:52 +01:00
Konicai
3794531910
Fix application main
2022-10-17 00:25:54 -04:00
Konicai
675e70be66
Fix shaded jar
2022-10-16 22:47:26 -04:00
Konicai
4dfb728b4d
Merge remote-tracking branch 'upstream/master' into fabric
2022-10-16 20:24:18 -04:00
Konicai
7bf9b92cbb
Cleanup buildscript, add github actions
2022-10-16 20:21:29 -04:00
SupremeMortal
5a805bc688
Fix building
2022-10-04 23:18:53 +01:00
Camotoy
97ec5fec33
Force-disable query if it would interfere with Geyser's startup.
...
Fixes #3312
2022-10-03 18:27:42 -04:00
SupremeMortal
7edde43141
Initial fabric merger
2022-10-03 21:11:07 +01:00
SupremeMortal
63cd071188
Merge remote-tracking branch 'Geyser-Fabric/master' into platform/fabric
2022-10-03 19:37:24 +01:00
Camotoy
04883a166a
Merge branch 'master' of https://github.com/GeyserMC/Geyser
2022-10-03 13:33:32 -04:00
Camotoy
07c7b2f7f8
Clean up on legacy code that will no longer trigger
2022-10-03 13:33:24 -04:00
Camotoy
7f05ab9d22
Fix reloading on Spigot
...
Fixes #3319
2022-10-03 13:15:30 -04:00
Konicai
7653a626af
Update Sponge to API 8 ( #2611 )
2022-10-02 16:43:14 -04:00
Camotoy
47d14e12eb
Geyser now requires 1.13.2+ on Spigot
2022-09-30 11:58:09 -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
