Removed Chimaera Wing

"RIP Chimera wing, an archaic item from a decadent past" ~ shatteredbeam
2024-11-29 16:46:46 +01:00 · 2013-02-04 19:41:23 +01:00 · 2013-02-04 19:41:23 +01:00 · fc40f545fe
commit fc40f545fe
parent 37e01f992d
28 changed files with 1 additions and 142 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@ -62,6 +62,7 @@ Version 1.4.00-dev
 - Removed unused "healthbar" files from the resources
 - Removed config options for disabling commands from the config.yml. This should instead be done through permissions.
 - Removed "ac" alias from /a due to Essentials incompatibilities.
+ - Removed Chimaera Wing

 Version 1.3.14
 + Added new Hylian Luck skill to Herbalism.
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@ -77,11 +77,6 @@ public class Config extends ConfigLoader {
    public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
    public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); }

-    /* Items */
-    public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); }
-    public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
-    public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
-
    /* PARTY SETTINGS */
    public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); }
    public double getPartyShareBonusBase() { return config.getDouble("Party.Sharing.ExpShare_bonus_base", 1.1); }
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@ -37,7 +37,6 @@ import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@ -269,8 +268,6 @@ public class PlayerListener implements Listener {
                    SkillTools.activationCheck(player, SkillType.UNARMED);
                    SkillTools.activationCheck(player, SkillType.WOODCUTTING);
                }
-
-                ChimaeraWing.activationCheck(player);
            }

            /* GREEN THUMB CHECK */
@ -293,9 +290,6 @@ public class PlayerListener implements Listener {
                SkillTools.activationCheck(player, SkillType.WOODCUTTING);
            }

-            /* ITEM CHECKS */
-            ChimaeraWing.activationCheck(player);
-
            break;

        case LEFT_CLICK_AIR:
--- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java
+++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java
@ -1,62 +0,0 @@
-package com.gmail.nossr50.util;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-
-public final class ChimaeraWing {
-    private ChimaeraWing() {}
-
-    /**
-     * Check for item usage.
-     *
-     * @param player Player whose item usage to check
-     */
-    public static void activationCheck(Player player) {
-        ItemStack inHand = player.getItemInHand();
-
-        if (!Config.getInstance().getChimaeraEnabled() || inHand.getTypeId() != Config.getInstance().getChimaeraItemId()) {
-            return;
-        }
-
-        PlayerProfile profile = Users.getPlayer(player).getProfile();
-        Block block = player.getLocation().getBlock();
-        int amount = inHand.getAmount();
-        long recentlyHurt = profile.getRecentlyHurt();
-
-        if (Permissions.chimaeraWing(player) && inHand.getTypeId() == Config.getInstance().getChimaeraItemId()) {
-            if (SkillTools.cooldownOver(recentlyHurt, 60, player) && amount >= Config.getInstance().getChimaeraCost()) {
-                player.setItemInHand(new ItemStack(Config.getInstance().getChimaeraItemId(), amount - Config.getInstance().getChimaeraCost()));
-
-                for (int y = 1; block.getY() + y < player.getWorld().getMaxHeight(); y++) {
-                    if (!(block.getRelative(0, y, 0).getType() == Material.AIR)) {
-                        player.sendMessage(LocaleLoader.getString("Item.ChimaeraWing.Fail"));
-                        player.teleport(block.getRelative(0, y - 1, 0).getLocation());
-                        return;
-                    }
-                }
-
-                if (player.getBedSpawnLocation() != null && player.getBedSpawnLocation().getBlock().getType() == Material.BED_BLOCK) {
-                    player.teleport(player.getBedSpawnLocation());
-                }
-                else {
-                    player.teleport(player.getWorld().getSpawnLocation());
-                }
-
-                player.sendMessage(LocaleLoader.getString("Item.ChimaeraWing.Pass"));
-            }
-            else if (!SkillTools.cooldownOver(recentlyHurt, 60, player) && amount >= Config.getInstance().getChimaeraCost()) {
-                player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", SkillTools.calculateTimeLeft(recentlyHurt, 60, player)));
-            }
-            else if (amount <= Config.getInstance().getChimaeraCost()) {
-                player.sendMessage(LocaleLoader.getString("Skills.NeedMore", Misc.prettyItemString(Config.getInstance().getChimaeraItemId())));
-            }
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/util/Permissions.java
+++ b/src/main/java/com/gmail/nossr50/util/Permissions.java
@ -570,14 +570,6 @@ public final class Permissions {
        return hasPermission(player, "mcmmo.ability.smelting.vanillaxpboost");
    }

-    /*
-     * MCMMO.ITEM.*
-     */
-
-    public static boolean chimaeraWing(Player player) {
-        return hasPermission(player, "mcmmo.item.chimaerawing");
-    }
-
    /*
     * MCMMO.COMMANDS.*
     */
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@ -56,15 +56,6 @@ Mods:
    Armor_Mods_Enabled: false
    Block_Mods_Enabled: false

-#
-#  Settings for mcMMO items
-###
-Items:
-    Chimaera_Wing:
-        Enabled: true
-        Feather_Cost: 10
-        Item_ID: 288
-
 #
 #  Settings for Parties
 ###
--- a/src/main/resources/locale/locale_cs_CZ.properties
+++ b/src/main/resources/locale/locale_cs_CZ.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]Nem\u00e1\u0161 pr\u00e1va kontrolovat hr\u00e1\u010de co
 Inspect.OfflineStats=mcMMO Statistiky pro offline hrace [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Statistiky pro [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]Jsi moc daleko pro prozkoum\u00e1n\u00ed tohoto hr\u00e1\u010de.
-Item.ChimaeraWing.Fail=**K\u0158\u00cdDLO CHIM\u00c9RY SELHALO!**
-Item.ChimaeraWing.Pass=**KRIDLO CHIMERY**
 Item.Injured.Wait=Predchvili jsi byl zranen a musis pockat az budes moci pouzit tuto schopnost. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Byl jsi odzbrojen!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_cy.properties
+++ b/src/main/resources/locale/locale_cy.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA ADAIN**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]] Rydych wedi cael eich diarfogi!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_da.properties
+++ b/src/main/resources/locale/locale_da.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]] Du har ikke tilladelse til at inspicere offline spillere
 Inspect.OfflineStats=mcMMO Stats for Offline Spillere [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO F\u00e6rdigheder for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]Du er for langt v\u00e6k til at inspicere denne spiller!
-Item.ChimaeraWing.Fail=**KIM\u00c6RE VINGE FEJLEDE!**
-Item.ChimaeraWing.Pass=**KIM\u00c6RE VINGE**
 Item.Injured.Wait=Du var for nylig skadet og m\u00e5 derfor vente med at bruge dette. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Du er blevet afv\u00e6bnet!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_de.properties
+++ b/src/main/resources/locale/locale_de.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]Du hast keine Rechte um ausgeloggte Spieler zu inspiziere
 Inspect.OfflineStats=mcMMO Werte f\u00fcr ausgeloggte Spieler [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Werte f\u00fcr [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]Du bist zu weit entfernt um diesen Spieler zu inspizieren!
-Item.ChimaeraWing.Fail=**CHIMAERA FL\u00dcGEL Fehlgeschlagen!**
-Item.ChimaeraWing.Pass=**CHIMAERA FL\u00dcGEL**
 Item.Injured.Wait=[[WHITE]]Du wurdest k\u00fcrzlich verletzt und musst [[YELLOW]]({0}s) [[WHITE]]warten bis du dies wieder nutzen kannst.
 Skills.Disarmed=[[DARK_RED]]Du wurdest entwaffnet!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@ -608,8 +608,6 @@ Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!

 #ITEMS
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)

 #SKILLS
