Merge branch '1.21.1' into ioworker-saveddata-atomic

neoforged · Jan 3, 2025 · 1089d11 · 1089d11
2 parents 4a54dc0 + 71a734b
commit 1089d11
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/patches/net/minecraft/data/tags/TagsProvider.java.patch b/patches/net/minecraft/data/tags/TagsProvider.java.patch
@@ -62,7 +62,7 @@
                                      TagBuilder tagbuilder = p_323138_.getValue();
                                      List<TagEntry> list = tagbuilder.build();
 -                                    List<TagEntry> list1 = list.stream().filter(p_274771_ -> !p_274771_.verifyIfPresent(predicate, predicate1)).toList();
-+                                    List<TagEntry> list1 = java.util.stream.Stream.concat(list.stream(), tagbuilder.getRemoveEntries())
++                                    List<TagEntry> list1 = list.stream()
 +                                              .filter((p_274771_) -> !p_274771_.verifyIfPresent(predicate, predicate1))
 +                                              .filter(this::missing)
 +                                              .toList();

diff --git a/src/main/java/net/neoforged/neoforge/items/ItemHandlerCopySlot.java b/src/main/java/net/neoforged/neoforge/items/ItemHandlerCopySlot.java
@@ -38,7 +38,7 @@ protected ItemStack getStackCopy() {
 
     @Override
     protected void setStackCopy(ItemStack stack) {
-        ((IItemHandlerModifiable) slotItemHandler.getItemHandler()).setStackInSlot(index, stack);
+        ((IItemHandlerModifiable) slotItemHandler.getItemHandler()).setStackInSlot(slotItemHandler.index, stack);
     }
 
     @Override

diff --git a/tests/src/generated/resources/data/minecraft/tags/block/test_tag.json b/tests/src/generated/resources/data/minecraft/tags/block/test_tag.json
@@ -8,7 +8,8 @@
     "minecraft:polished_andesite",
     "#minecraft:beehives",
     "#minecraft:banners",
-    "#minecraft:beds"
+    "#minecraft:beds",
+    "minecraft:dacite"
   ],
   "values": []
 }
diff --git a/...d/resources/data/neotests_reloadable_reg_data_maps/data_maps/loot_table/effect_grant.json b/...d/resources/data/neotests_reloadable_reg_data_maps/data_maps/loot_table/effect_grant.json
@@ -3,10 +3,6 @@
     "minecraft:blocks/copper_block": {
       "duration": 100,
       "id": "minecraft:nausea",
-      "neoforge:cures": [
-        "protected_by_totem",
-        "milk"
-      ],
       "show_icon": true
     }
   }

diff --git a/tests/src/main/java/net/neoforged/neoforge/debug/data/DataMapTests.java b/tests/src/main/java/net/neoforged/neoforge/debug/data/DataMapTests.java
@@ -317,8 +317,10 @@ static void reloadableRegDataMaps(final DynamicTest test, final RegistrationHelp
         reg.addProvider(event -> new DataMapProvider(event.getGenerator().getPackOutput(), event.getLookupProvider()) {
             @Override
             protected void gather() {
+                var effect = new MobEffectInstance(MobEffects.CONFUSION, 100);
+                effect.getCures().clear(); // Cures use a hash set (not linked) meaning that their serialization is not deterministic
                 builder(effectGrant)
-                        .add(Blocks.COPPER_BLOCK.getLootTable(), new MobEffectInstance(MobEffects.CONFUSION, 100), false);
+                        .add(Blocks.COPPER_BLOCK.getLootTable(), effect, false);
             }
         });
 

diff --git a/tests/src/main/java/net/neoforged/neoforge/oldtest/RemoveTagDatagenTest.java b/tests/src/main/java/net/neoforged/neoforge/oldtest/RemoveTagDatagenTest.java
@@ -46,7 +46,9 @@ protected void addTags(HolderLookup.Provider provider) {
                         .remove(key(Blocks.ANVIL))
                         .remove(key(Blocks.BASALT), key(Blocks.POLISHED_ANDESITE))
                         .remove(BlockTags.BEEHIVES)
-                        .remove(BlockTags.BANNERS, BlockTags.BEDS);
+                        .remove(BlockTags.BANNERS, BlockTags.BEDS)
+                        // test removing optional IDs not present at run-time
+                        .remove(ResourceLocation.withDefaultNamespace("dacite"));
             }
         };