Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-03 14:50:30 +01:00
Code Issues Releases Aktivität

Merge branch 'dev' of https://github.com/MylesIsCool/ViaVersion into dev2

Quellcode durchsuchen
Dieser Commit ist enthalten in:
creeper123123321 2018-06-04 17:36:27 -03:00
Commit 81f9f5ec60
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 0AC57D54786721D1
11 geänderte Dateien mit 8365 neuen und 8435 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>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>1.4.0-18w22c</version>
<version>1.4.0-1.13-pre1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bungee/pom.xml
Datei anzeigen

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

2
common/pom.xml
Datei anzeigen

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>1.4.0-18w22c</version>
<version>1.4.0-1.13-pre1</version>
</parent>
<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_1 = new ProtocolVersion(338, "1.12.1"));
register(v1_12_2 = new ProtocolVersion(340, "1.12.2"));
register(v1_13 = new ProtocolVersion(382, "18w22c"));
register(v1_13 = new ProtocolVersion(383, "1.13-pre1"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

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

@ -509,6 +509,8 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
newId += 1;
if (oldID >= 524)
newId += 8;
if (oldID >= 531)
newId += 1;
return newId;
}
}

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

@ -114,26 +114,26 @@
"281": "minecraft:spruce_log[axis=z]",
"282": "minecraft:birch_log[axis=z]",
"283": "minecraft:jungle_log[axis=z]",
"284": "minecraft:oak_bark[axis=y]",
"285": "minecraft:spruce_bark[axis=y]",
"286": "minecraft:birch_bark[axis=y]",
"287": "minecraft:jungle_bark[axis=y]",
"288": "minecraft:oak_leaves[distance=1,persistent=false]",
"289": "minecraft:spruce_leaves[distance=1,persistent=false]",
"290": "minecraft:birch_leaves[distance=1,persistent=false]",
"291": "minecraft:jungle_leaves[distance=1,persistent=false]",
"292": "minecraft:oak_leaves[distance=1,persistent=true]",
"293": "minecraft:spruce_leaves[distance=1,persistent=true]",
"294": "minecraft:birch_leaves[distance=1,persistent=true]",
"295": "minecraft:jungle_leaves[distance=1,persistent=true]",
"296": "minecraft:oak_leaves[distance=2,persistent=false]",
"297": "minecraft:spruce_leaves[distance=2,persistent=false]",
"298": "minecraft:birch_leaves[distance=2,persistent=false]",
"299": "minecraft:jungle_leaves[distance=2,persistent=false]",
"300": "minecraft:oak_leaves[distance=2,persistent=true]",
"301": "minecraft:spruce_leaves[distance=2,persistent=true]",
"302": "minecraft:birch_leaves[distance=2,persistent=true]",
"303": "minecraft:jungle_leaves[distance=2,persistent=true]",
"284": "minecraft:oak_bark",
"285": "minecraft:spruce_bark",
"286": "minecraft:birch_bark",
"287": "minecraft:jungle_bark",
"288": "minecraft:oak_leaves[check_decay=false,decayable=true]",
"289": "minecraft:spruce_leaves[check_decay=false,decayable=true]",
"290": "minecraft:birch_leaves[check_decay=false,decayable=true]",
"291": "minecraft:jungle_leaves[check_decay=false,decayable=true]",
"292": "minecraft:oak_leaves[check_decay=false,decayable=false]",
"293": "minecraft:spruce_leaves[check_decay=false,decayable=false]",
"294": "minecraft:birch_leaves[check_decay=false,decayable=false]",
"295": "minecraft:jungle_leaves[check_decay=false,decayable=false]",
"296": "minecraft:oak_leaves[check_decay=true,decayable=true]",
"297": "minecraft:spruce_leaves[check_decay=true,decayable=true]",
"298": "minecraft:birch_leaves[check_decay=true,decayable=true]",
"299": "minecraft:jungle_leaves[check_decay=true,decayable=true]",
"300": "minecraft:oak_leaves[check_decay=true,decayable=false]",
"301": "minecraft:spruce_leaves[check_decay=true,decayable=false]",
"302": "minecraft:birch_leaves[check_decay=true,decayable=false]",
"303": "minecraft:jungle_leaves[check_decay=true,decayable=false]",
"304": "minecraft:sponge",
"305": "minecraft:wet_sponge",
"320": "minecraft:glass",
@ -448,16 +448,16 @@
"1106": "minecraft:lever[face=wall,facing=west,powered=false]",
"1107": "minecraft:lever[face=wall,facing=south,powered=false]",
"1108": "minecraft:lever[face=wall,facing=north,powered=false]",
"1109": "minecraft:lever[face=floor,facing=west,powered=false]",
"1110": "minecraft:lever[face=floor,facing=north,powered=false]",
"1109": "minecraft:lever[face=floor,facing=north,powered=false]",
"1110": "minecraft:lever[face=floor,facing=west,powered=false]",
"1111": "minecraft:lever[face=ceiling,facing=north,powered=false]",
"1112": "minecraft:lever[face=ceiling,facing=west,powered=true]",
"1113": "minecraft:lever[face=wall,facing=east,powered=true]",
"1114": "minecraft:lever[face=wall,facing=west,powered=true]",
"1115": "minecraft:lever[face=wall,facing=south,powered=true]",
"1116": "minecraft:lever[face=wall,facing=north,powered=true]",
"1117": "minecraft:lever[face=floor,facing=east,powered=true]",
"1118": "minecraft:lever[face=floor,facing=north,powered=true]",
"1117": "minecraft:lever[face=floor,facing=north,powered=true]",
"1118": "minecraft:lever[face=floor,facing=west,powered=true]",
"1119": "minecraft:lever[face=ceiling,facing=north,powered=true]",
"1120": "minecraft:stone_pressure_plate[powered=false]",
"1121": "minecraft:stone_pressure_plate[powered=true]",
@ -690,22 +690,22 @@
"1685": "minecraft:melon_stem[age=5]",
"1686": "minecraft:melon_stem[age=6]",
"1687": "minecraft:melon_stem[age=7]",
"1696": "minecraft:vine[east=false,north=false,south=false,up=false,west=false]",
"1697": "minecraft:vine[east=false,north=false,south=true,up=false,west=false]",
"1698": "minecraft:vine[east=false,north=false,south=false,up=false,west=true]",
"1699": "minecraft:vine[east=false,north=false,south=true,up=false,west=true]",
"1700": "minecraft:vine[east=false,north=true,south=false,up=false,west=false]",
"1701": "minecraft:vine[east=false,north=true,south=true,up=false,west=false]",
"1702": "minecraft:vine[east=false,north=true,south=false,up=false,west=true]",
"1703": "minecraft:vine[east=false,north=true,south=true,up=false,west=true]",
"1704": "minecraft:vine[east=true,north=false,south=false,up=false,west=false]",
"1705": "minecraft:vine[east=true,north=false,south=true,up=false,west=false]",
"1706": "minecraft:vine[east=true,north=false,south=false,up=false,west=true]",
"1707": "minecraft:vine[east=true,north=false,south=true,up=false,west=true]",
"1708": "minecraft:vine[east=true,north=true,south=false,up=false,west=false]",
"1709": "minecraft:vine[east=true,north=true,south=true,up=false,west=false]",
"1710": "minecraft:vine[east=true,north=true,south=false,up=false,west=true]",
"1711": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"1696": "minecraft:vine[east=false,north=false,south=false,up=true,west=false]",
"1697": "minecraft:vine[east=false,north=false,south=true,up=true,west=false]",
"1698": "minecraft:vine[east=false,north=false,south=false,up=true,west=true]",
"1699": "minecraft:vine[east=false,north=false,south=true,up=true,west=true]",
"1700": "minecraft:vine[east=false,north=true,south=false,up=true,west=false]",
"1701": "minecraft:vine[east=false,north=true,south=true,up=true,west=false]",
"1702": "minecraft:vine[east=false,north=true,south=false,up=true,west=true]",
"1703": "minecraft:vine[east=false,north=true,south=true,up=true,west=true]",
"1704": "minecraft:vine[east=true,north=false,south=false,up=true,west=false]",
"1705": "minecraft:vine[east=true,north=false,south=true,up=true,west=false]",
"1706": "minecraft:vine[east=true,north=false,south=false,up=true,west=true]",
"1707": "minecraft:vine[east=true,north=false,south=true,up=true,west=true]",
"1708": "minecraft:vine[east=true,north=true,south=false,up=true,west=false]",
"1709": "minecraft:vine[east=true,north=true,south=true,up=true,west=false]",
"1710": "minecraft:vine[east=true,north=true,south=false,up=true,west=true]",
"1711": "minecraft:vine[east=true,north=true,south=true,up=true,west=true]",
"1712": "minecraft:oak_fence_gate[facing=south,in_wall=false,open=false,powered=false]",
"1713": "minecraft:oak_fence_gate[facing=west,in_wall=false,open=false,powered=false]",
"1714": "minecraft:oak_fence_gate[facing=north,in_wall=false,open=false,powered=false]",
@ -1127,22 +1127,22 @@
"2573": "minecraft:green_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"2574": "minecraft:red_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"2575": "minecraft:black_stained_glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]",
"2576": "minecraft:acacia_leaves[distance=1,persistent=false]",
"2577": "minecraft:dark_oak_leaves[distance=1,persistent=false]",
"2580": "minecraft:acacia_leaves[distance=1,persistent=true]",
"2581": "minecraft:dark_oak_leaves[distance=1,persistent=true]",
"2584": "minecraft:acacia_leaves[distance=2,persistent=false]",
"2585": "minecraft:dark_oak_leaves[distance=2,persistent=false]",
"2588": "minecraft:acacia_leaves[distance=2,persistent=true]",
"2589": "minecraft:dark_oak_leaves[distance=2,persistent=true]",
"2576": "minecraft:acacia_leaves[check_decay=false,decayable=true]",
"2577": "minecraft:dark_oak_leaves[check_decay=false,decayable=true]",
"2580": "minecraft:acacia_leaves[check_decay=false,decayable=false]",
"2581": "minecraft:dark_oak_leaves[check_decay=false,decayable=false]",
"2584": "minecraft:acacia_leaves[check_decay=true,decayable=true]",
"2585": "minecraft:dark_oak_leaves[check_decay=true,decayable=true]",
"2588": "minecraft:acacia_leaves[check_decay=true,decayable=false]",
"2589": "minecraft:dark_oak_leaves[check_decay=true,decayable=false]",
"2592": "minecraft:acacia_log[axis=y]",
"2593": "minecraft:dark_oak_log[axis=y]",
"2596": "minecraft:acacia_log[axis=x]",
"2597": "minecraft:dark_oak_log[axis=x]",
"2600": "minecraft:acacia_log[axis=z]",
"2601": "minecraft:dark_oak_log[axis=z]",
"2604": "minecraft:acacia_bark[axis=y]",
"2605": "minecraft:dark_oak_bark[axis=y]",
"2604": "minecraft:acacia_bark",
"2605": "minecraft:dark_oak_bark",
"2608": "minecraft:acacia_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]",
"2609": "minecraft:acacia_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]",
"2610": "minecraft:acacia_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]",

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

Datei-Diff unterdrückt, da er zu groß ist Diff laden

2
jar/pom.xml
Datei anzeigen

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

2
pom.xml
Datei anzeigen

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

2
sponge-legacy/pom.xml
Datei anzeigen

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

2
sponge/pom.xml
Datei anzeigen

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