Merge pull request #2048

wrincewind · web-flow · commit 2cbdec0c60bd · 2025-07-20T16:28:24.000+01:00
fluid names &amp; reinforced runes tools
diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_altar.json b/src/generated/resources/data/bloodmagic/recipes/blood_altar.json
@@ -21,4 +21,4 @@
     "item": "bloodmagic:altar"
   },
   "show_notification": true
-}
+}
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/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/GeneratorRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorRecipes.java
@@ -73,7 +73,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).define('d', Items.GOLD_INGOT).pattern("a a").pattern("aba").pattern("cdc").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"));
 		}
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() {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private void addVanillaRecipes(Consumer<FinishedRecipe> consumer)`
`73`	`73`	`// 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"));`
`74`	`74`	`}`
`75`	`75`	`{`
`76`		`- ShapedRecipeBuilder.shaped(RecipeCategory.MISC,BloodMagicBlocks.BLOOD_ALTAR.get()).define('a', Tags.Items.STONE).define('b', Items.FURNACE).define('c', Tags.Items.INGOTS_GOLD).define('d', Items.GOLD_INGOT).pattern("a a").pattern("aba").pattern("cdc").unlockedBy("has_gold", has(Items.GOLD_INGOT)).save(consumer, BloodMagic.rl("blood_altar"));`
	`76`	`+ 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"));`
`77`	`77`	`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"));`
`78`	`78`	`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"));`
`79`	`79`	`}`