Commit 611d02085860b8cec28809dfe19542e90e1c824a
1 parent
98dc04c3
Update to 1.12.2
Showing
7 changed files
with
138 additions
and
136 deletions
build.gradle
@@ -72,7 +72,7 @@ repositories { | @@ -72,7 +72,7 @@ repositories { | ||
72 | } | 72 | } |
73 | 73 | ||
74 | dependencies { | 74 | dependencies { |
75 | - compile('org.spongepowered:mixin:0.7.3-SNAPSHOT') { | 75 | + compile('org.spongepowered:mixin:0.7.4-SNAPSHOT') { |
76 | exclude module: 'asm-commons' | 76 | exclude module: 'asm-commons' |
77 | exclude module: 'asm-tree' | 77 | exclude module: 'asm-tree' |
78 | exclude module: 'launchwrapper' | 78 | exclude module: 'launchwrapper' |
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.12.1 | ||
9 | -mcVersion=1.12.1 | ||
10 | -mcMappings=snapshot_20170804 | ||
11 | \ No newline at end of file | 8 | \ No newline at end of file |
9 | +buildVersion=1.12.2 | ||
10 | +mcVersion=1.12.2 | ||
11 | +mcMappings=snapshot_20170919 | ||
12 | \ No newline at end of file | 12 | \ No newline at end of file |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRenderManager.java
@@ -33,7 +33,7 @@ public abstract class MixinRenderManager implements IRenderManager | @@ -33,7 +33,7 @@ public abstract class MixinRenderManager implements IRenderManager | ||
33 | return this.entityRenderMap; | 33 | return this.entityRenderMap; |
34 | } | 34 | } |
35 | 35 | ||
36 | - @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)V", at = @At( | 36 | + @Redirect(method = "renderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)V", at = @At( |
37 | value = "INVOKE", | 37 | value = "INVOKE", |
38 | target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V" | 38 | target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V" |
39 | )) | 39 | )) |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
@@ -52,12 +52,13 @@ public enum LiteLoaderVersion | @@ -52,12 +52,13 @@ public enum LiteLoaderVersion | ||
52 | MC_1_11_0_R0(39, 0, "1.11", "1.11", "1.11", "1.11.0", "1.11.r1"), | 52 | MC_1_11_0_R0(39, 0, "1.11", "1.11", "1.11", "1.11.0", "1.11.r1"), |
53 | MC_1_11_2_R0(40, 0, "1.11.2", "1.11.2", "1.11.2", "1.11.r2"), | 53 | MC_1_11_2_R0(40, 0, "1.11.2", "1.11.2", "1.11.2", "1.11.r2"), |
54 | MC_1_12_0_R0(41, 0, "1.12", "1.12", "1.12", "1.12.0", "1.12.r1"), | 54 | MC_1_12_0_R0(41, 0, "1.12", "1.12", "1.12", "1.12.0", "1.12.r1"), |
55 | - MC_1_12_1_R0(41, 0, "1.12.1", "1.12.1", "1.12.1", "1.12.r2"); | 55 | + MC_1_12_1_R0(41, 0, "1.12.1", "1.12.1", "1.12.1", "1.12.r2"), |
56 | + MC_1_12_2_R0(42, 0, "1.12.2", "1.12.2", "1.12.2", "1.12.r2", "1.12.r3"); | ||
56 | 57 | ||
57 | /** | 58 | /** |
58 | * Current loader version | 59 | * Current loader version |
59 | */ | 60 | */ |
60 | - public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_12_1_R0; | 61 | + public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_12_2_R0; |
61 | 62 | ||
62 | private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(), | 63 | private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(), |
63 | LiteLoaderVersion.CURRENT.getReleaseTimestamp()); | 64 | LiteLoaderVersion.CURRENT.getReleaseTimestamp()); |
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
@@ -14,7 +14,7 @@ import java.util.Map; | @@ -14,7 +14,7 @@ import java.util.Map; | ||
14 | * Centralised obfuscation table for LiteLoader | 14 | * Centralised obfuscation table for LiteLoader |
15 | * | 15 | * |
16 | * @author Adam Mummery-Smith | 16 | * @author Adam Mummery-Smith |
17 | - * TODO Obfuscation 1.12.1 | 17 | + * TODO Obfuscation 1.12.2 |
18 | */ | 18 | */ |
19 | public class Obf | 19 | public class Obf |
20 | { | 20 | { |
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
@@ -13,7 +13,7 @@ import java.util.Map; | @@ -13,7 +13,7 @@ import java.util.Map; | ||
13 | * Packet obfuscation table | 13 | * Packet obfuscation table |
14 | * | 14 | * |
15 | * @author Adam Mummery-Smith | 15 | * @author Adam Mummery-Smith |
16 | - * TODO Obfuscation 1.12.1 | 16 | + * TODO Obfuscation 1.12.2 |
17 | */ | 17 | */ |
18 | public final class Packets extends Obf | 18 | public final class Packets extends Obf |
19 | { | 19 | { |
@@ -38,130 +38,130 @@ public final class Packets extends Obf | @@ -38,130 +38,130 @@ public final class Packets extends Obf | ||
38 | 38 | ||
39 | private static Map<String, Packets> packetMap = new HashMap<String, Packets>(); | 39 | private static Map<String, Packets> packetMap = new HashMap<String, Packets>(); |
40 | 40 | ||
41 | - public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "md", Context.SERVER); | ||
42 | - public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "mn", Context.SERVER); | ||
43 | - public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "mm", Context.SERVER); | ||
44 | - public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "mk", Context.CLIENT); | ||
45 | - public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "mj", Context.CLIENT); | ||
46 | - public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "mi", Context.CLIENT); | ||
47 | - public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "mh", Context.CLIENT); | ||
48 | - public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "ly", Context.SERVER); | ||
49 | - public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "la", Context.SERVER); | ||
50 | - public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "lf", Context.SERVER); | ||
51 | - public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "lc", Context.SERVER); | ||
52 | - public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "lb", Context.SERVER); | ||
53 | - public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "lg", Context.SERVER); | ||
54 | - public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "ky", Context.SERVER); | ||
55 | - public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "ld", Context.SERVER); | ||
56 | - public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "lw", Context.SERVER); | ||
57 | - public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "lh", Context.SERVER); | ||
58 | - public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "le", Context.SERVER); | ||
59 | - public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "lq", Context.SERVER); | ||
60 | - public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "lv", Context.SERVER); | ||
61 | - public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "lr", Context.SERVER); | ||
62 | - public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "lj", Context.SERVER); | ||
63 | - public static Packets CPacketPlaceRecipe = new Packets("net/minecraft/network/play/client/CPacketPlaceRecipe", "ln", Context.SERVER); | ||
64 | - public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "lk", Context.SERVER); | ||
65 | - public static Packets CPacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$Position", "lk$a", Context.SERVER); | ||
66 | - public static Packets CPacketPlayerPositionRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$PositionRotation", "lk$b", Context.SERVER); | ||
67 | - public static Packets CPacketPlayerRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$Rotation", "lk$c", Context.SERVER); | ||
68 | - public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "lo", Context.SERVER); | ||
69 | - public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "lp", Context.SERVER); | ||
70 | - public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "mb", Context.SERVER); | ||
71 | - public static Packets CPacketPlayerTryUseItemOnBlock = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItemOnBlock", "ma", Context.SERVER); | ||
72 | - public static Packets CPacketRecipeInfo = new Packets("net/minecraft/network/play/client/CPacketRecipeInfo", "ls", Context.SERVER); | ||
73 | - public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "lt", Context.SERVER); | ||
74 | - public static Packets CPacketSeenAdvancements = new Packets("net/minecraft/network/play/client/CPacketSeenAdvancements", "lu", Context.SERVER); | ||
75 | - public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "lz", Context.SERVER); | ||
76 | - public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "lm", Context.SERVER); | ||
77 | - public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "kz", Context.SERVER); | ||
78 | - public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "lx", Context.SERVER); | ||
79 | - public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "li", Context.SERVER); | ||
80 | - public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "ll", Context.SERVER); | ||
81 | - public static Packets SPacketAdvancementInfo = new Packets("net/minecraft/network/play/server/SPacketAdvancementInfo", "ku", Context.CLIENT); | ||
82 | - public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "id", Context.CLIENT); | ||
83 | - public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "ii", Context.CLIENT); | ||
84 | - public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "ig", Context.CLIENT); | ||
85 | - public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "ij", Context.CLIENT); | ||
86 | - public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "ka", Context.CLIENT); | ||
87 | - public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "jc", Context.CLIENT); | ||
88 | - public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "in", Context.CLIENT); | ||
89 | - public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "je", Context.CLIENT); | ||
90 | - public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "iq", Context.CLIENT); | ||
91 | - public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "ks", Context.CLIENT); | ||
92 | - public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "jo", Context.CLIENT); | ||
93 | - public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "ip", Context.CLIENT); | ||
94 | - public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "iv", Context.CLIENT); | ||
95 | - public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "iw", Context.CLIENT); | ||
96 | - public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "ix", Context.CLIENT); | ||
97 | - public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "jt", Context.CLIENT); | ||
98 | - public static Packets SPacketDisconnect = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "iy", Context.CLIENT); | ||
99 | - public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "kc", Context.CLIENT); | ||
100 | - public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "jf", Context.CLIENT); | ||
101 | - public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "jj", Context.CLIENT); | ||
102 | - public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "jj$a", Context.CLIENT); | ||
103 | - public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "jj$c", Context.CLIENT); | ||
104 | - public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "jj$b", Context.CLIENT); | ||
105 | - public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "ke", Context.CLIENT); | ||
106 | - public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "kw", Context.CLIENT); | ||
107 | - public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "kg", Context.CLIENT); | ||
108 | - public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "jx", Context.CLIENT); | ||
109 | - public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "kd", Context.CLIENT); | ||
110 | - public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "kv", Context.CLIENT); | ||
111 | - public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "iz", Context.CLIENT); | ||
112 | - public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "kt", Context.CLIENT); | ||
113 | - public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "kf", Context.CLIENT); | ||
114 | - public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "ja", Context.CLIENT); | ||
115 | - public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "kb", Context.CLIENT); | ||
116 | - public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "jh", Context.CLIENT); | ||
117 | - public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "jd", Context.CLIENT); | ||
118 | - public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "ji", Context.CLIENT); | ||
119 | - public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "jk", Context.CLIENT); | ||
120 | - public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "io", Context.CLIENT); | ||
121 | - public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "ir", Context.CLIENT); | ||
122 | - public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "jg", Context.CLIENT); | ||
123 | - public static Packets SPacketPlaceGhostRecipe = new Packets("net/minecraft/network/play/server/SPacketPlaceGhostRecipe", "jm", Context.CLIENT); | ||
124 | - public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "jn", Context.CLIENT); | ||
125 | - public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "kr", Context.CLIENT); | ||
126 | - public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "jp", Context.CLIENT); | ||
127 | - public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "jq", Context.CLIENT); | ||
128 | - public static Packets SPacketRecipeBook = new Packets("net/minecraft/network/play/server/SPacketRecipeBook", "js", Context.CLIENT); | ||
129 | - public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "ju", Context.CLIENT); | ||
130 | - public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "jv", Context.CLIENT); | ||
131 | - public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "jw", Context.CLIENT); | ||
132 | - public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "kj", Context.CLIENT); | ||
133 | - public static Packets SPacketSelectAdvancementsTab = new Packets("net/minecraft/network/play/server/SPacketSelectAdvancementsTab", "jy", Context.CLIENT); | ||
134 | - public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "il", Context.CLIENT); | ||
135 | - public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "kh", Context.CLIENT); | ||
136 | - public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "kk", Context.CLIENT); | ||
137 | - public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "iu", Context.CLIENT); | ||
138 | - public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "jl", Context.CLIENT); | ||
139 | - public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "kq", Context.CLIENT); | ||
140 | - public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "hy", Context.CLIENT); | ||
141 | - public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "hz", Context.CLIENT); | ||
142 | - public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "ia", Context.CLIENT); | ||
143 | - public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "hx", Context.CLIENT); | ||
144 | - public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "ib", Context.CLIENT); | ||
145 | - public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "ic", Context.CLIENT); | ||
146 | - public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "kn", Context.CLIENT); | ||
147 | - public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "ie", Context.CLIENT); | ||
148 | - public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "im", Context.CLIENT); | ||
149 | - public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "kl", Context.CLIENT); | ||
150 | - public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "ko", Context.CLIENT); | ||
151 | - public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "kp", Context.CLIENT); | ||
152 | - public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "jb", Context.CLIENT); | ||
153 | - public static Packets SPacketUpdateBossInfo = new Packets("net/minecraft/network/play/server/SPacketUpdateBossInfo", "ik", Context.CLIENT); | ||
154 | - public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "ki", Context.CLIENT); | ||
155 | - public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "km", Context.CLIENT); | ||
156 | - public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "ih", Context.CLIENT); | ||
157 | - public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "jr", Context.CLIENT); | ||
158 | - public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "is", Context.CLIENT); | ||
159 | - public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "it", Context.CLIENT); | ||
160 | - public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "jz", Context.CLIENT); | ||
161 | - public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "mv", Context.SERVER); | ||
162 | - public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "mw", Context.SERVER); | ||
163 | - public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "mr", Context.CLIENT); | ||
164 | - public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "ms", Context.CLIENT); | 41 | + public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "md", Context.SERVER); |
42 | + public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "mn", Context.SERVER); | ||
43 | + public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "mm", Context.SERVER); | ||
44 | + public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "mk", Context.CLIENT); | ||
45 | + public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "mj", Context.CLIENT); | ||
46 | + public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "mi", Context.CLIENT); | ||
47 | + public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "mh", Context.CLIENT); | ||
48 | + public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "ly", Context.SERVER); | ||
49 | + public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "la", Context.SERVER); | ||
50 | + public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "lf", Context.SERVER); | ||
51 | + public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "lc", Context.SERVER); | ||
52 | + public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "lb", Context.SERVER); | ||
53 | + public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "lg", Context.SERVER); | ||
54 | + public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "ky", Context.SERVER); | ||
55 | + public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "ld", Context.SERVER); | ||
56 | + public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "lw", Context.SERVER); | ||
57 | + public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "lh", Context.SERVER); | ||
58 | + public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "le", Context.SERVER); | ||
59 | + public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "lq", Context.SERVER); | ||
60 | + public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "lv", Context.SERVER); | ||
61 | + public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "lr", Context.SERVER); | ||
62 | + public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "lj", Context.SERVER); | ||
63 | + public static Packets CPacketPlaceRecipe = new Packets("net/minecraft/network/play/client/CPacketPlaceRecipe", "ln", Context.SERVER); | ||
64 | + public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "lk", Context.SERVER); | ||
65 | + public static Packets CPacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$Position", "lk$a", Context.SERVER); | ||
66 | + public static Packets CPacketPlayerPositionRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$PositionRotation", "lk$b", Context.SERVER); | ||
67 | + public static Packets CPacketPlayerRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$Rotation", "lk$c", Context.SERVER); | ||
68 | + public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "lo", Context.SERVER); | ||
69 | + public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "lp", Context.SERVER); | ||
70 | + public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "mb", Context.SERVER); | ||
71 | + public static Packets CPacketPlayerTryUseItemOnBlock = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItemOnBlock", "ma", Context.SERVER); | ||
72 | + public static Packets CPacketRecipeInfo = new Packets("net/minecraft/network/play/client/CPacketRecipeInfo", "ls", Context.SERVER); | ||
73 | + public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "lt", Context.SERVER); | ||
74 | + public static Packets CPacketSeenAdvancements = new Packets("net/minecraft/network/play/client/CPacketSeenAdvancements", "lu", Context.SERVER); | ||
75 | + public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "lz", Context.SERVER); | ||
76 | + public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "lm", Context.SERVER); | ||
77 | + public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "kz", Context.SERVER); | ||
78 | + public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "lx", Context.SERVER); | ||
79 | + public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "li", Context.SERVER); | ||
80 | + public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "ll", Context.SERVER); | ||
81 | + public static Packets SPacketAdvancementInfo = new Packets("net/minecraft/network/play/server/SPacketAdvancementInfo", "ku", Context.CLIENT); | ||
82 | + public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "id", Context.CLIENT); | ||
83 | + public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "ii", Context.CLIENT); | ||
84 | + public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "ig", Context.CLIENT); | ||
85 | + public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "ij", Context.CLIENT); | ||
86 | + public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "ka", Context.CLIENT); | ||
87 | + public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "jc", Context.CLIENT); | ||
88 | + public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "in", Context.CLIENT); | ||
89 | + public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "je", Context.CLIENT); | ||
90 | + public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "iq", Context.CLIENT); | ||
91 | + public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "ks", Context.CLIENT); | ||
92 | + public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "jo", Context.CLIENT); | ||
93 | + public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "ip", Context.CLIENT); | ||
94 | + public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "iv", Context.CLIENT); | ||
95 | + public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "iw", Context.CLIENT); | ||
96 | + public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "ix", Context.CLIENT); | ||
97 | + public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "jt", Context.CLIENT); | ||
98 | + public static Packets SPacketDisconnect = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "iy", Context.CLIENT); | ||
99 | + public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "kc", Context.CLIENT); | ||
100 | + public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "jf", Context.CLIENT); | ||
101 | + public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "jj", Context.CLIENT); | ||
102 | + public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "jj$a", Context.CLIENT); | ||
103 | + public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "jj$c", Context.CLIENT); | ||
104 | + public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "jj$b", Context.CLIENT); | ||
105 | + public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "ke", Context.CLIENT); | ||
106 | + public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "kw", Context.CLIENT); | ||
107 | + public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "kg", Context.CLIENT); | ||
108 | + public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "jx", Context.CLIENT); | ||
109 | + public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "kd", Context.CLIENT); | ||
110 | + public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "kv", Context.CLIENT); | ||
111 | + public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "iz", Context.CLIENT); | ||
112 | + public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "kt", Context.CLIENT); | ||
113 | + public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "kf", Context.CLIENT); | ||
114 | + public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "ja", Context.CLIENT); | ||
115 | + public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "kb", Context.CLIENT); | ||
116 | + public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "jh", Context.CLIENT); | ||
117 | + public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "jd", Context.CLIENT); | ||
118 | + public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "ji", Context.CLIENT); | ||
119 | + public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "jk", Context.CLIENT); | ||
120 | + public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "io", Context.CLIENT); | ||
121 | + public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "ir", Context.CLIENT); | ||
122 | + public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "jg", Context.CLIENT); | ||
123 | + public static Packets SPacketPlaceGhostRecipe = new Packets("net/minecraft/network/play/server/SPacketPlaceGhostRecipe", "jm", Context.CLIENT); | ||
124 | + public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "jn", Context.CLIENT); | ||
125 | + public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "kr", Context.CLIENT); | ||
126 | + public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "jp", Context.CLIENT); | ||
127 | + public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "jq", Context.CLIENT); | ||
128 | + public static Packets SPacketRecipeBook = new Packets("net/minecraft/network/play/server/SPacketRecipeBook", "js", Context.CLIENT); | ||
129 | + public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "ju", Context.CLIENT); | ||
130 | + public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "jv", Context.CLIENT); | ||
131 | + public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "jw", Context.CLIENT); | ||
132 | + public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "kj", Context.CLIENT); | ||
133 | + public static Packets SPacketSelectAdvancementsTab = new Packets("net/minecraft/network/play/server/SPacketSelectAdvancementsTab", "jy", Context.CLIENT); | ||
134 | + public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "il", Context.CLIENT); | ||
135 | + public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "kh", Context.CLIENT); | ||
136 | + public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "kk", Context.CLIENT); | ||
137 | + public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "iu", Context.CLIENT); | ||
138 | + public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "jl", Context.CLIENT); | ||
139 | + public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "kq", Context.CLIENT); | ||
140 | + public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "hy", Context.CLIENT); | ||
141 | + public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "hz", Context.CLIENT); | ||
142 | + public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "ia", Context.CLIENT); | ||
143 | + public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "hx", Context.CLIENT); | ||
144 | + public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "ib", Context.CLIENT); | ||
145 | + public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "ic", Context.CLIENT); | ||
146 | + public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "kn", Context.CLIENT); | ||
147 | + public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "ie", Context.CLIENT); | ||
148 | + public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "im", Context.CLIENT); | ||
149 | + public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "kl", Context.CLIENT); | ||
150 | + public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "ko", Context.CLIENT); | ||
151 | + public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "kp", Context.CLIENT); | ||
152 | + public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "jb", Context.CLIENT); | ||
153 | + public static Packets SPacketUpdateBossInfo = new Packets("net/minecraft/network/play/server/SPacketUpdateBossInfo", "ik", Context.CLIENT); | ||
154 | + public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "ki", Context.CLIENT); | ||
155 | + public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "km", Context.CLIENT); | ||
156 | + public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "ih", Context.CLIENT); | ||
157 | + public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "jr", Context.CLIENT); | ||
158 | + public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "is", Context.CLIENT); | ||
159 | + public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "it", Context.CLIENT); | ||
160 | + public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "jz", Context.CLIENT); | ||
161 | + public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "mv", Context.SERVER); | ||
162 | + public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "mw", Context.SERVER); | ||
163 | + public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "mr", Context.CLIENT); | ||
164 | + public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "ms", Context.CLIENT); | ||
165 | 165 | ||
166 | // CHECKSTYLE:ON | 166 | // CHECKSTYLE:ON |
167 | 167 |
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
@@ -16,6 +16,7 @@ import java.util.Set; | @@ -16,6 +16,7 @@ import java.util.Set; | ||
16 | import java.util.TreeSet; | 16 | import java.util.TreeSet; |
17 | 17 | ||
18 | import org.spongepowered.asm.launch.MixinBootstrap; | 18 | import org.spongepowered.asm.launch.MixinBootstrap; |
19 | +import org.spongepowered.asm.service.MixinService; | ||
19 | 20 | ||
20 | import com.google.common.base.Preconditions; | 21 | import com.google.common.base.Preconditions; |
21 | import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType; | 22 | import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType; |
@@ -38,8 +39,8 @@ public class LiteLoaderTweaker implements ITweaker | @@ -38,8 +39,8 @@ public class LiteLoaderTweaker implements ITweaker | ||
38 | public static final int ENV_TYPE_CLIENT = 0; | 39 | public static final int ENV_TYPE_CLIENT = 0; |
39 | public static final int ENV_TYPE_DEDICATEDSERVER = 1; | 40 | public static final int ENV_TYPE_DEDICATEDSERVER = 1; |
40 | 41 | ||
41 | - // TODO Version - 1.12.1 | ||
42 | - public static final String VERSION = "1.12.1"; | 42 | + // TODO Version - 1.12.2 |
43 | + public static final String VERSION = "1.12.2"; | ||
43 | 44 | ||
44 | protected static final String BOOTSTRAP_CLASS = "com.mumfrey.liteloader.core.LiteLoaderBootstrap"; | 45 | protected static final String BOOTSTRAP_CLASS = "com.mumfrey.liteloader.core.LiteLoaderBootstrap"; |
45 | private static final String CLIENT_API = "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient"; | 46 | private static final String CLIENT_API = "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient"; |
@@ -374,7 +375,7 @@ public class LiteLoaderTweaker implements ITweaker | @@ -374,7 +375,7 @@ public class LiteLoaderTweaker implements ITweaker | ||
374 | { | 375 | { |
375 | this.transformerManager.injectDownstreamTransformers(Launch.classLoader); | 376 | this.transformerManager.injectDownstreamTransformers(Launch.classLoader); |
376 | this.bootstrap.preBeginGame(); | 377 | this.bootstrap.preBeginGame(); |
377 | - MixinBootstrap.addProxy(); | 378 | + MixinService.getService().beginPhase(); |
378 | StartupState.BEGINGAME.completed(); | 379 | StartupState.BEGINGAME.completed(); |
379 | } | 380 | } |
380 | catch (Throwable th) | 381 | catch (Throwable th) |