Fix all broken patches in client package

Author: kappa-maintainer

patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch

@@ -99,33 +99,24 @@
          this.mc.getTutorial().handleMovement(this.movementInput);
 
          if (this.isHandActive() && !this.isRiding())
-@@ -912,18 +932,13 @@
+@@ -912,6 +932,8 @@
          }
 
          AxisAlignedBB axisalignedbb = this.getEntityBoundingBox();
--        this.pushOutOfBlocks(
--            this.posX - (double)this.width * 0.35, axisalignedbb.minY + 0.5, this.posZ + (double)this.width * 0.35
--        );
--        this.pushOutOfBlocks(
--            this.posX - (double)this.width * 0.35, axisalignedbb.minY + 0.5, this.posZ - (double)this.width * 0.35
--        );
--        this.pushOutOfBlocks(
--            this.posX + (double)this.width * 0.35, axisalignedbb.minY + 0.5, this.posZ - (double)this.width * 0.35
--        );
--        this.pushOutOfBlocks(
--            this.posX + (double)this.width * 0.35, axisalignedbb.minY + 0.5, this.posZ + (double)this.width * 0.35
--        );
 +        net.minecraftforge.client.event.PlayerSPPushOutOfBlocksEvent event = new net.minecraftforge.client.event.PlayerSPPushOutOfBlocksEvent(this, axisalignedbb);
 +        if(!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) { axisalignedbb = event.getEntityBoundingBox();
-+        this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, axisalignedbb.minY + 0.5D, this.posZ + (double)this.width * 0.35D);
-+        this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, axisalignedbb.minY + 0.5D, this.posZ - (double)this.width * 0.35D);
-+        this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, axisalignedbb.minY + 0.5D, this.posZ - (double)this.width * 0.35D);
-+        this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, axisalignedbb.minY + 0.5D, this.posZ + (double)this.width * 0.35D);
+         this.pushOutOfBlocks(
+             this.posX - (double)this.width * 0.35, axisalignedbb.minY + 0.5, this.posZ + (double)this.width * 0.35
+         );
+@@ -924,6 +946,7 @@
+         this.pushOutOfBlocks(
+             this.posX + (double)this.width * 0.35, axisalignedbb.minY + 0.5, this.posZ + (double)this.width * 0.35
+         );
 +        }
          boolean flag4 = (float)this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying;
 
          if (this.onGround
-@@ -1252,5 +1267,18 @@
+@@ -1252,5 +1275,18 @@
                  }
              }
          }

patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch

@@ -1,21 +1,6 @@
 --- before/net/minecraft/client/gui/FontRenderer.java
 +++ after/net/minecraft/client/gui/FontRenderer.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.gui;
- 
-+import com.cleanroommc.client.BreakIteratorHolder;
- import com.ibm.icu.text.ArabicShaping;
- import com.ibm.icu.text.ArabicShapingException;
- import com.ibm.icu.text.Bidi;
-@@ -24,6 +25,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
- import org.apache.commons.io.IOUtils;
-+import java.util.*;
- 
- @SideOnly(Side.CLIENT)
- public class FontRenderer implements IResourceManagerReloadListener
-@@ -56,7 +58,7 @@
+@@ -56,7 +56,7 @@
          this.locationFontTexture = location;
          this.renderEngine = textureManagerIn;
          this.unicodeFlag = unicode;
@@ -24,7 +9,7 @@
 
          for (int i = 0; i < 32; i++)
          {
-@@ -107,7 +109,7 @@
+@@ -107,7 +107,7 @@
 
          try
          {
@@ -33,7 +18,7 @@
              bufferedimage = TextureUtil.readBufferedImage(iresource.getInputStream());
          }
          catch (IOException ioexception)
-@@ -171,7 +173,7 @@
+@@ -171,7 +171,7 @@
 
          try
          {
@@ -42,15 +27,15 @@
              iresource.getInputStream().read(this.glyphWidth);
          }
          catch (IOException ioexception)
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@
 
      private float renderChar(char ch, boolean italic)
      {
 +        if (ch == 160) return 4.0F; // forge: display nbsp as space. MC-2595
          if (ch == ' ')
          {
              return 4.0F;
-@@ -203,7 +206,7 @@
+@@ -203,7 +204,7 @@
          int i = ch % 16 * 8;
          int j = ch / 16 * 8;
          int k = italic ? 1 : 0;
@@ -59,7 +44,7 @@
          int l = this.charWidth[ch];
          float f = (float)l - 0.01F;
          GlStateManager.glBegin(5);
-@@ -231,7 +234,7 @@
+@@ -231,7 +232,7 @@
 
      private void loadGlyphTexture(int page)
      {
@@ -68,7 +53,7 @@
      }
 
      protected float renderUnicodeChar(char ch, boolean italic)
-@@ -280,7 +283,7 @@
+@@ -280,7 +281,7 @@
 
      public int drawString(String text, float x, float y, int color, boolean dropShadow)
      {
@@ -77,7 +62,7 @@
          this.resetStyles();
          int i;
 
-@@ -326,7 +329,7 @@
+@@ -326,7 +327,7 @@
          {
              char c0 = text.charAt(i);
 
@@ -86,7 +71,7 @@
              {
                  int i1 = "0123456789abcdefklmnor".indexOf(String.valueOf(text.charAt(i + 1)).toLowerCase(Locale.ROOT).charAt(0));
 
-@@ -338,11 +341,6 @@
+@@ -338,11 +339,6 @@
                      this.underlineStyle = false;
                      this.italicStyle = false;
 
@@ -98,7 +83,7 @@
                      if (shadow)
                      {
                          i1 += 16;
-@@ -350,7 +348,7 @@
+@@ -350,7 +346,7 @@
 
                      int j1 = this.colorCode[i1];
                      this.textColor = j1;
@@ -107,7 +92,7 @@
                  }
                  else if (i1 == 16)
                  {
-@@ -379,7 +377,7 @@
+@@ -379,7 +375,7 @@
                      this.strikethroughStyle = false;
                      this.underlineStyle = false;
                      this.italicStyle = false;
@@ -116,7 +101,7 @@
                  }
 
                  i++;
-@@ -409,7 +407,7 @@
+@@ -409,7 +405,7 @@
                      c0 = c1;
                  }
 
@@ -125,7 +110,7 @@
                  boolean flag = (c0 == 0 || j == -1 || this.unicodeFlag) && shadow;
 
                  if (flag)
-@@ -447,6 +445,15 @@
+@@ -447,6 +443,15 @@
 
                      f++;
                  }
@@ -141,7 +126,7 @@
 
                  if (this.strikethroughStyle)
                  {
-@@ -526,7 +533,7 @@
+@@ -526,7 +531,7 @@
              this.blue = (float)(color >> 8 & 0xFF) / 255.0F;
              this.green = (float)(color & 0xFF) / 255.0F;
              this.alpha = (float)(color >> 24 & 0xFF) / 255.0F;
@@ -150,15 +135,15 @@
              this.posX = x;
              this.posY = y;
              this.renderStringAtPos(text, dropShadow);
-@@ -580,6 +587,7 @@
+@@ -580,6 +585,7 @@
 
      public int getCharWidth(char character)
      {
 +        if (character == 160) return 4; // forge: display nbsp as space. MC-2595
          if (character == 167)
          {
              return -1;
-@@ -678,7 +686,7 @@
+@@ -678,7 +684,7 @@
 
      private String trimStringNewline(String text)
      {
@@ -167,16 +152,16 @@
          {
              text = text.substring(0, text.length() - 1);
          }
-@@ -725,9 +733,96 @@
+@@ -725,9 +731,96 @@
 
      public List<String> listFormattedStringToWidth(String str, int wrapWidth)
      {
 -        return Arrays.asList(this.wrapFormattedStringToWidth(str, wrapWidth).split("\n"));
 +        if (str.isEmpty()){
-+            return Collections.singletonList("");
++            return java.util.Collections.singletonList("");
 +        }
-+        BreakIteratorHolder.BREAK_ITERATOR.setText(str);
-+        List<String> list = new ArrayList<>();
++        com.cleanroommc.client.BreakIteratorHolder.BREAK_ITERATOR.setText(str);
++        List<String> list = new java.util.ArrayList<>();
 +        int lineWidth = 0, fed = 0, icui, d, prevFormat = 0;
 +        StringBuilder format = new StringBuilder(); // For next line's format since it should use format of previous line
 +        int[] widths = new int[str.length()];
@@ -234,10 +219,10 @@
 +            widths[i - fed] = lineWidth;
 +            formats[i - fed] = format.toString();
 +            if (lineWidth > wrapWidth) {
-+                if (BreakIteratorHolder.BREAK_ITERATOR.isBoundary(i)) {
++                if (com.cleanroommc.client.BreakIteratorHolder.BREAK_ITERATOR.isBoundary(i)) {
 +                    icui = i;
 +                } else {
-+                    icui = BreakIteratorHolder.BREAK_ITERATOR.preceding(i);
++                    icui = com.cleanroommc.client.BreakIteratorHolder.BREAK_ITERATOR.preceding(i);
 +                }
 +                if (icui <= fed + 1 || i == icui) {
 +                    list.add(line.substring(0,line.length() - 1));
@@ -265,15 +250,15 @@
      String wrapFormattedStringToWidth(String str, int wrapWidth)
      {
          int i = this.sizeStringToWidth(str, wrapWidth);
-@@ -746,6 +841,7 @@
+@@ -746,6 +839,7 @@
          }
      }
 
 +    @Deprecated
      private int sizeStringToWidth(String str, int wrapWidth)
      {
          int i = str.length();
-@@ -844,6 +940,26 @@
+@@ -844,6 +938,26 @@
      public boolean getBidiFlag()
      {
          return this.bidiFlag;

patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch

@@ -38,28 +38,20 @@
          }
 
          this.updateDisplayState();
-@@ -460,6 +451,31 @@
+@@ -460,6 +451,23 @@
      @Override
      protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException
      {
 +        if (this.btnMapType.mousePressed(this.mc, mouseX, mouseY)) {
 +            if (mouseButton == 1) {
-+                --this.selectedIndex;
 +
-+                if (this.selectedIndex < 0)
-+                {
-+                    this.selectedIndex = WorldType.WORLD_TYPES.length - 1;
-+                }
++                do {
++                    this.selectedIndex--;
 +
-+                while (!this.canSelectCurWorldType())
-+                {
-+                    --this.selectedIndex;
-+
-+                    if (this.selectedIndex < 0)
-+                    {
++                    if (this.selectedIndex < 0) {
 +                        this.selectedIndex = WorldType.WORLD_TYPES.length - 1;
 +                    }
-+                }
++                } while (!this.canSelectCurWorldType());
 +
 +                this.chunkProviderSettingsJson = "";
 +                this.updateDisplayState();

patches/minecraft/net/minecraft/client/gui/GuiKeyBindingList.java.patch

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiKeyBindingList.java
 +++ after/net/minecraft/client/gui/GuiKeyBindingList.java
+@@ -65,7 +65,7 @@
+     @Override
+     protected int getScrollBarX()
+     {
+-        return super.getScrollBarX() + 15;
++        return super.getScrollBarX() + 35;
+     }
+ 
+     @Override
 @@ -138,7 +138,7 @@
          {
              this.keybinding = name;

patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch

@@ -30,7 +30,7 @@
              int k = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
              int l = this.top + 4 - (int)this.amountScrolled;
 
-@@ -517,5 +498,19 @@
+@@ -517,5 +498,31 @@
      public int getSlotHeight()
      {
          return this.slotHeight;
@@ -43,10 +43,22 @@
 +        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
 +        float f = 32.0F;
 +        buffer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-+        buffer.pos((double)this.left,  (double)this.bottom, 0.0D).tex((double)((float)this.left  / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
-+        buffer.pos((double)this.right, (double)this.bottom, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
-+        buffer.pos((double)this.right, (double)this.top,    0.0D).tex((double)((float)this.right / f), (double)((float)(this.top    + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
-+        buffer.pos((double)this.left,  (double)this.top,    0.0D).tex((double)((float)this.left  / f), (double)((float)(this.top    + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex();
++        buffer.pos(this.left, this.bottom, 0.0)
++        .tex((float)this.left / f, (float)(this.bottom + (int)this.amountScrolled) / f)
++        .color(32, 32, 32, 255)
++        .endVertex();
++        buffer.pos(this.right, this.bottom, 0.0)
++        .tex((float)this.right / f, (float)(this.bottom + (int)this.amountScrolled) / f)
++        .color(32, 32, 32, 255)
++        .endVertex();
++        buffer.pos(this.right, this.top, 0.0)
++        .tex((float)this.right / f, (float)(this.top + (int)this.amountScrolled) / f)
++        .color(32, 32, 32, 255)
++        .endVertex();
++        buffer.pos(this.left, this.top, 0.0)
++        .tex((float)this.left / f, (float)(this.top + (int)this.amountScrolled) / f)
++        .color(32, 32, 32, 255)
++        .endVertex();
 +        tessellator.draw();
      }
  }

patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch

@@ -64,6 +64,15 @@
                          {
                              this.handleMouseClick(slot, l, mouseButton, ClickType.CLONE);
                          }
+@@ -411,7 +414,7 @@
+                         {
+                             this.dragSplittingLimit = 1;
+                         }
+-                        else if (mouseButton == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100)
++                        else if (this.mc.gameSettings.keyBindPickBlock.isActiveAndMatches(mouseButton - 100))
+                         {
+                             this.dragSplittingLimit = 2;
+                         }
 @@ -489,10 +492,12 @@
      @Override
      protected void mouseReleased(int mouseX, int mouseY, int state)