README.md

@@ -4,7 +4,7 @@
 [![view on SpigotMC](https://img.shields.io/badge/view%20on-spigotmc-orange.svg)](https://www.spigotmc.org/resources/customoregen.9532/)
 
 ## Welcome to the CustomOreGen GitHub repository!
-Spigot 1.7 - 1.19.x
+Spigot 1.7 - 1.21.x
 
 Documentation, Tutorial and Setup: https://docs.spaceio.xyz/plugin/customoregen/
 
@@ -14,6 +14,7 @@ A neat solution for modifying the default ore generator of minecraft. The must-h
 
 - SuperiorSkyblock2
 - BentoBox
+- IridiumSkyblock
 - FabledSkyblock
 - IslandWorld
 - PlotSquared
@@ -24,14 +25,14 @@ A neat solution for modifying the default ore generator of minecraft. The must-h
 
 ### Maven
 ```xml
-		<repository>
-			<id>spaceio-repo</id>
-			<url>https://repo.spaceio.xyz/repository/maven-public/</url>
-		</repository>
-		
-		<dependency>
-			<groupId>xyz.spaceio</groupId>
-			<artifactId>CustomOreGen</artifactId>
-			<version>1.3.34-SNAPSHOT</version>
-		</dependency>
+<repository>
+    <id>spaceio-repo</id>
+    <url>https://repo.spaceio.xyz/repository/maven-public/</url>
+</repository>
+
+<dependency>
+    <groupId>xyz.spaceio</groupId>
+    <artifactId>CustomOreGen</artifactId>
+    <version>1.3.40-SNAPSHOT</version>
+</dependency>
 ```

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>xyz.spaceio</groupId>
 	<artifactId>CustomOreGen</artifactId>
-	<version>1.3.39-SNAPSHOT</version>
+	<version>1.3.40-SNAPSHOT</version>
 	<repositories>
 		<!-- Spigot repository -->
 		<repository>
@@ -50,6 +50,10 @@
 			<id>spaceio-private</id>
 			<url>https://repo.spaceio.xyz/repository/maven-private/</url>
 		</repository>
+		<repository>
+			<id>iridiumskyblock-repo</id>
+			<url>https://nexus.iridiumdevelopment.net/repository/maven-public/</url>
+		</repository>
 	</repositories>
 	<dependencies>
 		<!--Spigot API -->
@@ -152,6 +156,13 @@
 			<artifactId>Metrics</artifactId>
 			<version>0.08-SNAPSHOT</version>
 		</dependency>
+		<!-- IridumSkyblock -->
+		<dependency>
+			<groupId>com.iridium</groupId>
+			<artifactId>IridiumSkyblock</artifactId>
+			<version>4.0.9.1</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<!-- Uses the properties in this file for plugin.yml and config.yml -->
@@ -173,8 +184,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/java/xyz/spaceio/customoregen/Cmd.java

@@ -1,6 +1,7 @@
 package xyz.spaceio.customoregen;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -45,11 +46,15 @@ public class Cmd implements CommandExecutor {
 						cs.sendMessage("§2Island level: §a" + plugin.getLevel(player.getUniqueId(), player.getWorld().getName()));
 						cs.sendMessage("§2Island owner: §a" + plugin.getApplicablePlayer(player.getLocation()).getName());
 						
-						GeneratorConfig gc = plugin.getGeneratorConfigForPlayer(player, player.getWorld().getName());
-						cs.sendMessage("§3Applied Generator name: §a" + gc.label);
-						cs.sendMessage("§3Generator permission: §a" + gc.permission);
-						cs.sendMessage("§3Generator unlock level: §a" + gc.unlock_islandLevel);
-						
+                        Optional<GeneratorConfig> gc = plugin.getGeneratorConfigForPlayer(player, player.getWorld().getName());
+
+						gc.ifPresentOrElse((config) -> {
+							cs.sendMessage("§3Applied Generator name: §a" + config.label);
+							cs.sendMessage("§3Generator permission: §a" + config.permission);
+							cs.sendMessage("§3Generator unlock level: §a" + config.unlock_islandLevel);
+						}, () -> {
+							cs.sendMessage("§eNo suitable generator config found");
+						});
 						return true;
 						
 					default:

src/main/java/xyz/spaceio/customoregen/CustomOreGen.java

@@ -233,7 +233,7 @@ public class CustomOreGen extends JavaPlugin {
 	 * @param world			the skyblock world
 	 * @return				the generator config
 	 */
-	public GeneratorConfig getGeneratorConfigForPlayer(OfflinePlayer offlinePlayer, String world) {
+	public Optional<GeneratorConfig> getGeneratorConfigForPlayer(OfflinePlayer offlinePlayer, String world) {
 		
 		GeneratorConfig gc = null;
 		int id = 0;
@@ -276,8 +276,8 @@ public class CustomOreGen extends JavaPlugin {
 			
 			gc = generatorConfigs.get(0);
 		}
-		
-		return gc;
+
+		return Optional.ofNullable(gc);
 	}
 
 	/**

src/main/java/xyz/spaceio/customoregen/Events.java

@@ -4,7 +4,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Optional;
-import java.util.Random;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -160,12 +159,12 @@ public class Events implements Listener {
 		OfflinePlayer player = plugin.getApplicablePlayer(location);
 		if (player == null)
 			return null;
-		GeneratorConfig gc = plugin.getGeneratorConfigForPlayer(player, location.getWorld().getName());
+		Optional<GeneratorConfig> gc = plugin.getGeneratorConfigForPlayer(player, location.getWorld().getName());
 
-		if (gc == null)
+		if (gc.isEmpty())
 			return null;
 
-		return gc;
+		return gc.orElse(null);
 	}
 
 	private BlockFace[] blockFaces = { BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH };

src/main/java/xyz/spaceio/hooks/HookInfo.java

@@ -11,7 +11,9 @@ public enum HookInfo {
 	ASkyBlock(HookASkyBlock.class), BentoBox(HookBentoBox.class),
 	IslandWorld(HookIslandWorld.class), SpaceSkyblock(HookSpaceSkyblock.class),
 	SuperiorSkyblock2(HookSuperiorSkyblock.class), uSkyBlock(HookuSkyBlock.class),
-	FabledSkyBlock(HookFabledSkyblock.class), PlotSquared(HookPlotSquared.class), PlotSquaredLegacy(HookPlotSquaredLegacy.class), Vanilla(HookVanilla.class);
+	FabledSkyBlock(HookFabledSkyblock.class), PlotSquared(HookPlotSquared.class),
+	PlotSquaredLegacy(HookPlotSquaredLegacy.class), IridiumSkyblock(HookIridiumSkyblock.class),
+	Vanilla(HookVanilla.class);
 
 	private Class<?> hookClass;
 

src/main/java/xyz/spaceio/hooks/HookIridiumSkyblock.java

@@ -0,0 +1,59 @@
+package xyz.spaceio.hooks;
+
+import com.iridium.iridiumskyblock.IridiumSkyblock;
+import com.iridium.iridiumskyblock.api.IridiumSkyblockAPI;
+import com.iridium.iridiumskyblock.database.User;
+import com.iridium.iridiumteams.database.IridiumUser;
+import com.iridium.iridiumteams.database.Team;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.plugin.Plugin;
+
+import java.util.Optional;
+import java.util.UUID;
+
+
+public class HookIridiumSkyblock implements SkyblockAPIHook {
+
+	public HookIridiumSkyblock(Plugin plugin) {
+
+	}
+
+	@Override
+	public int getIslandLevel(UUID uuid, String world) {
+		if (IridiumSkyblockAPI.getInstance() != null) {
+			return IridiumSkyblockAPI.getInstance().getUser(Bukkit.getOfflinePlayer(uuid)).getIsland().map(island -> island.getLevel()).orElse(0);
+		}
+
+		return 0;
+	}
+
+	@Override
+	public Optional<UUID> getIslandOwner(Location loc) {
+		if (IridiumSkyblockAPI.getInstance() != null) {
+			return IridiumSkyblockAPI.getInstance().getIslandViaLocation(loc)
+					.flatMap(island -> island.getOwner().map(user -> user.getUuid()));
+		}
+
+		return Optional.empty();
+	}
+
+	@Override
+	public String[] getSkyBlockWorldNames() {
+		if (IridiumSkyblockAPI.getInstance() != null) {
+			return new String[]{IridiumSkyblockAPI.getInstance().getWorld().toString(),
+					IridiumSkyblockAPI.getInstance().getNetherWorld().toString(),
+					IridiumSkyblockAPI.getInstance().getEndWorld().toString()};
+		}
+
+		return new String[]{};
+	}
+	
+	@Override
+	public void sendBlockAcknowledge(Block block) {
+		// TODO: Not implemented for IridiumSkyblock?
+	}
+
+}

src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: CustomOreGen
 version: ${project.version}-SNAPSHOT
 description: Controls the Ore-Generator
 author: Linus122
-softdepend: [PlaceholderAPI, ASkyBlock, AcidIsland, uSkyBlock, SkyBlock, BentoBox, IslandWorld, SuperiorSkyblock2, FabledSkyBlock]
+softdepend: [PlaceholderAPI, ASkyBlock, AcidIsland, uSkyBlock, SkyBlock, BentoBox, IslandWorld, SuperiorSkyblock2, FabledSkyBlock, IridiumSkyblock]
 main: xyz.spaceio.customoregen.CustomOreGen
 api-version: 1.13
 commands: