lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.16.3' of https://github.com/WayofTime/BloodMagic into 1.16.3

Browse source
This commit is contained in:
WayofTime 2020-12-30 17:57:37 -05:00
commit 510ec5cce5
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java
View file

@ -453,7 +453,9 @@ public class BloodAltar// implements IFluidHandler
this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getLevel(BloodRuneType.EFFICIENCY));
this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SACRIFICE));
this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SELF_SACRIFICE));
this.capacityMultiplier = (float) ((1 + 0.20 * upgrade.getLevel(BloodRuneType.CAPACITY)) * Math.pow(1.075, upgrade.getLevel(BloodRuneType.AUGMENTED_CAPACITY)));
int cap = upgrade.getLevel(BloodRuneType.CAPACITY);
int cap_aug = upgrade.getLevel(BloodRuneType.AUGMENTED_CAPACITY);
this.capacityMultiplier = (float) ((1 + 0.20 * cap) * Math.pow(1.1, cap_aug * Math.pow(0.99, Math.abs(cap_aug - cap))));
this.dislocationMultiplier = (float) (Math.pow(1.2, upgrade.getLevel(BloodRuneType.DISPLACEMENT)));
this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrade.getLevel(BloodRuneType.ORB));
this.chargingFrequency = Math.max(20 - accelerationUpgrades, 1);
@ -801,4 +803,4 @@ public class BloodAltar// implements IFluidHandler
return altar.drain(maxDrain, action == FluidAction.EXECUTE);
}
}
}
}

8
src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java
View file

@ -42,9 +42,9 @@ public class HarvestHandlerPlantable implements IHarvestHandler
HarvestRegistry.registerStandardCrop(Blocks.BEETROOTS, 3);
HarvestRegistry.registerStandardCrop(Blocks.NETHER_WART, 3);
addThirdPartyCrop("actuallyadditions", "blockFlax", 7);
addThirdPartyCrop("actuallyadditions", "blockCanola", 7);
addThirdPartyCrop("actuallyadditions", "blockRice", 7);
addThirdPartyCrop("actuallyadditions", "flax_block", 7);
addThirdPartyCrop("actuallyadditions", "canola_block", 7);
addThirdPartyCrop("actuallyadditions", "rice_block", 7);
addThirdPartyCrop("extrautils2", "redorchid", 6);
addThirdPartyCrop("extrautils2", "enderlily", 7);
@ -149,4 +149,4 @@ public class HarvestHandlerPlantable implements IHarvestHandler
BMLog.DEFAULT.error("HarvestCraft integration cancelled; crop name lookup broke");
}
}
}
}

2
src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java
View file

@ -234,7 +234,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
} else
{
if (activator != null)
activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true);
activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true);
}
return false;