Switch to AutoHeader patches.

neoforged · Nov 19, 2023 · ea77500 · ea77500
1 parent 5cbb4a0
commit ea77500
Show file tree

Hide file tree

Showing 675 changed files with 2,035 additions and 1,996 deletions.
diff --git a/patches/com/mojang/blaze3d/pipeline/RenderTarget.java.patch b/patches/com/mojang/blaze3d/pipeline/RenderTarget.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/pipeline/RenderTarget.java
 +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
-@@ -106,7 +106,10 @@
+@@ -106,7 +_,10 @@
              GlStateManager._texParameter(3553, 34892, 0);
              GlStateManager._texParameter(3553, 10242, 33071);
              GlStateManager._texParameter(3553, 10243, 33071);
@@ -11,7 +11,7 @@
           }
 
           this.setFilterMode(9728);
-@@ -117,7 +120,14 @@
+@@ -117,7 +_,14 @@
           GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
           GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
           if (this.useDepth) {
@@ -26,7 +26,7 @@
           }
 
           this.checkStatus();
-@@ -275,4 +285,27 @@
+@@ -275,4 +_,27 @@
     public int getDepthTextureId() {
        return this.depthBufferId;
     }

diff --git a/patches/com/mojang/blaze3d/platform/GlStateManager.java.patch b/patches/com/mojang/blaze3d/platform/GlStateManager.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/platform/GlStateManager.java
 +++ b/com/mojang/blaze3d/platform/GlStateManager.java
-@@ -493,9 +493,16 @@
+@@ -493,9 +_,16 @@
        }
     }
 

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
-@@ -82,7 +82,8 @@
+@@ -82,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;
-@@ -94,6 +95,7 @@
+@@ -94,6 +_,7 @@
           this.windowedX = this.x = aint1[0];
           this.windowedY = this.y = aint[0];
        }
 +      }
 
        GLFW.glfwMakeContextCurrent(this.window);
        GL.createCapabilities();
-@@ -242,6 +244,7 @@
+@@ -242,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/vertex/BufferBuilder.java.patch b/patches/com/mojang/blaze3d/vertex/BufferBuilder.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/BufferBuilder.java
 +++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
-@@ -477,4 +477,14 @@
+@@ -477,4 +_,14 @@
           this.sorting = p_277855_;
        }
     }

diff --git a/patches/com/mojang/blaze3d/vertex/PoseStack.java.patch b/patches/com/mojang/blaze3d/vertex/PoseStack.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/PoseStack.java
 +++ b/com/mojang/blaze3d/vertex/PoseStack.java
-@@ -12,7 +12,7 @@
+@@ -12,7 +_,7 @@
  import org.joml.Quaternionf;
 
  @OnlyIn(Dist.CLIENT)

diff --git a/patches/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java.patch b/patches/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
 +++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
-@@ -47,7 +47,7 @@
+@@ -47,7 +_,7 @@
     @Override
     public void endVertex() {
        Vector3f vector3f = this.normalInversePose.transform(new Vector3f(this.nx, this.ny, this.nz));

diff --git a/patches/com/mojang/blaze3d/vertex/VertexConsumer.java.patch b/patches/com/mojang/blaze3d/vertex/VertexConsumer.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/VertexConsumer.java
 +++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
-@@ -14,7 +14,7 @@
+@@ -14,7 +_,7 @@
  import org.lwjgl.system.MemoryStack;
 
  @OnlyIn(Dist.CLIENT)
@@ -9,7 +9,7 @@
     VertexConsumer vertex(double p_85945_, double p_85946_, double p_85947_);
 
     VertexConsumer color(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
-@@ -99,6 +99,10 @@
+@@ -99,6 +_,10 @@
        int p_86003_,
        boolean p_86004_
     ) {
@@ -20,7 +20,7 @@
        float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
        int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
        int[] aint1 = p_85997_.getVertices();
-@@ -134,11 +138,13 @@
+@@ -134,11 +_,13 @@
                 f5 = afloat[k] * p_86001_;
              }
 

diff --git a/patches/com/mojang/blaze3d/vertex/VertexFormat.java.patch b/patches/com/mojang/blaze3d/vertex/VertexFormat.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormat.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormat.java
-@@ -166,4 +166,11 @@
+@@ -166,4 +_,11 @@
           };
        }
     }

diff --git a/patches/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch b/patches/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/blaze3d/vertex/VertexFormatElement.java
 +++ b/com/mojang/blaze3d/vertex/VertexFormatElement.java
-@@ -93,6 +93,10 @@
+@@ -93,6 +_,10 @@
        this.usage.clearBufferState(this.index, p_166964_);
     }
 

