EliteMobs 9.1.10:

- [New] Added the remake of The Ruins Lair! - [New] Added the remake of The Catacombs Lair! - [New] Optimized and improved error handling of elite scripts - [Fix] Fixed but that would cause certain rays to not work correctly - [Fix] Fixed some minor bugs - [Removal] Removed dead code Signed-off-by: MagmaGuy <[email protected]>
MagmaGuy · Sep 15, 2024 · 1acb55b · 1acb55b
1 parent 7c3b23f
commit 1acb55b
Show file tree

Hide file tree

Showing 54 changed files with 1,278 additions and 872 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ processResources {
 }
 
 group 'com.magmaguy'
-version '9.1.9'
+version '9.1.10'
 
 repositories {
     maven {
@@ -113,7 +113,7 @@ dependencies {
     implementation group: 'org.bstats', name: 'bstats-bukkit', version: '2.2.1'
     implementation group: 'commons-io', name: 'commons-io', version: '2.7'
     implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
-    implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.13.0'
+    implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.13.4'
     implementation group: 'com.magmaguy', name: 'MagmaCore', version: '1.0-SNAPSHOT'
 
 }
@@ -135,6 +135,7 @@ shadowJar {
         relocate('org.bstats', packagePath + '.bstats')
         // Relocate MagmaCore
         relocate('com.magmaguy.magmacore', 'com.magmaguy.elitemobs.magmacore')
+        relocate('com.magmaguy.easyminecraftgoals', 'com.magmaguy.elitemobs.easyminecraftgoals')
     }
     archiveClassifier.set(null)
     archiveFileName.set(project.name + ".jar")

diff --git a/src/main/java/com/magmaguy/elitemobs/EliteMobs.java b/src/main/java/com/magmaguy/elitemobs/EliteMobs.java
@@ -59,7 +59,6 @@
 import com.magmaguy.elitemobs.thirdparty.worldguard.WorldGuardCompatibility;
 import com.magmaguy.elitemobs.treasurechest.TreasureChest;
 import com.magmaguy.elitemobs.utils.BossBarUtil;
-import com.magmaguy.elitemobs.utils.ServerTime;
 import com.magmaguy.elitemobs.versionnotifier.VersionChecker;
 import com.magmaguy.elitemobs.wormhole.Wormhole;
 import com.magmaguy.magmacore.MagmaCore;
@@ -141,8 +140,6 @@ public void onEnable() {
             return;
         }
 
-        ServerTime.startTickCounter();
-
         NMSManager.initializeAdapter(this);
 
         if (Bukkit.getServer().spigot().getConfig().getDouble("settings.attribute.maxHealth.max") < 100000000) {

diff --git a/src/main/java/com/magmaguy/elitemobs/collateralminecraftchanges/LightningSpawnBypass.java b/src/main/java/com/magmaguy/elitemobs/collateralminecraftchanges/LightningSpawnBypass.java
@@ -10,7 +10,7 @@
 public class LightningSpawnBypass implements Listener {
     private static boolean bypass = false;
 
-    public static void strikeLightingIgnoreProtections(Location location) {
+    public static void strikeLightningIgnoreProtections(Location location) {
         if (location == null || location.getWorld() == null) return;
         bypass = true;
         location.getWorld().strikeLightningEffect(location);

diff --git a/src/main/java/com/magmaguy/elitemobs/config/contentpackages/premade/CatacombsLair.java b/src/main/java/com/magmaguy/elitemobs/config/contentpackages/premade/CatacombsLair.java
@@ -0,0 +1,32 @@
+package com.magmaguy.elitemobs.config.contentpackages.premade;
+
+import com.magmaguy.elitemobs.config.contentpackages.ContentPackagesConfigFields;
+import org.bukkit.World;
+
+import java.util.List;
+
+public class CatacombsLair extends ContentPackagesConfigFields {
+    public CatacombsLair() {
+        super("catacombs_lair",
+                true,
+                "&2[lvl 010] &8The Catacombs",
+                List.of("&fA great starter lair for players!",
+                        "&6Credits: Realm of Lotheridon, MagmaGuy, Dali, Frost"),
+                "https://nightbreak.io/plugin/elitemobs/#the-catacombs",
+                DungeonSizeCategory.LAIR,
+                "em_the_catacombs",
+                World.Environment.NORMAL,
+                true,
+                "em_the_catacombs,41.5,65.0,82.5,176,0",
+                0,
+                "Difficulty: &cHard\n" +
+                        "$bossCount bosses, from tier $lowestTier to $highestTier\n" +
+                        "&2A great Lair challenge for groups of beginners!",
+                "&8[EM] &8Now entering the Catacombs. Be careful with what dwells below...",
+                "&8[EM] &8You have left the Catacombs. Was it worth it?",
+                "the_catacombs",
+                false);
+        setSetupMenuDescription(List.of(
+                "&2A level 10 lair for new players!"));
+    }
+}
diff --git a/src/main/java/com/magmaguy/elitemobs/config/contentpackages/premade/CatacombsLair.off b/src/main/java/com/magmaguy/elitemobs/config/contentpackages/premade/CatacombsLair.off
diff --git a/src/main/java/com/magmaguy/elitemobs/config/contentpackages/premade/ColosseumLair.off b/src/main/java/com/magmaguy/elitemobs/config/contentpackages/premade/ColosseumLair.off
diff --git a/...fig/contentpackages/premade/RuinsLair.off → ...ig/contentpackages/premade/RuinsLair.java b/...fig/contentpackages/premade/RuinsLair.off → ...ig/contentpackages/premade/RuinsLair.java
@@ -1,37 +1,33 @@
 package com.magmaguy.elitemobs.config.contentpackages.premade;
 
 import com.magmaguy.elitemobs.config.contentpackages.ContentPackagesConfigFields;
-import com.magmaguy.elitemobs.utils.DiscordLinks;
-import org.bukkit.util.Vector;
+import org.bukkit.World;
 
-import java.util.Arrays;
 import java.util.List;
 
-public class RuinsLair extends DungeonPackagerConfigFields {
+public class RuinsLair extends ContentPackagesConfigFields {
     public RuinsLair() {
         super("the_ruins",
                 true,
                 "&2[lvl 150] &6The Ruins",
-                new ArrayList<>(List.of("&fA fight against a myth from",
+                List.of("&fA fight against a myth from",
                         "&fNorse mythology, be prepared for a smiting!",
-                        "&6Credits: 69OzCanOfBepis, MagmaGuy"),
-                List.of(
-                        "ruins_boss_p1.yml:0,0,0"),
-                List.of(),
+                        "&6Credits: 69OzCanOfBepis, MagmaGuy, Dali, Frost"),
                 "https://nightbreak.io/plugin/elitemobs/#the-ruins",
                 DungeonSizeCategory.LAIR,
-                "em_the_ruins.schem",
+                "em_the_ruins",
+                World.Environment.NORMAL,
                 true,
-                new Vector(18, -6, -19),
-                new Vector(-21, 10, 20),
-                "-1,-4,18,0,0",
+                "em_the_ruins,-63.5,190.0,111.5,-132,0",
                 0,
                 "Difficulty: &cHard\n" +
                         "$bossCount level $lowestTier Big Boss!\n" +
                         "&cA tough fight against a Norse god!",
                 "&8[EM] &3Those who challenge the myths must be prepared for their downfall!",
                 "&8[EM] &3You now know what it takes to make a legend!",
-                SchematicPackage.SchematicRotation.SOUTH.toString(),
-                "the_ruins");
+                "em_the_ruins",
+                false);
+        setSetupMenuDescription(List.of(
+                "&2A Lair for players around level 150!"));
     }
-}
+}
diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave20Boss.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave20Boss.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave20Boss extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave21Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave21Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave21Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave21Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave21Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave21Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave22Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave22Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave22Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave22Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave22Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave22Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave23Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave23Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave23Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave23Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave23Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave23Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave24Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave24Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave24Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave24Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave24Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave24Ranged extends CustomBossesConfigFields {

diff --git a/...ain/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave25Miniboss.java b/...ain/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave25Miniboss.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave25Miniboss extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave26Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave26Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave26Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave26Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave26Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave26Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave27Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave27Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave27Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave27Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave27Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave27Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave28Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave28Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave28Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave29Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave29Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave29Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave30Boss.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave30Boss.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave30Boss extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave31Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave31Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave31Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave31Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave31Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave31Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave32Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave32Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave32Melee extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave32Ranged.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave32Ranged.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave32Ranged extends CustomBossesConfigFields {

diff --git a/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave33Melee.java b/src/main/java/com/magmaguy/elitemobs/config/custombosses/premade/WoodLeagueWave33Melee.java
@@ -6,7 +6,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class WoodLeagueWave33Melee extends CustomBossesConfigFields {