Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-22 18:15:39 +01:00
Code Issues Projects Releases Wiki Activity

1.13-pre2 + merge master

Browse Source
This commit is contained in:
creeper123123321 2018-06-17 10:17:33 -03:00
parent cb4fcde6f4
commit e26b6d08e1
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
15 changed files with 9529 additions and 9481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/pom.xml
View File

@ -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-1.13-pre1</version> <version>1.4.0-1.13-pre2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
bungee/pom.xml
View File

@ -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-1.13-pre1</version> <version>1.4.0-1.13-pre2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
common/pom.xml
View File

@ -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-1.13-pre1</version> <version>1.4.0-1.13-pre2</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
View File

@ -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(383, "1.13-pre1")); register(v1_13 = new ProtocolVersion(384, "1.13-pre2"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN")); register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
} }

2
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java
View File

@ -23,7 +23,7 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.Painting
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage;
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.EntityTracker; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.EntityTracker;
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.TabCompleteTracker; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.TabCompleteTracker;
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.type.Particle1_13Type; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.types.Particle1_13Type;
import java.util.Map; import java.util.Map;

2
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/WorldPackets.java
View File

@ -22,7 +22,7 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.data.ParticleRewri
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.BlockEntityProvider; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.BlockEntityProvider;
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.PaintingProvider; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.PaintingProvider;
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage;
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.type.Chunk1_13Type; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.types.Chunk1_13Type;
public class WorldPackets { public class WorldPackets {
public static void register(Protocol protocol) { public static void register(Protocol protocol) {

8
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/BannerHandler.java
View File

@ -8,11 +8,11 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.BlockEnt
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage;
public class BannerHandler implements BlockEntityProvider.BlockEntityHandler { public class BannerHandler implements BlockEntityProvider.BlockEntityHandler {
private final int WALL_BANNER_START = 7092; // 4 each private final int WALL_BANNER_START = 7110; // 4 each
private final int WALL_BANNER_STOP = 7155; private final int WALL_BANNER_STOP = 7173;
private final int BANNER_START = 6836; // 16 each private final int BANNER_START = 6854; // 16 each
private final int BANNER_STOP = 7091; private final int BANNER_STOP = 7109;
@Override @Override
public int transform(UserConnection user, CompoundTag tag) { public int transform(UserConnection user, CompoundTag tag) {

2
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/BedHandler.java
View File

@ -20,7 +20,7 @@ public class BedHandler implements BlockEntityProvider.BlockEntityHandler {
} }
// RED_BED + FIRST_BED // RED_BED + FIRST_BED
int blockId = storage.get(position).getOriginal() - 954 + 730; int blockId = storage.get(position).getOriginal() - 972 + 748;
int color = (int) tag.get("color").getValue(); int color = (int) tag.get("color").getValue();
blockId += (color * 16); blockId += (color * 16);

44
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/FlowerPotHandler.java
View File

@ -12,28 +12,28 @@ public class FlowerPotHandler implements BlockEntityProvider.BlockEntityHandler
private static final Map<Pair<String, Integer>, Integer> flowers = new ConcurrentHashMap<>(); private static final Map<Pair<String, Integer>, Integer> flowers = new ConcurrentHashMap<>();
static { static {
register("minecraft:air", 0, 5247); register("minecraft:air", 0, 5266);
register("minecraft:sapling", 0, 5248); register("minecraft:sapling", 0, 5267);
register("minecraft:sapling", 1, 5249); register("minecraft:sapling", 1, 5268);
register("minecraft:sapling", 2, 5250); register("minecraft:sapling", 2, 5269);
register("minecraft:sapling", 3, 5251); register("minecraft:sapling", 3, 5270);
register("minecraft:sapling", 4, 5252); register("minecraft:sapling", 4, 5271);
register("minecraft:sapling", 5, 5253); register("minecraft:sapling", 5, 5272);
register("minecraft:tallgrass", 2, 5254); register("minecraft:tallgrass", 2, 5273);
register("minecraft:yellow_flower", 0, 5255); register("minecraft:yellow_flower", 0, 5274);
register("minecraft:red_flower", 0, 5256); register("minecraft:red_flower", 0, 5275);
register("minecraft:red_flower", 1, 5257); register("minecraft:red_flower", 1, 5276);
register("minecraft:red_flower", 2, 5258); register("minecraft:red_flower", 2, 5277);
register("minecraft:red_flower", 3, 5259); register("minecraft:red_flower", 3, 5278);
register("minecraft:red_flower", 4, 5260); register("minecraft:red_flower", 4, 5279);
register("minecraft:red_flower", 5, 5261); register("minecraft:red_flower", 5, 5280);
register("minecraft:red_flower", 6, 5262); register("minecraft:red_flower", 6, 5281);
register("minecraft:red_flower", 7, 5263); register("minecraft:red_flower", 7, 5282);
register("minecraft:red_flower", 8, 5264); register("minecraft:red_flower", 8, 5283);
register("minecraft:red_mushroom", 0, 5265); register("minecraft:red_mushroom", 0, 5284);
register("minecraft:brown_mushroom", 0, 5266); register("minecraft:brown_mushroom", 0, 5285);
register("minecraft:deadbush", 0, 5267); register("minecraft:deadbush", 0, 5286);
register("minecraft:cactus", 0, 5268); register("minecraft:cactus", 0, 5287);
} }

4
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/SkullHandler.java
View File

@ -8,8 +8,8 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.BlockEnt
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage;
public class SkullHandler implements BlockEntityProvider.BlockEntityHandler { public class SkullHandler implements BlockEntityProvider.BlockEntityHandler {
private final int SKULL_WALL_START = 5429; private final int SKULL_WALL_START = 5447;
private final int SKULL_END = 5548; private final int SKULL_END = 5566;
@Override @Override
public int transform(UserConnection user, CompoundTag tag) { public int transform(UserConnection user, CompoundTag tag) {
BlockStorage storage = user.get(BlockStorage.class); BlockStorage storage = user.get(BlockStorage.class);

18932
common/src/main/resources/assets/viaversion/data/mapping-1.13.json
View File

File diff suppressed because it is too large Load Diff

2
jar/pom.xml
View File

@ -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-1.13-pre1</version> <version>1.4.0-1.13-pre2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>viaversion-jar</name> <name>viaversion-jar</name>

2
pom.xml
View File

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

2
sponge-legacy/pom.xml
View File

@ -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-1.13-pre1</version> <version>1.4.0-1.13-pre2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
sponge/pom.xml
View File

@ -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-1.13-pre1</version> <version>1.4.0-1.13-pre2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>