Commit 88836e2372fa3493865cce06d831a44d65a17ade
1 parent
7739602f
Quick and dirty 1.9.4 update
Showing
17 changed files
with
261 additions
and
261 deletions
gradle.properties
@@ -5,6 +5,6 @@ description=LiteLoader | @@ -5,6 +5,6 @@ description=LiteLoader | ||
5 | url=http://www.liteloader.com | 5 | url=http://www.liteloader.com |
6 | organization=LiteLoader | 6 | organization=LiteLoader |
7 | buildType=SNAPSHOT | 7 | buildType=SNAPSHOT |
8 | -buildVersion=1.9 | ||
9 | -mcVersion=1.9 | ||
10 | -mcMappings=snapshot_20160411 | ||
11 | \ No newline at end of file | 8 | \ No newline at end of file |
9 | +buildVersion=1.9.4 | ||
10 | +mcVersion=1.9.4 | ||
11 | +mcMappings=snapshot_custom | ||
12 | \ No newline at end of file | 12 | \ No newline at end of file |
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
@@ -113,9 +113,9 @@ public class ClientPluginChannelsClient extends ClientPluginChannels | @@ -113,9 +113,9 @@ public class ClientPluginChannelsClient extends ClientPluginChannels | ||
113 | { | 113 | { |
114 | Minecraft minecraft = Minecraft.getMinecraft(); | 114 | Minecraft minecraft = Minecraft.getMinecraft(); |
115 | 115 | ||
116 | - if (minecraft.thePlayer != null && minecraft.thePlayer.sendQueue != null) | 116 | + if (minecraft.thePlayer != null && minecraft.thePlayer.connection != null) |
117 | { | 117 | { |
118 | - minecraft.thePlayer.sendQueue.addToSendQueue(payload); | 118 | + minecraft.thePlayer.connection.sendPacket(payload); |
119 | return true; | 119 | return true; |
120 | } | 120 | } |
121 | } | 121 | } |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinIntIdentityHashBiMap.java
@@ -15,13 +15,13 @@ import net.minecraft.util.IntIdentityHashBiMap; | @@ -15,13 +15,13 @@ import net.minecraft.util.IntIdentityHashBiMap; | ||
15 | @Mixin(IntIdentityHashBiMap.class) | 15 | @Mixin(IntIdentityHashBiMap.class) |
16 | public abstract class MixinIntIdentityHashBiMap<V> implements IIntIdentityHashBiMap<V> | 16 | public abstract class MixinIntIdentityHashBiMap<V> implements IIntIdentityHashBiMap<V> |
17 | { | 17 | { |
18 | - @Shadow private V[] objectArray; | ||
19 | - @Shadow private int[] intKeys; | ||
20 | - @Shadow private V[] intToObjects; | ||
21 | - @Shadow private int field_186821_e; | 18 | + @Shadow private V[] keys; |
19 | + @Shadow private int[] values; | ||
20 | + @Shadow private V[] byId; | ||
21 | + @Shadow private int nextFreeIndex; | ||
22 | @Shadow private int mapSize; | 22 | @Shadow private int mapSize; |
23 | 23 | ||
24 | - @Shadow private int func_186816_b(V object, int hash) | 24 | + @Shadow private int getIndex(V object, int hash) |
25 | { | 25 | { |
26 | return -1; | 26 | return -1; |
27 | } | 27 | } |
@@ -34,10 +34,10 @@ public abstract class MixinIntIdentityHashBiMap<V> implements IIntIdentityHashBi | @@ -34,10 +34,10 @@ public abstract class MixinIntIdentityHashBiMap<V> implements IIntIdentityHashBi | ||
34 | @Override | 34 | @Override |
35 | public void removeObject(V object) | 35 | public void removeObject(V object) |
36 | { | 36 | { |
37 | - int index = this.func_186816_b(object, this.hashObject(object)); | ||
38 | - int intKey = this.intKeys[index]; | ||
39 | - this.objectArray[index] = null; | ||
40 | - this.intKeys[index] = 0; | ||
41 | - this.intToObjects[intKey] = null; | 37 | + int index = this.getIndex(object, this.hashObject(object)); |
38 | + int intKey = this.values[index]; | ||
39 | + this.keys[index] = null; | ||
40 | + this.values[index] = 0; | ||
41 | + this.byId[intKey] = null; | ||
42 | } | 42 | } |
43 | } | 43 | } |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinNetHandlerLoginClient.java
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | */ | 5 | */ |
6 | package com.mumfrey.liteloader.client.mixin; | 6 | package com.mumfrey.liteloader.client.mixin; |
7 | 7 | ||
8 | +import org.spongepowered.asm.mixin.Final; | ||
8 | import org.spongepowered.asm.mixin.Mixin; | 9 | import org.spongepowered.asm.mixin.Mixin; |
9 | import org.spongepowered.asm.mixin.Shadow; | 10 | import org.spongepowered.asm.mixin.Shadow; |
10 | 11 | ||
@@ -16,7 +17,7 @@ import net.minecraft.network.NetworkManager; | @@ -16,7 +17,7 @@ import net.minecraft.network.NetworkManager; | ||
16 | @Mixin(NetHandlerLoginClient.class) | 17 | @Mixin(NetHandlerLoginClient.class) |
17 | public abstract class MixinNetHandlerLoginClient implements IClientNetLoginHandler | 18 | public abstract class MixinNetHandlerLoginClient implements IClientNetLoginHandler |
18 | { | 19 | { |
19 | - @Shadow private NetworkManager networkManager; | 20 | + @Shadow @Final private NetworkManager networkManager; |
20 | 21 | ||
21 | @Override | 22 | @Override |
22 | public NetworkManager getNetMgr() | 23 | public NetworkManager getNetMgr() |
src/client/java/com/mumfrey/liteloader/resources/InternalResourcePack.java
@@ -13,7 +13,7 @@ import java.util.Set; | @@ -13,7 +13,7 @@ import java.util.Set; | ||
13 | 13 | ||
14 | import net.minecraft.client.resources.IResourcePack; | 14 | import net.minecraft.client.resources.IResourcePack; |
15 | import net.minecraft.client.resources.data.IMetadataSection; | 15 | import net.minecraft.client.resources.data.IMetadataSection; |
16 | -import net.minecraft.client.resources.data.IMetadataSerializer; | 16 | +import net.minecraft.client.resources.data.MetadataSerializer; |
17 | import net.minecraft.util.ResourceLocation; | 17 | import net.minecraft.util.ResourceLocation; |
18 | 18 | ||
19 | /** | 19 | /** |
@@ -101,7 +101,7 @@ public class InternalResourcePack implements IResourcePack | @@ -101,7 +101,7 @@ public class InternalResourcePack implements IResourcePack | ||
101 | * java.lang.String) | 101 | * java.lang.String) |
102 | */ | 102 | */ |
103 | @Override | 103 | @Override |
104 | - public <T extends IMetadataSection> T getPackMetadata(IMetadataSerializer par1MetadataSerializer, String par2Str) throws IOException | 104 | + public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer par1MetadataSerializer, String par2Str) throws IOException |
105 | { | 105 | { |
106 | return null; | 106 | return null; |
107 | } | 107 | } |
src/client/java/com/mumfrey/liteloader/resources/ModResourcePack.java
@@ -10,7 +10,7 @@ import java.io.IOException; | @@ -10,7 +10,7 @@ import java.io.IOException; | ||
10 | 10 | ||
11 | import net.minecraft.client.resources.FileResourcePack; | 11 | import net.minecraft.client.resources.FileResourcePack; |
12 | import net.minecraft.client.resources.data.IMetadataSection; | 12 | import net.minecraft.client.resources.data.IMetadataSection; |
13 | -import net.minecraft.client.resources.data.IMetadataSerializer; | 13 | +import net.minecraft.client.resources.data.MetadataSerializer; |
14 | 14 | ||
15 | /** | 15 | /** |
16 | * Resource pack which wraps a mod file | 16 | * Resource pack which wraps a mod file |
@@ -40,7 +40,7 @@ public class ModResourcePack extends FileResourcePack | @@ -40,7 +40,7 @@ public class ModResourcePack extends FileResourcePack | ||
40 | * java.lang.String) | 40 | * java.lang.String) |
41 | */ | 41 | */ |
42 | @Override | 42 | @Override |
43 | - public <T extends IMetadataSection> T getPackMetadata(IMetadataSerializer metadataSerializer, String metadataSectionName) throws IOException | 43 | + public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException |
44 | { | 44 | { |
45 | try | 45 | try |
46 | { | 46 | { |
src/client/java/com/mumfrey/liteloader/resources/ModResourcePackDir.java
@@ -10,7 +10,7 @@ import java.io.IOException; | @@ -10,7 +10,7 @@ import java.io.IOException; | ||
10 | 10 | ||
11 | import net.minecraft.client.resources.FolderResourcePack; | 11 | import net.minecraft.client.resources.FolderResourcePack; |
12 | import net.minecraft.client.resources.data.IMetadataSection; | 12 | import net.minecraft.client.resources.data.IMetadataSection; |
13 | -import net.minecraft.client.resources.data.IMetadataSerializer; | 13 | +import net.minecraft.client.resources.data.MetadataSerializer; |
14 | 14 | ||
15 | /** | 15 | /** |
16 | * Resource pack which wraps a mod directory on the classpath | 16 | * Resource pack which wraps a mod directory on the classpath |
@@ -40,7 +40,7 @@ public class ModResourcePackDir extends FolderResourcePack | @@ -40,7 +40,7 @@ public class ModResourcePackDir extends FolderResourcePack | ||
40 | * java.lang.String) | 40 | * java.lang.String) |
41 | */ | 41 | */ |
42 | @Override | 42 | @Override |
43 | - public <T extends IMetadataSection> T getPackMetadata(IMetadataSerializer metadataSerializer, String metadataSectionName) throws IOException | 43 | + public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException |
44 | { | 44 | { |
45 | try | 45 | try |
46 | { | 46 | { |
src/main/java/com/mumfrey/liteloader/common/mixin/MixinNetHandlerPlayServer.java
@@ -20,8 +20,8 @@ import com.mumfrey.liteloader.core.Proxy; | @@ -20,8 +20,8 @@ import com.mumfrey.liteloader.core.Proxy; | ||
20 | import net.minecraft.network.NetHandlerPlayServer; | 20 | import net.minecraft.network.NetHandlerPlayServer; |
21 | import net.minecraft.network.play.client.CPacketAnimation; | 21 | import net.minecraft.network.play.client.CPacketAnimation; |
22 | import net.minecraft.network.play.client.CPacketPlayer; | 22 | import net.minecraft.network.play.client.CPacketPlayer; |
23 | -import net.minecraft.network.play.client.CPacketPlayerBlockPlacement; | ||
24 | import net.minecraft.network.play.client.CPacketPlayerDigging; | 23 | import net.minecraft.network.play.client.CPacketPlayerDigging; |
24 | +import net.minecraft.network.play.client.CPacketPlayerTryUseItem; | ||
25 | import net.minecraft.util.math.Vec3d; | 25 | import net.minecraft.util.math.Vec3d; |
26 | import net.minecraft.world.WorldServer; | 26 | import net.minecraft.world.WorldServer; |
27 | 27 | ||
@@ -29,10 +29,10 @@ import net.minecraft.world.WorldServer; | @@ -29,10 +29,10 @@ import net.minecraft.world.WorldServer; | ||
29 | public abstract class MixinNetHandlerPlayServer implements ITeleportHandler | 29 | public abstract class MixinNetHandlerPlayServer implements ITeleportHandler |
30 | { | 30 | { |
31 | @Shadow private int teleportId; | 31 | @Shadow private int teleportId; |
32 | - @Shadow private Vec3d field_184362_y; | 32 | + @Shadow private Vec3d targetPos; |
33 | 33 | ||
34 | @Inject( | 34 | @Inject( |
35 | - method = "processPlayerBlockPlacement(Lnet/minecraft/network/play/client/CPacketPlayerBlockPlacement;)V", | 35 | + method = "processPlayerBlockPlacement(Lnet/minecraft/network/play/client/CPacketPlayerTryUseItem;)V", |
36 | cancellable = true, | 36 | cancellable = true, |
37 | at = @At( | 37 | at = @At( |
38 | value = "INVOKE", | 38 | value = "INVOKE", |
@@ -41,7 +41,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler | @@ -41,7 +41,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler | ||
41 | + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V" | 41 | + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V" |
42 | ) | 42 | ) |
43 | ) | 43 | ) |
44 | - private void onPlaceBlock(CPacketPlayerBlockPlacement packetIn, CallbackInfo ci) | 44 | + private void onPlaceBlock(CPacketPlayerTryUseItem packetIn, CallbackInfo ci) |
45 | { | 45 | { |
46 | Proxy.onPlaceBlock(ci, (NetHandlerPlayServer)(Object)this, packetIn); | 46 | Proxy.onPlaceBlock(ci, (NetHandlerPlayServer)(Object)this, packetIn); |
47 | } | 47 | } |
@@ -95,7 +95,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler | @@ -95,7 +95,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler | ||
95 | @Override | 95 | @Override |
96 | public int beginTeleport(Vec3d location) | 96 | public int beginTeleport(Vec3d location) |
97 | { | 97 | { |
98 | - this.field_184362_y = location; | 98 | + this.targetPos = location; |
99 | 99 | ||
100 | if (++this.teleportId == Integer.MAX_VALUE) | 100 | if (++this.teleportId == Integer.MAX_VALUE) |
101 | { | 101 | { |
src/main/java/com/mumfrey/liteloader/core/LiteLoader.java
@@ -1012,9 +1012,9 @@ public final class LiteLoader | @@ -1012,9 +1012,9 @@ public final class LiteLoader | ||
1012 | private static void populateCrashReport(CrashReport crashReport) | 1012 | private static void populateCrashReport(CrashReport crashReport) |
1013 | { | 1013 | { |
1014 | CrashReportCategory category = crashReport.getCategory(); // crashReport.makeCategoryDepth("Mod System Details", 1); | 1014 | CrashReportCategory category = crashReport.getCategory(); // crashReport.makeCategoryDepth("Mod System Details", 1); |
1015 | - category.addCrashSectionCallable("Mod Pack", new CallableLiteLoaderBrand(crashReport)); | ||
1016 | - category.addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(crashReport)); | ||
1017 | - category.addCrashSectionCallable("LaunchWrapper", new CallableLaunchWrapper(crashReport)); | 1015 | + category.addCrashSection("Mod Pack", new CallableLiteLoaderBrand(crashReport)); |
1016 | + category.addCrashSection("LiteLoader Mods", new CallableLiteLoaderMods(crashReport)); | ||
1017 | + category.addCrashSection("LaunchWrapper", new CallableLaunchWrapper(crashReport)); | ||
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | static final void createInstance(LoaderEnvironment environment, LoaderProperties properties, LaunchClassLoader classLoader) | 1020 | static final void createInstance(LoaderEnvironment environment, LoaderProperties properties, LaunchClassLoader classLoader) |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
@@ -411,7 +411,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -411,7 +411,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
411 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing)) | 411 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing)) |
412 | { | 412 | { |
413 | SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos.offset(facing)); | 413 | SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos.offset(facing)); |
414 | - netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation); | 414 | + netHandler.playerEntity.connection.sendPacket(cancellation); |
415 | player.sendContainerToPlayer(player.inventoryContainer); | 415 | player.sendContainerToPlayer(player.inventoryContainer); |
416 | return false; | 416 | return false; |
417 | } | 417 | } |
@@ -429,7 +429,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -429,7 +429,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
429 | if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH)) | 429 | if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH)) |
430 | { | 430 | { |
431 | SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos); | 431 | SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos); |
432 | - netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation); | 432 | + netHandler.playerEntity.connection.sendPacket(cancellation); |
433 | return false; | 433 | return false; |
434 | } | 434 | } |
435 | 435 | ||
@@ -441,7 +441,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -441,7 +441,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
441 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, stack, pos, side)) | 441 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, stack, pos, side)) |
442 | { | 442 | { |
443 | SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos); | 443 | SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos); |
444 | - player.playerNetServerHandler.sendPacket(cancellation); | 444 | + player.connection.sendPacket(cancellation); |
445 | return false; | 445 | return false; |
446 | } | 446 | } |
447 | 447 | ||
@@ -454,7 +454,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -454,7 +454,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
454 | if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, side)) | 454 | if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, side)) |
455 | { | 455 | { |
456 | SPacketBlockChange cancellation = new SPacketBlockChange(manager.theWorld, pos); | 456 | SPacketBlockChange cancellation = new SPacketBlockChange(manager.theWorld, pos); |
457 | - player.playerNetServerHandler.sendPacket(cancellation); | 457 | + player.connection.sendPacket(cancellation); |
458 | return false; | 458 | return false; |
459 | } | 459 | } |
460 | 460 | ||
@@ -491,9 +491,9 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -491,9 +491,9 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
491 | 491 | ||
492 | if (!this.playerMoveListeners.all().onPlayerMove(player, from, to, pos)) | 492 | if (!this.playerMoveListeners.all().onPlayerMove(player, from, to, pos)) |
493 | { | 493 | { |
494 | - int teleportId = ((ITeleportHandler)player.playerNetServerHandler).beginTeleport(from); | 494 | + int teleportId = ((ITeleportHandler)player.connection).beginTeleport(from); |
495 | player.setPositionAndRotation(from.xCoord, from.yCoord, from.zCoord, player.prevRotationYaw, player.prevRotationPitch); | 495 | player.setPositionAndRotation(from.xCoord, from.yCoord, from.zCoord, player.prevRotationYaw, player.prevRotationPitch); |
496 | - player.playerNetServerHandler.sendPacket(new SPacketPlayerPosLook(from.xCoord, from.yCoord, from.zCoord, | 496 | + player.connection.sendPacket(new SPacketPlayerPosLook(from.xCoord, from.yCoord, from.zCoord, |
497 | player.prevRotationYaw, player.prevRotationPitch, Collections.<EnumFlags>emptySet(), teleportId)); | 497 | player.prevRotationYaw, player.prevRotationPitch, Collections.<EnumFlags>emptySet(), teleportId)); |
498 | return false; | 498 | return false; |
499 | } | 499 | } |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
@@ -12,7 +12,7 @@ import java.util.Set; | @@ -12,7 +12,7 @@ import java.util.Set; | ||
12 | * LiteLoader version table | 12 | * LiteLoader version table |
13 | * | 13 | * |
14 | * @author Adam Mummery-Smith | 14 | * @author Adam Mummery-Smith |
15 | - * @version 1.9.0_00 | 15 | + * @version 1.9.4_00 |
16 | */ | 16 | */ |
17 | public enum LiteLoaderVersion | 17 | public enum LiteLoaderVersion |
18 | { | 18 | { |
@@ -45,7 +45,8 @@ public enum LiteLoaderVersion | @@ -45,7 +45,8 @@ public enum LiteLoaderVersion | ||
45 | MC_1_7_10_R4(31, 1414368553, "1.7.10", "1.7.10_04", "1.7.10", "1.7.10_03", "1.7.10_04"), | 45 | MC_1_7_10_R4(31, 1414368553, "1.7.10", "1.7.10_04", "1.7.10", "1.7.10_03", "1.7.10_04"), |
46 | MC_1_8_0_R0(32, 0, "1.8", "1.8.0", "1.8", "1.8.0"), | 46 | MC_1_8_0_R0(32, 0, "1.8", "1.8.0", "1.8", "1.8.0"), |
47 | MC_1_8_9_R0(34, 0, "1.8.9", "1.8.9", "1.8.9"), | 47 | MC_1_8_9_R0(34, 0, "1.8.9", "1.8.9", "1.8.9"), |
48 | - MC_1_9_0_R0(35, 0, "1.9", "1.9.0", "1.9", "1.9.0"); | 48 | + MC_1_9_4_R0(35, 0, "1.9", "1.9.0", "1.9", "1.9.0"), |
49 | + MC_1_9_0_R0(36, 0, "1.9.4", "1.9.4", "1.9.4"); | ||
49 | 50 | ||
50 | /** | 51 | /** |
51 | * Current loader version | 52 | * Current loader version |
src/main/java/com/mumfrey/liteloader/core/Proxy.java
@@ -18,9 +18,9 @@ import net.minecraft.network.NetHandlerPlayServer; | @@ -18,9 +18,9 @@ import net.minecraft.network.NetHandlerPlayServer; | ||
18 | import net.minecraft.network.NetworkManager; | 18 | import net.minecraft.network.NetworkManager; |
19 | import net.minecraft.network.play.client.CPacketAnimation; | 19 | import net.minecraft.network.play.client.CPacketAnimation; |
20 | import net.minecraft.network.play.client.CPacketPlayer; | 20 | import net.minecraft.network.play.client.CPacketPlayer; |
21 | -import net.minecraft.network.play.client.CPacketPlayerBlockPlacement; | ||
22 | import net.minecraft.network.play.client.CPacketPlayerDigging; | 21 | import net.minecraft.network.play.client.CPacketPlayerDigging; |
23 | import net.minecraft.network.play.client.CPacketPlayerDigging.Action; | 22 | import net.minecraft.network.play.client.CPacketPlayerDigging.Action; |
23 | +import net.minecraft.network.play.client.CPacketPlayerTryUseItem; | ||
24 | import net.minecraft.server.MinecraftServer; | 24 | import net.minecraft.server.MinecraftServer; |
25 | import net.minecraft.server.management.PlayerInteractionManager; | 25 | import net.minecraft.server.management.PlayerInteractionManager; |
26 | import net.minecraft.server.management.PlayerList; | 26 | import net.minecraft.server.management.PlayerList; |
@@ -79,7 +79,7 @@ public abstract class Proxy | @@ -79,7 +79,7 @@ public abstract class Proxy | ||
79 | Proxy.broker.onServerTick(mcServer); | 79 | Proxy.broker.onServerTick(mcServer); |
80 | } | 80 | } |
81 | 81 | ||
82 | - public static void onPlaceBlock(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayerBlockPlacement packet) | 82 | + public static void onPlaceBlock(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayerTryUseItem packet) |
83 | { | 83 | { |
84 | // Potentially not needed any more | 84 | // Potentially not needed any more |
85 | // if (!Proxy.broker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(), | 85 | // if (!Proxy.broker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(), |
src/main/java/com/mumfrey/liteloader/core/ServerPluginChannels.java
@@ -254,9 +254,9 @@ public class ServerPluginChannels extends PluginChannels<ServerPluginChannelList | @@ -254,9 +254,9 @@ public class ServerPluginChannels extends PluginChannels<ServerPluginChannelList | ||
254 | { | 254 | { |
255 | try | 255 | try |
256 | { | 256 | { |
257 | - if (recipient != null && recipient.playerNetServerHandler != null) | 257 | + if (recipient != null && recipient.connection != null) |
258 | { | 258 | { |
259 | - recipient.playerNetServerHandler.sendPacket(payload); | 259 | + recipient.connection.sendPacket(payload); |
260 | return true; | 260 | return true; |
261 | } | 261 | } |
262 | } | 262 | } |
src/main/java/com/mumfrey/liteloader/core/event/EventProxy.java
@@ -204,7 +204,7 @@ public final class EventProxy | @@ -204,7 +204,7 @@ public final class EventProxy | ||
204 | { | 204 | { |
205 | CrashReportCategory category = crashReport.makeCategoryDepth("Event Handler Error", 1); | 205 | CrashReportCategory category = crashReport.makeCategoryDepth("Event Handler Error", 1); |
206 | 206 | ||
207 | - category.addCrashSectionCallable(EventProxy.error, new Callable<String>() | 207 | + category.addCrashSection(EventProxy.error, new Callable<String>() |
208 | { | 208 | { |
209 | @Override | 209 | @Override |
210 | public String call() throws Exception | 210 | public String call() throws Exception |
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
@@ -17,7 +17,7 @@ import org.spongepowered.asm.obfuscation.SrgMethod; | @@ -17,7 +17,7 @@ import org.spongepowered.asm.obfuscation.SrgMethod; | ||
17 | * Centralised obfuscation table for LiteLoader | 17 | * Centralised obfuscation table for LiteLoader |
18 | * | 18 | * |
19 | * @author Adam Mummery-Smith | 19 | * @author Adam Mummery-Smith |
20 | - * TODO Obfuscation 1.9 | 20 | + * TODO Obfuscation 1.9.4 |
21 | */ | 21 | */ |
22 | public class Obf | 22 | public class Obf |
23 | { | 23 | { |
@@ -43,14 +43,14 @@ public class Obf | @@ -43,14 +43,14 @@ public class Obf | ||
43 | 43 | ||
44 | // Classes | 44 | // Classes |
45 | // ----------------------------------------------------------------------------------------- | 45 | // ----------------------------------------------------------------------------------------- |
46 | - public static final Obf Minecraft = new Obf("net.minecraft.client.Minecraft", "bcf" ); | ||
47 | - public static final Obf EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer", "bng" ); | 46 | + public static final Obf Minecraft = new Obf("net.minecraft.client.Minecraft", "bcd" ); |
47 | + public static final Obf EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer", "bnd" ); | ||
48 | public static final Obf Blocks = new Obf("net.minecraft.init.Blocks", "aju" ); | 48 | public static final Obf Blocks = new Obf("net.minecraft.init.Blocks", "aju" ); |
49 | public static final Obf CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6", "b$6" ); | 49 | public static final Obf CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6", "b$6" ); |
50 | - public static final Obf INetHandler = new Obf("net.minecraft.network.INetHandler", "ep" ); | 50 | + public static final Obf INetHandler = new Obf("net.minecraft.network.INetHandler", "er" ); |
51 | public static final Obf Items = new Obf("net.minecraft.init.Items", "ads" ); | 51 | public static final Obf Items = new Obf("net.minecraft.init.Items", "ads" ); |
52 | public static final Obf Profiler = new Obf("net.minecraft.profiler.Profiler", "oo" ); | 52 | public static final Obf Profiler = new Obf("net.minecraft.profiler.Profiler", "oo" ); |
53 | - public static final Obf TileEntity = new Obf("net.minecraft.tileentity.TileEntity", "apw" ); | 53 | + public static final Obf TileEntity = new Obf("net.minecraft.tileentity.TileEntity", "apv" ); |
54 | 54 | ||
55 | // Fields | 55 | // Fields |
56 | // ----------------------------------------------------------------------------------------- | 56 | // ----------------------------------------------------------------------------------------- |
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
@@ -12,7 +12,7 @@ import java.util.Map; | @@ -12,7 +12,7 @@ import java.util.Map; | ||
12 | * Packet obfuscation table | 12 | * Packet obfuscation table |
13 | * | 13 | * |
14 | * @author Adam Mummery-Smith | 14 | * @author Adam Mummery-Smith |
15 | - * TODO Obfuscation 1.9 | 15 | + * TODO Obfuscation 1.9.4 |
16 | */ | 16 | */ |
17 | public final class Packets extends Obf | 17 | public final class Packets extends Obf |
18 | { | 18 | { |
@@ -37,246 +37,244 @@ public final class Packets extends Obf | @@ -37,246 +37,244 @@ public final class Packets extends Obf | ||
37 | 37 | ||
38 | private static Map<String, Packets> packetMap = new HashMap<String, Packets>(); | 38 | private static Map<String, Packets> packetMap = new HashMap<String, Packets>(); |
39 | 39 | ||
40 | - public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "fj", Context.CLIENT); | ||
41 | - public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "fk", Context.CLIENT); | ||
42 | - public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "fl", Context.CLIENT); | ||
43 | - public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "fm", Context.CLIENT); | ||
44 | - public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "fn", Context.CLIENT); | ||
45 | - public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "fo", Context.CLIENT); | ||
46 | - public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "fp", Context.CLIENT); | ||
47 | - public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "fq", Context.CLIENT); | ||
48 | - public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "fr", Context.CLIENT); | ||
49 | - public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "fs", Context.CLIENT); | ||
50 | - public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "ft", Context.CLIENT); | ||
51 | - public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "fu", Context.CLIENT); | ||
52 | - public static Packets SPacketUpdateEntityNBT = new Packets("net/minecraft/network/play/server/SPacketUpdateEntityNBT", "fv", Context.CLIENT); | ||
53 | - public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "fw", Context.CLIENT); | ||
54 | - public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "fx", Context.CLIENT); | ||
55 | - public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "fy", Context.CLIENT); | ||
56 | - public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "fz", Context.CLIENT); | ||
57 | - public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "ga", Context.CLIENT); | ||
58 | - public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "gb", Context.CLIENT); | ||
59 | - public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "gc", Context.CLIENT); | ||
60 | - public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "gd", Context.CLIENT); | ||
61 | - public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "ge", Context.CLIENT); | ||
62 | - public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "gf", Context.CLIENT); | ||
63 | - public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "gg", Context.CLIENT); | ||
64 | - public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "gh", Context.CLIENT); | ||
65 | - public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "gi", Context.CLIENT); | ||
66 | - public static Packets SPacketDisconnectPlay = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "gj", Context.CLIENT); | ||
67 | - public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "gk", Context.CLIENT); | ||
68 | - public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "gl", Context.CLIENT); | ||
69 | - public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "gm", Context.CLIENT); | ||
70 | - public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "gn", Context.CLIENT); | ||
71 | - public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "go", Context.CLIENT); | ||
72 | - public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "gp", Context.CLIENT); | ||
73 | - public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "gq", Context.CLIENT); | ||
74 | - public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "gr", Context.CLIENT); | ||
75 | - public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "gs", Context.CLIENT); | ||
76 | - public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "gt", Context.CLIENT); | ||
77 | - public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "gu", Context.CLIENT); | ||
78 | - public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "gu$a", Context.CLIENT); | ||
79 | - public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "gu$b", Context.CLIENT); | ||
80 | - public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "gu$c", Context.CLIENT); | ||
81 | - public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "gv", Context.CLIENT); | ||
82 | - public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "gw", Context.CLIENT); | ||
83 | - public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "gx", Context.CLIENT); | ||
84 | - public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "gy", Context.CLIENT); | ||
85 | - public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "gz", Context.CLIENT); | ||
86 | - public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "ha", Context.CLIENT); | ||
87 | - public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "hb", Context.CLIENT); | ||
88 | - public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "hc", Context.CLIENT); | ||
89 | - public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "hd", Context.CLIENT); | ||
90 | - public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "he", Context.CLIENT); | ||
91 | - public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "hf", Context.CLIENT); | ||
92 | - public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "hg", Context.CLIENT); | ||
93 | - public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "hh", Context.CLIENT); | ||
94 | - public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "hi", Context.CLIENT); | ||
95 | - public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "hj", Context.CLIENT); | ||
96 | - public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "hk", Context.CLIENT); | ||
97 | - public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "hl", Context.CLIENT); | ||
98 | - public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "hm", Context.CLIENT); | ||
99 | - public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "hn", Context.CLIENT); | ||
100 | - public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "jj", Context.SERVER); | ||
101 | - public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "ho", Context.CLIENT); | ||
102 | - public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "hp", Context.CLIENT); | ||
103 | - public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "hq", Context.CLIENT); | ||
104 | - public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "hr", Context.CLIENT); | ||
105 | - public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "hs", Context.CLIENT); | ||
106 | - public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "ht", Context.CLIENT); | ||
107 | - public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "hu", Context.CLIENT); | ||
108 | - public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "hv", Context.CLIENT); | ||
109 | - public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "hw", Context.CLIENT); | ||
110 | - public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "hx", Context.CLIENT); | ||
111 | - public static Packets SPacketUpdateSign = new Packets("net/minecraft/network/play/server/SPacketUpdateSign", "hy", Context.CLIENT); | ||
112 | - public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "hz", Context.CLIENT); | ||
113 | - public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "ia", Context.CLIENT); | ||
114 | - public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "ib", Context.CLIENT); | ||
115 | - public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "ic", Context.CLIENT); | ||
116 | - public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "id", Context.CLIENT); | ||
117 | - public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "ie", Context.CLIENT); | ||
118 | - public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "ih", Context.SERVER); | ||
119 | - public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "ii", Context.SERVER); | ||
120 | - public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "ij", Context.SERVER); | ||
121 | - public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "ik", Context.SERVER); | ||
122 | - public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "il", Context.SERVER); | ||
123 | - public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "im", Context.SERVER); | ||
124 | - public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "in", Context.SERVER); | ||
125 | - public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "io", Context.SERVER); | ||
126 | - public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "ip", Context.SERVER); | ||
127 | - public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "iq", Context.SERVER); | ||
128 | - public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "ir", Context.SERVER); | ||
129 | - public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "is", Context.SERVER); | ||
130 | - public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "it", Context.SERVER); | ||
131 | - public static Packets C04PacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$C04PacketPlayerPosition", "it$a", Context.SERVER); | ||
132 | - public static Packets C06PacketPlayerPosLook = new Packets("net/minecraft/network/play/client/CPacketPlayer$C06PacketPlayerPosLook", "it$b", Context.SERVER); | ||
133 | - public static Packets C05PacketPlayerLook = new Packets("net/minecraft/network/play/client/CPacketPlayer$C05PacketPlayerLook", "it$c", Context.SERVER); | ||
134 | - public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "iu", Context.SERVER); | ||
135 | - public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "iv", Context.SERVER); | ||
136 | - public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "iw", Context.SERVER); | ||
137 | - public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "ix", Context.SERVER); | ||
138 | - public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "iy", Context.SERVER); | ||
139 | - public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "iz", Context.SERVER); | ||
140 | - public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "ja", Context.SERVER); | ||
141 | - public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "jb", Context.SERVER); | ||
142 | - public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "jc", Context.SERVER); | ||
143 | - public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "jd", Context.SERVER); | ||
144 | - public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "je", Context.SERVER); | ||
145 | - public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "jf", Context.SERVER); | ||
146 | - public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "jg", Context.SERVER); | ||
147 | - public static Packets CPacketPlayerBlockPlacement = new Packets("net/minecraft/network/play/client/CPacketPlayerBlockPlacement", "jh", Context.SERVER); | ||
148 | - public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "jn", Context.CLIENT); | ||
149 | - public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "jo", Context.CLIENT); | ||
150 | - public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "jp", Context.CLIENT); | ||
151 | - public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "jq", Context.CLIENT); | ||
152 | - public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "js", Context.SERVER); | ||
153 | - public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "jt", Context.SERVER); | ||
154 | - public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "jx", Context.CLIENT); | ||
155 | - public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "jy", Context.CLIENT); | ||
156 | - public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "kb", Context.SERVER); | ||
157 | - public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "kc", Context.SERVER); | 40 | + public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "ju", Context.SERVER); |
41 | + public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "jt", Context.SERVER); | ||
42 | + public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "jr", Context.CLIENT); | ||
43 | + public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "jq", Context.CLIENT); | ||
44 | + public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "jp", Context.CLIENT); | ||
45 | + public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "jo", Context.CLIENT); | ||
46 | + public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "jf", Context.SERVER); | ||
47 | + public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "ik", Context.SERVER); | ||
48 | + public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "ip", Context.SERVER); | ||
49 | + public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "im", Context.SERVER); | ||
50 | + public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "il", Context.SERVER); | ||
51 | + public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "iq", Context.SERVER); | ||
52 | + public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "ii", Context.SERVER); | ||
53 | + public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "in", Context.SERVER); | ||
54 | + public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "jd", Context.SERVER); | ||
55 | + public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "ir", Context.SERVER); | ||
56 | + public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "io", Context.SERVER); | ||
57 | + public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "iz", Context.SERVER); | ||
58 | + public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "jc", Context.SERVER); | ||
59 | + public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "ja", Context.SERVER); | ||
60 | + public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "jk", Context.SERVER); | ||
61 | + public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "it", Context.SERVER); | ||
62 | + public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "iu", Context.SERVER); | ||
63 | + public static Packets CPacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$Position", "iu$a", Context.SERVER); | ||
64 | + public static Packets CPacketPlayerPositionRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$PositionRotation", "iu$b", Context.SERVER); | ||
65 | + public static Packets CPacketPlayerRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$Rotation", "iu$c", Context.SERVER); | ||
66 | + public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "ix", Context.SERVER); | ||
67 | + public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "iy", Context.SERVER); | ||
68 | + public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "ji", Context.SERVER); | ||
69 | + public static Packets CPacketPlayerTryUseItemOnBlock = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItemOnBlock", "jh", Context.SERVER); | ||
70 | + public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "jb", Context.SERVER); | ||
71 | + public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "jg", Context.SERVER); | ||
72 | + public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "iw", Context.SERVER); | ||
73 | + public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "ij", Context.SERVER); | ||
74 | + public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "je", Context.SERVER); | ||
75 | + public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "is", Context.SERVER); | ||
76 | + public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "iv", Context.SERVER); | ||
77 | + public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "fr", Context.CLIENT); | ||
78 | + public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "fv", Context.CLIENT); | ||
79 | + public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "ft", Context.CLIENT); | ||
80 | + public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "fw", Context.CLIENT); | ||
81 | + public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "hk", Context.CLIENT); | ||
82 | + public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "gp", Context.CLIENT); | ||
83 | + public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "ga", Context.CLIENT); | ||
84 | + public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "gr", Context.CLIENT); | ||
85 | + public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "gd", Context.CLIENT); | ||
86 | + public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "ic", Context.CLIENT); | ||
87 | + public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "ha", Context.CLIENT); | ||
88 | + public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "gc", Context.CLIENT); | ||
89 | + public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "gi", Context.CLIENT); | ||
90 | + public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "gj", Context.CLIENT); | ||
91 | + public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "gk", Context.CLIENT); | ||
92 | + public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "he", Context.CLIENT); | ||
93 | + public static Packets SPacketDisconnect = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "gl", Context.CLIENT); | ||
94 | + public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "hm", Context.CLIENT); | ||
95 | + public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "gs", Context.CLIENT); | ||
96 | + public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "gw", Context.CLIENT); | ||
97 | + public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "gw$a", Context.CLIENT); | ||
98 | + public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "gw$c", Context.CLIENT); | ||
99 | + public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "gw$b", Context.CLIENT); | ||
100 | + public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "ho", Context.CLIENT); | ||
101 | + public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "ig", Context.CLIENT); | ||
102 | + public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "hq", Context.CLIENT); | ||
103 | + public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "hi", Context.CLIENT); | ||
104 | + public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "hn", Context.CLIENT); | ||
105 | + public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "ie", Context.CLIENT); | ||
106 | + public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "gm", Context.CLIENT); | ||
107 | + public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "id", Context.CLIENT); | ||
108 | + public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "hp", Context.CLIENT); | ||
109 | + public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "gn", Context.CLIENT); | ||
110 | + public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "hl", Context.CLIENT); | ||
111 | + public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "gu", Context.CLIENT); | ||
112 | + public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "gq", Context.CLIENT); | ||
113 | + public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "gv", Context.CLIENT); | ||
114 | + public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "gx", Context.CLIENT); | ||
115 | + public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "gb", Context.CLIENT); | ||
116 | + public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "ge", Context.CLIENT); | ||
117 | + public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "gt", Context.CLIENT); | ||
118 | + public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "gz", Context.CLIENT); | ||
119 | + public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "ib", Context.CLIENT); | ||
120 | + public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "hb", Context.CLIENT); | ||
121 | + public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "hc", Context.CLIENT); | ||
122 | + public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "hf", Context.CLIENT); | ||
123 | + public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "hg", Context.CLIENT); | ||
124 | + public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "hh", Context.CLIENT); | ||
125 | + public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "ht", Context.CLIENT); | ||
126 | + public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "fy", Context.CLIENT); | ||
127 | + public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "hr", Context.CLIENT); | ||
128 | + public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "hu", Context.CLIENT); | ||
129 | + public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "gh", Context.CLIENT); | ||
130 | + public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "gy", Context.CLIENT); | ||
131 | + public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "ia", Context.CLIENT); | ||
132 | + public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "fm", Context.CLIENT); | ||
133 | + public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "fn", Context.CLIENT); | ||
134 | + public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "fo", Context.CLIENT); | ||
135 | + public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "fl", Context.CLIENT); | ||
136 | + public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "fp", Context.CLIENT); | ||
137 | + public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "fq", Context.CLIENT); | ||
138 | + public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "hx", Context.CLIENT); | ||
139 | + public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "fs", Context.CLIENT); | ||
140 | + public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "fz", Context.CLIENT); | ||
141 | + public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "hv", Context.CLIENT); | ||
142 | + public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "hy", Context.CLIENT); | ||
143 | + public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "hz", Context.CLIENT); | ||
144 | + public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "go", Context.CLIENT); | ||
145 | + public static Packets SPacketUpdateBossInfo = new Packets("net/minecraft/network/play/server/SPacketUpdateBossInfo", "fx", Context.CLIENT); | ||
146 | + public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "hs", Context.CLIENT); | ||
147 | + public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "hw", Context.CLIENT); | ||
148 | + public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "fu", Context.CLIENT); | ||
149 | + public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "hd", Context.CLIENT); | ||
150 | + public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "gf", Context.CLIENT); | ||
151 | + public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "gg", Context.CLIENT); | ||
152 | + public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "hj", Context.CLIENT); | ||
153 | + public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "kc", Context.SERVER); | ||
154 | + public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "kd", Context.SERVER); | ||
155 | + public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "jy", Context.CLIENT); | ||
156 | + public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "jz", Context.CLIENT); | ||
158 | 157 | ||
159 | // CHECKSTYLE:ON | 158 | // CHECKSTYLE:ON |
160 | 159 | ||
161 | public static final Packets[] packets = new Packets[] { | 160 | public static final Packets[] packets = new Packets[] { |
162 | - SPacketSpawnObject, | ||
163 | - SPacketSpawnExperienceOrb, | ||
164 | - SPacketSpawnGlobalEntity, | ||
165 | - SPacketSpawnMob, | ||
166 | - SPacketSpawnPainting, | ||
167 | - SPacketSpawnPlayer, | 161 | + CPacketEncryptionResponse, |
162 | + CPacketLoginStart, | ||
163 | + SPacketDisconnectLogin, | ||
164 | + SPacketEnableCompression, | ||
165 | + SPacketEncryptionRequest, | ||
166 | + SPacketLoginSuccess, | ||
167 | + CPacketAnimation, | ||
168 | + CPacketChatMessage, | ||
169 | + CPacketClickWindow, | ||
170 | + CPacketClientSettings, | ||
171 | + CPacketClientStatus, | ||
172 | + CPacketCloseWindow, | ||
173 | + CPacketConfirmTeleport, | ||
174 | + CPacketConfirmTransaction, | ||
175 | + CPacketCreativeInventoryAction, | ||
176 | + CPacketCustomPayload, | ||
177 | + CPacketEnchantItem, | ||
178 | + CPacketEntityAction, | ||
179 | + CPacketHeldItemChange, | ||
180 | + CPacketInput, | ||
181 | + C00Handshake, | ||
182 | + CPacketKeepAlive, | ||
183 | + CPacketPlayer, | ||
184 | + CPacketPlayerPosition, | ||
185 | + CPacketPlayerPositionRotation, | ||
186 | + CPacketPlayerRotation, | ||
187 | + CPacketPlayerAbilities, | ||
188 | + CPacketPlayerDigging, | ||
189 | + CPacketPlayerTryUseItem, | ||
190 | + CPacketPlayerTryUseItemOnBlock, | ||
191 | + CPacketResourcePackStatus, | ||
192 | + CPacketSpectate, | ||
193 | + CPacketSteerBoat, | ||
194 | + CPacketTabComplete, | ||
195 | + CPacketUpdateSign, | ||
196 | + CPacketUseEntity, | ||
197 | + CPacketVehicleMove, | ||
168 | SPacketAnimation, | 198 | SPacketAnimation, |
169 | - SPacketStatistics, | ||
170 | - SPacketBlockBreakAnim, | ||
171 | - SPacketUpdateTileEntity, | ||
172 | SPacketBlockAction, | 199 | SPacketBlockAction, |
200 | + SPacketBlockBreakAnim, | ||
173 | SPacketBlockChange, | 201 | SPacketBlockChange, |
174 | - SPacketUpdateEntityNBT, | ||
175 | - SPacketServerDifficulty, | ||
176 | - SPacketTabComplete, | 202 | + SPacketCamera, |
203 | + SPacketChangeGameState, | ||
177 | SPacketChat, | 204 | SPacketChat, |
178 | - SPacketMultiBlockChange, | ||
179 | - SPacketConfirmTransaction, | 205 | + SPacketChunkData, |
180 | SPacketCloseWindow, | 206 | SPacketCloseWindow, |
181 | - SPacketOpenWindow, | ||
182 | - SPacketWindowItems, | ||
183 | - SPacketWindowProperty, | ||
184 | - SPacketSetSlot, | 207 | + SPacketCollectItem, |
208 | + SPacketCombatEvent, | ||
209 | + SPacketConfirmTransaction, | ||
185 | SPacketCooldown, | 210 | SPacketCooldown, |
186 | SPacketCustomPayload, | 211 | SPacketCustomPayload, |
187 | SPacketCustomSound, | 212 | SPacketCustomSound, |
188 | - SPacketDisconnectPlay, | ||
189 | - SPacketEntityStatus, | ||
190 | - SPacketExplosion, | ||
191 | - SPacketUnloadChunk, | ||
192 | - SPacketChangeGameState, | ||
193 | - SPacketKeepAlive, | ||
194 | - SPacketChunkData, | 213 | + SPacketDestroyEntities, |
214 | + SPacketDisconnect, | ||
215 | + SPacketDisplayObjective, | ||
195 | SPacketEffect, | 216 | SPacketEffect, |
196 | - SPacketParticles, | ||
197 | - SPacketJoinGame, | ||
198 | - SPacketMaps, | ||
199 | SPacketEntity, | 217 | SPacketEntity, |
200 | S15PacketEntityRelMove, | 218 | S15PacketEntityRelMove, |
201 | - S17PacketEntityLookMove, | ||
202 | S16PacketEntityLook, | 219 | S16PacketEntityLook, |
220 | + S17PacketEntityLookMove, | ||
221 | + SPacketEntityAttach, | ||
222 | + SPacketEntityEffect, | ||
223 | + SPacketEntityEquipment, | ||
224 | + SPacketEntityHeadLook, | ||
225 | + SPacketEntityMetadata, | ||
226 | + SPacketEntityProperties, | ||
227 | + SPacketEntityStatus, | ||
228 | + SPacketEntityTeleport, | ||
229 | + SPacketEntityVelocity, | ||
230 | + SPacketExplosion, | ||
231 | + SPacketHeldItemChange, | ||
232 | + SPacketJoinGame, | ||
233 | + SPacketKeepAlive, | ||
234 | + SPacketMaps, | ||
203 | SPacketMoveVehicle, | 235 | SPacketMoveVehicle, |
204 | - SPacketSignEditorOpen, | 236 | + SPacketMultiBlockChange, |
237 | + SPacketOpenWindow, | ||
238 | + SPacketParticles, | ||
205 | SPacketPlayerAbilities, | 239 | SPacketPlayerAbilities, |
206 | - SPacketCombatEvent, | 240 | + SPacketPlayerListHeaderFooter, |
207 | SPacketPlayerListItem, | 241 | SPacketPlayerListItem, |
208 | SPacketPlayerPosLook, | 242 | SPacketPlayerPosLook, |
209 | - SPacketUseBed, | ||
210 | - SPacketDestroyEntities, | ||
211 | SPacketRemoveEntityEffect, | 243 | SPacketRemoveEntityEffect, |
212 | SPacketResourcePackSend, | 244 | SPacketResourcePackSend, |
213 | SPacketRespawn, | 245 | SPacketRespawn, |
214 | - SPacketEntityHeadLook, | ||
215 | - SPacketWorldBorder, | ||
216 | - SPacketCamera, | ||
217 | - SPacketHeldItemChange, | ||
218 | - SPacketDisplayObjective, | ||
219 | - SPacketEntityMetadata, | ||
220 | - SPacketEntityAttach, | ||
221 | - SPacketEntityVelocity, | ||
222 | - C00Handshake, | ||
223 | - SPacketEntityEquipment, | ||
224 | - SPacketSetExperience, | ||
225 | - SPacketUpdateHealth, | ||
226 | SPacketScoreboardObjective, | 246 | SPacketScoreboardObjective, |
247 | + SPacketServerDifficulty, | ||
248 | + SPacketSetExperience, | ||
227 | SPacketSetPassengers, | 249 | SPacketSetPassengers, |
228 | - SPacketTeams, | ||
229 | - SPacketUpdateScore, | 250 | + SPacketSetSlot, |
251 | + SPacketSignEditorOpen, | ||
252 | + SPacketSoundEffect, | ||
253 | + SPacketSpawnExperienceOrb, | ||
254 | + SPacketSpawnGlobalEntity, | ||
255 | + SPacketSpawnMob, | ||
256 | + SPacketSpawnObject, | ||
257 | + SPacketSpawnPainting, | ||
258 | + SPacketSpawnPlayer, | ||
230 | SPacketSpawnPosition, | 259 | SPacketSpawnPosition, |
260 | + SPacketStatistics, | ||
261 | + SPacketTabComplete, | ||
262 | + SPacketTeams, | ||
231 | SPacketTimeUpdate, | 263 | SPacketTimeUpdate, |
232 | SPacketTitle, | 264 | SPacketTitle, |
233 | - SPacketUpdateSign, | ||
234 | - SPacketSoundEffect, | ||
235 | - SPacketPlayerListHeaderFooter, | ||
236 | - SPacketCollectItem, | ||
237 | - SPacketEntityTeleport, | ||
238 | - SPacketEntityProperties, | ||
239 | - SPacketEntityEffect, | ||
240 | - CPacketConfirmTeleport, | ||
241 | - CPacketTabComplete, | ||
242 | - CPacketChatMessage, | ||
243 | - CPacketClientStatus, | ||
244 | - CPacketClientSettings, | ||
245 | - CPacketConfirmTransaction, | ||
246 | - CPacketEnchantItem, | ||
247 | - CPacketClickWindow, | ||
248 | - CPacketCloseWindow, | ||
249 | - CPacketCustomPayload, | ||
250 | - CPacketUseEntity, | ||
251 | - CPacketKeepAlive, | ||
252 | - CPacketPlayer, | ||
253 | - C04PacketPlayerPosition, | ||
254 | - C06PacketPlayerPosLook, | ||
255 | - C05PacketPlayerLook, | ||
256 | - CPacketVehicleMove, | ||
257 | - CPacketSteerBoat, | ||
258 | - CPacketPlayerAbilities, | ||
259 | - CPacketPlayerDigging, | ||
260 | - CPacketEntityAction, | ||
261 | - CPacketInput, | ||
262 | - CPacketResourcePackStatus, | ||
263 | - CPacketHeldItemChange, | ||
264 | - CPacketCreativeInventoryAction, | ||
265 | - CPacketUpdateSign, | ||
266 | - CPacketAnimation, | ||
267 | - CPacketSpectate, | ||
268 | - CPacketPlayerTryUseItem, | ||
269 | - CPacketPlayerBlockPlacement, | ||
270 | - SPacketLoginSuccess, | ||
271 | - SPacketEncryptionRequest, | ||
272 | - SPacketEnableCompression, | ||
273 | - SPacketDisconnectLogin, | ||
274 | - CPacketLoginStart, | ||
275 | - CPacketEncryptionResponse, | ||
276 | - SPacketPong, | ||
277 | - SPacketServerInfo, | 265 | + SPacketUnloadChunk, |
266 | + SPacketUpdateBossInfo, | ||
267 | + SPacketUpdateHealth, | ||
268 | + SPacketUpdateScore, | ||
269 | + SPacketUpdateTileEntity, | ||
270 | + SPacketUseBed, | ||
271 | + SPacketWindowItems, | ||
272 | + SPacketWindowProperty, | ||
273 | + SPacketWorldBorder, | ||
278 | CPacketPing, | 274 | CPacketPing, |
279 | CPacketServerQuery, | 275 | CPacketServerQuery, |
276 | + SPacketPong, | ||
277 | + SPacketServerInfo | ||
280 | }; | 278 | }; |
281 | 279 | ||
282 | private static int nextPacketIndex; | 280 | private static int nextPacketIndex; |
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
@@ -38,8 +38,8 @@ public class LiteLoaderTweaker implements ITweaker | @@ -38,8 +38,8 @@ public class LiteLoaderTweaker implements ITweaker | ||
38 | public static final int ENV_TYPE_CLIENT = 0; | 38 | public static final int ENV_TYPE_CLIENT = 0; |
39 | public static final int ENV_TYPE_DEDICATEDSERVER = 1; | 39 | public static final int ENV_TYPE_DEDICATEDSERVER = 1; |
40 | 40 | ||
41 | - // TODO Version - 1.9 | ||
42 | - public static final String VERSION = "1.9"; | 41 | + // TODO Version - 1.9.4 |
42 | + public static final String VERSION = "1.9.4"; | ||
43 | 43 | ||
44 | protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap"; | 44 | protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap"; |
45 | 45 |