Merge branch 'architectury-1.19.3' into architectury-1.19.4

# Conflicts: # fabric/src/main/java/com/unlikepaladin/pfm/compat/farmersdelight/fabric/PFMFarmersDelightImpl.java # forge/src/main/java/com/unlikepaladin/pfm/compat/farmersdelight/forge/PFMFarmersDelightImpl.java
UnlikePaladin · Aug 15, 2023 · b1461d7 · b1461d7
2 parents 17375fb + a1defb7
commit b1461d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...c/main/java/com/unlikepaladin/pfm/compat/farmersdelight/fabric/PFMFarmersDelightImpl.java b/...c/main/java/com/unlikepaladin/pfm/compat/farmersdelight/fabric/PFMFarmersDelightImpl.java
@@ -29,7 +29,7 @@ public void generateTags() {
         stoves.addAll(IronStoveBlock.streamIronStoves().map(FurnitureBlock::getBlock).toList());
         stoves.add(PaladinFurnitureModBlocksItems.KITCHEN_STOVETOP);
         PFMTagProvider.getOrCreateTagBuilder(HEAT_SOURCES)
-                .addKey(stoves.stream().map(block -> Registries.BLOCK.getKey(block).or(null).get()).toArray(RegistryKey[]::new));
+                .add(stoves.toArray(new Block[0]));
     }
 
     @Override

diff --git a/...rc/main/java/com/unlikepaladin/pfm/compat/farmersdelight/forge/PFMFarmersDelightImpl.java b/...rc/main/java/com/unlikepaladin/pfm/compat/farmersdelight/forge/PFMFarmersDelightImpl.java
@@ -29,7 +29,7 @@ public void generateTags() {
         stoves.addAll(IronStoveBlock.streamIronStoves().map(FurnitureBlock::getBlock).toList());
         stoves.add(PaladinFurnitureModBlocksItems.KITCHEN_STOVETOP);
         PFMTagProvider.getOrCreateTagBuilder(HEAT_SOURCES)
-                .addKey(stoves.stream().map(block -> Registries.BLOCK.getKey(block).or(null).get()).toArray(RegistryKey[]::new));
+                .add(stoves.toArray(new Block[0]));
     }
 
     @Override