Merge remote-tracking branch 'upstream/1.20.1' into 1.20-filteruuid

dphaldes · dphaldes · commit 73b3578a66ae · 2025-07-21T11:51:54.000-07:00
diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json
@@ -228,6 +228,7 @@
   "item.bloodmagic.destructivecatalyst": "Destructive Will Catalyst",
   "item.bloodmagic.destructivecrystal": "Destructive Will Crystal",
   "item.bloodmagic.divinationsigil": "Divination Sigil",
+  "item.bloodmagic.doubt_bucket": "Bucket of Doubt",
   "item.bloodmagic.duskscribetool": "Inscription Tool: Dusk",
   "item.bloodmagic.earthscribetool": "Inscription Tool: Earth",
   "item.bloodmagic.enhancedteleposerfocus": "Enhanced Teleposition Focus",
diff --git a/src/generated/resources/data/bloodmagic/recipes/filter_copy.json b/src/generated/resources/data/bloodmagic/recipes/filter_copy.json
@@ -0,0 +1,4 @@
+{
+  "type": "bloodmagic:filter_copy",
+  "category": "misc"
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -88,6 +88,15 @@
     "bloodmagic:shaped_charge",
     "bloodmagic:fungal_charge",
     "bloodmagic:aug_shaped_charge",
-    "bloodmagic:shaped_charge_deep"
+    "bloodmagic:shaped_charge_deep",
+    "bloodmagic:speedrune2",
+    "bloodmagic:sacrificerune2",
+    "bloodmagic:selfsacrificerune2",
+    "bloodmagic:dislocationrune2",
+    "bloodmagic:altarcapacityrune2",
+    "bloodmagic:bettercapacityrune2",
+    "bloodmagic:orbcapacityrune2",
+    "bloodmagic:accelerationrune2",
+    "bloodmagic:chargingrune2"
   ]
 }
diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
@@ -1,5 +1,14 @@
 {
   "values": [
+    "bloodmagic:speedrune2",
+    "bloodmagic:sacrificerune2",
+    "bloodmagic:selfsacrificerune2",
+    "bloodmagic:dislocationrune2",
+    "bloodmagic:altarcapacityrune2",
+    "bloodmagic:bettercapacityrune2",
+    "bloodmagic:orbcapacityrune2",
+    "bloodmagic:accelerationrune2",
+    "bloodmagic:chargingrune2",
     "bloodmagic:obsidianbrickpath",
     "bloodmagic:obsidiantilepath"
   ]
diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/wayoftime/bloodmagic/client/hud/ElementRegistry.java
@@ -96,6 +96,7 @@ public static void save(Map<ResourceLocation, Vec2> newLocations)
 			toWrite.put(entry.getKey().toString(), entry.getValue().getPosition());
 
 		String json = GSON.toJson(toWrite);
+		FMLPaths.getOrCreateGameRelativePath(FMLPaths.CONFIGDIR.get().resolve(BloodMagic.MODID));
 		try (FileWriter writer = new FileWriter(CONFIG))
 		{
 			writer.write(json);
diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java
@@ -67,12 +67,14 @@ public void addTags(HolderLookup.Provider pProvider)
 		tag(BlockTags.MINEABLE_WITH_PICKAXE).add(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), BloodMagicBlocks.ETHEREAL_MIMIC.get(), BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), BloodMagicBlocks.ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.INPUT_ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.OUTPUT_ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.MASTER_ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.TELEPOSER.get(), BloodMagicBlocks.STONE_PATH.get(), BloodMagicBlocks.STONE_TILE_PATH.get(), BloodMagicBlocks.WORN_STONE_PATH.get(), BloodMagicBlocks.WORN_STONE_TILE_PATH.get(), BloodMagicBlocks.OBSIDIAN_PATH.get(), BloodMagicBlocks.OBSIDIAN_TILE_PATH.get(), BloodMagicBlocks.MIMIC.get());
 		tag(BlockTags.MINEABLE_WITH_PICKAXE).add(BloodMagicBlocks.DUNGEON_BRICK_1.get(), BloodMagicBlocks.DUNGEON_BRICK_2.get(), BloodMagicBlocks.DUNGEON_BRICK_3.get(), BloodMagicBlocks.DUNGEON_ORE.get(), BloodMagicBlocks.RAW_HELLFORGED_BLOCK.get(), BloodMagicBlocks.DUNGEON_STONE.get(), BloodMagicBlocks.DUNGEON_EYE.get(), BloodMagicBlocks.DUNGEON_EMITTER.get(), BloodMagicBlocks.DUNGEON_ALTERNATOR.get(), BloodMagicBlocks.DUNGEON_POLISHED_STONE.get(), BloodMagicBlocks.DUNGEON_TILE.get(), BloodMagicBlocks.DUNGEON_SMALL_BRICK.get(), BloodMagicBlocks.DUNGEON_TILE_SPECIAL.get(), BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get(), BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get(), BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get(), BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get(), BloodMagicBlocks.DUNGEON_PILLAR_CAP.get(), BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), BloodMagicBlocks.DUNGEON_BRICK_GATE.get(), BloodMagicBlocks.DUNGEON_POLISHED_GATE.get(), BloodMagicBlocks.DUNGEON_BRICK_SLAB.get(), BloodMagicBlocks.DUNGEON_TILE_SLAB.get(), BloodMagicBlocks.HELLFORGED_BLOCK.get(), BloodMagicBlocks.DUNGEON_CRACKED_BRICK_1.get(), BloodMagicBlocks.DUNGEON_GLOWING_CRACKED_BRICK_1.get(), BloodMagicBlocks.DUNGEON_CONTROLLER.get(), BloodMagicBlocks.DUNGEON_SEAL.get(), BloodMagicBlocks.SPIKES.get(), BloodMagicBlocks.DUNGEON_SPIKE_TRAP.get(), BloodMagicBlocks.INVERSION_PILLAR_CAP.get(), BloodMagicBlocks.INVERSION_PILLAR.get());
 		tag(BlockTags.MINEABLE_WITH_PICKAXE).add(BloodMagicBlocks.DEFORESTER_CHARGE.get()).add(BloodMagicBlocks.VEINMINE_CHARGE.get()).add(BloodMagicBlocks.VEINMINE_CHARGE_2.get()).add(BloodMagicBlocks.DEFORESTER_CHARGE_2.get()).add(BloodMagicBlocks.FUNGAL_CHARGE_2.get()).add(BloodMagicBlocks.SHAPED_CHARGE.get()).add(BloodMagicBlocks.FUNGAL_CHARGE.get()).add(BloodMagicBlocks.AUG_SHAPED_CHARGE.get()).add(BloodMagicBlocks.SHAPED_CHARGE_DEEP.get());
