This commit is contained in:
KennyTV 2021-01-20 17:59:34 +01:00
parent 4cc8a3f092
commit c8c54786fc
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
18 changed files with 16098 additions and 15266 deletions

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -27,15 +27,15 @@ public class Entity1_17Types {
EYE_OF_ENDER(26, ENTITY), EYE_OF_ENDER(26, ENTITY),
FALLING_BLOCK(27, ENTITY), FALLING_BLOCK(27, ENTITY),
FIREWORK_ROCKET(28, ENTITY), FIREWORK_ROCKET(28, ENTITY),
ITEM(38, ENTITY), ITEM(40, ENTITY),
LLAMA_SPIT(44, ENTITY), LLAMA_SPIT(46, ENTITY),
TNT(65, ENTITY), TNT(67, ENTITY),
SHULKER_BULLET(72, ENTITY), SHULKER_BULLET(74, ENTITY),
FISHING_BOBBER(108, ENTITY), FISHING_BOBBER(110, ENTITY),
LIVINGENTITY(-1, ENTITY), LIVINGENTITY(-1, ENTITY),
ARMOR_STAND(1, LIVINGENTITY), ARMOR_STAND(1, LIVINGENTITY),
PLAYER(107, LIVINGENTITY), PLAYER(109, LIVINGENTITY),
ABSTRACT_INSENTIENT(-1, LIVINGENTITY), ABSTRACT_INSENTIENT(-1, LIVINGENTITY),
ENDER_DRAGON(20, ABSTRACT_INSENTIENT), ENDER_DRAGON(20, ABSTRACT_INSENTIENT),
@ -45,8 +45,8 @@ public class Entity1_17Types {
ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT), ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT),
ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE), ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE),
VILLAGER(94, ABSTRACT_AGEABLE), VILLAGER(96, ABSTRACT_AGEABLE),
WANDERING_TRADER(96, ABSTRACT_AGEABLE), WANDERING_TRADER(98, ABSTRACT_AGEABLE),
// Animals // Animals
ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE), ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE),
@ -54,46 +54,46 @@ public class Entity1_17Types {
DOLPHIN(14, ABSTRACT_INSENTIENT), DOLPHIN(14, ABSTRACT_INSENTIENT),
CHICKEN(10, ABSTRACT_ANIMAL), CHICKEN(10, ABSTRACT_ANIMAL),
COW(12, ABSTRACT_ANIMAL), COW(12, ABSTRACT_ANIMAL),
MOOSHROOM(54, COW), MOOSHROOM(56, COW),
PANDA(57, ABSTRACT_INSENTIENT), PANDA(59, ABSTRACT_INSENTIENT),
PIG(60, ABSTRACT_ANIMAL), PIG(62, ABSTRACT_ANIMAL),
POLAR_BEAR(64, ABSTRACT_ANIMAL), POLAR_BEAR(66, ABSTRACT_ANIMAL),
RABBIT(67, ABSTRACT_ANIMAL), RABBIT(69, ABSTRACT_ANIMAL),
SHEEP(70, ABSTRACT_ANIMAL), SHEEP(72, ABSTRACT_ANIMAL),
TURTLE(92, ABSTRACT_ANIMAL), TURTLE(94, ABSTRACT_ANIMAL),
FOX(29, ABSTRACT_ANIMAL), FOX(29, ABSTRACT_ANIMAL),
ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL), ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL),
CAT(8, ABSTRACT_TAMEABLE_ANIMAL), CAT(8, ABSTRACT_TAMEABLE_ANIMAL),
OCELOT(55, ABSTRACT_TAMEABLE_ANIMAL), OCELOT(57, ABSTRACT_TAMEABLE_ANIMAL),
WOLF(101, ABSTRACT_TAMEABLE_ANIMAL), WOLF(103, ABSTRACT_TAMEABLE_ANIMAL),
ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL), ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL),
PARROT(58, ABSTRACT_PARROT), PARROT(60, ABSTRACT_PARROT),
// Horses // Horses
ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL), ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL),
CHESTED_HORSE(-1, ABSTRACT_HORSE), CHESTED_HORSE(-1, ABSTRACT_HORSE),
DONKEY(15, CHESTED_HORSE), DONKEY(15, CHESTED_HORSE),
MULE(53, CHESTED_HORSE), MULE(55, CHESTED_HORSE),
LLAMA(43, CHESTED_HORSE), LLAMA(45, CHESTED_HORSE),
TRADER_LLAMA(90, CHESTED_HORSE), TRADER_LLAMA(92, CHESTED_HORSE),
HORSE(34, ABSTRACT_HORSE), HORSE(36, ABSTRACT_HORSE),
SKELETON_HORSE(75, ABSTRACT_HORSE), SKELETON_HORSE(77, ABSTRACT_HORSE),
ZOMBIE_HORSE(104, ABSTRACT_HORSE), ZOMBIE_HORSE(106, ABSTRACT_HORSE),
// Golem // Golem
ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE), ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE),
SNOW_GOLEM(78, ABSTRACT_GOLEM), SNOW_GOLEM(80, ABSTRACT_GOLEM),
IRON_GOLEM(37, ABSTRACT_GOLEM), IRON_GOLEM(39, ABSTRACT_GOLEM),
SHULKER(71, ABSTRACT_GOLEM), SHULKER(73, ABSTRACT_GOLEM),
// Fish // Fish
ABSTRACT_FISHES(-1, ABSTRACT_CREATURE), ABSTRACT_FISHES(-1, ABSTRACT_CREATURE),
COD(11, ABSTRACT_FISHES), COD(11, ABSTRACT_FISHES),
PUFFERFISH(66, ABSTRACT_FISHES), PUFFERFISH(68, ABSTRACT_FISHES),
SALMON(69, ABSTRACT_FISHES), SALMON(71, ABSTRACT_FISHES),
TROPICAL_FISH(91, ABSTRACT_FISHES), TROPICAL_FISH(93, ABSTRACT_FISHES),
// Monsters // Monsters
ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE), ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE),
@ -102,108 +102,109 @@ public class Entity1_17Types {
ENDERMITE(22, ABSTRACT_MONSTER), ENDERMITE(22, ABSTRACT_MONSTER),
ENDERMAN(21, ABSTRACT_MONSTER), ENDERMAN(21, ABSTRACT_MONSTER),
GIANT(31, ABSTRACT_MONSTER), GIANT(31, ABSTRACT_MONSTER),
SILVERFISH(73, ABSTRACT_MONSTER), SILVERFISH(75, ABSTRACT_MONSTER),
VEX(93, ABSTRACT_MONSTER), VEX(95, ABSTRACT_MONSTER),
WITCH(97, ABSTRACT_MONSTER), WITCH(99, ABSTRACT_MONSTER),
WITHER(98, ABSTRACT_MONSTER), WITHER(100, ABSTRACT_MONSTER),
RAVAGER(68, ABSTRACT_MONSTER), RAVAGER(70, ABSTRACT_MONSTER),
ABSTRACT_PIGLIN(-1, ABSTRACT_MONSTER), ABSTRACT_PIGLIN(-1, ABSTRACT_MONSTER),
PIGLIN(61, ABSTRACT_PIGLIN), PIGLIN(63, ABSTRACT_PIGLIN),
PIGLIN_BRUTE(62, ABSTRACT_PIGLIN), PIGLIN_BRUTE(64, ABSTRACT_PIGLIN),
HOGLIN(33, ABSTRACT_ANIMAL), HOGLIN(35, ABSTRACT_ANIMAL),
STRIDER(84, ABSTRACT_ANIMAL), STRIDER(86, ABSTRACT_ANIMAL),
ZOGLIN(102, ABSTRACT_MONSTER), ZOGLIN(104, ABSTRACT_MONSTER),
// Illagers // Illagers
ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER), ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER),
ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE), ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE),
EVOKER(23, ABSTRACT_EVO_ILLU_ILLAGER), EVOKER(23, ABSTRACT_EVO_ILLU_ILLAGER),
ILLUSIONER(36, ABSTRACT_EVO_ILLU_ILLAGER), ILLUSIONER(38, ABSTRACT_EVO_ILLU_ILLAGER),
VINDICATOR(95, ABSTRACT_ILLAGER_BASE), VINDICATOR(97, ABSTRACT_ILLAGER_BASE),
PILLAGER(63, ABSTRACT_ILLAGER_BASE), PILLAGER(65, ABSTRACT_ILLAGER_BASE),
// Skeletons // Skeletons
ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER), ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER),
SKELETON(74, ABSTRACT_SKELETON), SKELETON(76, ABSTRACT_SKELETON),
STRAY(83, ABSTRACT_SKELETON), STRAY(85, ABSTRACT_SKELETON),
WITHER_SKELETON(99, ABSTRACT_SKELETON), WITHER_SKELETON(101, ABSTRACT_SKELETON),
// Guardians // Guardians
GUARDIAN(32, ABSTRACT_MONSTER), GUARDIAN(34, ABSTRACT_MONSTER),
ELDER_GUARDIAN(18, GUARDIAN), ELDER_GUARDIAN(18, GUARDIAN),
// Spiders // Spiders
SPIDER(81, ABSTRACT_MONSTER), SPIDER(83, ABSTRACT_MONSTER),
CAVE_SPIDER(9, SPIDER), CAVE_SPIDER(9, SPIDER),
// Zombies // Zombies
ZOMBIE(103, ABSTRACT_MONSTER), ZOMBIE(105, ABSTRACT_MONSTER),
DROWNED(17, ZOMBIE), DROWNED(17, ZOMBIE),
HUSK(35, ZOMBIE), HUSK(37, ZOMBIE),
ZOMBIFIED_PIGLIN(106, ZOMBIE), ZOMBIFIED_PIGLIN(108, ZOMBIE),
ZOMBIE_VILLAGER(105, ZOMBIE), ZOMBIE_VILLAGER(107, ZOMBIE),
// Flying entities // Flying entities
ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT), ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT),
GHAST(30, ABSTRACT_FLYING), GHAST(30, ABSTRACT_FLYING),
PHANTOM(59, ABSTRACT_FLYING), PHANTOM(61, ABSTRACT_FLYING),
ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT), ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT),
BAT(4, ABSTRACT_AMBIENT), BAT(4, ABSTRACT_AMBIENT),
ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT), ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT),
SQUID(82, ABSTRACT_WATERMOB), SQUID(84, ABSTRACT_WATERMOB),
GLOW_SQUID(32, SQUID),
// Slimes // Slimes
SLIME(76, ABSTRACT_INSENTIENT), SLIME(78, ABSTRACT_INSENTIENT),
MAGMA_CUBE(45, SLIME), MAGMA_CUBE(47, SLIME),
// Hangable objects // Hangable objects
ABSTRACT_HANGING(-1, ENTITY), ABSTRACT_HANGING(-1, ENTITY),
LEASH_KNOT(41, ABSTRACT_HANGING), LEASH_KNOT(43, ABSTRACT_HANGING),
ITEM_FRAME(39, ABSTRACT_HANGING), ITEM_FRAME(41, ABSTRACT_HANGING),
PAINTING(56, ABSTRACT_HANGING), GLOW_ITEM_FRAME(32, ITEM_FRAME),
PAINTING(58, ABSTRACT_HANGING),
ABSTRACT_LIGHTNING(-1, ENTITY), ABSTRACT_LIGHTNING(-1, ENTITY),
LIGHTNING_BOLT(42, ABSTRACT_LIGHTNING), LIGHTNING_BOLT(44, ABSTRACT_LIGHTNING),
// Arrows // Arrows
ABSTRACT_ARROW(-1, ENTITY), ABSTRACT_ARROW(-1, ENTITY),
ARROW(2, ABSTRACT_ARROW), ARROW(2, ABSTRACT_ARROW),
SPECTRAL_ARROW(80, ABSTRACT_ARROW), SPECTRAL_ARROW(82, ABSTRACT_ARROW),
TRIDENT(89, ABSTRACT_ARROW), TRIDENT(91, ABSTRACT_ARROW),
// Fireballs // Fireballs
ABSTRACT_FIREBALL(-1, ENTITY), ABSTRACT_FIREBALL(-1, ENTITY),
DRAGON_FIREBALL(16, ABSTRACT_FIREBALL), DRAGON_FIREBALL(16, ABSTRACT_FIREBALL),
FIREBALL(40, ABSTRACT_FIREBALL), FIREBALL(42, ABSTRACT_FIREBALL),
SMALL_FIREBALL(77, ABSTRACT_FIREBALL), SMALL_FIREBALL(79, ABSTRACT_FIREBALL),
WITHER_SKULL(100, ABSTRACT_FIREBALL), WITHER_SKULL(102, ABSTRACT_FIREBALL),
// Projectiles // Projectiles
PROJECTILE_ABSTRACT(-1, ENTITY), PROJECTILE_ABSTRACT(-1, ENTITY),
SNOWBALL(79, PROJECTILE_ABSTRACT), SNOWBALL(81, PROJECTILE_ABSTRACT),
ENDER_PEARL(86, PROJECTILE_ABSTRACT), ENDER_PEARL(88, PROJECTILE_ABSTRACT),
EGG(85, PROJECTILE_ABSTRACT), EGG(87, PROJECTILE_ABSTRACT),
POTION(88, PROJECTILE_ABSTRACT), POTION(90, PROJECTILE_ABSTRACT),
EXPERIENCE_BOTTLE(87, PROJECTILE_ABSTRACT), EXPERIENCE_BOTTLE(89, PROJECTILE_ABSTRACT),
// Vehicles // Vehicles
MINECART_ABSTRACT(-1, ENTITY), MINECART_ABSTRACT(-1, ENTITY),
CHESTED_MINECART_ABSTRACT(-1, MINECART_ABSTRACT), CHESTED_MINECART_ABSTRACT(-1, MINECART_ABSTRACT),
CHEST_MINECART(47, CHESTED_MINECART_ABSTRACT), CHEST_MINECART(49, CHESTED_MINECART_ABSTRACT),
HOPPER_MINECART(50, CHESTED_MINECART_ABSTRACT), HOPPER_MINECART(52, CHESTED_MINECART_ABSTRACT),
MINECART(46, MINECART_ABSTRACT), MINECART(48, MINECART_ABSTRACT),
FURNACE_MINECART(49, MINECART_ABSTRACT), FURNACE_MINECART(51, MINECART_ABSTRACT),
COMMAND_BLOCK_MINECART(48, MINECART_ABSTRACT), COMMAND_BLOCK_MINECART(50, MINECART_ABSTRACT),
TNT_MINECART(52, MINECART_ABSTRACT), TNT_MINECART(54, MINECART_ABSTRACT),
SPAWNER_MINECART(51, MINECART_ABSTRACT), SPAWNER_MINECART(53, MINECART_ABSTRACT),
BOAT(7, ENTITY); BOAT(7, ENTITY);
private static final Map<Integer, EntityType> TYPES = new HashMap<>(); private static final Map<Integer, EntityType> TYPES = new HashMap<>();
private final int id; private final int id;

