Update Lwjgl3ify (#233)

* sync lwjgl3ify * sync lwjgl3ify * fix missing symbol * update * fix config name
CleanroomMC · Nov 3, 2024 · ea9fd21 · ea9fd21
1 parent d4b84d3
commit ea9fd21
Show file tree

Hide file tree

Showing 20 changed files with 529 additions and 2,166 deletions.
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -880,7 +880,18 @@
                      {
                          this.field_71460_t.field_78516_c.func_187460_a(enumhand);
                          return;
-@@ -1662,6 +1632,11 @@
+@@ -1614,6 +1584,10 @@
+
+     public void func_71352_k()
+     {
++        if (net.minecraftforge.common.ForgeEarlyConfig.WINDOW_BORDERLESS_REPLACES_FULLSCREEN) {
++            Display.toggleBorderless();
++            return;
++        }
+         try
+         {
+             this.field_71431_Q = !this.field_71431_Q;
+@@ -1662,6 +1636,11 @@
              }
 
              Display.setFullscreen(this.field_71431_Q);
@@ -892,7 +903,7 @@
              Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
              this.func_175601_h();
          }
-@@ -1708,6 +1683,8 @@
+@@ -1708,6 +1687,8 @@
              --this.field_71467_ac;
          }
 
@@ -901,7 +912,7 @@
          this.field_71424_I.func_76320_a("gui");
 
          if (!this.field_71445_n)
-@@ -1736,7 +1713,7 @@
+@@ -1736,7 +1717,7 @@
          {
              if (this.field_71439_g.func_110143_aJ() <= 0.0F && !(this.field_71462_r instanceof GuiGameOver))
              {
@@ -910,7 +921,7 @@
              }
              else if (this.field_71439_g.func_70608_bn() && this.field_71441_e != null)
              {
-@@ -1745,7 +1722,7 @@
+@@ -1745,7 +1726,7 @@
          }
          else if (this.field_71462_r != null && this.field_71462_r instanceof GuiSleepMP && !this.field_71439_g.func_70608_bn())
          {
@@ -919,7 +930,7 @@
          }
 
          if (this.field_71462_r != null)
-@@ -1892,12 +1869,7 @@
+@@ -1892,12 +1873,7 @@
 
              if (!this.field_71445_n && this.field_71441_e != null)
              {
@@ -933,23 +944,23 @@
              }
 
              this.field_71424_I.func_76318_c("particles");
-@@ -1914,6 +1886,7 @@
+@@ -1914,6 +1890,7 @@
          }
 
          this.field_71424_I.func_76319_b();
 +        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
          this.field_71423_H = func_71386_F();
      }
 
-@@ -2019,6 +1992,7 @@
+@@ -2019,6 +1996,7 @@
                      }
                  }
              }
 +            net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput();
          }
 
          this.func_184117_aA();
-@@ -2095,16 +2069,16 @@
+@@ -2095,16 +2073,16 @@
          {
              this.func_190521_a("debug.help.message");
              GuiNewChat guinewchat = this.field_71456_v.func_146158_b();
@@ -976,7 +987,7 @@
              return true;
          }
          else if (p_184122_1_ == 20)
-@@ -2136,7 +2110,7 @@
+@@ -2136,7 +2114,7 @@
              }
              else if (this.field_71474_y.field_74320_O == 1)
              {
@@ -985,7 +996,7 @@
              }
          }
 
-@@ -2223,16 +2197,27 @@
+@@ -2223,16 +2201,27 @@
                  this.field_71442_b.func_78766_c(this.field_71439_g);
              }
 
@@ -1023,7 +1034,7 @@
              }
          }
          else
-@@ -2265,6 +2250,8 @@
+@@ -2265,6 +2254,8 @@
      {
          while (Mouse.next())
          {
@@ -1032,7 +1043,7 @@
              int i = Mouse.getEventButton();
              KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
 
-@@ -2320,24 +2307,19 @@
+@@ -2320,24 +2311,19 @@
                      this.field_71462_r.func_146274_d();
                  }
              }