diff --git a/patches/com/mojang/math/Transformation.java.patch b/patches/com/mojang/math/Transformation.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/math/Transformation.java
 +++ b/com/mojang/math/Transformation.java
-@@ -13,7 +13,7 @@
+@@ -13,7 +_,7 @@
  import org.joml.Quaternionf;
  import org.joml.Vector3f;
 
@@ -9,7 +9,7 @@
     private final Matrix4f matrix;
     public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
        p_269604_ -> p_269604_.group(
-@@ -156,6 +156,19 @@
+@@ -156,6 +_,19 @@
     public int hashCode() {
        return Objects.hash(this.matrix);
     }

diff --git a/patches/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch b/patches/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch
@@ -1,6 +1,6 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -65,6 +65,15 @@
+@@ -65,6 +_,15 @@
        return Component.empty().append(this.lines.title).append(": ").append(this.lines.detail);
     }
 

diff --git a/patches/net/minecraft/CrashReport.java.patch b/patches/net/minecraft/CrashReport.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -57,14 +57,8 @@
+@@ -57,14 +_,8 @@
        if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
           p_127520_.append("-- Head --\n");
           p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
@@ -17,15 +17,15 @@
        }
 
        for(CrashReportCategory crashreportcategory : this.details) {
-@@ -72,6 +66,7 @@
+@@ -72,6 +_,7 @@
           p_127520_.append("\n\n");
        }
 
 +      net.neoforged.neoforge.logging.CrashReportExtender.extendSystemReport(systemReport);
        this.systemReport.appendToCrashReportString(p_127520_);
     }
 
-@@ -91,23 +86,13 @@
+@@ -91,23 +_,13 @@
           throwable.setStackTrace(this.exception.getStackTrace());
        }
 

diff --git a/patches/net/minecraft/CrashReportCategory.java.patch b/patches/net/minecraft/CrashReportCategory.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReportCategory.java
 +++ b/net/minecraft/CrashReportCategory.java
-@@ -112,8 +112,10 @@
+@@ -112,8 +_,10 @@
        if (astacktraceelement.length <= 0) {
           return 0;
        } else {
@@ -13,7 +13,7 @@
           return this.stackTrace.length;
        }
     }
-@@ -160,16 +162,16 @@
+@@ -160,16 +_,16 @@
 
        if (this.stackTrace != null && this.stackTrace.length > 0) {
           p_128169_.append("\nStacktrace:");

diff --git a/patches/net/minecraft/SharedConstants.java.patch b/patches/net/minecraft/SharedConstants.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/SharedConstants.java
 +++ b/net/minecraft/SharedConstants.java
-@@ -201,6 +201,7 @@
+@@ -201,6 +_,7 @@
     }
 
     static {

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
-@@ -176,6 +176,11 @@
+@@ -176,6 +_,11 @@
        return 255;
     }
 
@@ -12,7 +12,7 @@
     public static ExecutorService backgroundExecutor() {
        return BACKGROUND_EXECUTOR;
     }
-@@ -245,7 +250,7 @@
+@@ -245,7 +_,7 @@
              .getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
              .getChoiceType(p_137552_, p_137553_);
        } catch (IllegalArgumentException illegalargumentexception) {

diff --git a/patches/net/minecraft/advancements/Advancement.java.patch b/patches/net/minecraft/advancements/Advancement.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/Advancement.java
 +++ b/net/minecraft/advancements/Advancement.java
-@@ -72,7 +72,18 @@
+@@ -72,7 +_,18 @@
        return jsonobject;
     }
 
@@ -19,7 +19,7 @@
        Optional<ResourceLocation> optional = p_301286_.has("parent")
           ? Optional.of(new ResourceLocation(GsonHelper.getAsString(p_301286_, "parent")))
           : Optional.empty();
-@@ -121,7 +132,7 @@
+@@ -121,7 +_,7 @@
        return this.parent.isEmpty();
     }
 

diff --git a/patches/net/minecraft/advancements/AdvancementRewards.java.patch b/patches/net/minecraft/advancements/AdvancementRewards.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -47,6 +47,7 @@
+@@ -47,6 +_,7 @@
        LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
           .withParameter(LootContextParams.THIS_ENTITY, p_9990_)
           .withParameter(LootContextParams.ORIGIN, p_9990_.position())

diff --git a/patches/net/minecraft/advancements/critereon/ItemPredicate.java.patch b/patches/net/minecraft/advancements/critereon/ItemPredicate.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/critereon/ItemPredicate.java
 +++ b/net/minecraft/advancements/critereon/ItemPredicate.java
