Reforge changes

eco-core/core-plugin/src/main/java/com/willfp/reforges/display/ReforgesDisplay.java

@@ -8,10 +8,13 @@ import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.reforges.reforges.Reforge;
 import com.willfp.reforges.reforges.meta.ReforgeTarget;
 import com.willfp.reforges.reforges.util.ReforgeUtils;
+import org.apache.commons.lang.WordUtils;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class ReforgesDisplay extends DisplayModule {
@@ -44,11 +47,22 @@ public class ReforgesDisplay extends DisplayModule {
 
         if (reforge != null) {
             if (this.getPlugin().getConfigYml().getBool("reforge.display-in-lore")) {
-                List<String> addLore = this.getPlugin().getConfigYml().getStrings("reforge.lore-suffix");
+                List<String> addLore = new ArrayList<>();
+
+                addLore.add(" ");
+                addLore.add(reforge.getName());
+
+                List<String> description = new ArrayList<>(Arrays.asList(WordUtils.wrap(
+                        reforge.getDescription(),
+                        this.getPlugin().getConfigYml().getInt("reforge.line-wrap"),
+                        "\n",
+                        false
+                ).split("\\r?\\n")));
+                description.replaceAll(s -> this.getPlugin().getLangYml().getString("description-color") + s.replace("%description%", reforge.getDescription()));
+                description.replaceAll(s -> s.replace("§r", this.getPlugin().getLangYml().getString("description-color")));
+                addLore.addAll(description);
 
                 addLore.replaceAll(s -> Display.PREFIX + s);
-                addLore.replaceAll(s -> s.replace("%reforge%", reforge.getName()));
-                addLore.replaceAll(s -> s.replace("%description%", reforge.getDescription()));
                 lore.addAll(addLore);
             }
         }

eco-core/core-plugin/src/main/java/com/willfp/reforges/gui/ReforgeGUI.java

@@ -141,6 +141,8 @@ public class ReforgeGUI {
                                         return;
                                     }
 
+                                    player.sendMessage(plugin.getLangYml().getMessage("applied-reforge").replace("%reforge%", reforge.getName()));
+
                                     EconomyHandler.getInstance().withdrawPlayer(player, cost);
 
                                     ReforgeUtils.setReforge(toReforge, reforge);

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeLight.java

@@ -7,6 +7,8 @@ import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
@@ -26,14 +28,16 @@ public class ReforgeLight extends Reforge {
         this.speedModifier = new AttributeModifier(
                 UUID.nameUUIDFromBytes("light-speed".getBytes()),
                 "light-speed",
-                this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
+                this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier"),
+                AttributeModifier.Operation.MULTIPLY_SCALAR_1,
+                EquipmentSlot.HAND
         );
         this.kbModifier = new AttributeModifier(
                 UUID.nameUUIDFromBytes("light-kb".getBytes()),
                 "light-kb",
-                this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
+                this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier"),
+                AttributeModifier.Operation.MULTIPLY_SCALAR_1,
+                EquipmentSlot.HAND
         );
     }
 
@@ -56,6 +60,7 @@ public class ReforgeLight extends Reforge {
 
         meta.addAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, speedModifier);
         meta.addAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, kbModifier);
+        meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
         itemStack.setItemMeta(meta);
     }
 

eco-core/core-plugin/src/main/resources/config.yml

@@ -41,16 +41,14 @@ gui:
 reforge:
   cost: 5000
 
+  line-wrap: 32
+
   show-reforgable: true
   reforgable-suffix:
     - ""
     - "&8This item can be reforged!"
 
   display-in-lore: true
-  lore-suffix:
-    - ""
-    - "%reforge%"
-    - "&7&o%description%"
 
 targets:
   melee:

eco-core/core-plugin/src/main/resources/lang.yml

@@ -4,4 +4,7 @@ messages:
   not-player: "&cThis command must be run by a player"
   invalid-command: "&cUnknown subcommand!"
   reloaded: "Reloaded! (Restart if you're removed weapons!)"
-  insufficient-money: "&cYou don't have enough money for this!"
+  insufficient-money: "&cYou don't have enough money for this!"
+  applied-reforge: "Applied %reforge%&r reforge!"
+
+description-color: "&7&o"

eco-core/core-plugin/src/main/resources/reforges/light.yml

@@ -4,9 +4,9 @@
 
 name: "<gradient:#1c92d2>Light</gradient:#f2fcfe>"
 enabled: true
-description: "Deal &a5%&7&o less damage and knockback, but attack &a3%&7&o faster."
+description: "Deal &a5%&r less damage and knockback, but attack &a3%&7&o faster."
 
 config:
   multiplier: 0.95 # Damage multiplier
-  speed-multiplier: 1.03
-  knockback-multiplier: 0.95
+  speed-multiplier: 0.03
+  knockback-multiplier: -0.05

eco-core/core-plugin/src/main/resources/reforges/sharp.yml

@@ -4,7 +4,7 @@
 
 name: "<gradient:#f12711>Sharp</gradient:#f5af19>"
 enabled: true
-description: "Deal &a3%&7&o more damage"
+description: "Deal &a3%&r more damage"
 
 config:
   multiplier: 1.03 # Damage multiplier