mirror of
https://github.com/ViaVersion/ViaVersion.git
synced 2024-10-31 23:59:33 +01:00
18w44a
This commit is contained in:
parent
aa067d4073
commit
c58b28fd00
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -26,166 +26,168 @@ public class Entity1_14Types {
|
||||
ENTITY(-1),
|
||||
|
||||
AREA_EFFECT_CLOUD(0, ENTITY),
|
||||
ENDER_CRYSTAL(16, ENTITY),
|
||||
EVOCATION_FANGS(20, ENTITY),
|
||||
XP_ORB(22, ENTITY),
|
||||
EYE_OF_ENDER_SIGNAL(23, ENTITY),
|
||||
FALLING_BLOCK(24, ENTITY),
|
||||
FIREWORKS_ROCKET(25, ENTITY),
|
||||
ITEM(32, ENTITY),
|
||||
ENDER_CRYSTAL(17, ENTITY),
|
||||
EVOCATION_FANGS(21, ENTITY),
|
||||
XP_ORB(23, ENTITY),
|
||||
EYE_OF_ENDER_SIGNAL(24, ENTITY),
|
||||
FALLING_BLOCK(25, ENTITY),
|
||||
FIREWORKS_ROCKET(26, ENTITY),
|
||||
ITEM(33, ENTITY),
|
||||
LLAMA_SPIT(37, ENTITY),
|
||||
TNT(56, ENTITY),
|
||||
SHULKER_BULLET(61, ENTITY),
|
||||
FISHING_BOBBER(96, ENTITY),
|
||||
TNT(57, ENTITY),
|
||||
SHULKER_BULLET(62, ENTITY),
|
||||
FISHING_BOBBER(97, ENTITY),
|
||||
|
||||
LIVINGENTITY(-1, ENTITY),
|
||||
ARMOR_STAND(1, LIVINGENTITY),
|
||||
PLAYER(95, LIVINGENTITY),
|
||||
PLAYER(96, LIVINGENTITY),
|
||||
|
||||
ABSTRACT_INSENTIENT(-1, LIVINGENTITY),
|
||||
ENDER_DRAGON(17, ABSTRACT_INSENTIENT),
|
||||
ENDER_DRAGON(18, ABSTRACT_INSENTIENT),
|
||||
|
||||
ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT),
|
||||
|
||||
ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE),
|
||||
VILLAGER(80, ABSTRACT_AGEABLE),
|
||||
VILLAGER(81, ABSTRACT_AGEABLE),
|
||||
|
||||
// Animals
|
||||
ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE),
|
||||
CHICKEN(7, ABSTRACT_ANIMAL),
|
||||
COW(9, ABSTRACT_ANIMAL),
|
||||
MOOSHROOM(47, COW),
|
||||
PIG(52, ABSTRACT_ANIMAL),
|
||||
POLAR_BEAR(55, ABSTRACT_ANIMAL),
|
||||
RABBIT(57, ABSTRACT_ANIMAL),
|
||||
SHEEP(59, ABSTRACT_ANIMAL),
|
||||
DOLPHIN(13, ABSTRACT_INSENTIENT),
|
||||
CHICKEN(8, ABSTRACT_ANIMAL),
|
||||
COW(10, ABSTRACT_ANIMAL),
|
||||
MOOSHROOM(48, COW),
|
||||
PIG(53, ABSTRACT_ANIMAL),
|
||||
POLAR_BEAR(56, ABSTRACT_ANIMAL),
|
||||
RABBIT(58, ABSTRACT_ANIMAL),
|
||||
SHEEP(60, ABSTRACT_ANIMAL),
|
||||
TURTLE(74, ABSTRACT_ANIMAL),
|
||||
|
||||
ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL),
|
||||
OCELOT(48, ABSTRACT_TAMEABLE_ANIMAL),
|
||||
WOLF(88, ABSTRACT_TAMEABLE_ANIMAL),
|
||||
CAT(6, ABSTRACT_TAMEABLE_ANIMAL),
|
||||
OCELOT(49, ABSTRACT_TAMEABLE_ANIMAL),
|
||||
WOLF(89, ABSTRACT_TAMEABLE_ANIMAL),
|
||||
|
||||
ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL),
|
||||
PARROT(51, ABSTRACT_PARROT),
|
||||
PARROT(52, ABSTRACT_PARROT),
|
||||
|
||||
// Horses
|
||||
ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL),
|
||||
CHESTED_HORSE(-1, ABSTRACT_HORSE),
|
||||
DONKEY(11, CHESTED_HORSE),
|
||||
MULE(46, CHESTED_HORSE),
|
||||
LLAMA(36, CHESTED_HORSE),
|
||||
HORSE(29, ABSTRACT_HORSE),
|
||||
SKELETON_HORSE(64, ABSTRACT_HORSE),
|
||||
ZOMBIE_HORSE(90, ABSTRACT_HORSE),
|
||||
DONKEY(12, CHESTED_HORSE),
|
||||
MULE(47, CHESTED_HORSE),
|
||||
LLAMA(37, CHESTED_HORSE),
|
||||
HORSE(30, ABSTRACT_HORSE),
|
||||
SKELETON_HORSE(65, ABSTRACT_HORSE),
|
||||
ZOMBIE_HORSE(91, ABSTRACT_HORSE),
|
||||
|
||||
// Golem
|
||||
ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE),
|
||||
SNOWMAN(66, ABSTRACT_GOLEM),
|
||||
VILLAGER_GOLEM(81, ABSTRACT_GOLEM),
|
||||
SHULKER(60, ABSTRACT_GOLEM),
|
||||
VILLAGER_GOLEM(82, ABSTRACT_GOLEM),
|
||||
SHULKER(61, ABSTRACT_GOLEM),
|
||||
|
||||
// Fish
|
||||
ABSTRACT_FISHES(-1, ABSTRACT_CREATURE),
|
||||
COD_MOB(8, ABSTRACT_FISHES),
|
||||
PUFFER_FISH(53, ABSTRACT_FISHES),
|
||||
SALMON_MOB(58, ABSTRACT_FISHES),
|
||||
TROPICAL_FISH(73, ABSTRACT_FISHES),
|
||||
COD(9, ABSTRACT_FISHES),
|
||||
PUFFER_FISH(54, ABSTRACT_FISHES),
|
||||
SALMON_MOB(59, ABSTRACT_FISHES),
|
||||
TROPICAL_FISH(74, ABSTRACT_FISHES),
|
||||
|
||||
// Monsters
|
||||
ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE),
|
||||
BLAZE(4, ABSTRACT_MONSTER),
|
||||
CREEPER(10, ABSTRACT_MONSTER),
|
||||
ENDERMITE(19, ABSTRACT_MONSTER),
|
||||
ENDERMAN(18, ABSTRACT_MONSTER),
|
||||
GIANT(27, ABSTRACT_MONSTER),
|
||||
SILVERFISH(62, ABSTRACT_MONSTER),
|
||||
VEX(79, ABSTRACT_MONSTER),
|
||||
WITCH(84, ABSTRACT_MONSTER),
|
||||
WITHER(85, ABSTRACT_MONSTER),
|
||||
CREEPER(11, ABSTRACT_MONSTER),
|
||||
ENDERMITE(20, ABSTRACT_MONSTER),
|
||||
ENDERMAN(19, ABSTRACT_MONSTER),
|
||||
GIANT(28, ABSTRACT_MONSTER),
|
||||
SILVERFISH(63, ABSTRACT_MONSTER),
|
||||
VEX(80, ABSTRACT_MONSTER),
|
||||
WITCH(85, ABSTRACT_MONSTER),
|
||||
WITHER(86, ABSTRACT_MONSTER),
|
||||
|
||||
// Illagers
|
||||
ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER),
|
||||
ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE),
|
||||
EVOCATION_ILLAGER(21, ABSTRACT_EVO_ILLU_ILLAGER),
|
||||
ILLUSION_ILLAGER(31, ABSTRACT_EVO_ILLU_ILLAGER),
|
||||
VINDICATION_ILLAGER(81, ABSTRACT_ILLAGER_BASE),
|
||||
EVOCATION_ILLAGER(22, ABSTRACT_EVO_ILLU_ILLAGER),
|
||||
ILLUSION_ILLAGER(32, ABSTRACT_EVO_ILLU_ILLAGER),
|
||||
VINDICATION_ILLAGER(83, ABSTRACT_ILLAGER_BASE),
|
||||
|
||||
// Skeletons
|
||||
ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER),
|
||||
SKELETON(63, ABSTRACT_SKELETON),
|
||||
STRAY(72, ABSTRACT_SKELETON),
|
||||
WITHER_SKELETON(86, ABSTRACT_SKELETON),
|
||||
SKELETON(64, ABSTRACT_SKELETON),
|
||||
STRAY(73, ABSTRACT_SKELETON),
|
||||
WITHER_SKELETON(87, ABSTRACT_SKELETON),
|
||||
|
||||
// Guardians
|
||||
GUARDIAN(28, ABSTRACT_MONSTER),
|
||||
ELDER_GUARDIAN(15, GUARDIAN),
|
||||
ELDER_GUARDIAN(16, GUARDIAN),
|
||||
|
||||
// Spiders
|
||||
SPIDER(70, ABSTRACT_MONSTER),
|
||||
CAVE_SPIDER(6, SPIDER),
|
||||
SPIDER(71, ABSTRACT_MONSTER),
|
||||
CAVE_SPIDER(7, SPIDER),
|
||||
|
||||
// Zombies - META CHECKED
|
||||
ZOMBIE(89, ABSTRACT_MONSTER),
|
||||
DROWNED(14, ZOMBIE),
|
||||
HUSK(30, ZOMBIE),
|
||||
ZOMBIE_PIGMAN(54, ZOMBIE),
|
||||
ZOMBIE_VILLAGER(91, ZOMBIE),
|
||||
ZOMBIE(90, ABSTRACT_MONSTER),
|
||||
DROWNED(15, ZOMBIE),
|
||||
HUSK(31, ZOMBIE),
|
||||
ZOMBIE_PIGMAN(55, ZOMBIE),
|
||||
ZOMBIE_VILLAGER(92, ZOMBIE),
|
||||
|
||||
// Flying entities
|
||||
ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT),
|
||||
GHAST(26, ABSTRACT_FLYING),
|
||||
PHANTOM(92, ABSTRACT_FLYING),
|
||||
GHAST(27, ABSTRACT_FLYING),
|
||||
PHANTOM(93, ABSTRACT_FLYING),
|
||||
|
||||
ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT),
|
||||
BAT(3, ABSTRACT_AMBIENT),
|
||||
|
||||
ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT),
|
||||
SQUID(71, ABSTRACT_WATERMOB),
|
||||
SQUID(72, ABSTRACT_WATERMOB),
|
||||
|
||||
// Slimes
|
||||
SLIME(65, ABSTRACT_INSENTIENT),
|
||||
MAGMA_CUBE(38, SLIME),
|
||||
SLIME(66, ABSTRACT_INSENTIENT),
|
||||
MAGMA_CUBE(39, SLIME),
|
||||
|
||||
// Hangable objects
|
||||
ABSTRACT_HANGING(-1, ENTITY),
|
||||
LEASH_KNOT(35, ABSTRACT_HANGING),
|
||||
ITEM_FRAME(33, ABSTRACT_HANGING),
|
||||
PAINTING(49, ABSTRACT_HANGING),
|
||||
LEASH_KNOT(36, ABSTRACT_HANGING),
|
||||
ITEM_FRAME(34, ABSTRACT_HANGING),
|
||||
PAINTING(50, ABSTRACT_HANGING),
|
||||
|
||||
ABSTRACT_LIGHTNING(-1, ENTITY),
|
||||
LIGHTNING_BOLT(94, ABSTRACT_LIGHTNING),
|
||||
LIGHTNING_BOLT(95, ABSTRACT_LIGHTNING),
|
||||
|
||||
// Arrows
|
||||
ABSTRACT_ARROW(-1, ENTITY),
|
||||
ARROW(2, ABSTRACT_ARROW),
|
||||
SPECTRAL_ARROW(69, ABSTRACT_ARROW),
|
||||
TRIDENT(97, ABSTRACT_ARROW),
|
||||
SPECTRAL_ARROW(70, ABSTRACT_ARROW),
|
||||
TRIDENT(98, ABSTRACT_ARROW),
|
||||
|
||||
// Fireballs
|
||||
ABSTRACT_FIREBALL(-1, ENTITY),
|
||||
DRAGON_FIREBALL(13, ABSTRACT_FIREBALL),
|
||||
FIREBALL(34, ABSTRACT_FIREBALL),
|
||||
SMALL_FIREBALL(66, ABSTRACT_FIREBALL),
|
||||
DRAGON_FIREBALL(14, ABSTRACT_FIREBALL),
|
||||
FIREBALL(35, ABSTRACT_FIREBALL),
|
||||
SMALL_FIREBALL(67, ABSTRACT_FIREBALL),
|
||||
WITHER_SKULL(87, ABSTRACT_FIREBALL),
|
||||
|
||||
// Projectiles
|
||||
PROJECTILE_ABSTRACT(-1, ENTITY),
|
||||
SNOWBALL(68, PROJECTILE_ABSTRACT),
|
||||
ENDER_PEARL(76, PROJECTILE_ABSTRACT),
|
||||
EGG(75, PROJECTILE_ABSTRACT),
|
||||
POTION(78, PROJECTILE_ABSTRACT),
|
||||
XP_BOTTLE(77, PROJECTILE_ABSTRACT),
|
||||
SNOWBALL(69, PROJECTILE_ABSTRACT),
|
||||
ENDER_PEARL(77, PROJECTILE_ABSTRACT),
|
||||
EGG(76, PROJECTILE_ABSTRACT),
|
||||
POTION(79, PROJECTILE_ABSTRACT),
|
||||
XP_BOTTLE(78, PROJECTILE_ABSTRACT),
|
||||
|
||||
// Vehicles
|
||||
MINECART_ABSTRACT(-1, ENTITY),
|
||||
CHESTED_MINECART_ABSTRACT(-1, MINECART_ABSTRACT),
|
||||
CHEST_MINECART(40, CHESTED_MINECART_ABSTRACT),
|
||||
HOPPER_MINECART(43, CHESTED_MINECART_ABSTRACT),
|
||||
MINECART(39, MINECART_ABSTRACT),
|
||||
FURNACE_MINECART(42, MINECART_ABSTRACT),
|
||||
COMMANDBLOCK_MINECART(41, MINECART_ABSTRACT),
|
||||
TNT_MINECART(45, MINECART_ABSTRACT),
|
||||
SPAWNER_MINECART(44, MINECART_ABSTRACT),
|
||||
CHEST_MINECART(41, CHESTED_MINECART_ABSTRACT),
|
||||
HOPPER_MINECART(44, CHESTED_MINECART_ABSTRACT),
|
||||
MINECART(40, MINECART_ABSTRACT),
|
||||
FURNACE_MINECART(43, MINECART_ABSTRACT),
|
||||
COMMANDBLOCK_MINECART(42, MINECART_ABSTRACT),
|
||||
TNT_MINECART(46, MINECART_ABSTRACT),
|
||||
SPAWNER_MINECART(45, MINECART_ABSTRACT),
|
||||
BOAT(5, ENTITY),
|
||||
;
|
||||
|
||||
|
@ -67,7 +67,7 @@ public class ProtocolVersion {
|
||||
register(v1_13 = new ProtocolVersion(393, "1.13"));
|
||||
register(v1_13_1 = new ProtocolVersion(401, "1.13.1"));
|
||||
register(v1_13_2 = new ProtocolVersion(404, "1.13.2"));
|
||||
register(v1_14 = new ProtocolVersion(442, "1.14"));
|
||||
register(v1_14 = new ProtocolVersion(443, "1.14"));
|
||||
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
|
||||
}
|
||||
|
||||
|
@ -10,51 +10,93 @@ public class EntityTypeRewriter {
|
||||
private static Map<Integer, Integer> objectTypes = new HashMap<>();
|
||||
|
||||
static {
|
||||
regEnt(74, 75); // egg
|
||||
regEnt(75, 76); // ender_pearl
|
||||
regEnt(76, 77); // experience_bottle
|
||||
regEnt(93, 96); // fishing_bobber
|
||||
regEnt(80, 81); // iron_golem
|
||||
regEnt(91, 94); // lightning_bolt
|
||||
regEnt(50, 51); // parrot
|
||||
regEnt(90, 92); // phantom
|
||||
regEnt(51, 52); // pig
|
||||
regEnt(92, 95); // player
|
||||
regEnt(54, 55); // polar_bear
|
||||
regEnt(77, 78); // potion
|
||||
regEnt(52, 53); // pufferfish
|
||||
regEnt(56, 57); // rabbit
|
||||
regEnt(57, 58); // salmon
|
||||
regEnt(58, 59); // sheep
|
||||
regEnt(59, 60); // shulker
|
||||
regEnt(60, 61); // shulker_bullet
|
||||
regEnt(61, 62); // silverfish
|
||||
regEnt(62, 63); // skeleton
|
||||
regEnt(63, 64); // skeleton_horse
|
||||
regEnt(64, 65); // slime
|
||||
regEnt(65, 66); // small_fireball
|
||||
regEnt(66, 67); // snowgolem
|
||||
regEnt(67, 68); // snowball
|
||||
regEnt(68, 69); // spectral_arrow
|
||||
regEnt(69, 70); // spider
|
||||
regEnt(70, 71); // squid
|
||||
regEnt(71, 72); // stray
|
||||
regEnt(55, 56); // tnt
|
||||
regEnt(94, 97); // trident
|
||||
regEnt(72, 73); // tropical_fish
|
||||
regEnt(73, 74); // turtle
|
||||
regEnt(78, 79); // vex
|
||||
regEnt(79, 80); // villager
|
||||
regEnt(81, 82); // vindicator
|
||||
regEnt(82, 84); // witch
|
||||
regEnt(83, 85); // wither
|
||||
regEnt(84, 86); // wither_skeleton
|
||||
regEnt(85, 87); // wither_skull
|
||||
regEnt(86, 88); // wolf
|
||||
regEnt(87, 89); // zombie
|
||||
regEnt(88, 90); // zombie_horse
|
||||
regEnt(53, 54); // zombie_pigman
|
||||
regEnt(89, 91); // zombie_villager
|
||||
regEnt(6, 7); // cave_spider
|
||||
regEnt(7, 8); // chicken
|
||||
regEnt(8, 9); // cod
|
||||
regEnt(9, 10); // cow
|
||||
regEnt(10, 11); // creeper
|
||||
regEnt(11, 12); // donkey
|
||||
regEnt(12, 13); // dolphin
|
||||
regEnt(13, 14); // dragon_fireball
|
||||
regEnt(14, 15); // drowned
|
||||
regEnt(15, 16); // elder_guardian
|
||||
regEnt(16, 17); // end_crystal
|
||||
regEnt(17, 18); // ender_dragon
|
||||
regEnt(18, 19); // enderman
|
||||
regEnt(19, 20); // endermite
|
||||
regEnt(20, 21); // evoker_fangs
|
||||
regEnt(21, 22); // evoker
|
||||
regEnt(22, 23); // experience_orb
|
||||
regEnt(23, 24); // eye_of_ender
|
||||
regEnt(24, 25); // falling_block
|
||||
regEnt(25, 26); // firework_rocket
|
||||
regEnt(26, 27); // ghast
|
||||
regEnt(27, 28); // giant
|
||||
regEnt(28, 29); // guardian
|
||||
regEnt(29, 30); // husk
|
||||
regEnt(31, 32); // illusioner
|
||||
regEnt(32, 33); // item
|
||||
regEnt(33, 34); // item_frame
|
||||
regEnt(35, 36); // leash_knot
|
||||
regEnt(34, 35); // fireball
|
||||
regEnt(36, 37); // llama
|
||||
regEnt(37, 38); // llama_spit
|
||||
regEnt(38, 39); // magma_cube
|
||||
regEnt(39, 40); // minecart
|
||||
regEnt(40, 41); // chest_minecart
|
||||
regEnt(41, 42); // command_block_minecart
|
||||
regEnt(42, 43); // furnace_minecart
|
||||
regEnt(43, 44); // hopper_minecart
|
||||
regEnt(45, 46); // tnt_minecart
|
||||
regEnt(46, 47); // mule
|
||||
regEnt(47, 48); // mooshroom
|
||||
regEnt(48, 49); // ocelot
|
||||
regEnt(49, 50); // painting
|
||||
regEnt(50, 52); // parrot
|
||||
regEnt(51, 53); // pig
|
||||
regEnt(52, 54); // pufferfish
|
||||
regEnt(53, 55); // zombie_pigman
|
||||
regEnt(54, 56); // polar_bear
|
||||
regEnt(55, 57); // tnt
|
||||
regEnt(56, 58); // rabbit
|
||||
regEnt(57, 59); // salmon
|
||||
regEnt(58, 60); // sheep
|
||||
regEnt(59, 61); // shulker
|
||||
regEnt(60, 62); // shulker_bullet
|
||||
regEnt(61, 63); // silverfish
|
||||
regEnt(62, 64); // skeleton
|
||||
regEnt(63, 65); // skeleton_horse
|
||||
regEnt(64, 66); // slime
|
||||
regEnt(65, 67); // small_fireball
|
||||
regEnt(66, 68); // snowgolem
|
||||
regEnt(67, 69); // snowball
|
||||
regEnt(68, 70); // spectral_arrow
|
||||
regEnt(69, 71); // spider
|
||||
regEnt(70, 72); // squid
|
||||
regEnt(71, 73); // stray
|
||||
regEnt(72, 74); // tropical_fish
|
||||
regEnt(73, 75); // turtle
|
||||
regEnt(74, 76); // egg
|
||||
regEnt(75, 77); // ender_pearl
|
||||
regEnt(76, 78); // experience_bottle
|
||||
regEnt(77, 79); // potion
|
||||
regEnt(78, 80); // vex
|
||||
regEnt(79, 81); // villager
|
||||
regEnt(80, 82); // iron_golem
|
||||
regEnt(81, 83); // vindicator
|
||||
regEnt(82, 85); // witch
|
||||
regEnt(83, 86); // wither
|
||||
regEnt(84, 87); // wither_skeleton
|
||||
regEnt(85, 88); // wither_skull
|
||||
regEnt(86, 89); // wolf
|
||||
regEnt(87, 90); // zombie
|
||||
regEnt(88, 91); // zombie_horse
|
||||
regEnt(89, 92); // zombie_villager
|
||||
regEnt(90, 93); // phantom
|
||||
regEnt(91, 95); // lightning_bolt
|
||||
regEnt(92, 96); // player
|
||||
regEnt(93, 97); // fishing_bobber
|
||||
regEnt(94, 98); // trident
|
||||
}
|
||||
|
||||
private static void regEnt(int type1_13, int type1_14) {
|
||||
|
@ -207,10 +207,11 @@ public class InventoryPackets {
|
||||
else if (id < 542) return id + 43;
|
||||
else if (id < 561) return id + 48;
|
||||
else if (id < 593) return id + 49;
|
||||
else if (id < 657) return id + 53;
|
||||
else if (id < 662) return id + 54;
|
||||
else if (id < 665) return id + 55;
|
||||
else return id + 56;
|
||||
else if (id < 641) return id + 53;
|
||||
else if (id < 657) return id + 54;
|
||||
else if (id < 662) return id + 55;
|
||||
else if (id < 665) return id + 56;
|
||||
else return id + 57;
|
||||
}
|
||||
|
||||
public static void toServer(Item item) {
|
||||
@ -231,13 +232,15 @@ public class InventoryPackets {
|
||||
else if (id < 610) return 1;
|
||||
else if (id < 642) return id - 49;
|
||||
else if (id < 646) return 1;
|
||||
else if (id < 710) return id - 53;
|
||||
else if (id < 711) return 1;
|
||||
else if (id < 716) return id - 54;
|
||||
else if (id < 717) return 1;
|
||||
else if (id < 720) return id - 55;
|
||||
else if (id < 721) return 1;
|
||||
else if (id < 846) return id - 56;
|
||||
else if (id < 694) return id - 53;
|
||||
else if (id < 695) return 1;
|
||||
else if (id < 711) return id - 54;
|
||||
else if (id < 712) return 1;
|
||||
else if (id < 717) return id - 55;
|
||||
else if (id < 718) return 1;
|
||||
else if (id < 721) return id - 56;
|
||||
else if (id < 722) return 1;
|
||||
else if (id < 847) return id - 57;
|
||||
else return 1;
|
||||
}
|
||||
}
|
||||
|
@ -91,6 +91,7 @@ public class WorldPackets {
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Chunk
|
||||
protocol.registerOutgoing(State.PLAY, 0x22, 0x22, new PacketRemapper() {
|
||||
@Override
|
||||
@ -146,6 +147,8 @@ public class WorldPackets {
|
||||
}
|
||||
lightPacket.write(Type.VAR_INT, skyLightMask);
|
||||
lightPacket.write(Type.VAR_INT, blockLightMask);
|
||||
lightPacket.write(Type.VAR_INT, 0); //TODO find out what these two bitmasks mean
|
||||
lightPacket.write(Type.VAR_INT, 0); //TODO
|
||||
for (ChunkSection section : chunk.getSections()) {
|
||||
if (section == null || !section.hasSkyLight()) continue;
|
||||
ByteBuf buf = wrapper.user().getChannel().alloc().buffer();
|
||||
|
@ -77,6 +77,7 @@ public class Chunk1_14Type extends PartialType<Chunk, ClientWorld> {
|
||||
|
||||
output.writeBoolean(chunk.isGroundUp());
|
||||
Type.VAR_INT.write(output, chunk.getBitmask());
|
||||
Type.NBT.write(output, new CompoundTag("")); //TODO unknown compound tag
|
||||
|
||||
ByteBuf buf = output.alloc().buffer();
|
||||
for (int i = 0; i < 16; i++) {
|
||||
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</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>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>viaversion-parent</name>
|
||||
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>viaversion-parent</artifactId>
|
||||
<groupId>us.myles</groupId>
|
||||
<version>1.6.1-18w43c</version>
|
||||
<version>1.6.1-18w44a</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user