Minecraft 1.21.4

fmlloader/src/main/java/net/minecraftforge/fml/loading/BackgroundWaiter.java

@@ -6,14 +6,13 @@
 package net.minecraftforge.fml.loading;
 
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 public class BackgroundWaiter {
-    private static final ExecutorService runner = Executors.newSingleThreadExecutor();
 
     public static void runAndTick(Runnable r, Runnable tick) {
+        var runner = Executors.newSingleThreadExecutor();
         ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
         final Future<?> work = runner.submit(r);
         do {

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java

@@ -71,6 +71,7 @@ protected ServiceRunner makeService(final String[] arguments, final ModuleLayer
 
     protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
     protected static final LaunchType CLIENT          = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
+    protected static final LaunchType CLIENT_DATA     = new LaunchType("client_data", "minecraft", "net.minecraft.client.data.Main", Dist.CLIENT, true);
     protected static final LaunchType DATA            = new LaunchType("data",   "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
     protected static final LaunchType SERVER          = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
     protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);

fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLaunchHandler.java

@@ -39,6 +39,12 @@ public Client() {
         }
     }
 
+    public static final class ClientData extends ForgeDevLaunchHandler {
+        public ClientData() {
+            super(CLIENT_DATA);
+        }
+    }
+
     public static final class Data extends ForgeDevLaunchHandler {
         public Data() {
             super(DATA);

gradle.properties

@@ -5,11 +5,11 @@ org.gradle.daemon=false
 org.gradle.parallel=true
 
 JAVA_VERSION=21
-MC_VERSION=1.21.3
+MC_VERSION=1.21.4
 MC_NEXT_VERSION=1.22
-MCP_VERSION=20241025.112443
+MCP_VERSION=20241203.143248
 MAPPING_CHANNEL=official
-MAPPING_VERSION=1.21.3
+MAPPING_VERSION=1.21.4
 
 // Set to true before the first build of a new MC version, so we don't do compatibility checks
 CHECK_COMPATIBILITY=false

patches/minecraft/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
-@@ -88,7 +_,8 @@
+@@ -89,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;
-@@ -100,6 +_,7 @@
+@@ -101,6 +_,7 @@
              this.windowedX = this.x = aint1[0];
              this.windowedY = this.y = aint[0];
          }
 +        }
 
          GLFW.glfwMakeContextCurrent(this.window);
          GL.createCapabilities();
-@@ -267,6 +_,9 @@
+@@ -271,6 +_,9 @@
          GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
          this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
          this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;

patches/minecraft/net/minecraft/Util.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -264,7 +_,7 @@
+@@ -268,7 +_,7 @@
                  .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
                  .getChoiceType(p_137552_, p_137553_);
          } catch (IllegalArgumentException illegalargumentexception) {

patches/minecraft/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.minecraftforge.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,14 +_,14 @@
+@@ -43,14 +_,14 @@
      private int clickCount;
 
      public static void click(InputConstants.Key p_90836_) {
@@ -29,7 +29,7 @@
          if (keymapping != null) {
              keymapping.setDown(p_90839_);
          }
-@@ -100,7 +_,7 @@
+@@ -101,7 +_,7 @@
      }
 
      public boolean isDown() {
@@ -38,7 +38,7 @@
      }
 
      public String getCategory() {
-@@ -136,7 +_,16 @@
+@@ -137,7 +_,16 @@
      public int compareTo(KeyMapping p_90841_) {
          return this.category.equals(p_90841_.category)
              ? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
@@ -56,7 +56,7 @@
      }
 
      public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -145,6 +_,20 @@
+@@ -146,6 +_,20 @@
      }
 
      public boolean same(KeyMapping p_90851_) {
@@ -77,7 +77,7 @@
          return this.key.equals(p_90851_.key);
      }
 
-@@ -163,11 +_,13 @@
+@@ -164,11 +_,13 @@
      }
 
      public Component getTranslatedKeyMessage() {
@@ -92,10 +92,10 @@
      }
 
      public String saveString() {
-@@ -176,5 +_,88 @@
-
-     public void setDown(boolean p_90846_) {
-         this.isDown = p_90846_;
+@@ -182,5 +_,88 @@
+     @Nullable
+     public static KeyMapping get(String p_378660_) {
+         return ALL.get(p_378660_);
 +    }
 +
 +    private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;