+		tag(BlockTags.MINEABLE_WITH_PICKAXE).add(BloodMagicBlocks.SPEED_RUNE_2.get(), BloodMagicBlocks.SACRIFICE_RUNE_2.get(), BloodMagicBlocks.SELF_SACRIFICE_RUNE_2.get(), BloodMagicBlocks.DISPLACEMENT_RUNE_2.get(), BloodMagicBlocks.CAPACITY_RUNE_2.get(), BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE_2.get(), BloodMagicBlocks.ORB_RUNE_2.get(), BloodMagicBlocks.ACCELERATION_RUNE_2.get(), BloodMagicBlocks.CHARGING_RUNE_2.get());
 
 		tag(BlockTags.MINEABLE_WITH_AXE).add(BloodMagicBlocks.WOOD_PATH.get(), BloodMagicBlocks.WOOD_TILE_PATH.get());
 
 		tag(BlockTags.NEEDS_STONE_TOOL).add(BloodMagicBlocks.SOUL_FORGE.get(), BloodMagicBlocks.INCENSE_ALTAR.get(), BloodMagicBlocks.BLANK_RUNE.get(), BloodMagicBlocks.SPEED_RUNE.get(), BloodMagicBlocks.SACRIFICE_RUNE.get(), BloodMagicBlocks.SELF_SACRIFICE_RUNE.get(), BloodMagicBlocks.DISPLACEMENT_RUNE.get(), BloodMagicBlocks.CAPACITY_RUNE.get(), BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get(), BloodMagicBlocks.ORB_RUNE.get(), BloodMagicBlocks.ACCELERATION_RUNE.get(), BloodMagicBlocks.CHARGING_RUNE.get(), BloodMagicBlocks.BLOOD_ALTAR.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get(), BloodMagicBlocks.AIR_RITUAL_STONE.get(), BloodMagicBlocks.WATER_RITUAL_STONE.get(), BloodMagicBlocks.FIRE_RITUAL_STONE.get(), BloodMagicBlocks.EARTH_RITUAL_STONE.get(), BloodMagicBlocks.DUSK_RITUAL_STONE.get(), BloodMagicBlocks.DAWN_RITUAL_STONE.get(), BloodMagicBlocks.BLOODSTONE.get(), BloodMagicBlocks.BLOODSTONE_BRICK.get(), BloodMagicBlocks.MASTER_RITUAL_STONE.get(), BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get(), BloodMagicBlocks.ALCHEMY_TABLE.get(), BloodMagicBlocks.DEMON_CRUCIBLE.get(), BloodMagicBlocks.DEMON_CRYSTALLIZER.get(), BloodMagicBlocks.DEMON_PYLON.get());
 		tag(BlockTags.NEEDS_STONE_TOOL).add(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), BloodMagicBlocks.ETHEREAL_MIMIC.get(), BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), BloodMagicBlocks.ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.INPUT_ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.OUTPUT_ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.MASTER_ROUTING_NODE_BLOCK.get(), BloodMagicBlocks.TELEPOSER.get(), BloodMagicBlocks.STONE_PATH.get(), BloodMagicBlocks.STONE_TILE_PATH.get(), BloodMagicBlocks.WORN_STONE_PATH.get(), BloodMagicBlocks.WORN_STONE_TILE_PATH.get(), BloodMagicBlocks.MIMIC.get());
 		tag(BlockTags.NEEDS_STONE_TOOL).add(BloodMagicBlocks.DUNGEON_BRICK_1.get(), BloodMagicBlocks.DUNGEON_BRICK_2.get(), BloodMagicBlocks.DUNGEON_BRICK_3.get(), BloodMagicBlocks.DUNGEON_ORE.get(), BloodMagicBlocks.RAW_HELLFORGED_BLOCK.get(), BloodMagicBlocks.DUNGEON_STONE.get(), BloodMagicBlocks.DUNGEON_EYE.get(), BloodMagicBlocks.DUNGEON_EMITTER.get(), BloodMagicBlocks.DUNGEON_ALTERNATOR.get(), BloodMagicBlocks.DUNGEON_POLISHED_STONE.get(), BloodMagicBlocks.DUNGEON_TILE.get(), BloodMagicBlocks.DUNGEON_SMALL_BRICK.get(), BloodMagicBlocks.DUNGEON_TILE_SPECIAL.get(), BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get(), BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get(), BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get(), BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get(), BloodMagicBlocks.DUNGEON_PILLAR_CAP.get(), BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), BloodMagicBlocks.DUNGEON_BRICK_GATE.get(), BloodMagicBlocks.DUNGEON_POLISHED_GATE.get(), BloodMagicBlocks.DUNGEON_BRICK_SLAB.get(), BloodMagicBlocks.DUNGEON_TILE_SLAB.get(), BloodMagicBlocks.HELLFORGED_BLOCK.get(), BloodMagicBlocks.DUNGEON_CRACKED_BRICK_1.get(), BloodMagicBlocks.DUNGEON_GLOWING_CRACKED_BRICK_1.get(), BloodMagicBlocks.DUNGEON_CONTROLLER.get(), BloodMagicBlocks.DUNGEON_SEAL.get(), BloodMagicBlocks.SPIKES.get(), BloodMagicBlocks.DUNGEON_SPIKE_TRAP.get(), BloodMagicBlocks.INVERSION_PILLAR_CAP.get(), BloodMagicBlocks.INVERSION_PILLAR.get());
