Skip to content

Commit 9eccd41

Browse files
matthi4smatthi4s
authored
Merge pull request #132 from KurtThiemann/new-version-numbers
Add support for the new Minecraft version numbering system
2 parents 9f9505a + 5607471 commit 9eccd41

4 files changed

Lines changed: 310 additions & 1 deletion

File tree

‎src/Analysis/Information/Vanilla/VanillaVersionInformation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class VanillaVersionInformation extends VanillaInformation
88
{
9-
protected static string $vanillaVersionPattern = '[0-9\.w]+(?:[a-z]|(?:-|\s)?(?:pre|rc|Pre-Release|Release Candidate)\s?\d+)?';
9+
protected static string $vanillaVersionPattern = '[0-9\.w]+(?:[a-z]|(?:-|\s)?(?:pre|rc|Pre-Release|Release Candidate|Snapshot)\s?\d+|-(?:snapshot|pre|rc)-\d+)?';
1010

1111
/**
1212
* @inheritDoc

‎test/data/Vanilla/vanilla-snapshot-26-1-snapshot-1.json‎

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
{
2+
"id": "vanilla\/server",
3+
"name": "Vanilla",
4+
"type": "Server Log",
5+
"version": "26.1 Snapshot 1",
6+
"title": "Vanilla 26.1 Snapshot 1 Server Log",
7+
"entries": [
8+
{
9+
"level": 6,
10+
"time": null,
11+
"prefix": "[15:25:21] [ServerMain\/INFO]:",
12+
"lines": [
13+
{
14+
"number": 1,
15+
"content": "[15:25:21] [ServerMain\/INFO]: Environment: Environment[sessionHost=https:\/\/sessionserver.mojang.com, servicesHost=https:\/\/api.minecraftservices.com, profilesHost=https:\/\/api.mojang.com, name=PROD]"
16+
}
17+
]
18+
},
19+
{
20+
"level": 6,
21+
"time": null,
22+
"prefix": "[15:25:21] [Worker-Main-1\/INFO]:",
23+
"lines": [
24+
{
25+
"number": 2,
26+
"content": "[15:25:21] [Worker-Main-1\/INFO]: No existing world data, creating new world"
27+
}
28+
]
29+
},
30+
{
31+
"level": 6,
32+
"time": null,
33+
"prefix": "[15:25:22] [ServerMain\/INFO]:",
34+
"lines": [
35+
{
36+
"number": 3,
37+
"content": "[15:25:22] [ServerMain\/INFO]: Loaded 1470 recipes"
38+
}
39+
]
40+
},
41+
{
42+
"level": 6,
43+
"time": null,
44+
"prefix": "[15:25:22] [ServerMain\/INFO]:",
45+
"lines": [
46+
{
47+
"number": 4,
48+
"content": "[15:25:22] [ServerMain\/INFO]: Loaded 1584 advancements"
49+
}
50+
]
51+
},
52+
{
53+
"level": 6,
54+
"time": null,
55+
"prefix": "[15:25:22] [Server thread\/INFO]:",
56+
"lines": [
57+
{
58+
"number": 5,
59+
"content": "[15:25:22] [Server thread\/INFO]: Starting json RPC server on 0.0.0.0:9900"
60+
}
61+
]
62+
},
63+
{
64+
"level": 6,
65+
"time": null,
66+
"prefix": "[15:25:22] [Server thread\/INFO]:",
67+
"lines": [
68+
{
69+
"number": 6,
70+
"content": "[15:25:22] [Server thread\/INFO]: Json-RPC Management connection listening on 0.0.0.0:9900"
71+
}
72+
]
73+
},
74+
{
75+
"level": 6,
76+
"time": null,
77+
"prefix": "[15:25:22] [Server thread\/INFO]:",
78+
"lines": [
79+
{
80+
"number": 7,
81+
"content": "[15:25:22] [Server thread\/INFO]: Starting minecraft server version 26.1 Snapshot 1"
82+
}
83+
]
84+
},
85+
{
86+
"level": 6,
87+
"time": null,
88+
"prefix": "[15:25:22] [Server thread\/INFO]:",
89+
"lines": [
90+
{
91+
"number": 8,
92+
"content": "[15:25:22] [Server thread\/INFO]: Loading properties"
93+
}
94+
]
95+
},
96+
{
97+
"level": 6,
98+
"time": null,
99+
"prefix": "[15:25:22] [Server thread\/INFO]:",
100+
"lines": [
101+
{
102+
"number": 9,
103+
"content": "[15:25:22] [Server thread\/INFO]: Default game type: SURVIVAL"
104+
}
105+
]
106+
},
107+
{
108+
"level": 6,
109+
"time": null,
110+
"prefix": "[15:25:22] [Server thread\/INFO]:",
111+
"lines": [
112+
{
113+
"number": 10,
114+
"content": "[15:25:22] [Server thread\/INFO]: Generating keypair"
115+
}
116+
]
117+
},
118+
{
119+
"level": 6,
120+
"time": null,
121+
"prefix": "[15:25:22] [Server thread\/INFO]:",
122+
"lines": [
123+
{
124+
"number": 11,
125+
"content": "[15:25:22] [Server thread\/INFO]: Starting Minecraft server on *:51062"
126+
}
127+
]
128+
},
129+
{
130+
"level": 6,
131+
"time": null,
132+
"prefix": "[15:25:22] [Server thread\/INFO]:",
133+
"lines": [
134+
{
135+
"number": 12,
136+
"content": "[15:25:22] [Server thread\/INFO]: Preparing level \"world\""
137+
}
138+
]
139+
},
140+
{
141+
"level": 6,
142+
"time": null,
143+
"prefix": "[15:25:22] [Management server IO #1\/INFO]:",
144+
"lines": [
145+
{
146+
"number": 13,
147+
"content": "[15:25:22] [Management server IO #1\/INFO]: RPC Connection #1: Management connection opened for \/172.19.0.1:10338"
148+
}
149+
]
150+
},
151+
{
152+
"level": 6,
153+
"time": null,
154+
"prefix": "[15:25:22] [Server thread\/INFO]:",
155+
"lines": [
156+
{
157+
"number": 14,
158+
"content": "[15:25:22] [Server thread\/INFO]: Selecting global world spawn..."
159+
}
160+
]
161+
},
162+
{
163+
"level": 6,
164+
"time": null,
165+
"prefix": "[15:25:28] [Server thread\/INFO]:",
166+
"lines": [
167+
{
168+
"number": 15,
169+
"content": "[15:25:28] [Server thread\/INFO]: Loading 0 persistent chunks..."
170+
}
171+
]
172+
},
173+
{
174+
"level": 6,
175+
"time": null,
176+
"prefix": "[15:25:28] [Server thread\/INFO]:",
177+
"lines": [
178+
{
179+
"number": 16,
180+
"content": "[15:25:28] [Server thread\/INFO]: Preparing spawn area: 100%"
181+
}
182+
]
183+
},
184+
{
185+
"level": 6,
186+
"time": null,
187+
"prefix": "[15:25:28] [Server thread\/INFO]:",
188+
"lines": [
189+
{
190+
"number": 17,
191+
"content": "[15:25:28] [Server thread\/INFO]: Time elapsed: 5369 ms"
192+
}
193+
]
194+
},
195+
{
196+
"level": 6,
197+
"time": null,
198+
"prefix": "[15:25:28] [Server thread\/INFO]:",
199+
"lines": [
200+
{
201+
"number": 18,
202+
"content": "[15:25:28] [Server thread\/INFO]: Done (5.792s)! For help, type \"help\""
203+
}
204+
]
205+
},
206+
{
207+
"level": 6,
208+
"time": null,
209+
"prefix": "[15:25:28] [Server thread\/INFO]:",
210+
"lines": [
211+
{
212+
"number": 19,
213+
"content": "[15:25:28] [Server thread\/INFO]: Starting GS4 status listener"
214+
}
215+
]
216+
},
217+
{
218+
"level": 6,
219+
"time": null,
220+
"prefix": "[15:25:28] [Server thread\/INFO]:",
221+
"lines": [
222+
{
223+
"number": 20,
224+
"content": "[15:25:28] [Server thread\/INFO]: Thread Query Listener started"
225+
}
226+
]
227+
},
228+
{
229+
"level": 6,
230+
"time": null,
231+
"prefix": "[15:25:28] [Query Listener #1\/INFO]:",
232+
"lines": [
233+
{
234+
"number": 21,
235+
"content": "[15:25:28] [Query Listener #1\/INFO]: Query running on 0.0.0.0:9898"
236+
}
237+
]
238+
},
239+
{
240+
"level": 6,
241+
"time": null,
242+
"prefix": "[15:25:28] [Server thread\/INFO]:",
243+
"lines": [
244+
{
245+
"number": 22,
246+
"content": "[15:25:28] [Server thread\/INFO]: JMX monitoring enabled"
247+
},
248+
{
249+
"number": 23,
250+
"content": ""
251+
}
252+
]
253+
}
254+
],
255+
"analysis": {
256+
"problems": [],
257+
"information": [
258+
{
259+
"message": "Minecraft version: 26.1 Snapshot 1",
260+
"counter": 1,
261+
"entry": {
262+
"level": 6,
263+
"time": null,
264+
"prefix": "[15:25:22] [Server thread\/INFO]:",
265+
"lines": [
266+
{
267+
"number": 7,
268+
"content": "[15:25:22] [Server thread\/INFO]: Starting minecraft server version 26.1 Snapshot 1"
269+
}
270+
]
271+
},
272+
"label": "Minecraft version",
273+
"value": "26.1 Snapshot 1"
274+
}
275+
]
276+
}
277+
}

‎test/data/Vanilla/vanilla-snapshot-26-1-snapshot-1.log‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[15:25:21] [ServerMain/INFO]: Environment: Environment[sessionHost=https://sessionserver.mojang.com, servicesHost=https://api.minecraftservices.com, profilesHost=https://api.mojang.com, name=PROD]
2+
[15:25:21] [Worker-Main-1/INFO]: No existing world data, creating new world
3+
[15:25:22] [ServerMain/INFO]: Loaded 1470 recipes
4+
[15:25:22] [ServerMain/INFO]: Loaded 1584 advancements
5+
[15:25:22] [Server thread/INFO]: Starting json RPC server on 0.0.0.0:9900
6+
[15:25:22] [Server thread/INFO]: Json-RPC Management connection listening on 0.0.0.0:9900
7+
[15:25:22] [Server thread/INFO]: Starting minecraft server version 26.1 Snapshot 1
8+
[15:25:22] [Server thread/INFO]: Loading properties
9+
[15:25:22] [Server thread/INFO]: Default game type: SURVIVAL
10+
[15:25:22] [Server thread/INFO]: Generating keypair
11+
[15:25:22] [Server thread/INFO]: Starting Minecraft server on *:51062
12+
[15:25:22] [Server thread/INFO]: Preparing level "world"
13+
[15:25:22] [Management server IO #1/INFO]: RPC Connection #1: Management connection opened for /172.19.0.1:10338
14+
[15:25:22] [Server thread/INFO]: Selecting global world spawn...
15+
[15:25:28] [Server thread/INFO]: Loading 0 persistent chunks...
16+
[15:25:28] [Server thread/INFO]: Preparing spawn area: 100%
17+
[15:25:28] [Server thread/INFO]: Time elapsed: 5369 ms
18+
[15:25:28] [Server thread/INFO]: Done (5.792s)! For help, type "help"
19+
[15:25:28] [Server thread/INFO]: Starting GS4 status listener
20+
[15:25:28] [Server thread/INFO]: Thread Query Listener started
21+
[15:25:28] [Query Listener #1/INFO]: Query running on 0.0.0.0:9898
22+
[15:25:28] [Server thread/INFO]: JMX monitoring enabled

‎test/tests/Logs/AutoLogsTest.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,6 +1854,16 @@ public function test_vanilla_snapshot_21w05b(): void
18541854
$this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath());
18551855
}
18561856

1857+
/**
1858+
* @return void
1859+
* @throws Exception
1860+
*/
1861+
public function test_vanilla_snapshot_26_1_snapshot_1(): void
1862+
{
1863+
$log = new TestLog('Vanilla/vanilla-snapshot-26-1-snapshot-1.log');
1864+
$this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath());
1865+
}
1866+
18571867
/**
18581868
* @return void
18591869
* @throws Exception

0 commit comments

Comments
 (0)