Skip to content

Commit

Permalink
Merge pull request #17 from aternosorg/vanilla-version
Browse files Browse the repository at this point in the history
 detect pre releases and release candidates
  • Loading branch information
matthi4s authored Mar 31, 2022
2 parents f866def + 568540e commit 5b86c25
Show file tree
Hide file tree
Showing 3 changed files with 714 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
class VanillaVersionInformation extends VanillaInformation
{
protected static $vanillaVersionPattern = '[0-9\.w]+[a-z]?';
protected static $vanillaVersionPattern = '[0-9\.w]+(?:[a-z]|-(?:pre|rc)\d+)?';

/**
* VanillaVersionInformation constructor.
Expand Down
29 changes: 29 additions & 0 deletions test/data/fabric/fabric-pre-release.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[11:28:26] [main/INFO]: Loading Minecraft 1.18.2-pre3 with Fabric Loader 0.13.3
[11:28:26] [main/INFO]: Fabric is preparing JARs on first launch, this may take a few seconds...
[11:28:26] [main/INFO]: Loading 3 mods:
- fabricloader 0.13.3
- java 17
- minecraft 1.18.2-beta.3
[11:28:26] [main/INFO]: SpongePowered MIXIN Subsystem Version=0.8.5 Source=file:/server/libraries/net/fabricmc/sponge-mixin/0.11.2+mixin.0.8.5/sponge-mixin-0.11.2+mixin.0.8.5.jar Service=Knot/Fabric Env=SERVER
[11:28:29] [main/INFO]: Environment: authHost='https://authserver.mojang.com', accountsHost='https://api.mojang.com', sessionHost='https://sessionserver.mojang.com', servicesHost='https://api.minecraftservices.com', name='PROD'
[11:28:31] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
[11:28:31] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, targets] with inputs: [0.1 -0.5 .9, 0 0 0]
[11:28:31] [main/WARN]: Ambiguity between arguments [teleport, destination] and [teleport, targets] with inputs: [Player, 0123, @e, dd12be42-52a9-4a91-a8a1-11c01849e498]
[11:28:31] [main/WARN]: Ambiguity between arguments [teleport, targets] and [teleport, destination] with inputs: [Player, 0123, dd12be42-52a9-4a91-a8a1-11c01849e498]
[11:28:31] [main/WARN]: Ambiguity between arguments [teleport, targets, location] and [teleport, targets, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
[11:28:31] [Worker-Main-6/INFO]: Loaded 7 recipes
[11:28:32] [Worker-Main-6/INFO]: Loaded 1141 advancements
[11:28:33] [Server thread/INFO]: Starting minecraft server version 1.18.2 Pre-release 3
[11:28:33] [Server thread/INFO]: Loading properties
[11:28:33] [Server thread/INFO]: Default game type: SURVIVAL
[11:28:33] [Server thread/INFO]: Generating keypair
[11:28:33] [Server thread/INFO]: Starting Minecraft server on *:23728
[11:28:33] [Server thread/INFO]: Using epoll channel type
[11:28:33] [Server thread/INFO]: Preparing level "world"
[11:28:42] [Server thread/INFO]: Preparing start region for dimension minecraft:overworld
[11:29:11] [Server thread/INFO]: Time elapsed: 2446 ms
[11:29:11] [Server thread/INFO]: Done (38.261s)! For help, type "help"
[11:29:11] [Server thread/INFO]: Starting GS4 status listener
[11:29:11] [Server thread/INFO]: Thread Query Listener started
[11:29:11] [Query Listener #1/INFO]: Query running on 0.0.0.0:9898
[11:29:11] [Server thread/INFO]: JMX monitoring enabled
Loading

0 comments on commit 5b86c25

Please sign in to comment.