+		tag(BlockTags.NEEDS_DIAMOND_TOOL).add(BloodMagicBlocks.SPEED_RUNE_2.get(), BloodMagicBlocks.SACRIFICE_RUNE_2.get(), BloodMagicBlocks.SELF_SACRIFICE_RUNE_2.get(), BloodMagicBlocks.DISPLACEMENT_RUNE_2.get(), BloodMagicBlocks.CAPACITY_RUNE_2.get(), BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE_2.get(), BloodMagicBlocks.ORB_RUNE_2.get(), BloodMagicBlocks.ACCELERATION_RUNE_2.get(), BloodMagicBlocks.CHARGING_RUNE_2.get());
 		tag(BlockTags.NEEDS_DIAMOND_TOOL).add(BloodMagicBlocks.OBSIDIAN_PATH.get(), BloodMagicBlocks.OBSIDIAN_TILE_PATH.get());
 		tag(BlockTags.BEACON_BASE_BLOCKS).add(BloodMagicBlocks.HELLFORGED_BLOCK.get());
 
diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
@@ -669,6 +669,7 @@ protected void addTranslations()
 		addItem(BloodMagicItems.SUPPRESSION_SIGIL, "Sigil of Suppression");
 		addItem(BloodMagicItems.TELEPOSITION_SIGIL, "Teleposition Sigil");
 
