Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-10-03 08:41:05 +02:00
Code Issues Releases Aktivität

18w19b

Quellcode durchsuchen
Dieser Commit ist enthalten in:
creeper123123321 2018-05-09 15:45:09 -03:00
Ursprung 188cc5019f
Commit 136adaebd5
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 0AC57D54786721D1
10 geänderte Dateien mit 39 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
bukkit/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
bungee/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
common/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
Datei anzeigen

@ -62,7 +62,7 @@ public class ProtocolVersion {
register(v1_12 = new ProtocolVersion(335, "1.12")); register(v1_12 = new ProtocolVersion(335, "1.12"));
register(v1_12_1 = new ProtocolVersion(338, "1.12.1")); register(v1_12_1 = new ProtocolVersion(338, "1.12.1"));
register(v1_12_2 = new ProtocolVersion(340, "1.12.2")); register(v1_12_2 = new ProtocolVersion(340, "1.12.2"));
register(v1_13 = new ProtocolVersion(372, "18w16a")); register(v1_13 = new ProtocolVersion(374, "18w19b"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN")); register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
} }

29
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java
Datei anzeigen

@ -165,6 +165,7 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
public void write(PacketWrapper wrapper) throws Exception { public void write(PacketWrapper wrapper) throws Exception {
wrapper.write(Type.VAR_INT, 0); wrapper.write(Type.VAR_INT, 0);
wrapper.write(Type.VAR_INT, 0); wrapper.write(Type.VAR_INT, 0);
wrapper.write(Type.VAR_INT, 0);
} }
}); });
tagsPacket.send(ProtocolSnapshotTo1_12_2.class); tagsPacket.send(ProtocolSnapshotTo1_12_2.class);
@ -186,12 +187,22 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
int iconCount = wrapper.passthrough(Type.VAR_INT); int iconCount = wrapper.passthrough(Type.VAR_INT);
for (int i = 0; i < iconCount; i++) { for (int i = 0; i < iconCount; i++) {
byte directionAndType = wrapper.read(Type.BYTE);
int type = (directionAndType & 0xF0) >> 4;
wrapper.write(Type.VAR_INT, type);
wrapper.passthrough(Type.BYTE); // Icon X wrapper.passthrough(Type.BYTE); // Icon X
wrapper.passthrough(Type.BYTE); // Icon Y
wrapper.passthrough(Type.BYTE); // Icon Z wrapper.passthrough(Type.BYTE); // Icon Z
byte direction = (byte) (directionAndType & 0x0F);
wrapper.write(Type.BYTE, direction);
wrapper.write(Type.OPTIONAL_CHAT, null); // Display Name wrapper.write(Type.OPTIONAL_CHAT, null); // Display Name
} }
wrapper.passthroughAll(); int columns = wrapper.passthrough(Type.BYTE);
if (columns > 0) {
wrapper.passthrough(Type.BYTE); // rows
wrapper.passthrough(Type.BYTE); // x
wrapper.passthrough(Type.BYTE); // z
wrapper.passthrough(Type.BYTE_ARRAY); // data
}
} }
}); });
} }
@ -458,8 +469,12 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
int newId = oldID; int newId = oldID;
if (oldID >= 1) if (oldID >= 1)
newId += 6; newId += 6;
if (oldID >= 9)
newId += 4;
if (oldID >= 10) if (oldID >= 10)
newId += 5; newId += 5;
if (oldID >= 21)
newId += 5;
if (oldID >= 86) if (oldID >= 86)
newId += 1; newId += 1;
if (oldID >= 166) if (oldID >= 166)
@ -470,14 +485,22 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
newId += 9; newId += 9;
if (oldID >= 226) if (oldID >= 226)
newId += 1; newId += 1;
if (oldID >= 271)
newId += 1;
if (oldID >= 326)
newId += 1;
if (oldID >= 335)
newId += 1;
if (oldID >= 352) if (oldID >= 352)
newId += 5; newId += 6;
if (oldID >= 373) if (oldID >= 373)
newId += 1; newId += 1;
if (oldID >= 380) if (oldID >= 380)
newId += 7; newId += 7;
if (oldID >= 385) if (oldID >= 385)
newId += 4; newId += 4;
if (oldID >= 412)
newId += 5;
if (oldID >= 438) if (oldID >= 438)
newId += 1; newId += 1;
if (oldID >= 443) if (oldID >= 443)

10
common/src/main/resources/assets/viaversion/data/mapping-1.13.json
Datei anzeigen

@ -954,9 +954,9 @@
"951": "minecraft:grass", "951": "minecraft:grass",
"952": "minecraft:fern", "952": "minecraft:fern",
"953": "minecraft:dead_bush", "953": "minecraft:dead_bush",
"954": "minecraft:sea_grass", "954": "minecraft:seagrass",
"955": "minecraft:tall_sea_grass[half=upper]", "955": "minecraft:tall_seagrass[half=upper]",
"956": "minecraft:tall_sea_grass[half=lower]", "956": "minecraft:tall_seagrass[half=lower]",
"957": "minecraft:piston[extended=true,facing=north]", "957": "minecraft:piston[extended=true,facing=north]",
"958": "minecraft:piston[extended=true,facing=east]", "958": "minecraft:piston[extended=true,facing=east]",
"959": "minecraft:piston[extended=true,facing=south]", "959": "minecraft:piston[extended=true,facing=south]",
@ -8487,7 +8487,7 @@
"70": "minecraft:grass", "70": "minecraft:grass",
"71": "minecraft:fern", "71": "minecraft:fern",
"72": "minecraft:dead_bush", "72": "minecraft:dead_bush",
"73": "minecraft:sea_grass", "73": "minecraft:seagrass",
"74": "minecraft:sea_pickle", "74": "minecraft:sea_pickle",
"75": "minecraft:piston", "75": "minecraft:piston",
"76": "minecraft:white_wool", "76": "minecraft:white_wool",
@ -9064,7 +9064,7 @@
"647": "minecraft:pig_spawn_egg", "647": "minecraft:pig_spawn_egg",
"648": "minecraft:phantom_spawn_egg", "648": "minecraft:phantom_spawn_egg",
"649": "minecraft:polar_bear_spawn_egg", "649": "minecraft:polar_bear_spawn_egg",
"650": "minecraft:puffer_fish_spawn_egg", "650": "minecraft:pufferfish_spawn_egg",
"651": "minecraft:rabbit_spawn_egg", "651": "minecraft:rabbit_spawn_egg",
"652": "minecraft:salmon_mob_spawn_egg", "652": "minecraft:salmon_mob_spawn_egg",
"653": "minecraft:sheep_spawn_egg", "653": "minecraft:sheep_spawn_egg",

2
jar/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>viaversion-jar</name> <name>viaversion-jar</name>

2
pom.xml
Datei anzeigen

@ -6,7 +6,7 @@
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>viaversion-parent</name> <name>viaversion-parent</name>

2
sponge-legacy/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
sponge/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<version>1.4.0-18w16a</version> <version>1.4.0-18w19b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>