Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1247 from creeper123123321/master 

More plugin messages
This commit is contained in:
Myles 2019-04-06 13:09:48 +01:00 committed by GitHub
parent 1a7195386c cf3eb8b993
commit 6731ade5d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
View File

@ -497,11 +497,13 @@ public class InventoryPackets {
case "WDL|INIT":
return "wdl:init";
case "WDL|CONTROL":
return "wdl:init";
return "wdl:control";
case "WDL|REQUEST":
return "wdl:request";
case "bungeecord:main":
return null;
default:
return old.matches("([0-9a-z_-]*:)?[0-9a-z_/.-]*") // Identifier regex
return old.matches("([0-9a-z_.-]*:)?[0-9a-z_/.-]*") // Identifier regex
? old : null;
}
}
@ -706,7 +708,22 @@ public class InventoryPackets {
}
public static String getOldPluginChannelId(String newId) {
if (!newId.matches("([0-9a-z_.-]*:)?[0-9a-z_/.-]*")) {
return null; // Not valid
}
int separatorIndex = newId.indexOf(':');
if (separatorIndex == -1 || separatorIndex == 0) { // Vanilla parses ``:`` and ```` as ``minecraft:``
newId = "minecraft:" + newId;
}
switch (newId) {
case "minecraft:trader_list":
return "MC|TrList";
case "minecraft:book_open":
return "MC|BOpen";
case "minecraft:debug/paths":
return "MC|DebugPath";
case "minecraft:debug/neighbors_update":
return "MC|DebugNeighborsUpdate";
case "minecraft:register":
return "REGISTER";
case "minecraft:unregister":
@ -722,8 +739,7 @@ public class InventoryPackets {
case "wdl:request":
return "WDL|REQUEST";
default:
return newId.matches("([0-9a-z_-]*:)?[0-9a-z_/.-]*") // Identifier regex
? newId : null;
return newId;
}
}