-
Notifications
You must be signed in to change notification settings - Fork 551
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Research unlock with vault economy provider #4002
Open
misdocumeno
wants to merge
2
commits into
Slimefun:master
Choose a base branch
from
misdocumeno:feature/vault-economy-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
src/main/java/io/github/thebusybiscuit/slimefun4/integrations/VaultIntegration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package io.github.thebusybiscuit.slimefun4.integrations; | ||
|
||
import javax.annotation.Nonnull; | ||
|
||
import org.bukkit.Bukkit; | ||
import org.bukkit.entity.Player; | ||
import org.bukkit.plugin.RegisteredServiceProvider; | ||
|
||
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; | ||
import net.milkbowl.vault.economy.Economy; | ||
|
||
/** | ||
* This handles all integrations with Vault's economy. | ||
* Used to unlock research. | ||
* | ||
* @author Mis | ||
* | ||
*/ | ||
public class VaultIntegration { | ||
private RegisteredServiceProvider<Economy> economy; | ||
|
||
public VaultIntegration() { | ||
this.economy = Bukkit.getServer().getServicesManager().getRegistration(Economy.class); | ||
} | ||
|
||
public double getBalance(@Nonnull Player player) { | ||
return this.economy.getProvider().getBalance(player); | ||
} | ||
|
||
public boolean hasBalance(@Nonnull Player player, double amount) { | ||
return this.getBalance(player) >= amount; | ||
} | ||
|
||
public void deposit(@Nonnull Player player, double amount) { | ||
this.economy.getProvider().depositPlayer(player, amount); | ||
} | ||
|
||
public void withdraw(@Nonnull Player player, double amount) { | ||
this.economy.getProvider().withdrawPlayer(player, amount); | ||
} | ||
|
||
/** | ||
* Checks if the player has enough money to buy this research, | ||
* depending on the xp levels required and the price multiplier. | ||
* | ||
* @return whether the player can afford the research or not. | ||
*/ | ||
public boolean hasBalanceForResearch(@Nonnull Player player, int xpCost) { | ||
return this.hasBalance(player, xpCost * Slimefun.getRegistry().getEconomyPriceMultiplier()); | ||
} | ||
|
||
/** | ||
* Withdraws money from the player by the given amount times the price multiplier. | ||
*/ | ||
public void withdrawForResearch(@Nonnull Player player, int xpCost) { | ||
this.withdraw(player, xpCost * Slimefun.getRegistry().getEconomyPriceMultiplier()); | ||
} | ||
|
||
/** | ||
* Returns the formatted price, according to the xp level cost and price multiplier. | ||
* | ||
* @return the formatted price. | ||
*/ | ||
public String getResearchPrice(int xpCost) { | ||
return this.economy.getProvider().format(xpCost * Slimefun.getRegistry().getEconomyPriceMultiplier()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -31,6 +31,8 @@ researches: | |||||||||||
free-in-creative-mode: true | ||||||||||||
enable-fireworks: true | ||||||||||||
disable-learning-animation: false | ||||||||||||
enable-vault-economy: false | ||||||||||||
economy-price-multiplier: 1000.0 | ||||||||||||
Comment on lines
+34
to
+35
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this should be grouped and simplified
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you mean you want |
||||||||||||
|
||||||||||||
URID: | ||||||||||||
info-delay: 3000 | ||||||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ softdepend: | |
- mcMMO | ||
- ItemsAdder | ||
- Orebfuscator | ||
- Vault | ||
|
||
# Our commands | ||
commands: | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a method with high traffic, so think about if we really need to calculate all of this everytime...
If you split this into smaller methods then the
||
operator would ensure that the sub-methods are not called unnecessarily.