+		addItem(BloodMagicItems.DOUBT_BUCKET, "Bucket of Doubt");
 		addItem(BloodMagicItems.LIFE_ESSENCE_BUCKET, "Bucket of Life");
 		addItem(BloodMagicItems.ARCANE_ASHES, "Arcane Ashes");
 		addItem(BloodMagicItems.SLATE, "Blank Slate");
diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorRecipes.java
@@ -18,6 +18,7 @@
 import wayoftime.bloodmagic.common.data.recipe.BaseRecipeProvider;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
 import wayoftime.bloodmagic.common.recipe.*;
+import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers;
 import wayoftime.bloodmagic.common.tags.BloodMagicTags;
 import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb;
 
@@ -75,7 +76,7 @@ private void addVanillaRecipes(Consumer<FinishedRecipe> consumer)
 //			ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SOUL_FORGE.get()).key('s', Tags.Items.STONE).key('g', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).key('o', Tags.Items.STORAGE_BLOCKS_IRON).patternLine("i i").patternLine("sgs").patternLine("sos").addCriterion("has_gold", hasItem(Items.GOLD_INGOT)).build(consumer, BloodMagic.rl("soul_forge"));
 		}
 		{
-			ShapedRecipeBuilder.shaped(RecipeCategory.MISC,BloodMagicBlocks.BLOOD_ALTAR.get()).define('a',Tags.Items.STONE).define('b', Items.FURNACE).define('c', Tags.Items.INGOTS_GOLD).pattern("a a").pattern("aba").pattern("ccc").unlockedBy("has_gold", has(Items.GOLD_INGOT)).save(consumer, BloodMagic.rl("blood_altar"));
+			ShapedRecipeBuilder.shaped(RecipeCategory.MISC,BloodMagicBlocks.BLOOD_ALTAR.get()).define('a', Tags.Items.STONE).define('b', Items.FURNACE).define('c', Tags.Items.INGOTS_GOLD).pattern("a a").pattern("aba").pattern("ccc").unlockedBy("has_gold", has(Items.GOLD_INGOT)).save(consumer, BloodMagic.rl("blood_altar"));
 			ShapedRecipeBuilder.shaped(RecipeCategory.MISC,BloodMagicBlocks.ALCHEMY_TABLE.get()).define('b', Tags.Items.INGOTS_IRON).define('s', Tags.Items.STONE).define('w', ItemTags.PLANKS).define('g', Tags.Items.INGOTS_GOLD).define('o', BloodMagicItems.SLATE.get()).pattern("sss").pattern("wbw").pattern("gog").unlockedBy("has_blank_slate", has(BloodMagicItems.SLATE.get())).save(consumer, BloodMagic.rl("alchemy_table"));
 			ShapedRecipeBuilder.shaped(RecipeCategory.MISC,BloodMagicBlocks.SOUL_FORGE.get()).define('s', Tags.Items.STONE).define('S', BloodMagicItems.SLATE.get()).define('i', Tags.Items.INGOTS_IRON).define('o', Tags.Items.STORAGE_BLOCKS_IRON).pattern("i i").pattern("sSs").pattern("sos").unlockedBy("has_blank_slate", has(BloodMagicItems.SLATE.get())).save(consumer, BloodMagic.rl("soul_forge"));
 		}
@@ -85,6 +86,7 @@ private void addVanillaRecipes(Consumer<FinishedRecipe> consumer)
 		ShapedRecipeBuilder.shaped(RecipeCategory.MISC,BloodMagicBlocks.RAW_HELLFORGED_BLOCK.get()).define('s', BloodMagicItems.DEMONITE_RAW.get()).pattern("sss").pattern("sss").pattern("sss").unlockedBy("has_raw_hellforged", has(BloodMagicItems.DEMONITE_RAW.get())).save(consumer, BloodMagic.rl("raw_hellforged_block"));
 		ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,BloodMagicItems.DEMONITE_RAW.get(), 9).requires(BloodMagicBlocks.RAW_HELLFORGED_BLOCK.get()).unlockedBy("has_raw_hellforged_block", has(BloodMagicBlocks.RAW_HELLFORGED_BLOCK.get())).save(consumer, BloodMagic.rl("raw_hellforged_block_to_item"));
 
