Skip to content

Commit cabeb9c

Browse files
authored
Corrected retrieval of NanoLimbo release file (#3662)
1 parent 81cbc72 commit cabeb9c

File tree

4 files changed

+150
-6
lines changed

4 files changed

+150
-6
lines changed

scripts/start-deployNanoLimbo

Lines changed: 147 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,159 @@ isDebugging && set -x
66

77
if ! SERVER=$(mc-image-helper github download-latest-asset \
88
--output-directory=/data \
9-
--name-pattern="NanoLimbo-.+?(?<!-sources)\.jar" \
9+
--name-pattern="NanoLimbo(-.+?(?<!-sources))?\.jar" \
1010
BoomEaro/NanoLimbo
1111
); then
1212
logError "Failed to download NanoLimbo"
1313
exit 1
1414
fi
1515

16+
: "${SERVER_PORT:=25565}"
17+
cat <<EOF > /data/settings.yml
18+
#
19+
# NanoLimbo configuration
20+
#
21+
22+
# Server's host address and port. Set ip empty to use public address
23+
bind:
24+
ip: '0.0.0.0'
25+
port: ${SERVER_PORT}
26+
27+
# Max number of players can join to server
28+
# Set -1 to make it infinite
29+
maxPlayers: 100
30+
31+
# Server's data in servers list
32+
ping:
33+
description: '{"text": "&9NanoLimbo"}'
34+
version: 'NanoLimbo'
35+
# Return static protocol version number in ping result
36+
# By default, its -1 to return the client version if it supported
37+
# https://wiki.vg/Protocol_version_numbers
38+
protocol: -1
39+
40+
# Available dimensions: OVERWORLD, NETHER, THE_END
41+
dimension: THE_END
42+
43+
# Whether to display the player in the player list
44+
# For 1.16.5 clients, the player list will be sent even if disabled, to avoid crash
45+
playerList:
46+
enable: false
47+
username: 'NanoLimbo'
48+
49+
# Whether to display header and footer in player list
50+
# For 1.8+ clients
51+
headerAndFooter:
52+
enable: false
53+
header: '{"text": "&eWelcome!"}'
54+
footer: '{"text": "&9NanoLimbo"}'
55+
56+
# Setup player's game mode
57+
# 0 - Survival
58+
# 1 - Creative (hide HP and food bar)
59+
# 2 - Adventure
60+
# 3 - Spectator (hide all UI bars)
61+
# Spectator works on 1.8+ clients
62+
gameMode: 3
63+
64+
# Remove secure-chat toast
65+
# For 1.20.5+ clients
66+
secureProfile: false
67+
68+
# Server name which is shown under F3
69+
# For 1.13+ clients
70+
brandName:
71+
enable: true
72+
content: 'NanoLimbo'
73+
74+
# Message sends when player joins to the server
75+
joinMessage:
76+
enable: true
77+
text: '{"text": "&eWelcome to the Limbo!"}'
78+
79+
# BossBar displays when player joins to the server
80+
# For 1.9+ clients
81+
bossBar:
82+
enable: true
83+
text: '{"text": "Welcome to the Limbo!"}'
84+
health: 1.0
85+
# Available colors: PINK, BLUE, RED, GREEN, YELLOW, PURPLE, WHITE
86+
color: PINK
87+
# Available divisions: SOLID, DASHES_6, DASHES_10, DASHES_12, DASHES_20
88+
division: SOLID
89+
90+
# Display title and subtitle
91+
# For 1.8+ clients
92+
title:
93+
enable: true
94+
# Set title text value empty, if you need only subtitle
95+
title: '{"text": "&9&lWelcome!"}'
96+
# Set subtitle text value empty, if you need only title
97+
subtitle: '{"text": "&6NanoLimbo"}'
98+
# Fade in time in ticks (1 sec = 20 ticks)
99+
fadeIn: 10
100+
# Stay time in ticks
101+
stay: 100
102+
# Fade out time in ticks
103+
fadeOut: 10
104+
105+
# Player info forwarding support.
106+
# Available types:
107+
# - NONE
108+
# - LEGACY
109+
# - MODERN
110+
# - BUNGEE_GUARD
111+
# Don't use secret if you do not use MODERN type
112+
infoForwarding:
113+
type: NONE
114+
secret: '<YOUR_SECRET_HERE>'
115+
tokens:
116+
- '<BUNGEE_GUARD_TOKEN>'
117+
118+
# Read timeout for connections in milliseconds
119+
readTimeout: 30000
120+
121+
# Define log level. For production, I'd recommend to use level 2
122+
# Log levels:
123+
# 0 - Display only errors
124+
# 1 - Display errors, warnings
125+
# 2 - Display errors, warnings, info
126+
# 3 - Display errors, warnings, info, debug
127+
debugLevel: 2
128+
129+
# Warning! Do not touch params of this block if you are not completely sure what is this!
130+
netty:
131+
# Use a Linux native transport type, if it possible
132+
useEpoll: true
133+
# EventLoopGroup threads count
134+
threads:
135+
bossGroup: 1
136+
workerGroup: 4
137+
138+
# Options to check incoming traffic and kick potentially malicious connections.
139+
# Take into account that player can send many small packets, for example, just moving mouse.
140+
traffic:
141+
# If true, then additional handler will be added to the channel pipeline
142+
enable: true
143+
# Max packet size in bytes
144+
# Unlimited if -1
145+
maxPacketSize: 8192
146+
# The interval to measure packets over
147+
# Lowering this value will limit peak packets from players which would target people with bad connections
148+
# Raising this value will allow higher peak packet rates, which will help with people who have poor connections
149+
# Ignored if -1.0
150+
interval: 7.0
151+
# The maximum packets per second for players
152+
# It is measured over the configured interval
153+
# Ignored if -1.0
154+
maxPacketRate: 500.0
155+
# The maximum packet bytes per second for players
156+
# It is measured over the configured interval as an average bytes/sec
157+
# Ignored if -1.0
158+
maxPacketBytesRate: 2048.0
159+
EOF
160+
16161
export SERVER
17162
export FAMILY=LIMBO
18163

19-
exec $(dirname "$0")/start-setupMounts "$@"
164+
exec "$(dirname "$0")/start-setupMounts" "$@"

tests/setuponlytests/nanolimbo/require.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
mc-image-helper assert fileExists "/data/NanoLimbo-*.jar"
1+
mc-image-helper assert fileExists "/data/NanoLimbo*.jar"
2+
mc-image-helper assert fileExists "/data/settings.yml"

tests/setuponlytests/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ image=""
7171

7272
# Go through each folder in setuponly and test setups
7373
if (( $# == 0 )); then
74-
readarray -t folders < <(find . -maxdepth 2 -mindepth 2 -name docker-compose.yml -printf '%h\n')
74+
readarray -t folders < <(find . -maxdepth 2 -mindepth 2 -name docker-compose.yml -exec dirname "{}" \;)
7575
foldersList=("${folders[@]}")
7676
image=" using $IMAGE_TO_TEST"
7777
fi

0 commit comments

Comments
 (0)