upstream:update upstream and README.md

Author: wdog5

README.md

@@ -14,6 +14,9 @@
 |---------|-------------|-----------|-------------------|----------------------| 
 | 1.21.1  | Active      | Poor      | Poor              | Poor                 |
 
+### Upstream Update Progress
+Current synced commit:
+- [**NeoForge 1.21.1**] - [ceff3d](https://github.com/neoforged/NeoForge/commit/ceff3d20430e6a6653a83adae68ca11464e6335b)
 
 ### Running?
 It could be compilable and running, but the compatibility with plugins is poor.

neotaiyitistlauncher/build.gradle

@@ -5,23 +5,42 @@ plugins {
 group = 'org.taiyitistmc'
 version = rootProject.version
 
+base {
+    archivesName = "neotaiyitist"
+}
 
 dependencies {
     compileOnly "cpw.mods:bootstraplauncher:${project.bootstraplauncher_version}"
 }
 
+// 使用 layout API 定义文件路径
+def neotaiyitistProjectDir = rootProject.layout.projectDirectory.dir("projects/neotaiyitist")
+def installerJarDir = neotaiyitistProjectDir.dir("build/libs")
+def installerJarFile = installerJarDir.file("neotaiyitist-${version}-installer.jar")
+
+// 创建一个新的任务 launcherJar
+tasks.register('launcherJar', Jar) {
+    // 设置 jar 文件的分类器，避免与默认 jar 文件名冲突
+    archiveClassifier = 'launcher'
 
-jar {
+    // 复制默认 jar 的配置
     manifest {
         attributes(
                 "Implementation-Title": project.name,
                 "Implementation-Version": version,
-                "Main-Class": "org.taiyitistmc.LauncherMain",
+                "Main-Class": "org.taiyitistmc.launcher.NeoTaiyitistLauncher",
         )
     }
-    // TODO: 将 universal jar 打包进 launcher 内
 
-}
+    // 包含当前项目编译后的类文件
+    from sourceSets.main.output
 
-// Wait for neoforge build
-tasks.named("build").get().dependsOn(project(":neotaiyitist").tasks.named("build").get())
+    // 在执行此任务前先执行 neotaiyitist 项目的 installerJar 任务
+    dependsOn project(':neotaiyitist').tasks.named('installerJar')
+
+    // 将 installer jar 添加到 resources 中，使其被打包进最终的 jar
+    from(installerJarFile.asFile) {
+        // 可以指定在 jar 中的路径
+        into('META-INF/installer')
+    }
+}

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

@@ -52,24 +52,25 @@
              RenderSystem.applyModelViewMatrix();
              Lighting.setupFor3DItems();
              GuiGraphics guigraphics = new GuiGraphics(this.minecraft, this.renderBuffers.bufferSource());
-@@ -1070,7 +_,8 @@
+@@ -1070,8 +_,8 @@
 
              if (this.minecraft.getOverlay() != null) {
                  try {
 -                    this.minecraft.getOverlay().render(guigraphics, i, j, p_348648_.getRealtimeDeltaTicks());
+-                } catch (Throwable throwable2) {
 +                    // Neo: Fix https://bugs.mojang.com/browse/MC-273464
-+                    this.minecraft.getOverlay().render(guigraphics, i, j, p_348648_.getGameTimeDeltaPartialTick(false));
-                 } catch (Throwable throwable2) {
++                    this.minecraft.getOverlay().render(guigraphics, i, j, p_348648_.getGameTimeDeltaTicks());                } catch (Throwable throwable2) {
                      CrashReport crashreport = CrashReport.forThrowable(throwable2, "Rendering overlay");
                      CrashReportCategory crashreportcategory = crashreport.addCategory("Overlay render details");
+                     crashreportcategory.setDetail("Overlay name", () -> this.minecraft.getOverlay().getClass().getCanonicalName());
 @@ -1079,7 +_,9 @@
                  }
              } else if (flag && this.minecraft.screen != null) {
                  try {
 -                    this.minecraft.screen.renderWithTooltip(guigraphics, i, j, p_348648_.getRealtimeDeltaTicks());
 +                    // Neo: Wrap Screen#render to allow for GUI Layers and ScreenEvent.Render.[Pre/Post]
 +                    // Also fixes https://bugs.mojang.com/browse/MC-273464
-+                    net.neoforged.neoforge.client.ClientHooks.drawScreen(this.minecraft.screen, guigraphics, i, j, p_348648_.getGameTimeDeltaPartialTick(false));
++                    net.neoforged.neoforge.client.ClientHooks.drawScreen(this.minecraft.screen, guigraphics, i, j, p_348648_.getGameTimeDeltaTicks());
                  } catch (Throwable throwable1) {
                      CrashReport crashreport1 = CrashReport.forThrowable(throwable1, "Rendering screen");
                      CrashReportCategory crashreportcategory1 = crashreport1.addCategory("Screen render details");