+		SpecialRecipeBuilder.special(BloodMagicRecipeSerializers.FILTER_COPY.getRecipeSerializer()).save(consumer, "bloodmagic:filter_copy");
 		clearFilter(BloodMagicItems.ITEM_ROUTER_FILTER.get(), BloodMagic.rl("clear_router_filter"), consumer);
 		clearFilter(BloodMagicItems.ITEM_TAG_FILTER.get(), BloodMagic.rl("clear_tag_filter"), consumer);
 		clearFilter(BloodMagicItems.ITEM_ENCHANT_FILTER.get(), BloodMagic.rl("clear_enchant_filter"), consumer);
diff --git a/src/main/java/wayoftime/bloodmagic/common/fluid/BloodMagicFluids.java b/src/main/java/wayoftime/bloodmagic/common/fluid/BloodMagicFluids.java
@@ -25,7 +25,7 @@ public class BloodMagicFluids {
 
     public static final DeferredRegister<Fluid> FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, BloodMagic.MODID);
     public static final DeferredRegister<FluidType> FLUID_TYPES = DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, BloodMagic.MODID);
-    public static final RegistryObject<FluidType> LIFE_ESSENCE_FLUID_TYPE = FLUID_TYPES.register("life_essence_fluid_type", () -> new FluidType(FluidType.Properties.create().descriptionId("life_essence_fluid_type").fallDistanceModifier(0F).canExtinguish(false).canConvertToSource(false).supportsBoating(false).sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL).sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY).sound(SoundActions.FLUID_VAPORIZE, SoundEvents.FIRE_EXTINGUISH).canHydrate(false).viscosity(1000)) {
+    public static final RegistryObject<FluidType> LIFE_ESSENCE_FLUID_TYPE = FLUID_TYPES.register("life_essence_fluid_type", () -> new FluidType(FluidType.Properties.create().descriptionId("fluid.bloodmagic.life_essence_fluid").fallDistanceModifier(0F).canExtinguish(false).canConvertToSource(false).supportsBoating(false).sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL).sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY).sound(SoundActions.FLUID_VAPORIZE, SoundEvents.FIRE_EXTINGUISH).canHydrate(false).viscosity(1000)) {
         @Override
         public void initializeClient(Consumer<IClientFluidTypeExtensions> consumer) {
             consumer.accept(new IClientFluidTypeExtensions() {
@@ -44,7 +44,7 @@ public ResourceLocation getFlowingTexture() {
             });
         }
     });
