Merge remote-tracking branch 'upstream/1.20.x' into 1.20.x

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,6 +8,6 @@ assignees: ''
 ---
 
 <!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
-<!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
+<!-- If you'd like to see something in NeoForge, you should be ready to implement it as a PR. -->
 <!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
 <!-- Discord: https://discord.gg/UvedJ9m -->

.github/workflows/build-prs.yml

@@ -7,6 +7,10 @@ on:
       - opened
       - ready_for_review
       - reopened
+  push:
+    branches:
+      - 'feature/**'
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - '1.*'
+
+permissions:
+  contents: read
+  statuses: write
+
+jobs:
+  release:
+    uses: neoforged/actions/.github/workflows/gradle-publish.yml@main
+    with:
+      java: 17
+      pre_gradle_tasks: setup
+      gradle_tasks: publish
+      version_labels: -beta, -stable
+
+    # We only publish the main repository. This way we avoid publishing Kits
+    if: ${{ github.repository == 'neoforged/NeoForge' }}
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      GPG_SUBKEY: ${{ secrets.GPG_SUBKEY }}
+      GPG_SUBKEY_ID: ${{ secrets.GPG_SUBKEY_ID }}
+      GPG_SUBKEY_PASSWORD: ${{ secrets.GPG_SUBKEY_PASSWORD }}

.github/workflows/test-prs.yml

@@ -7,6 +7,10 @@ on:
       - opened
       - ready_for_review
       - reopened
+  push:
+    branches:
+      - 'feature/**'
+  workflow_dispatch:
 
 jobs:
   build:

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'net.neoforged.gradleutils' version '3.0.0-alpha.1' apply false
+    id 'net.neoforged.gradleutils' version '3.0.0-alpha.8' apply false
     id 'com.diffplug.spotless' version '6.22.0' apply false
     id 'net.neoforged.licenser' version '0.7.2' apply false
 }
@@ -68,6 +68,15 @@ spotless {
         toggleOffOn()
         eclipse().configFile file('codeformat/formatter-config.xml')
         importOrder()
+
+        // courtesy of diffplug/spotless#240
+        // https://github.com/diffplug/spotless/issues/240#issuecomment-385206606
+        custom 'noWildcardImports', { String fileContents ->
+            if (fileContents.contains('*;\n')) {
+                throw new GradleException('No wildcard imports are allowed!')
+            }
+        }
+        bumpThisNumberIfACustomStepChanges(1)
     }
     format 'patches', {
         target rootProject.fileTree("patches")

gradle.properties

@@ -12,7 +12,7 @@ java_version=17
 minecraft_version=1.20.4
 neoform_version=20231207.154220
 
-spi_version=8.0.0
+spi_version=9.0.2
 mergetool_version=2.0.0
 accesstransformers_version=10.0.1
 coremods_version=6.0.2
@@ -30,7 +30,7 @@ jetbrains_annotations_version=24.0.1
 slf4j_api_version=2.0.7
 apache_maven_artifact_version=3.8.5
 jarjar_version=0.4.0
-fancy_mod_loader_version=1.0.17
+fancy_mod_loader_version=2.0.3
 mojang_logging_version=1.1.1
 log4j_version=2.19.0
 guava_version=31.1.2-jre
@@ -42,7 +42,7 @@ unsafe_version=0.2.+
 typetools_version=0.6.3
 nashorn_core_version=15.3
 lwjgl_glfw_version=3.3.2
-mixin_extras_version=0.3.1
+mixin_extras_version=0.3.2
 
 jupiter_api_version=5.7.0
 vintage_engine_version=5.+

patches/net/minecraft/advancements/critereon/ItemPredicate.java.patch

@@ -17,17 +17,16 @@
          p_297904_ -> p_297904_.group(
                      ExtraCodecs.strictOptionalField(TagKey.codec(Registries.ITEM), "tag").forGetter(ItemPredicate::tag),
                      ExtraCodecs.strictOptionalField(ITEMS_CODEC, "items").forGetter(ItemPredicate::items),
-@@ -51,8 +_,34 @@
+@@ -51,8 +_,33 @@
                  )
                  .apply(p_297904_, ItemPredicate::new)
      );
 +    public static Codec<ItemPredicate> CODEC = ExtraCodecs.<net.neoforged.neoforge.common.advancements.critereon.ICustomItemPredicate, ItemPredicate>either(
-+              // Use dispatchUnsafe to always inline the dispatched type parameters into the root ingredient object, next to the "type"
-+              net.neoforged.neoforge.common.util.NeoForgeExtraCodecs.dispatchUnsafe(
-+                         net.neoforged.neoforge.registries.NeoForgeRegistries.ITEM_PREDICATE_SERIALIZERS.byNameCodec(),
-+                         net.neoforged.neoforge.common.advancements.critereon.ICustomItemPredicate::codec,
-+                         java.util.function.Function.identity()),
-+              VANILLA_CODEC
++            net.neoforged.neoforge.registries.NeoForgeRegistries.ITEM_PREDICATE_SERIALIZERS.byNameCodec()
++                    .dispatch(
++                            net.neoforged.neoforge.common.advancements.critereon.ICustomItemPredicate::codec,
++                            java.util.function.Function.identity()),
++            VANILLA_CODEC
 +        ).xmap(either -> either.map(ItemPredicate::new, p -> p), predicate -> {
 +            // Serialize using dispatch codec if custom logic is present, otherwise use vanilla codec
 +            if (predicate.customLogic.isPresent()) {

patches/net/minecraft/client/Options.java.patch

@@ -12,6 +12,15 @@
                          && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
                      ? Optional.empty()
                      : Optional.of(p_232011_),
+@@ -787,7 +_,7 @@
+         this.incompatibleResourcePacks.clear();
+
+         for(Pack pack : p_275268_.getSelectedPacks()) {
+-            if (!pack.isFixedPosition()) {
++            if (!pack.isFixedPosition() && !pack.isHidden()) {
+                 this.resourcePacks.add(pack.getId());
+                 if (!pack.getCompatibility().isCompatible()) {
+                     this.incompatibleResourcePacks.add(pack.getId());
 @@ -1058,6 +_,7 @@
      }