Port Minecraft client patch for 'RenderTickEvent' (#5329)

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -134,7 +134,21 @@
        this.field_71424_I.func_76319_b();
        this.field_71424_I.func_76320_a("render");
        GlStateManager.func_179094_E();
-@@ -992,8 +1009,8 @@
+@@ -770,11 +787,13 @@
+       GlStateManager.func_179098_w();
+       this.field_71424_I.func_76319_b();
+       if (!this.field_71454_w) {
++         net.minecraftforge.fml.hooks.BasicEventHooks.onRenderTickStart(this.field_71428_T.field_194147_b);
+          this.field_71424_I.func_76318_c("gameRenderer");
+          this.field_71460_t.func_195458_a(this.field_71445_n ? this.field_193996_ah : this.field_71428_T.field_194147_b, i, p_195542_1_);
+          this.field_71424_I.func_76318_c("toasts");
+          this.field_193034_aS.func_195625_a();
+          this.field_71424_I.func_76319_b();
++         net.minecraftforge.fml.hooks.BasicEventHooks.onRenderTickEnd(this.field_71428_T.field_194147_b);
+       }
+ 
+       this.field_71424_I.func_76319_b();
+@@ -992,8 +1011,8 @@
        if (this.field_71429_W <= 0 && !this.field_71439_g.func_184587_cr()) {
           if (p_147115_1_ && this.field_71476_x != null && this.field_71476_x.field_72313_a == RayTraceResult.Type.BLOCK) {
              BlockPos blockpos = this.field_71476_x.func_178782_a();
@@ -145,7 +159,7 @@
                 this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
              }
  
-@@ -1018,7 +1035,7 @@
+@@ -1018,7 +1037,7 @@
                 break;
              case BLOCK:
                 BlockPos blockpos = this.field_71476_x.func_178782_a();
@@ -154,7 +168,7 @@
                    this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
                    break;
                 }
-@@ -1028,6 +1045,7 @@
+@@ -1028,6 +1047,7 @@
                 }
  
                 this.field_71439_g.func_184821_cY();
@@ -162,7 +176,7 @@
              }
  
              this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
-@@ -1077,6 +1095,9 @@
+@@ -1077,6 +1097,9 @@
                    }
                 }
  
@@ -172,7 +186,7 @@
                 if (!itemstack.func_190926_b() && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, enumhand) == EnumActionResult.SUCCESS) {
                    this.field_71460_t.field_78516_c.func_187460_a(enumhand);
                    return;
-@@ -1392,8 +1413,14 @@
+@@ -1392,8 +1415,14 @@
        NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
        networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null, (p_209507_0_) -> {
        }));
@@ -188,7 +202,7 @@
        this.field_71453_ak = networkmanager;
     }
  
-@@ -1407,6 +1434,7 @@
+@@ -1407,6 +1436,7 @@
     }
  
     public void func_205055_a(@Nullable WorldClient p_205055_1_, GuiScreen p_205055_2_) {
@@ -196,7 +210,7 @@
        if (p_205055_1_ == null) {
           NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
           if (nethandlerplayclient != null) {
-@@ -1443,6 +1471,7 @@
+@@ -1443,6 +1473,7 @@
        }
  
        TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_205055_1_);
@@ -204,7 +218,7 @@
        if (p_205055_1_ != null) {
           if (!this.field_71455_al) {
              AuthenticationService authenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
-@@ -1489,6 +1518,7 @@
+@@ -1489,6 +1520,7 @@
        EntityPlayerSP entityplayersp = this.field_71439_g;
        this.field_71439_g = this.field_71442_b.func_199681_a(this.field_71441_e, this.field_71439_g == null ? new StatisticsManager() : this.field_71439_g.func_146107_m(), this.field_71439_g == null ? new RecipeBookClient(new RecipeManager()) : this.field_71439_g.func_199507_B());
        this.field_71439_g.func_184212_Q().func_187218_a(entityplayersp.func_184212_Q().func_187231_c());
@@ -212,7 +226,7 @@
        this.field_71439_g.field_71093_bK = p_71354_1_;
        this.field_175622_Z = this.field_71439_g;
        this.field_71439_g.func_70065_x();
-@@ -1528,110 +1558,8 @@
+@@ -1528,110 +1560,8 @@
  
     private void func_147112_ai() {
        if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS) {
@@ -325,7 +339,7 @@
        }
     }
  
-@@ -1708,6 +1636,7 @@
+@@ -1708,6 +1638,7 @@
        return field_71432_P;
     }
  
@@ -333,7 +347,7 @@
     public ListenableFuture<Object> func_175603_A() {
        return this.func_152344_a(this::func_110436_a);
     }
-@@ -1867,6 +1796,8 @@
+@@ -1867,6 +1798,8 @@
     }
  
     public MusicTicker.MusicType func_147109_W() {
@@ -342,7 +356,7 @@
        if (this.field_71462_r instanceof GuiWinGame) {
           return MusicTicker.MusicType.CREDITS;
        } else if (this.field_71439_g == null) {
-@@ -2006,4 +1937,12 @@
+@@ -2006,4 +1939,12 @@
     public FontResourceManager func_211500_ak() {
        return this.field_211501_aD;
     }

patches_old_unknown/Minecraft.java.patch

@@ -6,20 +6,6 @@
          this.field_152354_ay = null;
          this.field_71461_s = new LoadingScreenRenderer(this);
          this.field_184132_p = new DebugRenderer(this);
-@@ -1094,11 +1113,13 @@
- 
-         if (!this.field_71454_w)
-         {
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_194147_b);
-             this.field_71424_I.func_76318_c("gameRenderer");
-             this.field_71460_t.func_181560_a(this.field_71445_n ? this.field_193996_ah : this.field_71428_T.field_194147_b, i);
-             this.field_71424_I.func_76318_c("toasts");
-             this.field_193034_aS.func_191783_a(new ScaledResolution(this));
-             this.field_71424_I.func_76319_b();
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_194147_b);
-         }
- 
-         this.field_71424_I.func_76319_b();
 @@ -1630,6 +1653,11 @@
              }