Jonas_Jones/McWebserver
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/McWebserver.git synced 2025-10-23 03:19:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed disabling server through config file having no effect

Browse source
This commit is contained in:
Jonas_Jones 2022-07-25 14:53:21 +02:00
parent 0b61efa72f
commit 47a8698b7d
43 changed files with 1245 additions and 1362 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.gradle/7.4/checksums/checksums.lock
View file

Binary file not shown.

BIN
.gradle/7.4/executionHistory/executionHistory.bin
View file

Binary file not shown.

BIN
.gradle/7.4/executionHistory/executionHistory.lock
View file

Binary file not shown.

BIN
.gradle/7.4/fileHashes/fileHashes.bin
View file

Binary file not shown.

BIN
.gradle/7.4/fileHashes/fileHashes.lock
View file

Binary file not shown.

BIN
.gradle/7.4/fileHashes/resourceHashesCache.bin
View file

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file

Binary file not shown.

BIN
.gradle/file-system.probe
View file

Binary file not shown.

1
.idea/gradle.xml generated
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>

BIN
build/classes/java/main/me/jonasjones/mcwebserver/McWebserver.class
View file

Binary file not shown.

BIN
build/classes/java/main/me/jonasjones/mcwebserver/config/ModConfigs.class
View file

Binary file not shown.

BIN
build/resources/main/assets/mcwebserver/icon-large.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
build/resources/main/assets/mcwebserver/icon-meduim.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 976 B

BIN
build/tmp/compileJava/previous-compilation-data.bin
View file

Binary file not shown.

2
run/config/mcwebserver.properties
View file

@ -1,4 +1,4 @@
web.isEnabled=true #whether or not the webserver should be enabled or not | default: true web.isEnabled=false #whether or not the webserver should be enabled or not | default: true
web.port=8080 #The port of the webserver | default: 8080 web.port=8080 #The port of the webserver | default: 8080
web.root=./webserver/ #the root directory of the webserver, starting from the main server directory | default: webserver/ web.root=./webserver/ #the root directory of the webserver, starting from the main server directory | default: webserver/
web.file.root=index.html #the name of the html file for the homepage | default: index.html web.file.root=index.html #the name of the html file for the homepage | default: index.html

BIN
run/logs/2022-07-24-5.log.gz Normal file
View file

Binary file not shown.

BIN
run/logs/2022-07-25-1.log.gz Normal file
View file

Binary file not shown.

BIN
run/logs/debug-1.log.gz
View file

Binary file not shown.

BIN
run/logs/debug-2.log.gz
View file

Binary file not shown.

BIN
run/logs/debug-3.log.gz
View file

Binary file not shown.

BIN
run/logs/debug-4.log.gz
View file

Binary file not shown.

BIN
run/logs/debug-5.log.gz Normal file
View file

Binary file not shown.

2442
run/logs/debug.log
View file

File diff suppressed because it is too large Load diff

152
run/logs/latest.log
View file

