Fix some mismatch patched

Author: kappa-maintainer

patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch

@@ -13,7 +13,7 @@
          }
 
 -        float f3 = this.mc.world.getLightBrightness(new BlockPos(this.mc.getRenderViewEntity()));
-+        float f3 = this.mc.world.getLightBrightness(new BlockPos(this.mc.getRenderViewEntity().getPositionEyes(1.0F)));
++        float f3 = this.mc.world.getLightBrightness(new BlockPos(this.mc.getRenderViewEntity().getPositionEyes(1.0F))); // Forge: fix MC-51150
          float f4 = (float)this.mc.gameSettings.renderDistanceChunks / 32.0F;
          float f2 = f3 * (1.0F - f4) + f4;
          this.fogColor1 = this.fogColor1 + (f2 - this.fogColor1) * 0.1F;
@@ -22,7 +22,7 @@
                          if (d3 < d2 || d2 == 0.0)
                          {
 -                            if (entity1.getLowestRidingEntity() == entity.getLowestRidingEntity())
-+                            if (entity1.getLowestRidingEntity() == entity.getLowestRidingEntity() && entity1.canRiderInteract())
++                            if (entity1.getLowestRidingEntity() == entity.getLowestRidingEntity() && !entity1.canRiderInteract())
                              {
                                  if (d2 == 0.0)
                                  {

patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch

@@ -124,17 +124,16 @@
          if (this.mc.world.provider.isSurfaceWorld())
          {
              if (this.mc.gameSettings.shouldRenderClouds() == 2)
-@@ -1945,7 +1968,8 @@
-             float f1 = (float)(i >> 8 & 0xFF) / 255.0F;
-             float f2 = (float)(i & 0xFF) / 255.0F;
-             GlStateManager.color(f, f1, f2, (float)d1);
--            GlStateManager.doPolygonOffset(-3.0F, -3.0F);
-+            // FORGE: Fix MC-234
-+            GlStateManager.doPolygonOffset(-3.0F, -10.0F);
-             GlStateManager.enablePolygonOffset();
-             GlStateManager.alphaFunc(516, 0.1F);
-             GlStateManager.enableAlpha();
-@@ -2102,8 +2126,13 @@
+@@ -2062,7 +2085,7 @@
+         );
+         GlStateManager.enableBlend();
+         GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F);
+-        GlStateManager.doPolygonOffset(-3.0F, -3.0F);
++        GlStateManager.doPolygonOffset(-1.0F, -10.0F); // FORGE: Fix MC-234
+         GlStateManager.enablePolygonOffset();
+         GlStateManager.alphaFunc(516, 0.1F);
+         GlStateManager.enableAlpha();
+@@ -2102,8 +2125,13 @@
                  double d4 = (double)blockpos.getY() - d1;
                  double d5 = (double)blockpos.getZ() - d2;
                  Block block = this.world.getBlockState(blockpos).getBlock();
@@ -149,7 +148,7 @@
                  {
                      if (d3 * d3 + d4 * d4 + d5 * d5 > 1024.0)
                      {
-@@ -2836,7 +2865,7 @@
+@@ -2836,7 +2864,7 @@
 
                  if (block.getDefaultState().getMaterial() != Material.AIR)
                  {

patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch

@@ -91,15 +91,15 @@
      }
 
      protected List<String> getVariantNames(Item stack)
-@@ -714,7 +730,7 @@
+@@ -713,7 +729,7 @@
+ 
      protected ResourceLocation getItemLocation(String location)
      {
-         ResourceLocation resourcelocation = new ResourceLocation(location);
--        return new ResourceLocation(resourcelocation.getNamespace(), "item/" + resourcelocation.getPath());
-+        return new ResourceLocation(resourcelocation.getNamespace(), "item/" + resourcelocation.getPath().replaceAll("#.*", ""));
+-        ResourceLocation resourcelocation = new ResourceLocation(location);
++        ResourceLocation resourcelocation = new ResourceLocation(location.replaceAll("#.*", ""));
+         return new ResourceLocation(resourcelocation.getNamespace(), "item/" + resourcelocation.getPath());
      }
 
-     private void bakeBlockModels()
 @@ -818,7 +834,7 @@
          for (Entry<String, ResourceLocation> entry : this.itemLocations.entrySet())
          {