Skip to content

Commit

Permalink
Merge pull request #40 from Exceptionflug/1.16
Browse files Browse the repository at this point in the history 
1.16
  • Loading branch information
@Exceptionflug
Exceptionflug authored Jun 24, 2020
2 parents 91c8527 + 3a4e301 commit b7df617
Show file tree
Hide file tree
Showing 32 changed files with 6,948 additions and 407 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ This is the full portfolio of protocolize dependencies:
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-api</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-items</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-inventory</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-world</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>de.exceptionflug</groupId>
<artifactId>protocolize</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -54,14 +54,14 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-proxy</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion protocolize-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<parent>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<groupId>de.exceptionflug</groupId>
Expand Down
4 changes: 3 additions & 1 deletion protocolize-api/src/main/java/de/exceptionflug/protocolize/api/util/ProtocolVersions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ public final class ProtocolVersions {
public final static int MINECRAFT_1_15 = 573;
public final static int MINECRAFT_1_15_1 = 575;
public final static int MINECRAFT_1_15_2 = 578;
public final static int MINECRAFT_1_16 = 735;
public final static int MINECRAFT_1_16_1 = 736;


public final static int MINECRAFT_LATEST = MINECRAFT_1_15_2;
public final static int MINECRAFT_LATEST = MINECRAFT_1_16_1;

private ProtocolVersions() {}

Expand Down
8 changes: 4 additions & 4 deletions protocolize-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<groupId>de.exceptionflug</groupId>
Expand All @@ -18,19 +18,19 @@
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-api</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-items</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-inventory</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions protocolize-inventory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
<parent>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-inventory</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-api</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions ...ze-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ClickWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public class ClickWindow extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x09);
MAPPING.put(MINECRAFT_1_15_1, 0x09);
MAPPING.put(MINECRAFT_1_15_2, 0x09);
MAPPING.put(MINECRAFT_1_16, 0x09);
MAPPING.put(MINECRAFT_1_16_1, 0x09);
}

private int windowId, actionNumber;
Expand Down
4 changes: 4 additions & 0 deletions ...ze-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/CloseWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class CloseWindow extends AbstractPacket {
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x14);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_1, 0x14);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_2, 0x14);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_16, 0x13);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_16_1, 0x13);

MAPPING_SERVERBOUND.put(MINECRAFT_1_8, 0x0D);
MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x08);
Expand All @@ -61,6 +63,8 @@ public class CloseWindow extends AbstractPacket {
MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x0A);
MAPPING_SERVERBOUND.put(MINECRAFT_1_15_1, 0x0A);
MAPPING_SERVERBOUND.put(MINECRAFT_1_15_2, 0x0A);
MAPPING_SERVERBOUND.put(MINECRAFT_1_16, 0x0A);
MAPPING_SERVERBOUND.put(MINECRAFT_1_16_1, 0x0A);
}

private int windowId;
Expand Down
3 changes: 3 additions & 0 deletions ...ntory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ConfirmTransaction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public class ConfirmTransaction extends AbstractPacket {
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x13);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_1, 0x13);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_2, 0x13);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_16, 0x12);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_16_1, 0x12);

MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x05);
MAPPING_SERVERBOUND.put(MINECRAFT_1_9_1, 0x05);
Expand All @@ -61,6 +63,7 @@ public class ConfirmTransaction extends AbstractPacket {
MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x07);
MAPPING_SERVERBOUND.put(MINECRAFT_1_15_1, 0x07);
MAPPING_SERVERBOUND.put(MINECRAFT_1_15_2, 0x07);
MAPPING_SERVERBOUND.put(MINECRAFT_1_16_1, 0x07);
}

private int windowId;
Expand Down
2 changes: 2 additions & 0 deletions ...ize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/OpenWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class OpenWindow extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x2F);
MAPPING.put(MINECRAFT_1_15_1, 0x2F);
MAPPING.put(MINECRAFT_1_15_2, 0x2F);
MAPPING.put(MINECRAFT_1_16, 0x2E);
MAPPING.put(MINECRAFT_1_16_1, 0x2E);
}

private int windowId;
Expand Down
2 changes: 2 additions & 0 deletions ...inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/WindowProperty.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class WindowProperty extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x16);
MAPPING.put(MINECRAFT_1_15_1, 0x16);
MAPPING.put(MINECRAFT_1_15_2, 0x16);
MAPPING.put(MINECRAFT_1_16, 0x15);
MAPPING.put(MINECRAFT_1_16_1, 0x15);
}

private int windowId;
Expand Down
6 changes: 3 additions & 3 deletions protocolize-items/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<plugin>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-protogen-plugin</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -33,12 +33,12 @@
<parent>
<groupId>de.exceptionflug</groupId>
<artifactId>protocolize</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<groupId>de.exceptionflug</groupId>
<artifactId>protocolize-items</artifactId>
<version>1.5.5-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions ...ocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/BlockPlacement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public class BlockPlacement extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x2C);
MAPPING.put(MINECRAFT_1_15_1, 0x2C);
MAPPING.put(MINECRAFT_1_15_2, 0x2C);
MAPPING.put(MINECRAFT_1_16, 0x2D);
MAPPING.put(MINECRAFT_1_16_1, 0x2D);
}

private BlockPosition position;
Expand Down
3 changes: 3 additions & 0 deletions ...ocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/HeldItemChange.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class HeldItemChange extends AbstractPacket {
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x40);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_1, 0x40);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_2, 0x40);
MAPPING_CLIENTBOUND.put(MINECRAFT_1_16, 0x3F);

MAPPING_SERVERBOUND.put(MINECRAFT_1_8, 0x09);
MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x17);
Expand All @@ -61,6 +62,8 @@ public class HeldItemChange extends AbstractPacket {
MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x23);
MAPPING_SERVERBOUND.put(MINECRAFT_1_15_1, 0x23);
MAPPING_SERVERBOUND.put(MINECRAFT_1_15_2, 0x23);
MAPPING_SERVERBOUND.put(MINECRAFT_1_16, 0x24);
MAPPING_SERVERBOUND.put(MINECRAFT_1_16_1, 0x24);
}

private short newSlot;
Expand Down
2 changes: 2 additions & 0 deletions protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/SetSlot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public class SetSlot extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x17);
MAPPING.put(MINECRAFT_1_15_1, 0x17);
MAPPING.put(MINECRAFT_1_15_2, 0x17);
MAPPING.put(MINECRAFT_1_16, 0x16);
MAPPING.put(MINECRAFT_1_16_1, 0x16);
}

private byte windowId;
Expand Down
2 changes: 2 additions & 0 deletions protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/UseItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class UseItem extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x2D);
MAPPING.put(MINECRAFT_1_15_1, 0x2D);
MAPPING.put(MINECRAFT_1_15_2, 0x2D);
MAPPING.put(MINECRAFT_1_16, 0x2E);
MAPPING.put(MINECRAFT_1_16_1, 0x2E);
}

private Hand hand;
Expand Down
2 changes: 2 additions & 0 deletions protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/WindowItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public class WindowItems extends AbstractPacket {
MAPPING.put(MINECRAFT_1_15, 0x15);
MAPPING.put(MINECRAFT_1_15_1, 0x15);
MAPPING.put(MINECRAFT_1_15_2, 0x15);
MAPPING.put(MINECRAFT_1_16, 0x14);
MAPPING.put(MINECRAFT_1_16_1, 0x14);
}

public WindowItems(final short windowId, final List<ItemStack> items) {
Expand Down
Loading

0 comments on commit b7df617

Please sign in to comment.