Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

Author: wrincewind

src/main/java/wayoftime/bloodmagic/ConfigHandler.java

@@ -9,7 +9,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.AABB;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.ConfigHandler;
+import wayoftime.bloodmagic.ConfigManager;
 import wayoftime.bloodmagic.altar.IBloodAltar;
 import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
 import wayoftime.bloodmagic.core.LivingArmorRegistrar;
@@ -163,7 +163,7 @@ public void performRitual(IMasterRitualStone masterRitualStone)
 					player.setHealth(health - sacrificedHealth);
 					BloodMagic.packetHandler.sendTo(new SetClientHealthPacket(health - sacrificedHealth), (ServerPlayer) player);
 
-					tileAltar.sacrificialDaggerCall((int) (ConfigHandler.values.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false);
+					tileAltar.sacrificialDaggerCall((int) (ConfigManager.COMMON.sacrificialDaggerConversion.get() * lpModifier * sacrificedHealth), false);
 
 					totalEffects++;
 

src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java

@@ -7,7 +7,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.common.MinecraftForge;
-import wayoftime.bloodmagic.ConfigHandler;
+import wayoftime.bloodmagic.ConfigManager;
 import wayoftime.bloodmagic.altar.IBloodAltar;
 import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent;
 
@@ -74,7 +74,7 @@ public static boolean sacrificePlayerHealth(Player player)
 			if (health > maxHealth / 10.0)
 			{
 				float sacrificedHealth = health - maxHealth / 10.0f;
-				int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion * getModifier(amount));
+				int lpAdded = (int) (sacrificedHealth * ConfigManager.COMMON.sacrificialDaggerConversion.get() * getModifier(amount));
 
 				IBloodAltar altar = getAltar(player.getCommandSenderWorld(), player.blockPosition());
 				if (altar != null)