mirror of
https://github.com/ViaVersion/ViaVersion.git
synced 2024-10-31 23:59:33 +01:00
1.20-pre1
This commit is contained in:
parent
75dd79347a
commit
07bdb57694
@ -85,6 +85,8 @@ public class ProtocolVersion {
|
|||||||
public static final ProtocolVersion v1_19 = register(759, "1.19");
|
public static final ProtocolVersion v1_19 = register(759, "1.19");
|
||||||
public static final ProtocolVersion v1_19_1 = register(760, "1.19.1");
|
public static final ProtocolVersion v1_19_1 = register(760, "1.19.1");
|
||||||
public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
|
public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
|
||||||
|
public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
|
||||||
|
public static final ProtocolVersion v1_20 = register(763, "1.20");
|
||||||
public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
|
public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
|
||||||
|
|
||||||
public static ProtocolVersion register(int version, String name) {
|
public static ProtocolVersion register(int version, String name) {
|
||||||
|
@ -83,7 +83,7 @@ public class ProtocolVersion {
|
|||||||
public static final ProtocolVersion v1_19_1 = register(760, "1.19.1/2", new VersionRange("1.19", 1, 2));
|
public static final ProtocolVersion v1_19_1 = register(760, "1.19.1/2", new VersionRange("1.19", 1, 2));
|
||||||
public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
|
public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
|
||||||
public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
|
public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
|
||||||
public static final ProtocolVersion v1_20 = register(763, 133, "1.20");
|
public static final ProtocolVersion v1_20 = register(763, 134, "1.20");
|
||||||
public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
|
public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
|
||||||
|
|
||||||
public static ProtocolVersion register(int version, String name) {
|
public static ProtocolVersion register(int version, String name) {
|
||||||
|
@ -34,8 +34,7 @@ public final class MappingData extends MappingDataBase {
|
|||||||
@Override
|
@Override
|
||||||
protected void loadExtras(final CompoundTag data) {
|
protected void loadExtras(final CompoundTag data) {
|
||||||
try {
|
try {
|
||||||
// TODO Read uncompressed file
|
damageTypesRegistry = BinaryTagIO.readInputStream(MappingDataLoader.getResource("damage-types-1.19.4.nbt"));
|
||||||
damageTypesRegistry = BinaryTagIO.readCompressedInputStream(MappingDataLoader.getResource("damage-types-1.19.4.nbt"));
|
|
||||||
} catch (final IOException e) {
|
} catch (final IOException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,13 @@
|
|||||||
*/
|
*/
|
||||||
package com.viaversion.viaversion.protocols.protocol1_20to1_19_4.packets;
|
package com.viaversion.viaversion.protocols.protocol1_20to1_19_4.packets;
|
||||||
|
|
||||||
|
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
|
||||||
|
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
|
||||||
|
import com.github.steveice10.opennbt.tag.builtin.FloatTag;
|
||||||
|
import com.github.steveice10.opennbt.tag.builtin.IntTag;
|
||||||
|
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.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types;
|
import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types;
|
||||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||||
@ -50,9 +57,51 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_4
|
|||||||
map(Type.NBT); // Dimension registry
|
map(Type.NBT); // Dimension registry
|
||||||
map(Type.STRING); // Dimension key
|
map(Type.STRING); // Dimension key
|
||||||
map(Type.STRING); // World
|
map(Type.STRING); // World
|
||||||
|
map(Type.LONG); // Seed
|
||||||
|
map(Type.VAR_INT); // Max players
|
||||||
|
map(Type.VAR_INT); // Chunk radius
|
||||||
|
map(Type.VAR_INT); // Simulation distance
|
||||||
|
map(Type.BOOLEAN); // Reduced debug info
|
||||||
|
map(Type.BOOLEAN); // Show death screen
|
||||||
|
map(Type.BOOLEAN); // Debug
|
||||||
|
map(Type.BOOLEAN); // Flat
|
||||||
|
map(Type.OPTIONAL_GLOBAL_POSITION); // Last death location
|
||||||
|
create(Type.VAR_INT, 0); // Portal cooldown
|
||||||
|
|
||||||
handler(dimensionDataHandler()); // Caches dimensions to access data like height later
|
handler(dimensionDataHandler()); // Caches dimensions to access data like height later
|
||||||
handler(biomeSizeTracker()); // Tracks the amount of biomes sent for chunk data
|
handler(biomeSizeTracker()); // Tracks the amount of biomes sent for chunk data
|
||||||
handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
|
handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
|
||||||
|
handler(wrapper -> {
|
||||||
|
final CompoundTag registry = wrapper.get(Type.NBT, 0);
|
||||||
|
final CompoundTag damageTypeRegistry = registry.get("minecraft:damage_type");
|
||||||
|
final ListTag damageTypes = damageTypeRegistry.get("value");
|
||||||
|
int highestId = -1;
|
||||||
|
for (final Tag damageType : damageTypes) {
|
||||||
|
final IntTag id = ((CompoundTag) damageType).get("id");
|
||||||
|
highestId = Math.max(highestId, id.asInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
// AaaaAAAaa
|
||||||
|
final CompoundTag outsideBorderReason = new CompoundTag();
|
||||||
|
final CompoundTag outsideBorderElement = new CompoundTag();
|
||||||
|
outsideBorderElement.put("scaling", new StringTag("always"));
|
||||||
|
outsideBorderElement.put("exhaustion", new FloatTag(0F));
|
||||||
|
outsideBorderElement.put("message_id", new StringTag("badRespawnPoint"));
|
||||||
|
outsideBorderReason.put("id", new IntTag(highestId + 1));
|
||||||
|
outsideBorderReason.put("name", new StringTag("minecraft:outside_border"));
|
||||||
|
outsideBorderReason.put("element", outsideBorderElement);
|
||||||
|
damageTypes.add(outsideBorderReason);
|
||||||
|
|
||||||
|
final CompoundTag genericKillReason = new CompoundTag();
|
||||||
|
final CompoundTag genericKillElement = new CompoundTag();
|
||||||
|
genericKillElement.put("scaling", new StringTag("always"));
|
||||||
|
genericKillElement.put("exhaustion", new FloatTag(0F));
|
||||||
|
genericKillElement.put("message_id", new StringTag("badRespawnPoint"));
|
||||||
|
genericKillReason.put("id", new IntTag(highestId + 2));
|
||||||
|
genericKillReason.put("name", new StringTag("minecraft:generic_kill"));
|
||||||
|
genericKillReason.put("element", genericKillElement);
|
||||||
|
damageTypes.add(genericKillReason);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -61,6 +110,14 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_4
|
|||||||
public void register() {
|
public void register() {
|
||||||
map(Type.STRING); // Dimension
|
map(Type.STRING); // Dimension
|
||||||
map(Type.STRING); // World
|
map(Type.STRING); // World
|
||||||
|
map(Type.LONG); // Seed
|
||||||
|
map(Type.UNSIGNED_BYTE); // Gamemode
|
||||||
|
map(Type.BYTE); // Previous gamemode
|
||||||
|
map(Type.BOOLEAN); // Debug
|
||||||
|
map(Type.BOOLEAN); // Flat
|
||||||
|
map(Type.BYTE); // Data to keep
|
||||||
|
map(Type.OPTIONAL_GLOBAL_POSITION); // Last death location
|
||||||
|
create(Type.VAR_INT, 0); // Portal cooldown
|
||||||
handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
|
handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
# Project properties - we put these here so they can be modified without causing a recompile of the build scripts
|
# Project properties - we put these here so they can be modified without causing a recompile of the build scripts
|
||||||
projectVersion=4.7.0-23w18a-SNAPSHOT
|
projectVersion=4.7.0-1.20-pre1-SNAPSHOT
|
||||||
|
|
||||||
# Gradle properties
|
# Gradle properties
|
||||||
org.gradle.daemon=true
|
org.gradle.daemon=true
|
||||||
|
Loading…
Reference in New Issue
Block a user