Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-25 07:40:08 +01:00
Code Issues Releases Aktivität

18w20b

Quellcode durchsuchen
Dieser Commit ist enthalten in:
creeper123123321 2018-05-16 17:12:43 -03:00
Ursprung 5878c53aa4
Commit bb64329b07
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 0AC57D54786721D1
11 geänderte Dateien mit 28 neuen und 18 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-18w20a</version> <version>1.4.0-18w20b</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-18w20a</version> <version>1.4.0-18w20b</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-18w20a</version> <version>1.4.0-18w20b</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(375, "18w20a")); register(v1_13 = new ProtocolVersion(376, "18w20b"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN")); register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
} }

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

@ -1,5 +1,7 @@
package us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2; package us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.chat.ComponentSerializer;
import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.entities.Entity1_13Types; import us.myles.ViaVersion.api.entities.Entity1_13Types;
@ -27,6 +29,12 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.type.Particle1_13T
public class ProtocolSnapshotTo1_12_2 extends Protocol { public class ProtocolSnapshotTo1_12_2 extends Protocol {
public static final Particle1_13Type PARTICLE_TYPE = new Particle1_13Type(); public static final Particle1_13Type PARTICLE_TYPE = new Particle1_13Type();
public static String legacyTextToJson(String legacyText) {
return ComponentSerializer.toString(
TextComponent.fromLegacyText(legacyText)
);
}
static { static {
MappingData.init(); MappingData.init();
} }
@ -313,8 +321,8 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
if (action == 0 || action == 2) { if (action == 0 || action == 2) {
wrapper.passthrough(Type.STRING); // Display Name wrapper.passthrough(Type.STRING); // Display Name
wrapper.read(Type.STRING); // Prefix !REMOVED! TODO alternative or drop? String prefix = wrapper.read(Type.STRING); // Prefix moved
wrapper.read(Type.STRING); // Suffix !REMOVED! String suffix = wrapper.read(Type.STRING); // Suffix moved
wrapper.passthrough(Type.BYTE); // Flags wrapper.passthrough(Type.BYTE); // Flags
@ -329,6 +337,8 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
else else
wrapper.write(Type.VAR_INT, (int) color); wrapper.write(Type.VAR_INT, (int) color);
wrapper.write(Type.STRING, legacyTextToJson(prefix)); // Prefix
wrapper.write(Type.STRING, legacyTextToJson(suffix)); // Suffix
} }
} }
}); });

8
common/src/main/resources/assets/viaversion/data/mapping-1.12.json
Datei anzeigen

@ -673,7 +673,7 @@
"1615": "minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=true,west=true]", "1615": "minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=true,west=true]",
"1616": "minecraft:iron_bars[east=false,north=false,south=false,waterlogged=false,west=false]", "1616": "minecraft:iron_bars[east=false,north=false,south=false,waterlogged=false,west=false]",
"1632": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", "1632": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"1648": "minecraft:melon_block", "1648": "minecraft:melon",
"1664": "minecraft:pumpkin_stem[age=0]", "1664": "minecraft:pumpkin_stem[age=0]",
"1665": "minecraft:pumpkin_stem[age=1]", "1665": "minecraft:pumpkin_stem[age=1]",
"1666": "minecraft:pumpkin_stem[age=2]", "1666": "minecraft:pumpkin_stem[age=2]",
@ -1852,7 +1852,7 @@
"1600": "minecraft:red_mushroom_block", "1600": "minecraft:red_mushroom_block",
"1616": "minecraft:iron_bars", "1616": "minecraft:iron_bars",
"1632": "minecraft:glass_pane", "1632": "minecraft:glass_pane",
"1648": "minecraft:melon_block", "1648": "minecraft:melon",
"1696": "minecraft:vine", "1696": "minecraft:vine",
"1712": "minecraft:oak_fence_gate", "1712": "minecraft:oak_fence_gate",
"1728": "minecraft:brick_stairs", "1728": "minecraft:brick_stairs",
@ -2210,7 +2210,7 @@
"5712": "minecraft:cookie", "5712": "minecraft:cookie",
"5728": "minecraft:filled_map", "5728": "minecraft:filled_map",
"5744": "minecraft:shears", "5744": "minecraft:shears",
"5760": "minecraft:melon", "5760": "minecraft:melon_slice",
"5776": "minecraft:pumpkin_seeds", "5776": "minecraft:pumpkin_seeds",
"5792": "minecraft:melon_seeds", "5792": "minecraft:melon_seeds",
"5808": "minecraft:beef", "5808": "minecraft:beef",
@ -2232,7 +2232,7 @@
"6064": "minecraft:brewing_stand", "6064": "minecraft:brewing_stand",
"6080": "minecraft:cauldron", "6080": "minecraft:cauldron",
"6096": "minecraft:ender_eye", "6096": "minecraft:ender_eye",
"6112": "minecraft:speckled_melon", "6112": "minecraft:glistering_melon_slice",
"6144": "minecraft:experience_bottle", "6144": "minecraft:experience_bottle",
"6160": "minecraft:fire_charge", "6160": "minecraft:fire_charge",
"6176": "minecraft:writable_book", "6176": "minecraft:writable_book",

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

@ -4153,7 +4153,7 @@
"4150": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=true,west=false]", "4150": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=true,west=false]",
"4151": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=true]", "4151": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=true]",
"4152": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", "4152": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"4153": "minecraft:melon_block", "4153": "minecraft:melon",
"4154": "minecraft:attached_pumpkin_stem[facing=north]", "4154": "minecraft:attached_pumpkin_stem[facing=north]",
"4155": "minecraft:attached_pumpkin_stem[facing=east]", "4155": "minecraft:attached_pumpkin_stem[facing=east]",
"4156": "minecraft:attached_pumpkin_stem[facing=south]", "4156": "minecraft:attached_pumpkin_stem[facing=south]",
@ -8616,7 +8616,7 @@
"199": "minecraft:mushroom_stem", "199": "minecraft:mushroom_stem",
"200": "minecraft:iron_bars", "200": "minecraft:iron_bars",
"201": "minecraft:glass_pane", "201": "minecraft:glass_pane",
"202": "minecraft:melon_block", "202": "minecraft:melon",
"203": "minecraft:vine", "203": "minecraft:vine",
"204": "minecraft:oak_fence_gate", "204": "minecraft:oak_fence_gate",
"205": "minecraft:spruce_fence_gate", "205": "minecraft:spruce_fence_gate",
@ -9013,7 +9013,7 @@
"596": "minecraft:cookie", "596": "minecraft:cookie",
"597": "minecraft:filled_map", "597": "minecraft:filled_map",
"598": "minecraft:shears", "598": "minecraft:shears",
"599": "minecraft:melon", "599": "minecraft:melon_slice",
"600": "minecraft:dried_kelp", "600": "minecraft:dried_kelp",
"601": "minecraft:pumpkin_seeds", "601": "minecraft:pumpkin_seeds",
"602": "minecraft:melon_seeds", "602": "minecraft:melon_seeds",
@ -9036,7 +9036,7 @@
"619": "minecraft:brewing_stand", "619": "minecraft:brewing_stand",
"620": "minecraft:cauldron", "620": "minecraft:cauldron",
"621": "minecraft:ender_eye", "621": "minecraft:ender_eye",
"622": "minecraft:speckled_melon", "622": "minecraft:glistering_melon_slice",
"623": "minecraft:bat_spawn_egg", "623": "minecraft:bat_spawn_egg",
"624": "minecraft:blaze_spawn_egg", "624": "minecraft:blaze_spawn_egg",
"625": "minecraft:cave_spider_spawn_egg", "625": "minecraft:cave_spider_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-18w20a</version> <version>1.4.0-18w20b</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-18w20a</version> <version>1.4.0-18w20b</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-18w20a</version> <version>1.4.0-18w20b</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-18w20a</version> <version>1.4.0-18w20b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>