Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-11-19 14:30:16 +01:00
1.16.2-pre3 (almost)
The Nether does not have its custom fog, no idea why yet
Dieser Commit ist enthalten in:
KennyTV
Ursprung
ea0f91136e
Commit
f6fec5b93b
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -84,7 +84,7 @@ public class ProtocolVersion {
|
||||
register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
|
||||
register(v1_16 = new ProtocolVersion(735, "1.16"));
|
||||
register(v1_16_1 = new ProtocolVersion(736, "1.16.1"));
|
||||
register(v1_16_2 = new ProtocolVersion(746, "1.16.2"));
|
||||
register(v1_16_2 = new ProtocolVersion(748, "1.16.2"));
|
||||
|
||||
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
|
||||
}
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
package us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.data;
|
||||
|
||||
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
|
||||
import com.github.steveice10.opennbt.tag.builtin.ListTag;
|
||||
import com.github.steveice10.opennbt.tag.builtin.StringTag;
|
||||
import com.github.steveice10.opennbt.tag.builtin.Tag;
|
||||
import com.google.gson.JsonObject;
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.data.MappingDataLoader;
|
||||
@ -9,9 +12,12 @@ import us.myles.ViaVersion.api.minecraft.nbt.BinaryTagIO;
|
||||
import us.myles.ViaVersion.util.Int2IntBiMap;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class MappingData {
|
||||
public static CompoundTag dimensionRegistry;
|
||||
public static Map<String, CompoundTag> dimensionDataMap = new HashMap<>();
|
||||
public static Int2IntBiMap oldToNewItems = new Int2IntBiMap();
|
||||
public static Mappings blockMappings;
|
||||
public static Mappings blockStateMappings;
|
||||
@ -35,5 +41,14 @@ public class MappingData {
|
||||
blockMappings = new Mappings(mapping1_16.getAsJsonObject("blocks"), mapping1_16_2.getAsJsonObject("blocks"));
|
||||
MappingDataLoader.mapIdentifiers(oldToNewItems, mapping1_16.getAsJsonObject("items"), mapping1_16_2.getAsJsonObject("items"));
|
||||
soundMappings = new Mappings(mapping1_16.getAsJsonArray("sounds"), mapping1_16_2.getAsJsonArray("sounds"));
|
||||
|
||||
// Data of each dimension
|
||||
ListTag dimensions = ((CompoundTag) dimensionRegistry.get("minecraft:dimension_type")).get("value");
|
||||
for (Tag dimension : dimensions) {
|
||||
CompoundTag dimensionCompound = (CompoundTag) dimension;
|
||||
// Copy with an empty name
|
||||
CompoundTag dimensionData = new CompoundTag("", ((CompoundTag) dimensionCompound.get("element")).getValue());
|
||||
dimensionDataMap.put(((StringTag) dimensionCompound.get("name")).getValue(), dimensionData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
package us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.packets;
|
||||
|
||||
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.entities.Entity1_16_2Types;
|
||||
import us.myles.ViaVersion.api.remapper.PacketRemapper;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
@ -40,8 +42,11 @@ public class EntityPackets {
|
||||
// Throw away the old dimension registry, extra conversion would be too hard of a hit
|
||||
wrapper.read(Type.NBT);
|
||||
wrapper.write(Type.NBT, MappingData.dimensionRegistry);
|
||||
|
||||
// Instead of the dimension's resource key, it now just wants the data directly
|
||||
String dimensionType = wrapper.read(Type.STRING);
|
||||
wrapper.write(Type.NBT, getDimensionData(dimensionType));
|
||||
});
|
||||
map(Type.STRING); // Dimension Type
|
||||
map(Type.STRING); // Dimension
|
||||
map(Type.LONG); // Seed
|
||||
map(Type.UNSIGNED_BYTE, Type.VAR_INT); // Max players
|
||||
@ -54,5 +59,24 @@ public class EntityPackets {
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerOutgoing(ClientboundPackets1_16.RESPAWN, new PacketRemapper() {
|
||||
@Override
|
||||
public void registerMap() {
|
||||
handler(wrapper -> {
|
||||
String dimensionType = wrapper.read(Type.STRING);
|
||||
wrapper.write(Type.NBT, getDimensionData(dimensionType));
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static CompoundTag getDimensionData(String dimensionType) {
|
||||
CompoundTag tag = MappingData.dimensionDataMap.get(dimensionType);
|
||||
if (tag == null) {
|
||||
Via.getPlatform().getLogger().severe("Could not get dimension data of " + dimensionType);
|
||||
throw new NullPointerException("Dimension data for " + dimensionType + " is null!");
|
||||
}
|
||||
return tag;
|
||||
}
|
||||
}
|
||||
|
||||
@ -84,6 +84,7 @@ public class WorldPackets {
|
||||
|
||||
PacketWrapper newPacket = wrapper.create(ClientboundPackets1_16_2.MULTI_BLOCK_CHANGE.ordinal());
|
||||
newPacket.write(Type.LONG, chunkPosition | (chunkY & 0xFFFFFL));
|
||||
newPacket.write(Type.BOOLEAN, false); // Ignore light updates
|
||||
newPacket.write(Type.VAR_LONG_BLOCK_CHANGE_RECORD_ARRAY, sectionRecord.toArray(EMPTY_RECORDS));
|
||||
}
|
||||
});
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<name>viaversion-jar</name>
|
||||
|
||||
2
pom.xml
2
pom.xml
@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>us.myles</groupId>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>viaversion-parent</name>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>3.1.0-1.16.2-pre2</version>
|
||||
<version>3.1.0-1.16.2-pre3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren