Update 1.2.12

Author: Fox2Code

client/src/main/java/com/fox2code/foxloader/client/KeyBindingAPI.java

@@ -11,8 +11,8 @@ public class KeyBindingAPI {
 
     public static void registerKeyBinding(KeyBinding keyBinding) {
         if (loaded) throw new IllegalStateException("Options are already loaded");
-        if (registeredKeyBindings.size() >= 9) // This limit will be fixed in future update!
-            throw new IllegalStateException("Cannot register more than 9 custom key-binds!");
+        if (registeredKeyBindings.size() >= 8) // This limit will be fixed in future update!
+            throw new IllegalStateException("Cannot register more than 8 custom key-binds!");
         registeredKeyBindings.add(keyBinding);
     }
 

client/src/main/java/com/fox2code/foxloader/client/gui/ContainerWrapped.java

@@ -0,0 +1,21 @@
+package com.fox2code.foxloader.client.gui;
+
+import net.minecraft.src.client.gui.Container;
+
+/**
+ * Tells FoxLoader that the container is a wrapped container.
+ * <p>
+ * If your container has client side only inventory slots please use {@link InventoryClientOnly} too
+ */
+public interface ContainerWrapped {
+    Container getParentContainer();
+
+     static Container getNetworkContainer(Container container) {
+         int antiSoftLock = 0;
+         while (container instanceof ContainerWrapped) {
+             container = ((ContainerWrapped) container).getParentContainer();
+             if (antiSoftLock++>100) return null;
+         }
+         return container;
+     }
+}

client/src/main/java/com/fox2code/foxloader/client/gui/InventoryBasicClientOnly.java

@@ -0,0 +1,9 @@
+package com.fox2code.foxloader.client.gui;
+
+import net.minecraft.src.client.inventory.InventoryBasic;
+
+public class InventoryBasicClientOnly extends InventoryBasic implements InventoryClientOnly {
+    public InventoryBasicClientOnly(String var1, int var2) {
+        super(var1, var2);
+    }
+}

client/src/main/java/com/fox2code/foxloader/client/gui/InventoryClientOnly.java

@@ -0,0 +1,9 @@
+package com.fox2code.foxloader.client.gui;
+
+import net.minecraft.src.client.inventory.IInventory;
+
+/**
+ * Mark a {@link IInventory} as client side only, and to avoid any network inconsistencies
+ */
+public interface InventoryClientOnly extends IInventory {
+}

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinContainer.java

@@ -1,11 +1,20 @@
 package com.fox2code.foxloader.client.mixins;
 
+import com.fox2code.foxloader.client.gui.ContainerWrapped;
 import net.minecraft.src.client.gui.Container;
+import net.minecraft.src.client.gui.GuiContainer;
+import net.minecraft.src.client.gui.Slot;
 import net.minecraft.src.game.entity.player.EntityPlayer;
+import net.minecraft.src.game.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+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;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
 
 
 @Mixin(Container.class)
@@ -16,4 +25,14 @@ public void hotfix_onCraftGuiClosedHook(EntityPlayer var1, CallbackInfo ci) {
             ci.cancel();
         }
     }
+
+    /**
+     * Disable default behaviour on wrapped container for better stability.
+     */
+    @Inject(method = "quickMove", at = @At("HEAD"), cancellable = true)
+    public void onQuickMove(int var1, CallbackInfoReturnable<ItemStack> cir) {
+        if (this instanceof ContainerWrapped) {
+            cir.setReturnValue(null);
+        }
+    }
 }

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinContainerCreative.java

@@ -1,6 +1,8 @@
 package com.fox2code.foxloader.client.mixins;
 
 import com.fox2code.foxloader.client.CreativeItems;
+import com.fox2code.foxloader.client.gui.ContainerWrapped;
+import net.minecraft.src.client.gui.Container;
 import net.minecraft.src.client.gui.ContainerCreative;
 import net.minecraft.src.game.entity.player.EntityPlayer;
 import net.minecraft.src.game.item.ItemStack;
@@ -14,11 +16,13 @@
 import java.util.List;
 
 @Mixin(ContainerCreative.class)
-public abstract class MixinContainerCreative {
+public abstract class MixinContainerCreative implements ContainerWrapped {
     @Shadow public List<ItemStack> itemList;
 
     @Shadow public abstract void addToSlot(ItemStack itemstack);
 
+    @Shadow private EntityPlayer player;
+
     @Inject(method = "addItems", at = @At("HEAD"), cancellable = true)
     public void onAddItems(EntityPlayer player, CallbackInfo ci) {
         List<ItemStack> creativeItemStacks =
@@ -36,4 +40,9 @@ public void onAddItems(EntityPlayer player, CallbackInfo ci) {
     public void onItemsAdded(EntityPlayer player, CallbackInfo ci) {
         CreativeItems.Internal.markLoadFinished(this.itemList);
     }
+
+    @Override
+    public Container getParentContainer() {
+        return this.player.playerContainer;
+    }
 }

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinGameSettings.java

@@ -4,6 +4,7 @@
 import net.minecraft.src.client.EnumOptions;
 import net.minecraft.src.client.GameSettings;
 import net.minecraft.src.client.KeyBinding;
+import org.lwjgl.input.Keyboard;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -27,4 +28,12 @@ public void onLoadOptionInit(GameSettings instance) {
     public void onOptionInit(CallbackInfo ci) {
         this.keyBindings = KeyBindingAPI.Internal.inject(this.keyBindings);
     }
+
+    @Redirect(method = "*", at = @At(value = "INVOKE", target =
+            "Lorg/lwjgl/input/Keyboard;getKeyName(I)Ljava/lang/String;"))
+    public String getKeyName(int i) {
+        if (i > Keyboard.KEYBOARD_SIZE || i < 0)
+            return "#" + i;
+        return Keyboard.getKeyName(i);
+    }
 }

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinGuiIngameMenu.java

@@ -0,0 +1,27 @@
+package com.fox2code.foxloader.client.mixins;
+
+import com.fox2code.foxloader.client.gui.GuiModList;
+import com.fox2code.foxloader.client.gui.GuiUpdateButton;
+import net.minecraft.src.client.gui.GuiButton;
+import net.minecraft.src.client.gui.GuiIngameMenu;
+import net.minecraft.src.client.gui.GuiScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GuiIngameMenu.class)
+public class MixinGuiIngameMenu extends GuiScreen {
+    @Inject(method = "initGui", at = @At(value = "RETURN"))
+    public void onInitGui(CallbackInfo ci) {
+        this.controlList.add(new GuiUpdateButton(500, this.width - 62, 2, 60, 20, "Mods"));
+    }
+
+    @Inject(method = "actionPerformed", at = @At(value = "HEAD"), cancellable = true)
+    public void onActionPerformed(GuiButton var1, CallbackInfo ci) {
+        if (var1.id == 500) {
+            this.mc.displayGuiScreen(new GuiModList(this));
+            ci.cancel();
+        }
+    }
+}

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinItemStack.java

@@ -9,6 +9,9 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ItemStack.class)
 public abstract class MixinItemStack implements RegisteredItemStack, NetworkItemStack {
@@ -22,6 +25,16 @@ public abstract class MixinItemStack implements RegisteredItemStack, NetworkItem
     @Shadow public abstract void setItemName(String par1Str);
     @Shadow public abstract boolean hasDisplayName();
 
+    @Inject(method = "splitStack", at = @At("RETURN"))
+    public void onSplitStack(int stacksize, CallbackInfoReturnable<ItemStack> cir) {
+        ((NetworkItemStack) (Object) cir.getReturnValue()).setRemoteNetworkId(this.networkId);
+    }
+
+    @Inject(method = "copy", at = @At("RETURN"))
+    public void onCopy(CallbackInfoReturnable<ItemStack> cir) {
+        ((NetworkItemStack) (Object) cir.getReturnValue()).setRemoteNetworkId(this.networkId);
+    }
+
     @Override
     public RegisteredItem getRegisteredItem() {
         return (RegisteredItem) this.getItem();

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinNetClientHandler.java

@@ -10,14 +10,15 @@
 import net.minecraft.src.client.packets.*;
 import net.minecraft.src.game.level.WorldClient;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(NetClientHandler.class)
 public class MixinNetClientHandler implements NetClientHandlerExtensions {
-    boolean isFoxLoader = false;
+    @Unique boolean isFoxLoader = false;
 
     @Inject(method = "handlePickupSpawn", at = @At("HEAD"))
     public void onHandlePickupSpawn(Packet21PickupSpawn packet21, CallbackInfo ci) {