Bukkit-1.21.4

MohistMC · Dec 7, 2024 · f71e865 · f71e865
1 parent c323654
commit f71e865
Show file tree

Hide file tree

Showing 286 changed files with 5,252 additions and 4,791 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -23,7 +23,7 @@ Progress
 
 - [x] Rectify NeoForge([**00f3f80ef9**](https://github.com/neoforged/NeoForge/commit/00f3f80ef9))
 - [ ] Start patch
- * [x] Bukkit([**8ec77750**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/8ec77750))
+ * [x] Bukkit([**3339db16**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/3339db16))
  * [ ] CraftBukkit([**d50f50585**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/d50f50585))
  * [ ] Spigot ([**d2eba2c8**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/commits/d2eba2c8))
   * [ ] Bukkit-Patches

diff --git a/patches/com/mojang/blaze3d/platform/Window.java.patch b/patches/com/mojang/blaze3d/platform/Window.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/Window.java
 +++ b/com/mojang/blaze3d/platform/Window.java
-@@ -90,7 +_,8 @@
+@@ -91,7 +_,8 @@
          GLFW.glfwWindowHint(139267, 2);
          GLFW.glfwWindowHint(139272, 204801);
          GLFW.glfwWindowHint(139270, 1);
@@ -10,15 +10,15 @@
          if (monitor != null) {
              VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
              this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
-@@ -102,6 +_,7 @@
+@@ -103,6 +_,7 @@
              this.windowedX = this.x = aint1[0];
              this.windowedY = this.y = aint[0];
          }
 +        }
 
          GLFW.glfwMakeContextCurrent(this.window);
          GL.createCapabilities();
-@@ -269,6 +_,7 @@
+@@ -273,6 +_,7 @@
          GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
          this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
          this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;

diff --git a/patches/com/mojang/blaze3d/systems/RenderSystem.java.patch b/patches/com/mojang/blaze3d/systems/RenderSystem.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/systems/RenderSystem.java
 +++ b/com/mojang/blaze3d/systems/RenderSystem.java
-@@ -822,4 +_,14 @@
+@@ -818,4 +_,14 @@
              void accept(it.unimi.dsi.fastutil.ints.IntConsumer p_157488_, int p_157489_);
          }
      }

diff --git a/patches/com/mojang/realmsclient/dto/RealmsText.java.patch b/patches/com/mojang/realmsclient/dto/RealmsText.java.patch
diff --git a/patches/net/minecraft/Util.java.patch b/patches/net/minecraft/Util.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -264,8 +_,8 @@
+@@ -268,8 +_,8 @@
                  .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
                  .getChoiceType(p_137552_, p_137553_);
          } catch (IllegalArgumentException illegalargumentexception) {
@@ -11,7 +11,7 @@
                  throw illegalargumentexception;
              }
          }
-@@ -630,20 +_,20 @@
+@@ -634,20 +_,20 @@
 
      public static void logAndPauseIfInIde(String p_143786_) {
          LOGGER.error(p_143786_);

diff --git a/patches/net/minecraft/client/KeyMapping.java.patch b/patches/net/minecraft/client/KeyMapping.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/KeyMapping.java
 +++ b/net/minecraft/client/KeyMapping.java
-@@ -14,9 +_,9 @@
+@@ -15,9 +_,9 @@
  import net.neoforged.api.distmarker.OnlyIn;
 
  @OnlyIn(Dist.CLIENT)
@@ -12,7 +12,7 @@
      private static final Set<String> CATEGORIES = Sets.newHashSet();
      public static final String CATEGORY_MOVEMENT = "key.categories.movement";
      public static final String CATEGORY_MISC = "key.categories.misc";
-@@ -42,17 +_,17 @@
+@@ -43,17 +_,17 @@
      private int clickCount;
 
      public static void click(InputConstants.Key p_90836_) {
@@ -35,7 +35,7 @@
      }
 
      public static void setAll() {
-@@ -100,7 +_,7 @@
+@@ -101,7 +_,7 @@
      }
 
      public boolean isDown() {
@@ -44,7 +44,7 @@
      }
 
      public String getCategory() {
-@@ -134,9 +_,13 @@
+@@ -135,9 +_,13 @@
      }
 
      public int compareTo(KeyMapping p_90841_) {
@@ -61,7 +61,7 @@
      }
 
      public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -145,6 +_,20 @@
+@@ -146,6 +_,20 @@
      }
 
      public boolean same(KeyMapping p_90851_) {
@@ -82,7 +82,7 @@
          return this.key.equals(p_90851_.key);
      }
 
-@@ -163,11 +_,13 @@
+@@ -164,11 +_,13 @@
      }
 
      public Component getTranslatedKeyMessage() {
@@ -97,10 +97,10 @@
      }
 
      public String saveString() {
-@@ -176,5 +_,86 @@
-
-     public void setDown(boolean p_90846_) {
-         this.isDown = p_90846_;
+@@ -182,5 +_,86 @@
+     @Nullable
+     public static KeyMapping get(String p_389468_) {
+         return ALL.get(p_389468_);
 +    }
 +
 +    // Neo: Injected Key Mapping controls