--- a/src/main/resources/locale/locale_es.properties
+++ b/src/main/resources/locale/locale_es.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]\u00a1No tienen permiso para inspeccionar jugadores fuera
 Inspect.OfflineStats=Estad\u00edsticas de mcMMO para el Jugador Desconectado [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]Estad\u00edsticas de mcMMO para [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]\u00a1Est\u00e1s demasiado lejos como para inspeccionar a ese jugador!
-Item.ChimaeraWing.Fail=**\u00a1LAS ALAS DE QUIMERA FALLARON!**
-Item.ChimaeraWing.Pass=**\u00a1ALAS DE QUIMERA!**
 Item.Injured.Wait=Te lesionaste recientemente y ten\u00e9s que esperar para usar esto. [[YELLOW]]({0}seg)
 Skills.Disarmed=[[DARK_RED]]\u00a1Has sido desarmado!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_fi.properties
+++ b/src/main/resources/locale/locale_fi.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_fr.properties
+++ b/src/main/resources/locale/locale_fr.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]Tu n\'as pas la permission d\'inspecter un joueur hors li
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]Vous \u00eates trop \u00e9loign\u00e9 de ce joueur pour l\'inspecter !
-Item.ChimaeraWing.Fail=**\u00c9CHEC D\'AILE DE CHIM\u00c8RE !**
-Item.ChimaeraWing.Pass=**AILE DE CHIM\u00c8RE**
 Item.Injured.Wait=Vous avez \u00e9t\u00e9 bless\u00e9 r\u00e9cemment et devez attendre pour utiliser cela. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Vous avez \u00e9t\u00e9 d\u00e9sarm\u00e9 !
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_hu_HU.properties
+++ b/src/main/resources/locale/locale_hu_HU.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_it.properties
+++ b/src/main/resources/locale/locale_it.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]Non hai il permesso di esaminare giocatori disconnessi!
 Inspect.OfflineStats=Statistiche mcMMO del Giocatore Disconnesso [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]Statistiche mcMMO di [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]Sei troppo lontano da quel giocatore per esaminarlo!
-Item.ChimaeraWing.Fail=**ALA CHIMERA FALLITA!**
-Item.ChimaeraWing.Pass=**ALA CHIMERA**
 Item.Injured.Wait=Sei stato ferito di recente e devi aspettare per usarla. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Sei stato disarmato!!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_ko.properties
+++ b/src/main/resources/locale/locale_ko.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]\ud604\uc7ac \ubb34\uc7a5\ud574\uc81c \ub410\uc2b5\ub2c8\ub2e4!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_lv.properties
+++ b/src/main/resources/locale/locale_lv.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Tevi ir atbru\u0146oju\u0161i!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_nl.properties
+++ b/src/main/resources/locale/locale_nl.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO statistieken voor offline-speler [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Statistieken voor [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]Jij bent te ver weg om deze speler te inspecteren!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Je bent ontwapend!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_no.properties
+++ b/src/main/resources/locale/locale_no.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Du har blitt avv\u00e6pnet!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_pl.properties
+++ b/src/main/resources/locale/locale_pl.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**SKRZYD\u0141O CHIMERY**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Zostales rozbrojony!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_pl_PL.properties
+++ b/src/main/resources/locale/locale_pl_PL.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_pt_BR.properties
+++ b/src/main/resources/locale/locale_pt_BR.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]Voc\u00ea foi Desarmado!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_ru.properties
+++ b/src/main/resources/locale/locale_ru.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440
 Inspect.OfflineStats=mcMMO \u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0434\u043b\u044f \u041e\u0444\u0444\u043b\u0430\u0439\u043d \u0418\u0433\u0440\u043e\u043a\u043e\u0432 [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO \u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0434\u043b\u044f [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]\u0412\u044b \u0441\u043b\u0438\u0448\u043a\u043e\u043c \u0434\u0430\u043b\u0435\u043a\u043e \u0447\u0442\u043e\u0431\u044b \u0438\u043d\u0441\u043f\u0435\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u0438\u0433\u0440\u043e\u043a\u0430!
-Item.ChimaeraWing.Fail=**\u041a\u0420\u042b\u041b\u042c\u042f \u0425\u0418\u041c\u0415\u0420\u042b \u041d\u0415 \u0421\u041c\u041e\u0413\u041b\u0418 \u0423\u041d\u0415\u0421\u0422\u0418 \u0412\u0410\u0421!**
-Item.ChimaeraWing.Pass=**\u041a\u0420\u042b\u041b\u042c\u042f \u0425\u0418\u041c\u0415\u0420\u042b \u0423\u041d\u0415\u0421\u041b\u0418 \u0412\u0410\u0421!**
 Item.Injured.Wait=\u0412\u044b \u0431\u044b\u043b\u0438 \u0440\u0430\u043d\u0435\u043d\u044b \u0438 \u0434\u043e\u043b\u0436\u043d\u044b \u043f\u043e\u0434\u043e\u0436\u0434\u0430\u0442\u044c \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u044d\u0442\u043e. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]\u0412\u044b \u043e\u0431\u0435\u0437\u043e\u0440\u0443\u0436\u0435\u043d\u044b!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_sv.properties