@ -1,6 +1,5 @@
[23:57:49] [main/INFO] (FabricLoader/GameProvider) Loading Minecraft 1.19 with Fabric Loader 0.14.6 [14:51:27] [main/INFO] (FabricLoader/GameProvider) Loading Minecraft 1.19 with Fabric Loader 0.14.6
[23:57:50] [ForkJoinPool-1-worker-1/WARN] (FabricLoader/Metadata) Mod mcwebserver uses the version v0.1.0 which isn't compatible with Loader's extended semantic version format (Could not parse version number component 'v0'!), SemVer is recommended for reliably evaluating dependencies and prioritizing newer version [14:51:27] [main/INFO] (FabricLoader) Loading 35 mods:
[23:57:50] [main/INFO] (FabricLoader) Loading 35 mods:
- fabric 0.55.1+1.19 - fabric 0.55.1+1.19
- fabric-api-base 0.4.8+e62f51a357 - fabric-api-base 0.4.8+e62f51a357
- fabric-api-lookup-api-v1 1.6.5+9ff28f4057 - fabric-api-lookup-api-v1 1.6.5+9ff28f4057
@ -34,56 +33,99 @@
- fabric-transitive-access-wideners-v1 1.1.0+9e7660c657 - fabric-transitive-access-wideners-v1 1.1.0+9e7660c657
- fabricloader 0.14.6 - fabricloader 0.14.6
- java 17 - java 17
- mcwebserver v0.1.0 - mcwebserver 0.1.0
- minecraft 1.19 - minecraft 1.19
[23:57:50] [main/INFO] (FabricLoader/Mixin) SpongePowered MIXIN Subsystem Version=0.8.5 Source=file:/home/jonas_jones/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.11.4+mixin.0.8.5/c1dc27696aa4006e492c2485c9ccbcb26045a971/sponge-mixin-0.11.4+mixin.0.8.5.jar Service=Knot/Fabric Env=SERVER [14:51:28] [main/INFO] (FabricLoader/Mixin) SpongePowered MIXIN Subsystem Version=0.8.5 Source=file:/home/jonas_jones/.gradle/caches/modules-2/files-2.1/net.fabricmc/sponge-mixin/0.11.4+mixin.0.8.5/c1dc27696aa4006e492c2485c9ccbcb26045a971/sponge-mixin-0.11.4+mixin.0.8.5.jar Service=Knot/Fabric Env=SERVER
[23:57:51] [main/INFO] (FabricLoader/Mixin) Loaded Fabric development mappings for mixin remapper! [14:51:28] [main/INFO] (FabricLoader/Mixin) Loaded Fabric development mappings for mixin remapper!
[23:57:51] [main/INFO] (FabricLoader/Mixin) Compatibility level set to JAVA_16 [14:51:28] [main/INFO] (FabricLoader/Mixin) Compatibility level set to JAVA_16
[23:57:51] [main/INFO] (FabricLoader/Mixin) Compatibility level set to JAVA_17 [14:51:28] [main/INFO] (FabricLoader/Mixin) Compatibility level set to JAVA_17
[23:57:54] [main/WARN] (FileUtil) Configuration conflict: there is more than one oshi.properties file on the classpath [14:51:30] [main/WARN] (FileUtil) Configuration conflict: there is more than one oshi.properties file on the classpath
[23:57:54] [main/WARN] (FileUtil) Configuration conflict: there is more than one oshi.architecture.properties file on the classpath [14:51:30] [main/WARN] (FileUtil) Configuration conflict: there is more than one oshi.architecture.properties file on the classpath
[23:58:01] [main/INFO] (Minecraft) Building unoptimized datafixer [14:51:36] [main/INFO] (Minecraft) Building unoptimized datafixer
[23:58:04] [main/INFO] (mcwebserver - VERBOSE LOGGER) Verbose Logger is now logging. [14:51:39] [main/INFO] (mcwebserver - VERBOSE LOGGER) Verbose Logger is now logging.
[23:58:04] [main/INFO] (mcwebserver - VERBOSE LOGGER) Loaded config file successfully: found 7 overrides and configurations. [14:51:39] [main/INFO] (mcwebserver - VERBOSE LOGGER) Loaded config file successfully: found 7 overrides and configurations.
[23:58:04] [main/INFO] (mcwebserver) McWebserver initialized! [14:51:39] [main/INFO] (mcwebserver) McWebserver initialized!
[23:58:04] [main/INFO] (mcwebserver) Starting Webserver... [14:51:39] [main/INFO] (mcwebserver) Webserver disabled in the config file.
[23:58:04] [Thread-1/INFO] (mcwebserver) Server started. [14:51:39] [main/INFO] (Minecraft) Environment: authHost='https://authserver.mojang.com', accountsHost='https://api.mojang.com', sessionHost='https://sessionserver.mojang.com', servicesHost='https://api.minecraftservices.com', name='PROD'
[23:58:04] [Thread-1/INFO] (mcwebserver - VERBOSE LOGGER) Listening for connections on port : " + PORT + " ... [14:51:43] [main/INFO] (Minecraft) Loaded 7 recipes
[23:58:05] [main/INFO] (Minecraft) Environment: authHost='https://authserver.mojang.com', accountsHost='https://api.mojang.com', sessionHost='https://sessionserver.mojang.com', servicesHost='https://api.minecraftservices.com', name='PROD' [14:51:43] [main/INFO] (Minecraft) Loaded 1179 advancements
[23:58:11] [main/INFO] (Minecraft) Loaded 7 recipes [14:51:45] [main/INFO] (BiomeModificationImpl) Applied 0 biome modifications to 0 of 63 new biomes in 3.372 ms
[23:58:11] [main/INFO] (Minecraft) Loaded 1179 advancements [14:51:45] [Server thread/INFO] (Minecraft) Starting minecraft server version 1.19
[23:58:13] [main/INFO] (BiomeModificationImpl) Applied 0 biome modifications to 0 of 63 new biomes in 3.173 ms [14:51:45] [Server thread/INFO] (Minecraft) Loading properties
[23:58:13] [Server thread/INFO] (Minecraft) Starting minecraft server version 1.19 [14:51:45] [Server thread/INFO] (Minecraft) Default game type: SURVIVAL
[23:58:13] [Server thread/INFO] (Minecraft) Loading properties [14:51:45] [Server thread/INFO] (Minecraft) Generating keypair
[23:58:13] [Server thread/INFO] (Minecraft) Default game type: SURVIVAL [14:51:45] [Server thread/INFO] (Minecraft) Starting Minecraft server on *:25565
[23:58:13] [Server thread/INFO] (Minecraft) Generating keypair [14:51:45] [Server thread/INFO] (Minecraft) Using epoll channel type
[23:58:13] [Server thread/INFO] (Minecraft) Starting Minecraft server on *:25565 [14:51:45] [Server thread/INFO] (Minecraft) Preparing level "world"
[23:58:13] [Server thread/INFO] (Minecraft) Using epoll channel type [14:51:46] [Server thread/INFO] (Minecraft) Preparing start region for dimension minecraft:overworld
[23:58:14] [Server thread/INFO] (Minecraft) Preparing level "world" [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:14] [Server thread/INFO] (Minecraft) Preparing start region for dimension minecraft:overworld [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:21] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:22] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 1% [14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:23] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 7% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:23] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 17% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:24] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 32% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:24] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 45% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:25] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 61% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:25] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 79% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:26] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 93% [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:26] [Server thread/INFO] (Minecraft) Time elapsed: 11605 ms [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[23:58:26] [Server thread/INFO] (Minecraft) Done (12.077s)! For help, type "help" [14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:18] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 0%
[14:52:19] [Worker-Main-2/INFO] (Minecraft) Preparing spawn area: 1%
[14:52:19] [Worker-Main-1/INFO] (Minecraft) Preparing spawn area: 25%
[14:52:20] [Worker-Main-3/INFO] (Minecraft) Preparing spawn area: 72%
[14:52:20] [Server thread/INFO] (Minecraft) Time elapsed: 34486 ms
[14:52:20] [Server thread/INFO] (Minecraft) Done (34.954s)! For help, type "help"

2
run/server.properties
View file

@ -1,5 +1,5 @@
#Minecraft server properties #Minecraft server properties
#Sun Jul 24 23:58:05 CEST 2022 #Mon Jul 25 14:51:39 CEST 2022
enable-jmx-monitoring=false enable-jmx-monitoring=false
rcon.port=25575 rcon.port=25575
level-seed= level-seed=

BIN
run/world/DIM-1/data/raids.dat
View file

Binary file not shown.

BIN
run/world/DIM1/data/raids_end.dat
View file

Binary file not shown.

BIN
run/world/data/raids.dat
View file

Binary file not shown.

BIN
run/world/entities/r.-1.-1.mca
View file

Binary file not shown.

BIN
run/world/level.dat
View file

Binary file not shown.

BIN
run/world/level.dat_old
View file

Binary file not shown.

BIN
run/world/region/r.-1.-1.mca
View file

Binary file not shown.

BIN
run/world/region/r.-1.-2.mca
View file

Binary file not shown.

BIN
run/world/region/r.-1.0.mca
View file

Binary file not shown.

BIN
run/world/region/r.-2.-1.mca
View file

Binary file not shown.

BIN
run/world/region/r.-2.-2.mca
View file

Binary file not shown.

BIN
run/world/region/r.-2.0.mca
View file

Binary file not shown.

BIN
run/world/region/r.0.-1.mca
View file

Binary file not shown.

BIN
run/world/region/r.0.-2.mca
View file

Binary file not shown.

BIN
run/world/region/r.0.0.mca
View file

Binary file not shown.

2
src/main/java/me/jonasjones/mcwebserver/McWebserver.java
View file

@ -24,7 +24,7 @@ public class McWebserver implements ModInitializer {
LOGGER.info("McWebserver initialized!"); LOGGER.info("McWebserver initialized!");
if (true) { if (ModConfigs.IS_ENABLED) {
LOGGER.info("Starting Webserver..."); LOGGER.info("Starting Webserver...");
new Thread(() -> { new Thread(() -> {

4
src/main/java/me/jonasjones/mcwebserver/config/ModConfigs.java
View file

@ -10,7 +10,7 @@ public class ModConfigs {
private static ModConfigProvider config; private static ModConfigProvider config;
//config //config
public static Boolean ISENABLED; public static Boolean IS_ENABLED;
public static int WEB_PORT; public static int WEB_PORT;
public static String WEB_ROOT; public static String WEB_ROOT;
public static String WEB_FILE_ROOT; public static String WEB_FILE_ROOT;
@ -45,7 +45,7 @@ public class ModConfigs {
} }
private static void assignConfigs() { private static void assignConfigs() {
ISENABLED = CONFIG.getOrDefault("basic.isEnabled", false); IS_ENABLED = CONFIG.getOrDefault("web.isEnabled", false);
WEB_PORT = CONFIG.getOrDefault("web.port", 8080); WEB_PORT = CONFIG.getOrDefault("web.port", 8080);
WEB_ROOT = CONFIG.getOrDefault("web.root", "webserver/"); WEB_ROOT = CONFIG.getOrDefault("web.root", "webserver/");
WEB_FILE_ROOT = CONFIG.getOrDefault("web.file.root", "index.html"); WEB_FILE_ROOT = CONFIG.getOrDefault("web.file.root", "index.html");

2
src/main/resources/fabric.mod.json
View file

@ -1,7 +1,7 @@
{ {
"schemaVersion": 1, "schemaVersion": 1,
"id": "mcwebserver", "id": "mcwebserver",
"version": "0.1.0", "version": "0.1.1",
"name": "McWebserver", "name": "McWebserver",
"description": "A simple webserver that runs alongside the Minecraft Server", "description": "A simple webserver that runs alongside the Minecraft Server",