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

Merge pull request #979 from ForceUpdate1/dev

Quellcode durchsuchen 
update to 1.13.1-pre1
Dieser Commit ist enthalten in:
Myles 2018-08-16 22:18:25 +01:00 committet von GitHub
Commit acf5fc1ee4
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
14 geänderte Dateien mit 38 neuen und 35 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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java
Datei anzeigen

@ -19,7 +19,7 @@ import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.Protocol1_9_3TO1_9_1_2; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.Protocol1_9_3TO1_9_1_2;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
import us.myles.ViaVersion.protocols.protocol1_9to1_9_1.Protocol1_9TO1_9_1; import us.myles.ViaVersion.protocols.protocol1_9to1_9_1.Protocol1_9TO1_9_1;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.Protocol18w32aTO1_13; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.Protocol13_1_PRE1TO1_13;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -57,7 +57,7 @@ public class ProtocolRegistry {
// 1.13 support in development! (: // 1.13 support in development! (:
registerProtocol(new Protocol1_13To1_12_2(), Collections.singletonList(ProtocolVersion.v1_13.getId()), ProtocolVersion.v1_12_2.getId()); registerProtocol(new Protocol1_13To1_12_2(), Collections.singletonList(ProtocolVersion.v1_13.getId()), ProtocolVersion.v1_12_2.getId());
registerProtocol(new Protocol18w32aTO1_13(), Arrays.asList(ProtocolVersion.v18w32a.getId()), ProtocolVersion.v1_13.getId()); registerProtocol(new Protocol13_1_PRE1TO1_13(), Arrays.asList(ProtocolVersion.v1_13_1_pre1.getId()), ProtocolVersion.v1_13.getId());
} }
/** /**

4
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
Datei anzeigen

@ -34,7 +34,7 @@ public class ProtocolVersion {
public static final ProtocolVersion v1_12_2; public static final ProtocolVersion v1_12_2;
// v1_13 as name for better ViaBackwards compatibility. // v1_13 as name for better ViaBackwards compatibility.
public static final ProtocolVersion v1_13; public static final ProtocolVersion v1_13;
public static final ProtocolVersion v18w32a; public static final ProtocolVersion v1_13_1_pre1;
public static final ProtocolVersion unknown; public static final ProtocolVersion unknown;
private final int id; private final int id;
@ -64,7 +64,7 @@ public class ProtocolVersion {
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(393, "1.13")); register(v1_13 = new ProtocolVersion(393, "1.13"));
register(v18w32a = new ProtocolVersion(397, "18w32a")); register(v1_13_1_pre1 = new ProtocolVersion(399, "1.13.1-pre1"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN")); register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
} }

8
common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/MetadataRewriter.java → common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/MetadataRewriter.java
Datei anzeigen

@ -1,4 +1,4 @@
package us.myles.ViaVersion.protocols.protocol18w32ato1_13; package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13;
import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.data.UserConnection;
@ -7,7 +7,7 @@ import us.myles.ViaVersion.api.entities.Entity1_13Types.EntityType;
import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.item.Item;
import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13; import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.InventoryPackets; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.InventoryPackets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -23,13 +23,13 @@ public class MetadataRewriter {
} else if (metadata.getMetaType() == MetaType1_13.BlockID) { } else if (metadata.getMetaType() == MetaType1_13.BlockID) {
// Convert to new block id // Convert to new block id
int data = (int) metadata.getValue(); int data = (int) metadata.getValue();
metadata.setValue(Protocol18w32aTO1_13.getNewBlockStateId(data)); metadata.setValue(Protocol13_1_PRE1TO1_13.getNewBlockStateId(data));
} }
if (type == null) continue; if (type == null) continue;
if (type.isOrHasParent(Entity1_13Types.EntityType.MINECART_ABSTRACT) && metadata.getId() == 9) { if (type.isOrHasParent(Entity1_13Types.EntityType.MINECART_ABSTRACT) && metadata.getId() == 9) {
// New block format // New block format
int data = (int) metadata.getValue(); int data = (int) metadata.getValue();
metadata.setValue(Protocol18w32aTO1_13.getNewBlockStateId(data)); metadata.setValue(Protocol13_1_PRE1TO1_13.getNewBlockStateId(data));
} }
if(type.is(EntityType.ITEM)){ if(type.is(EntityType.ITEM)){

17
common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/Protocol18w32aTO1_13.java → common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/Protocol13_1_PRE1TO1_13.java
Datei anzeigen

@ -1,4 +1,4 @@
package us.myles.ViaVersion.protocols.protocol18w32ato1_13; package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13;
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;
@ -8,13 +8,13 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.PacketRemapper;
import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.packets.State;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.EntityPackets; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.EntityPackets;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.InventoryPackets; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.InventoryPackets;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.WorldPackets; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.WorldPackets;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.EntityTracker; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.EntityTracker;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
public class Protocol18w32aTO1_13 extends Protocol { public class Protocol13_1_PRE1TO1_13 extends Protocol {
@Override @Override
protected void registerPackets() { protected void registerPackets() {
@ -123,13 +123,16 @@ public class Protocol18w32aTO1_13 extends Protocol {
} }
}); });
//Tags
registerOutgoing(State.PLAY, 0x55, 0x55, new PacketRemapper() { registerOutgoing(State.PLAY, 0x55, 0x55, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
int blockTagsSize = wrapper.read(Type.VAR_INT); // block tags int blockTagsSize = wrapper.passthrough(Type.VAR_INT); // block tags
for (int i = 0; i < blockTagsSize; i++) { for (int i = 0; i < blockTagsSize; i++) {
wrapper.passthrough(Type.STRING); wrapper.passthrough(Type.STRING);
Integer[] blocks = wrapper.passthrough(Type.VAR_INT_ARRAY); Integer[] blocks = wrapper.passthrough(Type.VAR_INT_ARRAY);
@ -137,7 +140,7 @@ public class Protocol18w32aTO1_13 extends Protocol {
blocks[j] = getNewBlockId(blocks[j]); blocks[j] = getNewBlockId(blocks[j]);
} }
} }
int itemTagsSize = wrapper.read(Type.VAR_INT); // item tags int itemTagsSize = wrapper.passthrough(Type.VAR_INT); // item tags
for (int i = 0; i < itemTagsSize; i++) { for (int i = 0; i < itemTagsSize; i++) {
wrapper.passthrough(Type.STRING); wrapper.passthrough(Type.STRING);
Integer[] items = wrapper.passthrough(Type.VAR_INT_ARRAY); Integer[] items = wrapper.passthrough(Type.VAR_INT_ARRAY);

8
common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/EntityPackets.java → common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/EntityPackets.java
Datei anzeigen

@ -1,4 +1,4 @@
package us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets; package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.PacketWrapper;
@ -10,9 +10,9 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.api.type.types.version.Types1_13; import us.myles.ViaVersion.api.type.types.version.Types1_13;
import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.packets.State;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.MetadataRewriter; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.MetadataRewriter;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.EntityTracker; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.EntityTracker;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.Protocol18w32aTO1_13; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.Protocol13_1_PRE1TO1_13;
public class EntityPackets { public class EntityPackets {
@ -43,7 +43,7 @@ public class EntityPackets {
if (entType != null) { if (entType != null) {
if (entType.is(Entity1_13Types.EntityType.FALLING_BLOCK)) { if (entType.is(Entity1_13Types.EntityType.FALLING_BLOCK)) {
int data = wrapper.get(Type.INT, 0); int data = wrapper.get(Type.INT, 0);
wrapper.set(Type.INT, 0, Protocol18w32aTO1_13.getNewBlockStateId(data)); wrapper.set(Type.INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockStateId(data));
} }
} }
// Register Type ID // Register Type ID

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/InventoryPackets.java → common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/InventoryPackets.java
Datei anzeigen

@ -1,4 +1,4 @@
package us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets; package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets;
import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.item.Item;

16
common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/WorldPackets.java → common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/WorldPackets.java
Datei anzeigen

@ -1,4 +1,4 @@
package us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets; package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets;
import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; import us.myles.ViaVersion.api.minecraft.BlockChangeRecord;
@ -9,7 +9,7 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.PacketRemapper;
import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.packets.State;
import us.myles.ViaVersion.protocols.protocol18w32ato1_13.Protocol18w32aTO1_13; import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.Protocol13_1_PRE1TO1_13;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
@ -31,7 +31,7 @@ public class WorldPackets {
for (int i = 0; i < section.getPalette().size(); i++) { for (int i = 0; i < section.getPalette().size(); i++) {
section.getPalette().set( section.getPalette().set(
i, i,
Protocol18w32aTO1_13.getNewBlockStateId(section.getPalette().get(i)) Protocol13_1_PRE1TO1_13.getNewBlockStateId(section.getPalette().get(i))
); );
} }
} }
@ -53,7 +53,7 @@ public class WorldPackets {
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
wrapper.set(Type.VAR_INT, 0, Protocol18w32aTO1_13.getNewBlockId(wrapper.get(Type.VAR_INT, 0))); wrapper.set(Type.VAR_INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockId(wrapper.get(Type.VAR_INT, 0)));
} }
}); });
} }
@ -70,7 +70,7 @@ public class WorldPackets {
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
int id = wrapper.get(Type.VAR_INT, 0); int id = wrapper.get(Type.VAR_INT, 0);
wrapper.set(Type.VAR_INT, 0, Protocol18w32aTO1_13.getNewBlockStateId(id)); wrapper.set(Type.VAR_INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockStateId(id));
} }
}); });
} }
@ -89,7 +89,7 @@ public class WorldPackets {
// Convert ids // Convert ids
for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) { for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
int id = record.getBlockId(); int id = record.getBlockId();
record.setBlockId(Protocol18w32aTO1_13.getNewBlockStateId(id)); record.setBlockId(Protocol13_1_PRE1TO1_13.getNewBlockStateId(id));
} }
} }
}); });
@ -111,7 +111,7 @@ public class WorldPackets {
if (id == 1010) { // Play record if (id == 1010) { // Play record
wrapper.set(Type.INT, 1, data = InventoryPackets.getNewItemId(data)); wrapper.set(Type.INT, 1, data = InventoryPackets.getNewItemId(data));
} else if (id == 2001) { // Block break + block break sound } else if (id == 2001) { // Block break + block break sound
wrapper.set(Type.INT, 1, data = Protocol18w32aTO1_13.getNewBlockStateId(data)); wrapper.set(Type.INT, 1, data = Protocol13_1_PRE1TO1_13.getNewBlockStateId(data));
} }
} }
}); });
@ -174,7 +174,7 @@ public class WorldPackets {
int id = wrapper.get(Type.INT, 0); int id = wrapper.get(Type.INT, 0);
if(id == 3 || id == 20){ if(id == 3 || id == 20){
int data = wrapper.passthrough(Type.VAR_INT); int data = wrapper.passthrough(Type.VAR_INT);
wrapper.set(Type.VAR_INT, 0, Protocol18w32aTO1_13.getNewBlockStateId(data)); wrapper.set(Type.VAR_INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockStateId(data));
} }
} }
}); });

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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</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.2-18w32a</version> <version>1.4.2-1.13.1-pre1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>