Skip to content

Commit 158ae13

Browse files
committed
Fix asset exclusions
1 parent f99924e commit 158ae13

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,17 @@ jar {
6565
exclude '*.dll*', '*.so*', '*.dylib*', '*.csv', '*.jnilib'
6666
exclude '**/Log4j2Plugins.dat'
6767
exclude 'org/lwjgl/**'
68-
exclude 'assets/**'
68+
exclude 'assets/realms/**'
69+
70+
// Exclude all unnecessary minecraft assets not needed by the server
71+
exclude 'assets/minecraft/gpu_warnlist.json'
72+
exclude 'assets/minecraft/textures/**'
73+
exclude 'assets/minecraft/texts/**'
74+
exclude 'assets/minecraft/shaders/**'
75+
exclude 'assets/minecraft/particles/**'
76+
exclude 'assets/minecraft/models/**'
77+
exclude 'assets/minecraft/font/**'
78+
exclude 'assets/minecraft/blockstates/**'
6979
// Exclude all log4j configuration from libraries, the log4j configuration in resource will remain
7080
exclude 'log4j2.xml'
7181
}

diffs/velox_source.diff

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ index 0000000..b471a55
591591
+ }
592592
+}
593593
diff --git a/build/mcp_diff_src/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
594-
index e1cb326..4015873 100644
594+
index e1cb326..aa72ace 100644
595595
--- a/build/mcp_diff_src/net/minecraft/server/dedicated/DedicatedServer.java
596596
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
597597
@@ -97,7 +97,9 @@ public class DedicatedServer extends MinecraftServer implements IServer {
@@ -605,15 +605,18 @@ index e1cb326..4015873 100644
605605
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
606606
LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
607607
}
608-
@@ -131,7 +133,7 @@ public class DedicatedServer extends MinecraftServer implements IServer {
608+
@@ -131,8 +133,9 @@ public class DedicatedServer extends MinecraftServer implements IServer {
609609
}
610610

611611
this.func_244801_P();
612612
- LOGGER.info("Starting Minecraft server on {}:{}", this.getServerHostname().isEmpty() ? "*" : this.getServerHostname(), this.getServerPort());
613+
-
614+
+ // Velox start: Change start log 2
613615
+ LOGGER.info("Starting Velox server on {}:{}", this.getServerHostname().isEmpty() ? "*" : this.getServerHostname(), this.getServerPort());
614-
616+
+ // Velox end
615617
try {
616618
this.getNetworkSystem().addEndpoint(inetaddress, this.getServerPort());
619+
} catch (IOException ioexception) {
617620
diff --git a/build/mcp_diff_src/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java
618621
index a53a1a5..2b4a80b 100644
619622
--- a/build/mcp_diff_src/net/minecraft/world/World.java

0 commit comments

Comments
 (0)