Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix TexturePackSystem for newer versions

Browse Source
This commit is contained in:
YoyoNow
2026-08-13 09:39:42 +02:00
parent 8dc101639d
commit 683236bb59
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
+22 -17
View File
@@ -39,22 +39,28 @@ public class TexturePackSystem extends BasicListener {
private static final File PACKS_DIR = new File("/var/www/packs"); private static final File PACKS_DIR = new File("/var/www/packs");
private static final String BASE_ULR = "https://packs.steamwar.de/"; private static final String BASE_ULR = "https://packs.steamwar.de/";
private TreeMap<Integer, Integer> protocolVersionToPackVersion = new TreeMap<>(); private TreeMap<Integer, String> protocolVersionToPackVersion = new TreeMap<>();
public TexturePackSystem() { public TexturePackSystem() {
// https://minecraft.wiki/w/Pack_format#List_of_resource_pack_formats // https://minecraft.wiki/w/Pack_format#List_of_resource_pack_formats
// https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers // https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers
protocolVersionToPackVersion.put(759, 9); protocolVersionToPackVersion.put(759, "9");
protocolVersionToPackVersion.put(761, 12); protocolVersionToPackVersion.put(761, "12");
protocolVersionToPackVersion.put(762, 13); protocolVersionToPackVersion.put(762, "13");
protocolVersionToPackVersion.put(763, 15); protocolVersionToPackVersion.put(763, "15");
protocolVersionToPackVersion.put(764, 18); protocolVersionToPackVersion.put(764, "18");
protocolVersionToPackVersion.put(765, 22); protocolVersionToPackVersion.put(765, "22");
protocolVersionToPackVersion.put(766, 32); protocolVersionToPackVersion.put(766, "32");
protocolVersionToPackVersion.put(767, 34); protocolVersionToPackVersion.put(767, "34");
protocolVersionToPackVersion.put(768, 42); protocolVersionToPackVersion.put(768, "42");
protocolVersionToPackVersion.put(769, 46); protocolVersionToPackVersion.put(769, "46");
protocolVersionToPackVersion.put(770, 55); protocolVersionToPackVersion.put(770, "55");
protocolVersionToPackVersion.put(771, "63");
protocolVersionToPackVersion.put(772, "64");
protocolVersionToPackVersion.put(773, "69.0");
protocolVersionToPackVersion.put(774, "75.0");
protocolVersionToPackVersion.put(775, "84.0");
protocolVersionToPackVersion.put(776, "88.0");
} }
@Subscribe @Subscribe
@@ -63,20 +69,19 @@ public class TexturePackSystem extends BasicListener {
return; return;
} }
VelocityCore.schedule(() -> { VelocityCore.schedule(() -> {
TreeMap<Integer, File> fileTreeMap = new TreeMap<>(); TreeMap<String, File> fileTreeMap = new TreeMap<>();
for (File fileEntry : PACKS_DIR.listFiles()) { for (File fileEntry : PACKS_DIR.listFiles()) {
try { try {
int packVersion = Integer.parseInt(fileEntry.getName().split("_")[0]); fileTreeMap.put(fileEntry.getName().split("_")[0], fileEntry);
fileTreeMap.put(packVersion, fileEntry);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// Ignore // Ignore
} }
} }
int playerVersion = event.getPlayer().getProtocolVersion().getProtocol(); int playerVersion = event.getPlayer().getProtocolVersion().getProtocol();
Map.Entry<Integer, Integer> packVersionEntry = protocolVersionToPackVersion.floorEntry(playerVersion); Map.Entry<Integer, String> packVersionEntry = protocolVersionToPackVersion.floorEntry(playerVersion);
if (packVersionEntry == null) return; if (packVersionEntry == null) return;
Map.Entry<Integer, File> selectedPackEntry = fileTreeMap.floorEntry(packVersionEntry.getValue()); Map.Entry<String, File> selectedPackEntry = fileTreeMap.floorEntry(packVersionEntry.getValue());
if (selectedPackEntry == null) return; if (selectedPackEntry == null) return;
File selectedPack = selectedPackEntry.getValue(); File selectedPack = selectedPackEntry.getValue();