Skip to content

Added optional support for mcMMO alchemy potions #4

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.

Sign up for GitHub

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

Open
Byteflux wants to merge 1 commit into
base: master
Choose a base branch
from
+65 −6
Open

Added optional support for mcMMO alchemy potions #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions src/com/flobi/WhatIsIt/WhatIsIt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import net.milkbowl.vault.permission.Permission;

import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.block.Block;
import org.bukkit.block.CreatureSpawner;
Expand All @@ -35,16 +36,21 @@
import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.potion.Potion;
import org.bukkit.util.Vector;

import com.gmail.nossr50.api.ExperienceAPI;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;

/**
*
* WhatIsIt
* Friendly names plugin for Bukkit
*
* @author Joshua "Flobi" Hatfield
*/

public class WhatIsIt extends JavaPlugin {
private static final Logger log = Logger.getLogger("Minecraft");

Expand Down Expand Up @@ -333,6 +339,29 @@ private static void loadConfig() {
namesConfig.set("items.373;13", defNamesConfig.getString("items.373;13"));
namesConfig.set("items.373;45", defNamesConfig.getString("items.373;45"));
}
if (namesConfig.getString("version").compareTo("1.3.8") < 0) {
// mcMMO Alchemy Potions
namesConfig.set("items.373;768", defNamesConfig.getString("items.373;768"));
namesConfig.set("items.373;800", defNamesConfig.getString("items.373;800"));
namesConfig.set("items.373;1024", defNamesConfig.getString("items.373;1024"));
namesConfig.set("items.373;1056", defNamesConfig.getString("items.373;1056"));
namesConfig.set("items.373;2048", defNamesConfig.getString("items.373;2048"));
namesConfig.set("items.373;2080", defNamesConfig.getString("items.373;2080"));
namesConfig.set("items.373;2304", defNamesConfig.getString("items.373;2304"));
namesConfig.set("items.373;2816", defNamesConfig.getString("items.373;2816"));
namesConfig.set("items.373;2848", defNamesConfig.getString("items.373;2848"));
namesConfig.set("items.373;3840", defNamesConfig.getString("items.373;3840"));
namesConfig.set("items.373;4352", defNamesConfig.getString("items.373;4352"));
namesConfig.set("items.373;4384", defNamesConfig.getString("items.373;4384"));
namesConfig.set("items.373;5120", defNamesConfig.getString("items.373;5120"));
namesConfig.set("items.373;5152", defNamesConfig.getString("items.373;5152"));
namesConfig.set("items.373;5376", defNamesConfig.getString("items.373;5376"));
namesConfig.set("items.373;5408", defNamesConfig.getString("items.373;5408"));
namesConfig.set("items.373;5632", defNamesConfig.getString("items.373;5632"));
namesConfig.set("items.373;5664", defNamesConfig.getString("items.373;5664"));
namesConfig.set("items.373;5888", defNamesConfig.getString("items.373;5888"));
namesConfig.set("items.373;5920", defNamesConfig.getString("items.373;5920"));
}

// Make sure any new entries are added to the names.yml file so people can see them.
Map<String, Object> nameConfigValues = namesConfig.getDefaults().getValues(true);
Expand All @@ -343,8 +372,6 @@ private static void loadConfig() {
namesConfig.set("version", version);
saveNamesConfig();
}


}

/**
Expand Down Expand Up @@ -749,8 +776,20 @@ private static String itemName(ItemStack item, Boolean showData, String newName)
if (potionData == 0) {
name = namesConfig.getString("potion-parts.absolute-zero");
} else {
boolean isAlchemyPotion = false;
boolean alchemyPotionIsExtended = false;
if (Bukkit.getPluginManager().isPluginEnabled("mcMMO") && ExperienceAPI.isValidSkillType("alchemy")) {
AlchemyPotion alchemyPotion = PotionConfig.getInstance().getPotion(item.getDurability());
if (alchemyPotion != null && !alchemyPotion.getEffects().isEmpty()) {
Potion potion = Potion.fromItemStack(item);
alchemyPotionIsExtended = potion.hasExtendedDuration();
isAlchemyPotion = true;
}
}
for (short bitPos = 14; bitPos > 5; bitPos--) {

if (isAlchemyPotion && ((bitPos == 6 && !alchemyPotionIsExtended) || (bitPos > 6 && bitPos < 13) )) {
continue;
}
short bitPow = (short) Math.pow(2, bitPos);
if (potionData >= bitPow) {
potionData -= bitPow;
Expand Down
20 changes: 20 additions & 0 deletions src/names.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,26 @@ items:
'373;61': Gross Potion
'373;62': Potion of Invisibility
'373;63': Stinky Potion
'373;768': Potion of Haste
'373;800': Potion of Haste II
'373;1024': Potion of Dullness
'373;1056': Potion of Dullness II
'373;2048': Potion of Leaping
'373;2080': Potion of Leaping II
'373;2304': Potion of Nausea
'373;2816': Potion of Resistance
'373;2848': Potion of Resistance II
'373;3840': Potion of Blindness
'373;4352': Potion of Hunger
'373;4384': Potion of Hunger II
'373;5120': Potion of Decay
'373;5152': Potion of Decay II
'373;5376': Potion of Health Boost
'373;5408': Potion of Health Boost II
'373;5632': Potion of Absorption
'373;5664': Potion of Absorption II
'373;5888': Potion of Saturation
'373;5920': Potion of Saturation II
'374;0': Glass Bottle
'375;0': Spider Eye
'376;0': Fermented Spider Eye
Expand Down
4 changes: 2 additions & 2 deletions src/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: WhatIsIt
version: 1.3.8
version: 1.3.9
description: Gets names of stuff.
author: flobi
website: http://dev.bukkit.org/server-mods/whatisit/
softdepend: [Vault]
softdepend: [Vault, mcMMO]

main: com.flobi.WhatIsIt.WhatIsIt
database: false
Expand Down