-@@ -36,13 +36,14 @@
+@@ -36,13 +_,14 @@
     List<EnchantmentPredicate> enchantments,
     List<EnchantmentPredicate> storedEnchantments,
     Optional<Holder<Potion>> potion,
@@ -17,7 +17,7 @@
        p_297904_ -> p_297904_.group(
                 ExtraCodecs.strictOptionalField(TagKey.codec(Registries.ITEM), "tag").forGetter(ItemPredicate::tag),
                 ExtraCodecs.strictOptionalField(ITEMS_CODEC, "items").forGetter(ItemPredicate::items),
-@@ -56,8 +57,42 @@
+@@ -56,8 +_,42 @@
              )
              .apply(p_297904_, ItemPredicate::new)
     );
@@ -60,7 +60,7 @@
        if (this.tag.isPresent() && !p_45050_.is(this.tag.get())) {
           return false;
        } else if (this.items.isPresent() && !p_45050_.is(this.items.get())) {
-@@ -72,7 +107,7 @@
+@@ -72,7 +_,7 @@
           return false;
        } else {
           if (!this.enchantments.isEmpty()) {
@@ -69,7 +69,7 @@
 
              for(EnchantmentPredicate enchantmentpredicate : this.enchantments) {
                 if (!enchantmentpredicate.containedIn(map)) {
-@@ -105,10 +140,14 @@
+@@ -105,10 +_,14 @@
        return Util.getOrThrow(CODEC.encodeStart(JsonOps.INSTANCE, this), IllegalStateException::new);
     }
 

diff --git a/patches/net/minecraft/client/Camera.java.patch b/patches/net/minecraft/client/Camera.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Camera.java
 +++ b/net/minecraft/client/Camera.java
-@@ -219,6 +219,18 @@
+@@ -219,6 +_,18 @@
        this.initialized = false;
     }
 

diff --git a/patches/net/minecraft/client/ClientBrandRetriever.java.patch b/patches/net/minecraft/client/ClientBrandRetriever.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/ClientBrandRetriever.java
 +++ b/net/minecraft/client/ClientBrandRetriever.java
-@@ -10,6 +10,6 @@
+@@ -10,6 +_,6 @@
 
     @DontObfuscate
     public static String getClientModName() {

diff --git a/patches/net/minecraft/client/ClientRecipeBook.java.patch b/patches/net/minecraft/client/ClientRecipeBook.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/ClientRecipeBook.java
 +++ b/net/minecraft/client/ClientRecipeBook.java
-@@ -60,7 +60,7 @@
+@@ -60,7 +_,7 @@
           Recipe<?> recipe = recipeholder.value();
           if (!recipe.isSpecial() && !recipe.isIncomplete()) {
              RecipeBookCategories recipebookcategories = getCategory(recipeholder);
@@ -9,7 +9,7 @@
              if (s.isEmpty()) {
                 map.computeIfAbsent(recipebookcategories, p_90645_ -> Lists.newArrayList()).add(ImmutableList.of(recipeholder));
              } else {
-@@ -118,6 +118,8 @@
+@@ -118,6 +_,8 @@
           } else if (recipetype == RecipeType.SMITHING) {
              return RecipeBookCategories.SMITHING;
           } else {

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 +14,9 @@
+@@ -14,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 +42,17 @@
+@@ -42,17 +_,17 @@
     private int clickCount;
 
     public static void click(InputConstants.Key p_90836_) {
@@ -35,7 +35,7 @@
     }
 
     public static void setAll() {
-@@ -100,7 +100,7 @@
+@@ -100,7 +_,7 @@
     }
 
     public boolean isDown() {
@@ -44,7 +44,7 @@
     }
 
     public String getCategory() {
-@@ -134,9 +134,13 @@
+@@ -134,9 +_,13 @@
     }
 
     public int compareTo(KeyMapping p_90841_) {
@@ -61,7 +61,7 @@
     }
 
     public static Supplier<Component> createNameSupplier(String p_90843_) {
-@@ -145,6 +149,20 @@
+@@ -145,6 +_,20 @@
     }
 
     public boolean same(KeyMapping p_90851_) {
@@ -82,7 +82,7 @@
        return this.key.equals(p_90851_.key);
     }
 
-@@ -165,11 +183,13 @@
+@@ -165,11 +_,13 @@
     }
 
     public Component getTranslatedKeyMessage() {
@@ -97,7 +97,7 @@
     }
 
     public String saveString() {
-@@ -179,4 +199,84 @@
+@@ -179,4 +_,84 @@
     public void setDown(boolean p_90846_) {
        this.isDown = p_90846_;
     }