Merge pull request #28 from ChafficPlugins/customisable-addiction-and-overdose-effects

feat: made overdose and addiction effects customisable

Author: Chafficui

src/main/java/de/chafficplugins/mytrip/MyTrip.java

@@ -19,6 +19,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.logging.Logger;
 
 public final class MyTrip extends JavaPlugin {
@@ -80,6 +81,8 @@ public void loadConfig() {
         getConfig().addDefault(ConfigStrings.SETTING_PERMISSIONS, false);
         getConfig().addDefault(ConfigStrings.SETTING_ALERTS, true);
         getConfig().addDefault(ConfigStrings.DISABLE_DRUG_SET, false);
+        getConfig().addDefault(ConfigStrings.ADDICTION_EFFECTS, List.of("CONFUSION:0"));
+        getConfig().addDefault(ConfigStrings.OVERDOSE_EFFECTS, List.of("BLINDNESS:0", "NAUSEA:0", "SLOW:0", "SLOW_DIGGING:0", "WEAKNESS:0"));
         getConfig().options().header("MyTrip config file");
         getConfig().set("version", getDescription().getVersion());
         getConfig().options().copyDefaults(true);
@@ -100,6 +103,10 @@ public String getConfigString(String path) {
         return getConfig().getString(path);
     }
 
+    public List<String> getConfigStringList(String path) {
+        return getConfig().getStringList(path);
+    }
+
     public void log(String message) {
         logger.info(message);
     }

src/main/java/de/chafficplugins/mytrip/drugs/objects/Addiction.java

@@ -12,6 +12,7 @@
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import static de.chafficplugins.mytrip.utils.ConfigStrings.*;
@@ -63,7 +64,10 @@ public void run() {
 
                         player.damage(intensity);
                         if(intensity > 5) {
-                            player.addPotionEffect(new PotionEffect(PotionEffectType.CONFUSION, 60 * intensity, 0));
+                            for(String type: plugin.getConfigStringList(ADDICTION_EFFECTS)) {
+                                String[] split = type.split(":");
+                                player.addPotionEffect(new PotionEffect(Objects.requireNonNull(PotionEffectType.getByName(split[0])), 60 * intensity, Integer.parseInt(split[2])));
+                            }
                         }
 
                         player.sendTitle(getLocalized(ADDICTION), getLocalized(ADDICTED_TO, CrucialItem.getById(drugId).getName()), 10, 40, 10);

src/main/java/de/chafficplugins/mytrip/drugs/objects/MyDrug.java

@@ -202,7 +202,10 @@ public static void doDrug(Player p, ItemStack stack) {
             DrugPlayer.addPlayer(dp);
         }
         if(dp.consume(drug)) {
-            p.addPotionEffect(new PotionEffect(PotionEffectType.WITHER, 100*20, 0));
+            for (String effect : plugin.getConfigStringList(OVERDOSE_EFFECTS)) {
+                String[] split = effect.split(":");
+                p.addPotionEffect(new PotionEffect(Objects.requireNonNull(PotionEffectType.getByName(split[0])), 100*20, Integer.parseInt(split[1])));
+            }
         }
         doEffects(p, drug, duration, delay);
     }

src/main/java/de/chafficplugins/mytrip/utils/ConfigStrings.java

@@ -19,6 +19,8 @@ public class ConfigStrings {
     //Messages
     public final static String ONLY_PLAYERS_CMD = "only_players_cmd"; //Only players can use this command
     public final static String DISABLE_DRUG_SET = "disable_drug_set"; //Only players can use this command
+    public final static String ADDICTION_EFFECTS = "addiction_effects";
+    public final static String OVERDOSE_EFFECTS = "overdose_effects";
     public final static String UNKNOWN_CMD = "unknown_cmd"; //Unknown command: {0}
     public final static String PLAYER_NOT_FOUND = "player_not_found"; //The player {0} was not found
     public final static String NO_PERMISSION = "no_permission"; //You don't have the permission to use this command.