View File

@ -1,32 +1,42 @@
package us.myles.ViaVersion.api.minecraft.chunks; package us.myles.ViaVersion.api.minecraft.chunks;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import org.jetbrains.annotations.Nullable;
import java.util.BitSet;
import java.util.List; import java.util.List;
//TODO Move methods from distinctly different versions to different objects/interfaces
public class BaseChunk implements Chunk { public class BaseChunk implements Chunk {
protected final int x; protected final int x;
protected final int z; protected final int z;
protected final boolean fullChunk; protected final boolean fullChunk;
protected boolean ignoreOldLightData; protected boolean ignoreOldLightData;
protected final int bitmask; protected BitSet chunkSectionBitSet;
protected int bitmask;
protected final ChunkSection[] sections; protected final ChunkSection[] sections;
protected int[] biomeData; protected int[] biomeData;
protected CompoundTag heightMap; protected CompoundTag heightMap;
protected final List<CompoundTag> blockEntities; protected final List<CompoundTag> blockEntities;
public BaseChunk(int x, int z, boolean fullChunk, boolean ignoreOldLightData, int bitmask, ChunkSection[] sections, int[] biomeData, CompoundTag heightMap, List<CompoundTag> blockEntities) { public BaseChunk(int x, int z, boolean fullChunk, boolean ignoreOldLightData, @Nullable BitSet chunkSectionBitSet,
ChunkSection[] sections, @Nullable int[] biomeData, @Nullable CompoundTag heightMap, List<CompoundTag> blockEntities) {
this.x = x; this.x = x;
this.z = z; this.z = z;
this.fullChunk = fullChunk; this.fullChunk = fullChunk;
this.ignoreOldLightData = ignoreOldLightData; this.ignoreOldLightData = ignoreOldLightData;
this.bitmask = bitmask; this.chunkSectionBitSet = chunkSectionBitSet;
this.sections = sections; this.sections = sections;
this.biomeData = biomeData; this.biomeData = biomeData;
this.heightMap = heightMap; this.heightMap = heightMap;
this.blockEntities = blockEntities; this.blockEntities = blockEntities;
} }
public BaseChunk(int x, int z, boolean fullChunk, boolean ignoreOldLightData, int bitmask, ChunkSection[] sections, int[] biomeData, CompoundTag heightMap, List<CompoundTag> blockEntities) {
this(x, z, fullChunk, ignoreOldLightData, null, sections, biomeData, heightMap, blockEntities);
this.bitmask = bitmask;
}
public BaseChunk(int x, int z, boolean fullChunk, boolean ignoreOldLightData, int bitmask, ChunkSection[] sections, int[] biomeData, List<CompoundTag> blockEntities) { public BaseChunk(int x, int z, boolean fullChunk, boolean ignoreOldLightData, int bitmask, ChunkSection[] sections, int[] biomeData, List<CompoundTag> blockEntities) {
this(x, z, fullChunk, ignoreOldLightData, bitmask, sections, biomeData, null, blockEntities); this(x, z, fullChunk, ignoreOldLightData, bitmask, sections, biomeData, null, blockEntities);
} }
@ -66,12 +76,24 @@ public class BaseChunk implements Chunk {
return bitmask; return bitmask;
} }
@Override
@Nullable
public BitSet getChunkMask() {
return chunkSectionBitSet;
}
@Override
public void setChunkMask(BitSet chunkSectionMask) {
this.chunkSectionBitSet = chunkSectionMask;
}
@Override @Override
public ChunkSection[] getSections() { public ChunkSection[] getSections() {
return sections; return sections;
} }
@Override @Override
@Nullable
public int[] getBiomeData() { public int[] getBiomeData() {
return biomeData; return biomeData;
} }

View File

@ -1,7 +1,9 @@
package us.myles.ViaVersion.api.minecraft.chunks; package us.myles.ViaVersion.api.minecraft.chunks;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import org.jetbrains.annotations.Nullable;
import java.util.BitSet;
import java.util.List; import java.util.List;
public interface Chunk { public interface Chunk {
@ -10,8 +12,14 @@ public interface Chunk {
int getZ(); int getZ();
/**
* @return whether this chunk holds biome data, always true for 1.17+ chunks
*/
boolean isBiomeData(); boolean isBiomeData();
/**
* @return whether this is a full chunk, always true for 1.17+ chunks
*/
boolean isFullChunk(); boolean isFullChunk();
@Deprecated @Deprecated
@ -23,10 +31,24 @@ public interface Chunk {
void setIgnoreOldLightData(boolean ignoreOldLightData); void setIgnoreOldLightData(boolean ignoreOldLightData);
/**
* @return chunk section bit mask for chunks < 1.17
* @see #getChunkMask()
*/
int getBitmask(); int getBitmask();
/**
* @return chunk section bit mask, only non-null available for 1.17+ chunks
* @see #getBitmask()
*/
@Nullable
BitSet getChunkMask();
void setChunkMask(BitSet chunkSectionMask);
ChunkSection[] getSections(); ChunkSection[] getSections();
@Nullable
int[] getBiomeData(); int[] getBiomeData();
void setBiomeData(int[] biomeData); void setBiomeData(int[] biomeData);

View File

@ -54,7 +54,7 @@ public class ProtocolVersion {
public static final ProtocolVersion v1_16_2 = register(751, "1.16.2"); public static final ProtocolVersion v1_16_2 = register(751, "1.16.2");
public static final ProtocolVersion v1_16_3 = register(753, "1.16.3"); public static final ProtocolVersion v1_16_3 = register(753, "1.16.3");
public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5)); public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5));
public static final ProtocolVersion v1_17 = register(755, 9, "1.17"); public static final ProtocolVersion v1_17 = register(755, 11, "1.17");
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) {

View File

@ -21,6 +21,7 @@ import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.storage.EntityTracker1
import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type; import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.BitSet;
import java.util.List; import java.util.List;
public class WorldPackets { public class WorldPackets {
@ -84,6 +85,9 @@ public class WorldPackets {
Chunk chunk = wrapper.read(new Chunk1_16_2Type()); Chunk chunk = wrapper.read(new Chunk1_16_2Type());
wrapper.write(new Chunk1_17Type(chunk.getSections().length), chunk); wrapper.write(new Chunk1_17Type(chunk.getSections().length), chunk);
// 1.17 uses a bitset for the mask
chunk.setChunkMask(BitSet.valueOf(new long[]{chunk.getBitmask()}));
BiomeStorage biomeStorage = wrapper.user().get(BiomeStorage.class); BiomeStorage biomeStorage = wrapper.user().get(BiomeStorage.class);
if (chunk.isFullChunk()) { if (chunk.isFullChunk()) {
biomeStorage.setBiomes(chunk.getX(), chunk.getZ(), chunk.getBiomeData()); biomeStorage.setBiomes(chunk.getX(), chunk.getZ(), chunk.getBiomeData());

View File

@ -13,6 +13,7 @@ import us.myles.ViaVersion.api.type.types.version.Types1_16;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.BitSet;
import java.util.List; import java.util.List;
public class Chunk1_17Type extends Type<Chunk> { public class Chunk1_17Type extends Type<Chunk> {
@ -30,7 +31,7 @@ public class Chunk1_17Type extends Type<Chunk> {
int chunkX = input.readInt(); int chunkX = input.readInt();
int chunkZ = input.readInt(); int chunkZ = input.readInt();
int sectionsMask = Type.VAR_INT.readPrimitive(input); BitSet sectionsMask = BitSet.valueOf(Type.LONG_ARRAY_PRIMITIVE.read(input));
CompoundTag heightMap = Type.NBT.read(input); CompoundTag heightMap = Type.NBT.read(input);
int[] biomeData = Type.VAR_INT_ARRAY_PRIMITIVE.read(input); int[] biomeData = Type.VAR_INT_ARRAY_PRIMITIVE.read(input);
@ -40,7 +41,7 @@ public class Chunk1_17Type extends Type<Chunk> {
// Read sections // Read sections
ChunkSection[] sections = new ChunkSection[ySectionCount]; ChunkSection[] sections = new ChunkSection[ySectionCount];
for (int i = 0; i < ySectionCount; i++) { for (int i = 0; i < ySectionCount; i++) {
if ((sectionsMask & (1 << i)) == 0) continue; // Section not set if (!sectionsMask.get(i)) continue; // Section not set
short nonAirBlocksCount = input.readShort(); short nonAirBlocksCount = input.readShort();
ChunkSection section = Types1_16.CHUNK_SECTION.read(input); ChunkSection section = Types1_16.CHUNK_SECTION.read(input);
@ -66,7 +67,7 @@ public class Chunk1_17Type extends Type<Chunk> {
output.writeInt(chunk.getX()); output.writeInt(chunk.getX());
output.writeInt(chunk.getZ()); output.writeInt(chunk.getZ());
Type.VAR_INT.writePrimitive(output, chunk.getBitmask()); Type.LONG_ARRAY_PRIMITIVE.write(output, chunk.getChunkMask().toLongArray());
Type.NBT.write(output, chunk.getHeightMap()); Type.NBT.write(output, chunk.getHeightMap());
// Write biome data // Write biome data

View File

@ -53,7 +53,327 @@
"5146": "minecraft:water_cauldron[level=1]", "5146": "minecraft:water_cauldron[level=1]",
"5147": "minecraft:water_cauldron[level=2]", "5147": "minecraft:water_cauldron[level=2]",
"5148": "minecraft:water_cauldron[level=3]", "5148": "minecraft:water_cauldron[level=3]",
"9227": "minecraft:dirt_path" "9227": "minecraft:dirt_path",
"3381": "minecraft:oak_sign[lit=false,rotation=0,waterlogged=true]",
"3382": "minecraft:oak_sign[lit=false,rotation=0,waterlogged=false]",
"3383": "minecraft:oak_sign[lit=false,rotation=1,waterlogged=true]",
"3384": "minecraft:oak_sign[lit=false,rotation=1,waterlogged=false]",
"3385": "minecraft:oak_sign[lit=false,rotation=2,waterlogged=true]",
"3386": "minecraft:oak_sign[lit=false,rotation=2,waterlogged=false]",
"3387": "minecraft:oak_sign[lit=false,rotation=3,waterlogged=true]",
"3388": "minecraft:oak_sign[lit=false,rotation=3,waterlogged=false]",
"3389": "minecraft:oak_sign[lit=false,rotation=4,waterlogged=true]",
"3390": "minecraft:oak_sign[lit=false,rotation=4,waterlogged=false]",
"3391": "minecraft:oak_sign[lit=false,rotation=5,waterlogged=true]",
"3392": "minecraft:oak_sign[lit=false,rotation=5,waterlogged=false]",
"3393": "minecraft:oak_sign[lit=false,rotation=6,waterlogged=true]",
"3394": "minecraft:oak_sign[lit=false,rotation=6,waterlogged=false]",
"3395": "minecraft:oak_sign[lit=false,rotation=7,waterlogged=true]",
"3396": "minecraft:oak_sign[lit=false,rotation=7,waterlogged=false]",
"3397": "minecraft:oak_sign[lit=false,rotation=8,waterlogged=true]",
"3398": "minecraft:oak_sign[lit=false,rotation=8,waterlogged=false]",
"3399": "minecraft:oak_sign[lit=false,rotation=9,waterlogged=true]",
"3400": "minecraft:oak_sign[lit=false,rotation=9,waterlogged=false]",
"3401": "minecraft:oak_sign[lit=false,rotation=10,waterlogged=true]",
"3402": "minecraft:oak_sign[lit=false,rotation=10,waterlogged=false]",
"3403": "minecraft:oak_sign[lit=false,rotation=11,waterlogged=true]",
"3404": "minecraft:oak_sign[lit=false,rotation=11,waterlogged=false]",
"3405": "minecraft:oak_sign[lit=false,rotation=12,waterlogged=true]",
"3406": "minecraft:oak_sign[lit=false,rotation=12,waterlogged=false]",
"3407": "minecraft:oak_sign[lit=false,rotation=13,waterlogged=true]",
"3408": "minecraft:oak_sign[lit=false,rotation=13,waterlogged=false]",
"3409": "minecraft:oak_sign[lit=false,rotation=14,waterlogged=true]",
"3410": "minecraft:oak_sign[lit=false,rotation=14,waterlogged=false]",
"3411": "minecraft:oak_sign[lit=false,rotation=15,waterlogged=true]",
"3412": "minecraft:oak_sign[lit=false,rotation=15,waterlogged=false]",
"3413": "minecraft:spruce_sign[lit=false,rotation=0,waterlogged=true]",
"3414": "minecraft:spruce_sign[lit=false,rotation=0,waterlogged=false]",
"3415": "minecraft:spruce_sign[lit=false,rotation=1,waterlogged=true]",
"3416": "minecraft:spruce_sign[lit=false,rotation=1,waterlogged=false]",
"3417": "minecraft:spruce_sign[lit=false,rotation=2,waterlogged=true]",
"3418": "minecraft:spruce_sign[lit=false,rotation=2,waterlogged=false]",
"3419": "minecraft:spruce_sign[lit=false,rotation=3,waterlogged=true]",
"3420": "minecraft:spruce_sign[lit=false,rotation=3,waterlogged=false]",
"3421": "minecraft:spruce_sign[lit=false,rotation=4,waterlogged=true]",
"3422": "minecraft:spruce_sign[lit=false,rotation=4,waterlogged=false]",
"3423": "minecraft:spruce_sign[lit=false,rotation=5,waterlogged=true]",
"3424": "minecraft:spruce_sign[lit=false,rotation=5,waterlogged=false]",
"3425": "minecraft:spruce_sign[lit=false,rotation=6,waterlogged=true]",
"3426": "minecraft:spruce_sign[lit=false,rotation=6,waterlogged=false]",
"3427": "minecraft:spruce_sign[lit=false,rotation=7,waterlogged=true]",
"3428": "minecraft:spruce_sign[lit=false,rotation=7,waterlogged=false]",
"3429": "minecraft:spruce_sign[lit=false,rotation=8,waterlogged=true]",
"3430": "minecraft:spruce_sign[lit=false,rotation=8,waterlogged=false]",
"3431": "minecraft:spruce_sign[lit=false,rotation=9,waterlogged=true]",
"3432": "minecraft:spruce_sign[lit=false,rotation=9,waterlogged=false]",
"3433": "minecraft:spruce_sign[lit=false,rotation=10,waterlogged=true]",
"3434": "minecraft:spruce_sign[lit=false,rotation=10,waterlogged=false]",
"3435": "minecraft:spruce_sign[lit=false,rotation=11,waterlogged=true]",
"3436": "minecraft:spruce_sign[lit=false,rotation=11,waterlogged=false]",
"3437": "minecraft:spruce_sign[lit=false,rotation=12,waterlogged=true]",
"3438": "minecraft:spruce_sign[lit=false,rotation=12,waterlogged=false]",
"3439": "minecraft:spruce_sign[lit=false,rotation=13,waterlogged=true]",
"3440": "minecraft:spruce_sign[lit=false,rotation=13,waterlogged=false]",
"3441": "minecraft:spruce_sign[lit=false,rotation=14,waterlogged=true]",
"3442": "minecraft:spruce_sign[lit=false,rotation=14,waterlogged=false]",
"3443": "minecraft:spruce_sign[lit=false,rotation=15,waterlogged=true]",
"3444": "minecraft:spruce_sign[lit=false,rotation=15,waterlogged=false]",
"3445": "minecraft:birch_sign[lit=false,rotation=0,waterlogged=true]",
"3446": "minecraft:birch_sign[lit=false,rotation=0,waterlogged=false]",
"3447": "minecraft:birch_sign[lit=false,rotation=1,waterlogged=true]",
"3448": "minecraft:birch_sign[lit=false,rotation=1,waterlogged=false]",
"3449": "minecraft:birch_sign[lit=false,rotation=2,waterlogged=true]",
"3450": "minecraft:birch_sign[lit=false,rotation=2,waterlogged=false]",
"3451": "minecraft:birch_sign[lit=false,rotation=3,waterlogged=true]",
"3452": "minecraft:birch_sign[lit=false,rotation=3,waterlogged=false]",
"3453": "minecraft:birch_sign[lit=false,rotation=4,waterlogged=true]",
"3454": "minecraft:birch_sign[lit=false,rotation=4,waterlogged=false]",
"3455": "minecraft:birch_sign[lit=false,rotation=5,waterlogged=true]",
"3456": "minecraft:birch_sign[lit=false,rotation=5,waterlogged=false]",
"3457": "minecraft:birch_sign[lit=false,rotation=6,waterlogged=true]",
"3458": "minecraft:birch_sign[lit=false,rotation=6,waterlogged=false]",
"3459": "minecraft:birch_sign[lit=false,rotation=7,waterlogged=true]",
"3460": "minecraft:birch_sign[lit=false,rotation=7,waterlogged=false]",
"3461": "minecraft:birch_sign[lit=false,rotation=8,waterlogged=true]",
"3462": "minecraft:birch_sign[lit=false,rotation=8,waterlogged=false]",
"3463": "minecraft:birch_sign[lit=false,rotation=9,waterlogged=true]",
"3464": "minecraft:birch_sign[lit=false,rotation=9,waterlogged=false]",
"3465": "minecraft:birch_sign[lit=false,rotation=10,waterlogged=true]",
"3466": "minecraft:birch_sign[lit=false,rotation=10,waterlogged=false]",
"3467": "minecraft:birch_sign[lit=false,rotation=11,waterlogged=true]",
"3468": "minecraft:birch_sign[lit=false,rotation=11,waterlogged=false]",
"3469": "minecraft:birch_sign[lit=false,rotation=12,waterlogged=true]",
"3470": "minecraft:birch_sign[lit=false,rotation=12,waterlogged=false]",
"3471": "minecraft:birch_sign[lit=false,rotation=13,waterlogged=true]",
"3472": "minecraft:birch_sign[lit=false,rotation=13,waterlogged=false]",
"3473": "minecraft:birch_sign[lit=false,rotation=14,waterlogged=true]",
"3474": "minecraft:birch_sign[lit=false,rotation=14,waterlogged=false]",
"3475": "minecraft:birch_sign[lit=false,rotation=15,waterlogged=true]",
"3476": "minecraft:birch_sign[lit=false,rotation=15,waterlogged=false]",
"3477": "minecraft:acacia_sign[lit=false,rotation=0,waterlogged=true]",
"3478": "minecraft:acacia_sign[lit=false,rotation=0,waterlogged=false]",
"3479": "minecraft:acacia_sign[lit=false,rotation=1,waterlogged=true]",
"3480": "minecraft:acacia_sign[lit=false,rotation=1,waterlogged=false]",
"3481": "minecraft:acacia_sign[lit=false,rotation=2,waterlogged=true]",
"3482": "minecraft:acacia_sign[lit=false,rotation=2,waterlogged=false]",
"3483": "minecraft:acacia_sign[lit=false,rotation=3,waterlogged=true]",
"3484": "minecraft:acacia_sign[lit=false,rotation=3,waterlogged=false]",
"3485": "minecraft:acacia_sign[lit=false,rotation=4,waterlogged=true]",
"3486": "minecraft:acacia_sign[lit=false,rotation=4,waterlogged=false]",
"3487": "minecraft:acacia_sign[lit=false,rotation=5,waterlogged=true]",
"3488": "minecraft:acacia_sign[lit=false,rotation=5,waterlogged=false]",
"3489": "minecraft:acacia_sign[lit=false,rotation=6,waterlogged=true]",
"3490": "minecraft:acacia_sign[lit=false,rotation=6,waterlogged=false]",
"3491": "minecraft:acacia_sign[lit=false,rotation=7,waterlogged=true]",
"3492": "minecraft:acacia_sign[lit=false,rotation=7,waterlogged=false]",
"3493": "minecraft:acacia_sign[lit=false,rotation=8,waterlogged=true]",
"3494": "minecraft:acacia_sign[lit=false,rotation=8,waterlogged=false]",
"3495": "minecraft:acacia_sign[lit=false,rotation=9,waterlogged=true]",
"3496": "minecraft:acacia_sign[lit=false,rotation=9,waterlogged=false]",
"3497": "minecraft:acacia_sign[lit=false,rotation=10,waterlogged=true]",
"3498": "minecraft:acacia_sign[lit=false,rotation=10,waterlogged=false]",
"3499": "minecraft:acacia_sign[lit=false,rotation=11,waterlogged=true]",
"3500": "minecraft:acacia_sign[lit=false,rotation=11,waterlogged=false]",
"3501": "minecraft:acacia_sign[lit=false,rotation=12,waterlogged=true]",
"3502": "minecraft:acacia_sign[lit=false,rotation=12,waterlogged=false]",
"3503": "minecraft:acacia_sign[lit=false,rotation=13,waterlogged=true]",
"3504": "minecraft:acacia_sign[lit=false,rotation=13,waterlogged=false]",
"3505": "minecraft:acacia_sign[lit=false,rotation=14,waterlogged=true]",
"3506": "minecraft:acacia_sign[lit=false,rotation=14,waterlogged=false]",
"3507": "minecraft:acacia_sign[lit=false,rotation=15,waterlogged=true]",
"3508": "minecraft:acacia_sign[lit=false,rotation=15,waterlogged=false]",
"3509": "minecraft:jungle_sign[lit=false,rotation=0,waterlogged=true]",
"3510": "minecraft:jungle_sign[lit=false,rotation=0,waterlogged=false]",
"3511": "minecraft:jungle_sign[lit=false,rotation=1,waterlogged=true]",
"3512": "minecraft:jungle_sign[lit=false,rotation=1,waterlogged=false]",
"3513": "minecraft:jungle_sign[lit=false,rotation=2,waterlogged=true]",
"3514": "minecraft:jungle_sign[lit=false,rotation=2,waterlogged=false]",
"3515": "minecraft:jungle_sign[lit=false,rotation=3,waterlogged=true]",
"3516": "minecraft:jungle_sign[lit=false,rotation=3,waterlogged=false]",
"3517": "minecraft:jungle_sign[lit=false,rotation=4,waterlogged=true]",
"3518": "minecraft:jungle_sign[lit=false,rotation=4,waterlogged=false]",
"3519": "minecraft:jungle_sign[lit=false,rotation=5,waterlogged=true]",
"3520": "minecraft:jungle_sign[lit=false,rotation=5,waterlogged=false]",
"3521": "minecraft:jungle_sign[lit=false,rotation=6,waterlogged=true]",
"3522": "minecraft:jungle_sign[lit=false,rotation=6,waterlogged=false]",
"3523": "minecraft:jungle_sign[lit=false,rotation=7,waterlogged=true]",
"3524": "minecraft:jungle_sign[lit=false,rotation=7,waterlogged=false]",
"3525": "minecraft:jungle_sign[lit=false,rotation=8,waterlogged=true]",
"3526": "minecraft:jungle_sign[lit=false,rotation=8,waterlogged=false]",
"3527": "minecraft:jungle_sign[lit=false,rotation=9,waterlogged=true]",
"3528": "minecraft:jungle_sign[lit=false,rotation=9,waterlogged=false]",
"3529": "minecraft:jungle_sign[lit=false,rotation=10,waterlogged=true]",
"3530": "minecraft:jungle_sign[lit=false,rotation=10,waterlogged=false]",
"3531": "minecraft:jungle_sign[lit=false,rotation=11,waterlogged=true]",
"3532": "minecraft:jungle_sign[lit=false,rotation=11,waterlogged=false]",
"3533": "minecraft:jungle_sign[lit=false,rotation=12,waterlogged=true]",
"3534": "minecraft:jungle_sign[lit=false,rotation=12,waterlogged=false]",
"3535": "minecraft:jungle_sign[lit=false,rotation=13,waterlogged=true]",
"3536": "minecraft:jungle_sign[lit=false,rotation=13,waterlogged=false]",
"3537": "minecraft:jungle_sign[lit=false,rotation=14,waterlogged=true]",
"3538": "minecraft:jungle_sign[lit=false,rotation=14,waterlogged=false]",
"3539": "minecraft:jungle_sign[lit=false,rotation=15,waterlogged=true]",
"3540": "minecraft:jungle_sign[lit=false,rotation=15,waterlogged=false]",
"3541": "minecraft:dark_oak_sign[lit=false,rotation=0,waterlogged=true]",
"3542": "minecraft:dark_oak_sign[lit=false,rotation=0,waterlogged=false]",
"3543": "minecraft:dark_oak_sign[lit=false,rotation=1,waterlogged=true]",
"3544": "minecraft:dark_oak_sign[lit=false,rotation=1,waterlogged=false]",
"3545": "minecraft:dark_oak_sign[lit=false,rotation=2,waterlogged=true]",
"3546": "minecraft:dark_oak_sign[lit=false,rotation=2,waterlogged=false]",
"3547": "minecraft:dark_oak_sign[lit=false,rotation=3,waterlogged=true]",
"3548": "minecraft:dark_oak_sign[lit=false,rotation=3,waterlogged=false]",
"3549": "minecraft:dark_oak_sign[lit=false,rotation=4,waterlogged=true]",
"3550": "minecraft:dark_oak_sign[lit=false,rotation=4,waterlogged=false]",
"3551": "minecraft:dark_oak_sign[lit=false,rotation=5,waterlogged=true]",
"3552": "minecraft:dark_oak_sign[lit=false,rotation=5,waterlogged=false]",
"3553": "minecraft:dark_oak_sign[lit=false,rotation=6,waterlogged=true]",
"3554": "minecraft:dark_oak_sign[lit=false,rotation=6,waterlogged=false]",
"3555": "minecraft:dark_oak_sign[lit=false,rotation=7,waterlogged=true]",
"3556": "minecraft:dark_oak_sign[lit=false,rotation=7,waterlogged=false]",
"3557": "minecraft:dark_oak_sign[lit=false,rotation=8,waterlogged=true]",
"3558": "minecraft:dark_oak_sign[lit=false,rotation=8,waterlogged=false]",
"3559": "minecraft:dark_oak_sign[lit=false,rotation=9,waterlogged=true]",
"3560": "minecraft:dark_oak_sign[lit=false,rotation=9,waterlogged=false]",
"3561": "minecraft:dark_oak_sign[lit=false,rotation=10,waterlogged=true]",
"3562": "minecraft:dark_oak_sign[lit=false,rotation=10,waterlogged=false]",
"3563": "minecraft:dark_oak_sign[lit=false,rotation=11,waterlogged=true]",
"3564": "minecraft:dark_oak_sign[lit=false,rotation=11,waterlogged=false]",
"3565": "minecraft:dark_oak_sign[lit=false,rotation=12,waterlogged=true]",
"3566": "minecraft:dark_oak_sign[lit=false,rotation=12,waterlogged=false]",
"3567": "minecraft:dark_oak_sign[lit=false,rotation=13,waterlogged=true]",
"3568": "minecraft:dark_oak_sign[lit=false,rotation=13,waterlogged=false]",
"3569": "minecraft:dark_oak_sign[lit=false,rotation=14,waterlogged=true]",
"3570": "minecraft:dark_oak_sign[lit=false,rotation=14,waterlogged=false]",
"3571": "minecraft:dark_oak_sign[lit=false,rotation=15,waterlogged=true]",
"3572": "minecraft:dark_oak_sign[lit=false,rotation=15,waterlogged=false]",
"3735": "minecraft:oak_wall_sign[facing=north,lit=false,waterlogged=true]",
"3736": "minecraft:oak_wall_sign[facing=north,lit=false,waterlogged=false]",
"3737": "minecraft:oak_wall_sign[facing=south,lit=false,waterlogged=true]",
"3738": "minecraft:oak_wall_sign[facing=south,lit=false,waterlogged=false]",
"3739": "minecraft:oak_wall_sign[facing=west,lit=false,waterlogged=true]",
"3740": "minecraft:oak_wall_sign[facing=west,lit=false,waterlogged=false]",
"3741": "minecraft:oak_wall_sign[facing=east,lit=false,waterlogged=true]",
"3742": "minecraft:oak_wall_sign[facing=east,lit=false,waterlogged=false]",
"3743": "minecraft:spruce_wall_sign[facing=north,lit=false,waterlogged=true]",
"3744": "minecraft:spruce_wall_sign[facing=north,lit=false,waterlogged=false]",
"3745": "minecraft:spruce_wall_sign[facing=south,lit=false,waterlogged=true]",
"3746": "minecraft:spruce_wall_sign[facing=south,lit=false,waterlogged=false]",
"3747": "minecraft:spruce_wall_sign[facing=west,lit=false,waterlogged=true]",
"3748": "minecraft:spruce_wall_sign[facing=west,lit=false,waterlogged=false]",
"3749": "minecraft:spruce_wall_sign[facing=east,lit=false,waterlogged=true]",
"3750": "minecraft:spruce_wall_sign[facing=east,lit=false,waterlogged=false]",
"3751": "minecraft:birch_wall_sign[facing=north,lit=false,waterlogged=true]",
"3752": "minecraft:birch_wall_sign[facing=north,lit=false,waterlogged=false]",
"3753": "minecraft:birch_wall_sign[facing=south,lit=false,waterlogged=true]",
"3754": "minecraft:birch_wall_sign[facing=south,lit=false,waterlogged=false]",
"3755": "minecraft:birch_wall_sign[facing=west,lit=false,waterlogged=true]",
"3756": "minecraft:birch_wall_sign[facing=west,lit=false,waterlogged=false]",
"3757": "minecraft:birch_wall_sign[facing=east,lit=false,waterlogged=true]",
"3758": "minecraft:birch_wall_sign[facing=east,lit=false,waterlogged=false]",
"3759": "minecraft:acacia_wall_sign[facing=north,lit=false,waterlogged=true]",
"3760": "minecraft:acacia_wall_sign[facing=north,lit=false,waterlogged=false]",
"3761": "minecraft:acacia_wall_sign[facing=south,lit=false,waterlogged=true]",
"3762": "minecraft:acacia_wall_sign[facing=south,lit=false,waterlogged=false]",
"3763": "minecraft:acacia_wall_sign[facing=west,lit=false,waterlogged=true]",
"3764": "minecraft:acacia_wall_sign[facing=west,lit=false,waterlogged=false]",
"3765": "minecraft:acacia_wall_sign[facing=east,lit=false,waterlogged=true]",
"3766": "minecraft:acacia_wall_sign[facing=east,lit=false,waterlogged=false]",
"3767": "minecraft:jungle_wall_sign[facing=north,lit=false,waterlogged=true]",
"3768": "minecraft:jungle_wall_sign[facing=north,lit=false,waterlogged=false]",
"3769": "minecraft:jungle_wall_sign[facing=south,lit=false,waterlogged=true]",
"3770": "minecraft:jungle_wall_sign[facing=south,lit=false,waterlogged=false]",
"3771": "minecraft:jungle_wall_sign[facing=west,lit=false,waterlogged=true]",
"3772": "minecraft:jungle_wall_sign[facing=west,lit=false,waterlogged=false]",
"3773": "minecraft:jungle_wall_sign[facing=east,lit=false,waterlogged=true]",
"3774": "minecraft:jungle_wall_sign[facing=east,lit=false,waterlogged=false]",
"3775": "minecraft:dark_oak_wall_sign[facing=north,lit=false,waterlogged=true]",
"3776": "minecraft:dark_oak_wall_sign[facing=north,lit=false,waterlogged=false]",
"3777": "minecraft:dark_oak_wall_sign[facing=south,lit=false,waterlogged=true]",
"3778": "minecraft:dark_oak_wall_sign[facing=south,lit=false,waterlogged=false]",
"3779": "minecraft:dark_oak_wall_sign[facing=west,lit=false,waterlogged=true]",
"3780": "minecraft:dark_oak_wall_sign[facing=west,lit=false,waterlogged=false]",
"3781": "minecraft:dark_oak_wall_sign[facing=east,lit=false,waterlogged=true]",
"3782": "minecraft:dark_oak_wall_sign[facing=east,lit=false,waterlogged=false]",
"15663": "minecraft:crimson_sign[lit=false,rotation=0,waterlogged=true]",
"15664": "minecraft:crimson_sign[lit=false,rotation=0,waterlogged=false]",
"15665": "minecraft:crimson_sign[lit=false,rotation=1,waterlogged=true]",
"15666": "minecraft:crimson_sign[lit=false,rotation=1,waterlogged=false]",
"15667": "minecraft:crimson_sign[lit=false,rotation=2,waterlogged=true]",
"15668": "minecraft:crimson_sign[lit=false,rotation=2,waterlogged=false]",
"15669": "minecraft:crimson_sign[lit=false,rotation=3,waterlogged=true]",
"15670": "minecraft:crimson_sign[lit=false,rotation=3,waterlogged=false]",
"15671": "minecraft:crimson_sign[lit=false,rotation=4,waterlogged=true]",
"15672": "minecraft:crimson_sign[lit=false,rotation=4,waterlogged=false]",
"15673": "minecraft:crimson_sign[lit=false,rotation=5,waterlogged=true]",
"15674": "minecraft:crimson_sign[lit=false,rotation=5,waterlogged=false]",
"15675": "minecraft:crimson_sign[lit=false,rotation=6,waterlogged=true]",
"15676": "minecraft:crimson_sign[lit=false,rotation=6,waterlogged=false]",
"15677": "minecraft:crimson_sign[lit=false,rotation=7,waterlogged=true]",
"15678": "minecraft:crimson_sign[lit=false,rotation=7,waterlogged=false]",
"15679": "minecraft:crimson_sign[lit=false,rotation=8,waterlogged=true]",
"15680": "minecraft:crimson_sign[lit=false,rotation=8,waterlogged=false]",
"15681": "minecraft:crimson_sign[lit=false,rotation=9,waterlogged=true]",
"15682": "minecraft:crimson_sign[lit=false,rotation=9,waterlogged=false]",
"15683": "minecraft:crimson_sign[lit=false,rotation=10,waterlogged=true]",
"15684": "minecraft:crimson_sign[lit=false,rotation=10,waterlogged=false]",
"15685": "minecraft:crimson_sign[lit=false,rotation=11,waterlogged=true]",
"15686": "minecraft:crimson_sign[lit=false,rotation=11,waterlogged=false]",
"15687": "minecraft:crimson_sign[lit=false,rotation=12,waterlogged=true]",
"15688": "minecraft:crimson_sign[lit=false,rotation=12,waterlogged=false]",
"15689": "minecraft:crimson_sign[lit=false,rotation=13,waterlogged=true]",
"15690": "minecraft:crimson_sign[lit=false,rotation=13,waterlogged=false]",
"15691": "minecraft:crimson_sign[lit=false,rotation=14,waterlogged=true]",
"15692": "minecraft:crimson_sign[lit=false,rotation=14,waterlogged=false]",
"15693": "minecraft:crimson_sign[lit=false,rotation=15,waterlogged=true]",
"15694": "minecraft:crimson_sign[lit=false,rotation=15,waterlogged=false]",
"15695": "minecraft:warped_sign[lit=false,rotation=0,waterlogged=true]",
"15696": "minecraft:warped_sign[lit=false,rotation=0,waterlogged=false]",
"15697": "minecraft:warped_sign[lit=false,rotation=1,waterlogged=true]",
"15698": "minecraft:warped_sign[lit=false,rotation=1,waterlogged=false]",
"15699": "minecraft:warped_sign[lit=false,rotation=2,waterlogged=true]",
"15700": "minecraft:warped_sign[lit=false,rotation=2,waterlogged=false]",
"15701": "minecraft:warped_sign[lit=false,rotation=3,waterlogged=true]",
"15702": "minecraft:warped_sign[lit=false,rotation=3,waterlogged=false]",
"15703": "minecraft:warped_sign[lit=false,rotation=4,waterlogged=true]",
"15704": "minecraft:warped_sign[lit=false,rotation=4,waterlogged=false]",
"15705": "minecraft:warped_sign[lit=false,rotation=5,waterlogged=true]",
"15706": "minecraft:warped_sign[lit=false,rotation=5,waterlogged=false]",
"15707": "minecraft:warped_sign[lit=false,rotation=6,waterlogged=true]",
"15708": "minecraft:warped_sign[lit=false,rotation=6,waterlogged=false]",
"15709": "minecraft:warped_sign[lit=false,rotation=7,waterlogged=true]",
"15710": "minecraft:warped_sign[lit=false,rotation=7,waterlogged=false]",
"15711": "minecraft:warped_sign[lit=false,rotation=8,waterlogged=true]",
"15712": "minecraft:warped_sign[lit=false,rotation=8,waterlogged=false]",
"15713": "minecraft:warped_sign[lit=false,rotation=9,waterlogged=true]",
"15714": "minecraft:warped_sign[lit=false,rotation=9,waterlogged=false]",
"15715": "minecraft:warped_sign[lit=false,rotation=10,waterlogged=true]",
"15716": "minecraft:warped_sign[lit=false,rotation=10,waterlogged=false]",
"15717": "minecraft:warped_sign[lit=false,rotation=11,waterlogged=true]",
"15718": "minecraft:warped_sign[lit=false,rotation=11,waterlogged=false]",
"15719": "minecraft:warped_sign[lit=false,rotation=12,waterlogged=true]",
"15720": "minecraft:warped_sign[lit=false,rotation=12,waterlogged=false]",
"15721": "minecraft:warped_sign[lit=false,rotation=13,waterlogged=true]",
"15722": "minecraft:warped_sign[lit=false,rotation=13,waterlogged=false]",
"15723": "minecraft:warped_sign[lit=false,rotation=14,waterlogged=true]",
"15724": "minecraft:warped_sign[lit=false,rotation=14,waterlogged=false]",
"15725": "minecraft:warped_sign[lit=false,rotation=15,waterlogged=true]",
"15726": "minecraft:warped_sign[lit=false,rotation=15,waterlogged=false]",
"15727": "minecraft:crimson_wall_sign[facing=north,lit=false,waterlogged=true]",
"15728": "minecraft:crimson_wall_sign[facing=north,lit=false,waterlogged=false]",
"15729": "minecraft:crimson_wall_sign[facing=south,lit=false,waterlogged=true]",
"15730": "minecraft:crimson_wall_sign[facing=south,lit=false,waterlogged=false]",
"15731": "minecraft:crimson_wall_sign[facing=west,lit=false,waterlogged=true]",
"15732": "minecraft:crimson_wall_sign[facing=west,lit=false,waterlogged=false]",
"15733": "minecraft:crimson_wall_sign[facing=east,lit=false,waterlogged=true]",
"15734": "minecraft:crimson_wall_sign[facing=east,lit=false,waterlogged=false]",
"15735": "minecraft:warped_wall_sign[facing=north,lit=false,waterlogged=true]",
"15736": "minecraft:warped_wall_sign[facing=north,lit=false,waterlogged=false]",
"15737": "minecraft:warped_wall_sign[facing=south,lit=false,waterlogged=true]",
"15738": "minecraft:warped_wall_sign[facing=south,lit=false,waterlogged=false]",
"15739": "minecraft:warped_wall_sign[facing=west,lit=false,waterlogged=true]",
"15740": "minecraft:warped_wall_sign[facing=west,lit=false,waterlogged=false]",
"15741": "minecraft:warped_wall_sign[facing=east,lit=false,waterlogged=true]",
"15742": "minecraft:warped_wall_sign[facing=east,lit=false,waterlogged=false]"
}, },
"items": { "items": {
"372": "minecraft:dirt_path" "372": "minecraft:dirt_path"

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>viaversion-jar</name> <name>viaversion-jar</name>

View File

@ -6,7 +6,7 @@
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<artifactId>viaversion-parent</artifactId> <artifactId>viaversion-parent</artifactId>
<version>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>viaversion-parent</name> <name>viaversion-parent</name>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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>3.3.0-20w51a</version> <version>3.3.0-21w03a</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>