Neoforge - 1.21.3

MohistMC · Oct 23, 2024 · 15b8377 · 15b8377
1 parent 18b5635
commit 15b8377
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -21,7 +21,7 @@
 Progress
 ------
 
-- [x] Rectify NeoForge([**91303b6970**](https://github.com/neoforged/NeoForge/commit/91303b6970))
+- [x] Rectify NeoForge([**dd989e5cff**](https://github.com/neoforged/NeoForge/commit/dd989e5cff))
 - [ ] Start patch
  * [x] Bukkit([**8ec77750**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/8ec77750))
  * [ ] CraftBukkit([**d50f50585**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/d50f50585))

diff --git a/gradle.properties b/gradle.properties
@@ -9,10 +9,10 @@ org.gradle.debug=false
 
 java_version=21
 
-minecraft_version=1.21.2
-neoform_version=20241022.151510
+minecraft_version=1.21.3
+neoform_version=20241023.131943
 # on snapshot versions, used to prefix the version
-neoforge_snapshot_next_stable=21.3
+neoforge_snapshot_next_stable=21.4
 
 mergetool_version=2.0.0
 accesstransformers_version=10.0.1

diff --git a/patches/net/minecraft/client/KeyboardHandler.java.patch b/patches/net/minecraft/client/KeyboardHandler.java.patch
@@ -23,6 +23,14 @@
                              return;
                          }
                      }
+@@ -507,6 +_,7 @@
+                     }
+                 }
+             }
++            net.neoforged.neoforge.client.ClientHooks.onKeyInput(p_90895_, p_90896_, p_90897_, p_90898_);
+         }
+     }
+
 @@ -516,10 +_,20 @@
              if (screen != null && this.minecraft.getOverlay() == null) {
                  try {

diff --git a/patches/net/minecraft/util/datafix/DataFixers.java.patch b/patches/net/minecraft/util/datafix/DataFixers.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1307,10 +_,35 @@
+@@ -1308,10 +_,35 @@
          Schema schema199 = p_14514_.addSchema(3800, SAME_NAMESPACED);
          UnaryOperator<String> unaryoperator2 = createRenamer(Map.of("minecraft:scute", "minecraft:turtle_scute"));
          p_14514_.addFixer(ItemRenameFix.create(schema199, "Rename scute item to turtle_scute", unaryoperator2));
@@ -36,7 +36,7 @@
          Schema schema201 = p_14514_.addSchema(3807, V3807::new);
          p_14514_.addFixer(new AddNewChoices(schema201, "Added Vault", References.BLOCK_ENTITY));
          Schema schema202 = p_14514_.addSchema(3807, 1, SAME_NAMESPACED);
-@@ -1333,6 +_,18 @@
+@@ -1334,6 +_,18 @@
                  schema209, "Rename jump strength attribute", createRenamer("minecraft:horse.jump_strength", "minecraft:generic.jump_strength")
              )
          );

diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 
-import net.minecraft.commands.CommandListenerWrapper; // CraftBukkit
+import net.minecraft.commands.CommandSourceStack; // CraftBukkit
 
 public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
     private final Map<String, CommandNode<S>> children = new LinkedHashMap<>();
@@ -73,12 +73,12 @@ public RedirectModifier<S> getRedirectModifier() {
 
     // CraftBukkit start
     public synchronized boolean canUse(final S source) {
-        if (source instanceof CommandListenerWrapper) {
+        if (source instanceof CommandSourceStack) {
             try {
-                ((CommandListenerWrapper) source).currentCommand = this;
+                ((CommandSourceStack) source).currentCommand = this;
                 return requirement.test(source);
             } finally {
-                ((CommandListenerWrapper) source).currentCommand = null;
+                ((CommandSourceStack) source).currentCommand = null;
             }
         }
         // CraftBukkit end