Add last of misc commits to Master branch

Author: ZombieHDGaming

src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinEnumConnectionState.java

@@ -0,0 +1,55 @@
+package org.dimdev.vanillafix.bugs.mixins.client;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.EnumPacketDirection;
+import net.minecraft.network.Packet;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+import javax.annotation.Nullable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.function.Supplier;
+
+@Mixin(EnumConnectionState.class)
+public final class MixinEnumConnectionState {
+
+    private final Int2ObjectMap<Supplier<? extends Packet<?>>> serverbound = new Int2ObjectArrayMap<>();
+    private final Int2ObjectMap<Supplier<? extends Packet<?>>> clientbound = new Int2ObjectArrayMap<>();
+    private int serverboundId = 0, clientboundId = 0;
+
+    /**
+     * @reason Makes packet construction faster
+     */
+    @Overwrite
+    protected EnumConnectionState registerPacket(EnumPacketDirection direction, Class<? extends Packet<?>> packetClass) {
+        Int2ObjectMap<Supplier<? extends Packet<?>>> suppliers = direction == EnumPacketDirection.SERVERBOUND ? serverbound : clientbound;
+        Constructor<? extends Packet<?>> constructor;
+        try {
+            constructor = packetClass.getConstructor();
+        } catch (NoSuchMethodException ex) {
+            throw new RuntimeException(ex);
+        }
+        constructor.setAccessible(true);
+        suppliers.put(direction == EnumPacketDirection.SERVERBOUND ? serverboundId++ : clientboundId++, () -> {
+            try {
+                return constructor.newInstance();
+            } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
+                throw new RuntimeException(ex);
+            }
+        });
+        return (EnumConnectionState) (Object) this;
+    }
+
+    /**
+     * @reason Makes packet construction faster
+     */
+    @Nullable
+    @Overwrite
+    public Packet<?> getPacket(EnumPacketDirection direction, int packetId) {
+        Supplier<? extends Packet<?>> packet = (direction == EnumPacketDirection.SERVERBOUND ? serverbound : clientbound).get(packetId);
+        return packet == null ? null : packet.get();
+    }
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinNetHandlerLoginClient.java

@@ -0,0 +1,36 @@
+package org.dimdev.vanillafix.bugs.mixins.client;
+
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.server.SPacketLoginSuccess;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(NetHandlerLoginClient.class)
+public final class MixinNetHandlerLoginClient {
+
+    @Shadow @Final private NetworkManager networkManager;
+
+    /**
+     * @reason forces reading of the channel when we enable autoread
+     * Fixes issue with stuck "Logging in..." screen
+     */
+    @Inject(method = "handleLoginSuccess", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkManager;setConnectionState(Lnet/minecraft/network/EnumConnectionState;)V"), cancellable = true)
+    private void onConnectionStateSet(SPacketLoginSuccess packetIn, CallbackInfo ci) {
+        ci.cancel();
+    }
+
+    /**
+     * @reason forces reading of the channel when we enable autoread
+     * Fixes issue with stuck "Logging in..." screen
+     */
+    @Inject(method = "handleLoginSuccess", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkManager;setNetHandler(Lnet/minecraft/network/INetHandler;)V", shift = At.Shift.AFTER))
+    private void onNetHandlerSet(SPacketLoginSuccess packetIn, CallbackInfo ci) {
+        this.networkManager.setConnectionState(EnumConnectionState.PLAY);
+    }
+}

src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinNetworkManager.java

@@ -0,0 +1,25 @@
+package org.dimdev.vanillafix.bugs.mixins.client;
+
+import io.netty.channel.Channel;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(NetworkManager.class)
+public final class MixinNetworkManager {
+
+    @Shadow private Channel channel;
+
+    /**
+     * @reason forces reading of the channel when we enable autoread
+     * Fixes issue with stuck "Logging in..." screen
+     */
+    @Inject(method = "setConnectionState", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelConfig;setAutoRead(Z)Lio/netty/channel/ChannelConfig;", shift = At.Shift.AFTER))
+    private void onAutoReadEnabled(EnumConnectionState newState, CallbackInfo ci) {
+        this.channel.read();
+    }
+}

src/main/resources/mixins.vanillafix.bugs.json

@@ -21,7 +21,10 @@
     "client.MixinEntityPlayerSP",
     "client.MixinIntegratedServer",
     "client.MixinEntityRenderer",
-    "client.MixinThreadDownloadImageData"
+    "client.MixinThreadDownloadImageData",
+    "client.MixinEnumConnectionState",
+    "client.MixinNetHandlerLoginClient",
+    "client.MixinNetworkManager"
   ],
   "injectors": {
     "maxShiftBy": 10