Browse Source

make it compile + removed acid island hook

MasterCake 2 years ago
parent
commit
1ba4cd0129

+ 10 - 26
pom.xml

@@ -16,11 +16,7 @@
 			<id>codemc-repo</id>
 			<url>https://repo.codemc.org/repository/maven-public/</url>
 		</repository>
-		<!-- PlotSquared repos -->
-		<repository>
-			<id>athion-repo</id>
-			<url>http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/</url>
-		</repository>
+		<!-- PlotSquared repo -->
 		<repository>
 			<id>intellectualsites snapshots</id>
 			<url>https://mvn.intellectualsites.com/content/repositories/snapshots/</url>
@@ -32,7 +28,7 @@
 		<!-- Placeholder repository -->
 		<repository>
 			<id>placeholderapi</id>
-			<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+			<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 		</repository>
 		<!-- SpaceIO private repository -->
 		<repository>
@@ -49,12 +45,6 @@
 	        <id>bg-repo</id>
 	        <url>https://repo.bg-software.com/repository/api/</url>
 	    </repository>
-   		<!-- Tastybento repository -->
-		<repository>
-			<id>bintray-tastybento-maven-repo</id>
-			<name>bintray</name>
-			<url>http://dl.bintray.com/tastybento/maven-repo</url>
-		</repository>
 		<!-- SpaceIO repository -->
 		<repository>
 			<id>spaceio-repo</id>
@@ -78,15 +68,9 @@
 		</dependency>
 		<!-- ASkyBlock -->
 		<dependency>
-			<groupId>com.wasteofplastic</groupId>
-			<artifactId>askyblock</artifactId>
-			<version>3.0.9</version>
-		</dependency>
-		<!-- AcidIsland -->
-		<dependency>
-			<groupId>com.wasteofplastic</groupId>
-			<artifactId>acidisland</artifactId>
-			<version>3.0.9</version>
+		  <groupId>com.wasteofplastic</groupId>
+		  <artifactId>askyblock</artifactId>
+		  <version>3.0.9.4</version>
 		</dependency>
 		<!-- USkyblock -->
 		<dependency>
@@ -116,11 +100,11 @@
 			<scope>provided</scope>
 		</dependency>
 		<!-- SuperiorSkyblock -->
-	    <dependency>
-	        <groupId>com.bgsoftware</groupId>
-	        <artifactId>SuperiorSkyblockAPI</artifactId>
-	        <version>latest</version>
-	    </dependency>
+		<dependency>
+		  <groupId>com.bgsoftware</groupId>
+		  <artifactId>SuperiorSkyblockAPI</artifactId>
+		  <version>latest</version>
+		</dependency>
 		<!-- SpaceSkyblock -->
 		<dependency>
 			<groupId>xyz.spaceio.skyblock</groupId>

+ 0 - 43
src/main/java/xyz/spaceio/hooks/HookAcidIsland.java

@@ -1,43 +0,0 @@
-package xyz.spaceio.hooks;
-
-import java.util.Optional;
-import java.util.UUID;
-
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-
-import com.wasteofplastic.acidisland.ASkyBlockAPI;
-
-public class HookAcidIsland implements SkyblockAPIHook {
-
-	private ASkyBlockAPI api;
-
-	public HookAcidIsland() {
-		api = ASkyBlockAPI.getInstance();
-	}
-
-	@Override
-	public int getIslandLevel(UUID uuid, String world) {
-		return api.getIslandLevel(uuid);
-	}
-
-	@Override
-	public Optional<UUID> getIslandOwner(Location loc) {
-		Optional<UUID> optional = Optional.empty();
-		if(api.getIslandAt(loc) != null) {
-			optional = Optional.of(api.getIslandAt(loc).getOwner());
-		}
-		return optional;
-	}
-
-	@Override
-	public String[] getSkyBlockWorldNames() {
-		return new String[] { api.getIslandWorld().getName() };
-	}
-
-	@Override
-	public void sendBlockAcknowledge(Block block) {
-		// TODO Auto-generated method stub
-		
-	}
-}

+ 1 - 1
src/main/java/xyz/spaceio/hooks/HookInfo.java

@@ -8,7 +8,7 @@ package xyz.spaceio.hooks;
  */
 public enum HookInfo {
 
-	AcidIsland(HookAcidIsland.class), ASkyBlock(HookASkyBlock.class), BentoBox(HookBentoBox.class),
+	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);

+ 0 - 3
src/main/resources/config.yml

@@ -11,9 +11,6 @@
 # Enable this when you also want random blocks from stone generators (lava floats on water vertically)
 enable-stone-generator: false
 
-# Enables the hiss sound effect when a block was generated
-enable-sound-effect: true
-
 # Enables the smoke particle effect when a block was generated
 enable-particle-effect: true