Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-07-03 11:35:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #101 from creeper123123321/1.14

Browse Source 
merge dev and add -19w11b suffix
This commit is contained in:
Mats 2019-03-16 22:18:40 +01:00 committed by GitHub
commit b6e1e7e35b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all/pom.xml
View File

@ -15,7 +15,7 @@
<parent> <parent>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
bukkit/pom.xml
View File

@ -15,7 +15,7 @@
<parent> <parent>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
bungee/pom.xml
View File

@ -15,7 +15,7 @@
<parent> <parent>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
core/pom.xml
View File

@ -15,7 +15,7 @@
<parent> <parent>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

52
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java
View File

@ -7,32 +7,32 @@ public class PaintingMapping {
private static Map<Integer, String> paintings = new HashMap<>(); private static Map<Integer, String> paintings = new HashMap<>();
public static void init() { public static void init() {
add("kebab"); add("Kebab");
add("aztec"); add("Aztec");
add("alban"); add("Alban");
add("aztec2"); add("Aztec2");
add("bomb"); add("Bomb");
add("plant"); add("Plant");
add("wasteland"); add("Wasteland");
add("pool"); add("Pool");
add("courbet"); add("Courbet");
add("sea"); add("Sea");
add("sunset"); add("Sunset");
add("creebet"); add("Creebet");
add("wanderer"); add("Wanderer");
add("graham"); add("Graham");
add("match"); add("Match");
add("bust"); add("Bust");
add("stage"); add("Stage");
add("void"); add("Void");
add("skullandroses"); add("SkullAndRoses");
add("wither"); add("Wither");
add("fighters"); add("Fighters");
add("pointer"); add("Pointer");
add("pigscene"); add("Pigscene");
add("burningskull"); add("BurningSkull");
add("skeleton"); add("Skeleton");
add("donkeykong"); add("DonkeyKong");
} }
private static void add(String motive) { private static void add(String motive) {

8
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
View File

@ -352,7 +352,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
protocol.registerOutgoing(State.PLAY, 0x0A, 0x0A, new PacketRemapper() { protocol.registerOutgoing(State.PLAY, 0x0A, 0x0A, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.POSITION, Type.POSITION1_14); // Location map(Type.POSITION1_14, Type.POSITION); // Location
map(Type.UNSIGNED_BYTE); // Action id map(Type.UNSIGNED_BYTE); // Action id
map(Type.UNSIGNED_BYTE); // Action param map(Type.UNSIGNED_BYTE); // Action param
map(Type.VAR_INT); // Block id - /!\ NOT BLOCK STATE map(Type.VAR_INT); // Block id - /!\ NOT BLOCK STATE
@ -369,7 +369,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
protocol.registerOutgoing(State.PLAY, 0xB, 0xB, new PacketRemapper() { protocol.registerOutgoing(State.PLAY, 0xB, 0xB, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.POSITION, Type.POSITION1_14); map(Type.POSITION1_14, Type.POSITION);
map(Type.VAR_INT); map(Type.VAR_INT);
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
@ -435,7 +435,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.INT); // Effect Id map(Type.INT); // Effect Id
map(Type.POSITION, Type.POSITION1_14); // Location map(Type.POSITION1_14, Type.POSITION); // Location
map(Type.INT); // Data map(Type.INT); // Data
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
@ -514,7 +514,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() { protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.POSITION, Type.POSITION1_14); map(Type.POSITION1_14, Type.POSITION);
} }
}); });
} }

2
pom.xml
View File

@ -16,7 +16,7 @@
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>Allow newer clients to join older server versions.</description> <description>Allow newer clients to join older server versions.</description>

2
sponge/pom.xml
View File

@ -15,7 +15,7 @@
<parent> <parent>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
velocity/pom.xml
View File

@ -15,7 +15,7 @@
<parent> <parent>
<artifactId>viabackwards-parent</artifactId> <artifactId>viabackwards-parent</artifactId>
<groupId>nl.matsv</groupId> <groupId>nl.matsv</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-19w11b</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>