#86 Added fishing rod

weihao · Mar 2, 2019 · 346e9a3 · 346e9a3
1 parent abb78ad
commit 346e9a3
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,19 @@
 - Reblath failstacking can be disabled.
 - Sword can be enhanced as tool.
 - Shovel can be enhanced as tool.
+- Item set can now support tool.
+- Option to only accept EE renamed item
+- Fishing rod can be enhanced as tool.
 
 ### Fixed
 - Issue displaying enchantments chance.
 - Items can be glitched into menu.
+- Overflow error.
 
 ### Changed
+- Plugin is now compatible with `1.8`-`1.13.2`
 - Configuration file changed to adapt knife and shovel.
+- Jar files now contains markdown files.
 
 ## [7.0.0] - 2019-2-25
 ### Added

diff --git a/...antmentsEnhance-Plugin/src/main/java/org/pixeltime/enchantmentsenhance/event/Enhance.java b/...antmentsEnhance-Plugin/src/main/java/org/pixeltime/enchantmentsenhance/event/Enhance.java
@@ -64,7 +64,8 @@ public static int getStoneId(ItemStack item, int level, Clickable clicked) {
                     || ItemManager.isValid(item, MaterialManager.axe)
                     || ItemManager.isValid(item, MaterialManager.hoe)
                     || ItemManager.isValid(item, MaterialManager.shovel)
-                    || ItemManager.isValid(item, MaterialManager.knife)) {
+                    || ItemManager.isValid(item, MaterialManager.knife)
+                    || ItemManager.isValid(item, MaterialManager.rod)) {
                 if (DataManager.requireConcentratedStones[level]) {
                     return 2;
                 } else {

diff --git a/...tsEnhance-Plugin/src/main/java/org/pixeltime/enchantmentsenhance/manager/ItemManager.java b/...tsEnhance-Plugin/src/main/java/org/pixeltime/enchantmentsenhance/manager/ItemManager.java
@@ -77,6 +77,8 @@ public static ItemType getToolItemEnchantmentType(ItemStack item) {
             return ItemType.SHOVEL;
         } else if (isValid(item, MaterialManager.knife)) {
             return ItemType.KNIFE;
+        } else if (isValid(item, MaterialManager.rod)) {
+            return ItemType.ROD;
         } else {
             return ItemType.INVALID;
         }

diff --git a/...ntmentsEnhance-Plugin/src/main/kotlin/org/pixeltime/enchantmentsenhance/enums/ItemType.kt b/...ntmentsEnhance-Plugin/src/main/kotlin/org/pixeltime/enchantmentsenhance/enums/ItemType.kt
@@ -19,5 +19,5 @@
 package org.pixeltime.enchantmentsenhance.enums
 
 enum class ItemType {
-    WEAPON, ARMOR, ACCESSORY, PICKAXE, HOE, AXE, BOW, SHOVEL, KNIFE, INVALID
+    WEAPON, ARMOR, ACCESSORY, PICKAXE, HOE, AXE, BOW, SHOVEL, KNIFE, ROD, INVALID
 }
diff --git a/...hance-Plugin/src/main/kotlin/org/pixeltime/enchantmentsenhance/manager/MaterialManager.kt b/...hance-Plugin/src/main/kotlin/org/pixeltime/enchantmentsenhance/manager/MaterialManager.kt
@@ -67,6 +67,9 @@ class MaterialManager {
         @JvmField
         val knife = mutableListOf<Material>()
 
+        @JvmField
+        val rod = mutableListOf<Material>()
+
         @JvmField
         val stoneTypes = mutableListOf<Material>()
 
@@ -111,6 +114,10 @@ class MaterialManager {
                     "material.knife")) {
                 knife.add(XMaterial.fromString(s).parseMaterial())
             }
+            for (s in SettingsManager.config.getStringList(
+                    "material.rod")) {
+                rod.add(XMaterial.fromString(s).parseMaterial())
+            }
             for (s in SettingsManager.config.getStringList(
                     "material.pickaxe")) {
                 pickaxe.add(XMaterial.fromString(s).parseMaterial())

diff --git a/EnchantmentsEnhance-Plugin/src/resources/config.yml b/EnchantmentsEnhance-Plugin/src/resources/config.yml
@@ -276,6 +276,8 @@ material:
     - IRON_SWORD
   bow:
     - BOW
+  rod:
+    - FISHING_ROD
 slots:
   # Armor includes armor contents and item in hand.
   enableArmor: true
@@ -334,6 +336,7 @@ enhance:
       SHOEVEL: []
       BOW: []
       KNIFE: []
+      ROD: []
     lore: []
   "1":
     baseChance: 100
@@ -366,6 +369,8 @@ enhance:
         - Endless:1
       KNIFE:
         - Endless:1
+      Rod:
+        - Endless:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -401,6 +406,8 @@ enhance:
         - Arrow_Fire:1
       KNIFE:
         - Fire_Aspect:1
+      ROD:
+        - Lure:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -437,6 +444,8 @@ enhance:
         - Arrow_Fire:1
       KNIFE:
         - Fire_Aspect:1
+      ROD:
+        - Lure:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -476,6 +485,8 @@ enhance:
         - Arrow_Infinite:1
       KNIFE:
         - Damage_Arthropods:1
+      ROD:
+        - Lure:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -516,6 +527,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Arthropods:1
+      ROD:
+        - Lure:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -555,6 +568,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Arthropods:1
+      ROD:
+        - Lure:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -593,6 +608,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Arthropods:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -629,6 +646,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Arthropods:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -666,6 +685,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Undead:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -703,6 +724,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Undead:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -740,6 +763,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Undead:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -778,6 +803,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Undead:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -813,6 +840,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_Undead:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -848,6 +877,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Loot_Bonus_Mobs:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lLow Tier."
@@ -920,6 +951,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Loot_Bonus_Mobs:1
+      ROD:
+        - Luck:1
     lore:
       - "&3&l&m                                  "
       - "&9&lMid Tier."
@@ -960,6 +993,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Loot_Bonus_Mobs:1
+      ROD:
+        - Knockback:5
     lore:
       - "&3&l&m                                  "
       - "&9&lMid Tier."
@@ -1000,6 +1035,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Loot_Bonus_Mobs:1
+      ROD:
+        - Luck:10
     lore:
       - "&3&l&m                                  "
       - "&9&lMid Tier."
@@ -1040,6 +1077,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_All:1-5
+      ROD:
+        - Lure:10
     lore:
       - "&3&l&m                                  "
       - "&9&lHigh Tier."
@@ -1079,6 +1118,8 @@ enhance:
         - Arrow_Damage:1
       KNIFE:
         - Damage_All:1-5
+      ROD:
+        - Damage_All:1-20
     lore:
       - "&8&l&m                                  "
       - "&4&lMAX Tier."