+++ b/src/main/resources/locale/locale_sv.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_tr_TR.properties
+++ b/src/main/resources/locale/locale_tr_TR.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]You do not have permission to inspect offline players!
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
-Item.ChimaeraWing.Fail=**CHIMAERA WING FAILED!**
-Item.ChimaeraWing.Pass=**CHIMAERA WING**
 Item.Injured.Wait=You were injured recently and must wait to use this. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/locale/locale_zh_CN.properties
+++ b/src/main/resources/locale/locale_zh_CN.properties
@ -543,8 +543,6 @@ Inspect.Offline=[[RED]]\u4f60\u6ca1\u6709\u67e5\u8be2\u4e0d\u5728\u7ebf\u73a9\u5
 Inspect.OfflineStats=\u4e0d\u5728\u7ebf\u73a9\u5bb6\u7684mcmmo\u7edf\u8ba1\u4fe1\u606f [[YELLOW]]{0}
 Inspect.Stats=[[GREEN]]mcMMO \u7684\u7edf\u8ba1\u4fe1\u606f [[YELLOW]]{0}
 Inspect.TooFar=[[RED]]\u4f60\u65e0\u6cd5\u68c0\u67e5\u90a3\u4e2a\u73a9\u5bb6\u56e0\u4e3a\u4f60\u4eec\u8ddd\u79bb\u592a\u8fdc\u4e86!
-Item.ChimaeraWing.Fail=**\u5947\u7f8e\u62c9\u4e4b\u7ffc\u5931\u8d25\u4e86!**
-Item.ChimaeraWing.Pass=**\u5947\u7f8e\u62c9\u4e4b\u7ffc**
 Item.Injured.Wait=\u4f60\u6700\u8fd1\u53d7\u4f24\u4e86\u6240\u4ee5\u4f60\u5fc5\u987b\u7b49\u4e00\u6bb5\u65f6\u95f4\u624d\u80fd\u4f7f\u7528\u8fd9\u4e2a. [[YELLOW]]({0}s)
 Skills.Disarmed=[[DARK_RED]]\u4f60\u88ab\u7f34\u68b0\u4e86!
 Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@ -687,16 +687,6 @@ permissions:
        description: Allows access to the Second Smelt ability
    mcmmo.ability.smelting.vanillaxpboost:
        description: Allows vanilla XP boost from Smelting
-    mcmmo.item.*:
-        description: Implies all mcmmo.item permissions
-        children:
-            mcmmo.item.all: true 
-    mcmmo.item.all:
-        description: Implies all mcmmo.item permissions
-        children:
-            mcmmo.item.chimaerawing: true 
-    mcmmo.item.chimaerawing:
-        description: Allows use of Chimaera Wing item
    mcmmo.motd:
        description: Allows access to the motd
    mcmmo.commands.*: