Merge pull request #7 from ADHDMC/rewrite

Rewrite

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ADHDMC</groupId>
     <artifactId>NerfFarms</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.10</version>
     <packaging>jar</packaging>
 
     <name>NerfFarms</name>

src/main/java/adhdmc/nerffarms/NerfFarms.java

@@ -1,8 +1,10 @@
 package adhdmc.nerffarms;
 
-import adhdmc.nerffarms.Commands.CommandHandler;
+import adhdmc.nerffarms.command.CommandHandler;
+import adhdmc.nerffarms.config.ConfigParser;
+import adhdmc.nerffarms.listener.MobDamageListener;
+import adhdmc.nerffarms.listener.MobDeathListener;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -14,7 +16,7 @@
 public final class NerfFarms extends JavaPlugin {
     public static NerfFarms plugin;
     public final MiniMessage miniMessage = MiniMessage.miniMessage();
-    public final String version = "0.0.6";
+    public final String version = "0.0.10";
 
     @Override
     public void onEnable() {
@@ -36,17 +38,20 @@ private static void registerCommand(PluginCommand command, CommandExecutor execu
 
     private void configDefaults() {
         FileConfiguration config = getConfig();
+        config.addDefault("debug", false);
         config.addDefault("only-nerf-hostiles", true);
         config.addDefault("bypass", List.of(""));
         config.addDefault("modification-type", "EXP");
-        config.addDefault("spawn-types", List.of("SPAWNER", "NATURAL", "DEFAULT"));
+        config.addDefault("blacklisted-spawn-types", List.of("CUSTOM"));
         config.addDefault("blacklisted-below", Arrays.asList("MAGMA_BLOCK", "HONEY_BLOCK", "LAVA"));
-        config.addDefault("blacklisted-in", Arrays.asList("WATER", "LAVA", "BUBBLE_COLUMN"));
-        config.addDefault("whitelisted-damage-types", Arrays.asList("PROJECTILE", "THORNS", "MAGIC", "ENTITY_ATTACK", "ENTITY_SWEEP_ATTACK"));
-        config.addDefault("require-targetting", false);
-        config.addDefault("debug", false);
-        config.addDefault("max-mob-distance", 15);
-        config.addDefault("environmental-damage-types", Arrays.asList("FALL", "FALLING_BLOCK", "LAVA", "DROWNING"));
-        config.addDefault("percent-from-environment", 75);
+        config.addDefault("blacklisted-in", Arrays.asList("HONEY_BLOCK", "LAVA", "BUBBLE_COLUMN"));
+        config.addDefault("allow-projectile-damage", true);
+        config.addDefault("require-path", false);
+        config.addDefault("require-line-of-sight", false);
+        config.addDefault("skeletons-can-damage-creepers", true);
+        config.addDefault("withers-can-damage-entities", true);
+        config.addDefault("max-distance", 15);
+        config.addDefault("disallowed-damage-types", Arrays.asList("FALL", "FALLING_BLOCK", "LAVA", "DROWNING"));
+        config.addDefault("max-disallowed-damage-percent", 75);
     }
 }

src/main/java/adhdmc/nerffarms/Commands/CommandHandler.java → src/main/java/adhdmc/nerffarms/command/CommandHandler.java

@@ -1,4 +1,4 @@
-package adhdmc.nerffarms.Commands;
+package adhdmc.nerffarms.command;
 
 import adhdmc.nerffarms.NerfFarms;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

src/main/java/adhdmc/nerffarms/Commands/HelpCommand.java → src/main/java/adhdmc/nerffarms/command/HelpCommand.java

@@ -1,4 +1,4 @@
-package adhdmc.nerffarms.Commands;
+package adhdmc.nerffarms.command;
 
 import adhdmc.nerffarms.NerfFarms;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;