-    public static final RegistryObject<FluidType> DOUBT_FLUID_TYPE = FLUID_TYPES.register("doubt_fluid_type", () -> new FluidType(FluidType.Properties.create().descriptionId("doubt_fluid_type").fallDistanceModifier(0F).canExtinguish(false).canConvertToSource(false).supportsBoating(false).sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL).sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY).sound(SoundActions.FLUID_VAPORIZE, SoundEvents.FIRE_EXTINGUISH).canHydrate(false).viscosity(1000)) {
+    public static final RegistryObject<FluidType> DOUBT_FLUID_TYPE = FLUID_TYPES.register("doubt_fluid_type", () -> new FluidType(FluidType.Properties.create().descriptionId("fluid.bloodmagic.doubt_fluid").fallDistanceModifier(0F).canExtinguish(false).canConvertToSource(false).supportsBoating(false).sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL).sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY).sound(SoundActions.FLUID_VAPORIZE, SoundEvents.FIRE_EXTINGUISH).canHydrate(false).viscosity(1000)) {
         @Override
         public void initializeClient(Consumer<IClientFluidTypeExtensions> consumer) {
             consumer.accept(new IClientFluidTypeExtensions() {
diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java
@@ -1,5 +1,6 @@
 package wayoftime.bloodmagic.common.registries;
 
+import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.recipe.serializer.ARCPotionRecipeSerializer;
 import wayoftime.bloodmagic.common.recipe.serializer.ARCRecipeSerializer;
@@ -19,15 +20,7 @@
 import wayoftime.bloodmagic.common.recipe.serializer.TartaricForgeRecipeSerializer;
 import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerDeferredRegister;
 import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerRegistryObject;
-import wayoftime.bloodmagic.recipe.RecipeARC;
-import wayoftime.bloodmagic.recipe.RecipeARCPotion;
-import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
-import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
-import wayoftime.bloodmagic.recipe.RecipeBloodAltar;
-import wayoftime.bloodmagic.recipe.RecipeFilterMergeAlchemyTable;
-import wayoftime.bloodmagic.recipe.RecipeLivingDowngrade;
-import wayoftime.bloodmagic.recipe.RecipeMeteor;
-import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.recipe.*;
 import wayoftime.bloodmagic.recipe.flask.RecipePotionCycle;
 import wayoftime.bloodmagic.recipe.flask.RecipePotionEffect;
 import wayoftime.bloodmagic.recipe.flask.RecipePotionFill;
@@ -64,6 +57,8 @@ private BloodMagicRecipeSerializers()
 
 	public static final IRecipeSerializerRegistryObject<RecipeMeteor> METEOR = RECIPE_SERIALIZERS.register("meteor", () -> new MeteorRecipeSerializer<>(RecipeMeteor::new));
 
+	public static final IRecipeSerializerRegistryObject<RecipeFilterCopy> FILTER_COPY = RECIPE_SERIALIZERS.register("filter_copy", () -> new SimpleCraftingRecipeSerializer<>(RecipeFilterCopy::new));
+
 //	public static final DeferredRegister<IRecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, BloodMagic.MODID);
 
 //	public static final DeferredObject<RecipeBloodAltar> REC = RECIPE_SERIALIZERS.register("test", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new));
diff --git a/src/main/java/wayoftime/bloodmagic/common/tile/TileAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/common/tile/TileAlchemicalReactionChamber.java
@@ -381,10 +381,10 @@ public void consumeInventory(int inputCount, boolean consumeInput, boolean break
 		ItemStack toolStack = getItem(ARC_TOOL_SLOT);
 		if (!toolStack.isEmpty())
 		{
-			if (toolStack.isDamageableItem())
+			if (toolStack.getItem().isDamageable(toolStack))
 			{
 				int unbreakingLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, toolStack);
-				if (unbreakingLevel == 0 || level.random.nextInt(unbreakingLevel + 1) == 0)
+				if (toolStack.isDamageableItem() && (unbreakingLevel == 0 || level.random.nextInt(unbreakingLevel + 1) == 0))
 				{
 					toolStack.setDamageValue(toolStack.getDamageValue() + 1);
 					if (toolStack.getDamageValue() >= toolStack.getMaxDamage() && breakTool)
diff --git a/src/main/java/wayoftime/bloodmagic/common/tile/TileTeleposer.java b/src/main/java/wayoftime/bloodmagic/common/tile/TileTeleposer.java
@@ -196,9 +196,12 @@ public boolean canTeleport()
 	private SoulNetwork getNetwork()
 	{
 		ItemStack focusStack = this.getItem(FOCUS_SLOT);
-		if (!focusStack.isEmpty() && focusStack.getItem() instanceof ITeleposerFocus)
+		if (!focusStack.isEmpty() && focusStack.getItem() instanceof ITeleposerFocus focus)
 		{
-			return NetworkHelper.getSoulNetwork(((ITeleposerFocus) focusStack.getItem()).getBinding(focusStack));
+			if (focus.getBinding(focusStack) != null)
+			{
+				return NetworkHelper.getSoulNetwork(focus.getBinding(focusStack));
+			}
 		}
 
 		return null;
diff --git a/src/main/java/wayoftime/bloodmagic/recipe/RecipeFilterCopy.java b/src/main/java/wayoftime/bloodmagic/recipe/RecipeFilterCopy.java
diff --git a/src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/item_routing/copying_filters.json b/src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/item_routing/copying_filters.json
diff --git a/src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/templates/manual_recipe.json b/src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/templates/manual_recipe.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type": "bloodmagic:filter_copy",
 +  "category": "misc"
 +}
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ public static void save(Map<ResourceLocation, Vec2> newLocations)`
`96`	`96`	`toWrite.put(entry.getKey().toString(), entry.getValue().getPosition());`
`97`	`97`
`98`	`98`	`String json = GSON.toJson(toWrite);`
	`99`	`+ FMLPaths.getOrCreateGameRelativePath(FMLPaths.CONFIGDIR.get().resolve(BloodMagic.MODID));`
`99`	`100`	`try (FileWriter writer = new FileWriter(CONFIG))`
`100`	`101`	`{`
`101`	`102`	`writer.write(json);`