@@ -1061,7 +1072,7 @@
          System.gc();
          ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
          WorldInfo worldinfo = isavehandler.func_75757_d();
-@@ -2358,15 +2340,11 @@
+@@ -2358,15 +2344,11 @@
              YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
              MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
              GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
@@ -1079,7 +1090,7 @@
              this.field_71437_Z.func_71256_s();
              this.field_71455_al = true;
          }
-@@ -2383,6 +2361,12 @@
+@@ -2383,6 +2365,12 @@
 
          while (!this.field_71437_Z.func_71200_ad())
          {
@@ -1092,7 +1103,7 @@
              String s = this.field_71437_Z.func_71195_b_();
 
              if (s != null)
-@@ -2398,17 +2382,24 @@
+@@ -2398,17 +2386,24 @@
              {
                  Thread.sleep(200L);
              }
@@ -1121,7 +1132,7 @@
          this.field_71453_ak = networkmanager;
      }
 
-@@ -2419,6 +2410,8 @@
+@@ -2419,6 +2414,8 @@
 
      public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
      {
@@ -1130,7 +1141,7 @@
          if (p_71353_1_ == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2431,6 +2424,18 @@
+@@ -2431,6 +2428,18 @@
              if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
              {
                  this.field_71437_Z.func_71263_m();
@@ -1149,7 +1160,7 @@
              }
 
              this.field_71437_Z = null;
-@@ -2452,8 +2457,9 @@
+@@ -2452,8 +2461,9 @@
          {
              this.field_110448_aq.func_148529_f();
              this.field_71456_v.func_181029_i();
@@ -1160,15 +1171,15 @@
          }
 
          this.field_147127_av.func_147690_c();
-@@ -2470,6 +2476,7 @@
+@@ -2470,6 +2480,7 @@
          }
 
          TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_71353_1_);
 +        net.minecraftforge.client.MinecraftForgeClient.clearRenderCache();
 
          if (p_71353_1_ != null)
          {
-@@ -2478,9 +2485,7 @@
+@@ -2478,9 +2489,7 @@
                  AuthenticationService authenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
                  MinecraftSessionService minecraftsessionservice = authenticationservice.createMinecraftSessionService();
                  GameProfileRepository gameprofilerepository = authenticationservice.createProfileRepository();
@@ -1179,7 +1190,7 @@
                  TileEntitySkull.func_184293_a(playerprofilecache);
                  TileEntitySkull.func_184294_a(minecraftsessionservice);
                  PlayerProfileCache.func_187320_a(false);
-@@ -2524,13 +2529,9 @@
+@@ -2524,13 +2533,9 @@
 
          this.field_175622_Z = null;
          EntityPlayerSP entityplayersp = this.field_71439_g;
@@ -1195,7 +1206,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();
-@@ -2544,7 +2545,7 @@
+@@ -2544,7 +2549,7 @@
 
          if (this.field_71462_r instanceof GuiGameOver)
          {
@@ -1204,7 +1215,7 @@
          }
      }
 
-@@ -2578,159 +2579,8 @@
+@@ -2578,159 +2583,8 @@
      {
          if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
          {
@@ -1366,7 +1377,7 @@
          }
      }
 
-@@ -2778,7 +2628,14 @@
+@@ -2778,7 +2632,14 @@
          {
              public String call()
              {
@@ -1382,7 +1393,7 @@
              }
          });
          p_71396_1_.func_85056_g().func_189529_a("GL Caps", new ICrashReportDetail<String>()
-@@ -2795,10 +2652,7 @@
+@@ -2795,10 +2656,7 @@
                  return Minecraft.this.field_71474_y.field_178881_t ? "Yes" : "No";
              }
          });
@@ -1394,7 +1405,7 @@
          {
              public String call() throws Exception
              {
-@@ -2810,13 +2664,10 @@
+@@ -2810,13 +2668,10 @@
                  }
                  else
                  {
@@ -1410,7 +1421,7 @@
          p_71396_1_.func_85056_g().func_189529_a("Type", new ICrashReportDetail<String>()
          {
              public String call() throws Exception
-@@ -2883,11 +2734,11 @@
+@@ -2883,11 +2738,11 @@
          return field_71432_P;
      }
 
@@ -1423,7 +1434,7 @@
              public void run()
              {
                  Minecraft.this.func_110436_a();
-@@ -2895,21 +2746,20 @@
+@@ -2895,21 +2750,20 @@
          });
      }
 
@@ -1451,15 +1462,15 @@
          int i = 0;
 
          for (ResourcePackRepository.Entry resourcepackrepository$entry : this.field_110448_aq.func_110613_c())
-@@ -2939,7 +2789,6 @@
+@@ -2939,7 +2793,6 @@
          }
      }
 
 -    @Override
      public void func_70001_b(Snooper p_70001_1_)
      {
          p_70001_1_.func_152767_b("opengl_version", GlStateManager.func_187416_u(7938));
-@@ -2947,110 +2796,110 @@
+@@ -2947,110 +2800,110 @@
          p_70001_1_.func_152767_b("client_brand", ClientBrandRetriever.getClientModName());
          p_70001_1_.func_152767_b("launched_version", this.field_110447_Z);
          ContextCapabilities contextcapabilities = GLContext.getCapabilities();
@@ -1674,7 +1685,7 @@
          GameProfile gameprofile = this.field_71449_j.func_148256_e();
 
          if (gameprofile != null && gameprofile.getId() != null)
-@@ -3061,21 +2910,10 @@
+@@ -3061,21 +2914,10 @@
 
      public static int func_71369_N()
      {
@@ -1698,7 +1709,7 @@
      public boolean func_70002_Q()
      {
          return this.field_71474_y.field_74355_t;
-@@ -3205,6 +3043,9 @@
+@@ -3205,6 +3047,9 @@
          }
          else if (this.field_71439_g != null)
          {
@@ -1708,7 +1719,7 @@
              if (this.field_71439_g.field_70170_p.field_73011_w instanceof WorldProviderHell)
              {
                  return MusicTicker.MusicType.NETHER;
-@@ -3215,9 +3056,7 @@
+@@ -3215,9 +3060,7 @@
              }
              else
              {
@@ -1719,7 +1730,7 @@
              }
          }
          else
-@@ -3236,19 +3075,15 @@
+@@ -3236,19 +3079,15 @@
              {
                  if (Keyboard.getEventKeyState())
                  {
@@ -1743,15 +1754,15 @@
                      {
                          this.field_71474_y.func_74306_a(GameSettings.Options.NARRATOR, 1);
 
-@@ -3258,6 +3093,7 @@
+@@ -3258,6 +3097,7 @@
                          }
                      }
                  }
 +                else if (this.field_71462_r instanceof GuiControls) ((GuiControls)this.field_71462_r).field_146491_f = null;
              }
          }
      }
-@@ -3292,16 +3128,16 @@
+@@ -3292,16 +3132,16 @@
          {
              try
              {
@@ -1771,7 +1782,7 @@
 
              synchronized (this.field_152351_aB)
              {
-@@ -3311,14 +3147,12 @@
+@@ -3311,14 +3151,12 @@
          }
      }
 
@@ -1787,7 +1798,7 @@
      public boolean func_152345_ab()
      {
          return Thread.currentThread() == this.field_152352_aC;
-@@ -3346,7 +3180,7 @@
+@@ -3346,7 +3184,7 @@
 
      public <T> ISearchTree<T> func_193987_a(SearchTreeManager.Key<T> p_193987_1_)
      {
@@ -1796,7 +1807,7 @@
      }
 
      public static int func_175610_ah()
-@@ -3389,6 +3223,12 @@
+@@ -3389,6 +3227,12 @@
          return this.field_184127_aH;
      }
 
@@ -1809,7 +1820,7 @@
      public boolean func_189648_am()
      {
          return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v;
-@@ -3402,5 +3242,10 @@
+@@ -3402,5 +3246,10 @@
      public Tutorial func_193032_ao()
      {
          return this.field_193035_aW;