From d14d2caa2d4086b56349ed15311e80b69f557042 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 13 Jan 2022 14:50:07 +0100 Subject: [PATCH] refactor: Prepare removal of our maven repository (#3451) --- Bukkit/build.gradle.kts | 1 - .../plotsquared/bukkit/inject/WorldManagerModule.java | 5 +---- .../bukkit/managers/HyperverseWorldManager.java | 9 +++++---- build.gradle.kts | 5 ----- gradle/libs.versions.toml | 2 -- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index b49c75652..0207c2a6a 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -40,7 +40,6 @@ dependencies { compileOnly(libs.placeholderapi) compileOnly(libs.luckperms) compileOnly(libs.essentialsx) - compileOnly(libs.hyperverse) { isTransitive = false } compileOnly(libs.mvdwapi) { isTransitive = false } // Other libraries diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java index f2df53bf9..9d5aa50fb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java @@ -29,7 +29,6 @@ import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.google.inject.Singleton; import com.plotsquared.bukkit.managers.BukkitWorldManager; -import com.plotsquared.bukkit.managers.HyperverseWorldManager; import com.plotsquared.bukkit.managers.MultiverseWorldManager; import com.plotsquared.core.util.PlatformWorldManager; import org.bukkit.Bukkit; @@ -40,9 +39,7 @@ public class WorldManagerModule extends AbstractModule { @Provides @Singleton PlatformWorldManager provideWorldManager() { - if (Bukkit.getPluginManager().getPlugin("Hyperverse") != null) { - return new HyperverseWorldManager(); - } else if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) { + if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) { return new MultiverseWorldManager(); } else { return new BukkitWorldManager(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java index 4659cacde..c280c6df9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java @@ -25,6 +25,7 @@ */ package com.plotsquared.bukkit.managers; +/* import com.google.inject.Singleton; import org.bukkit.World; import org.checkerframework.checker.nullness.qual.NonNull; @@ -35,10 +36,9 @@ import se.hyperver.hyperverse.world.WorldConfigurationBuilder; import se.hyperver.hyperverse.world.WorldFeatures; import se.hyperver.hyperverse.world.WorldType; -/** - * Hyperverse specific manager that creates worlds - * using Hyperverse's API - */ +Hyperverse implementation is currently put on ice until Hyperverse is released on a stable line and deployed to the central +repository. + @Singleton public class HyperverseWorldManager extends BukkitWorldManager { @@ -67,3 +67,4 @@ public class HyperverseWorldManager extends BukkitWorldManager { } } + */ diff --git a/build.gradle.kts b/build.gradle.kts index 1712d0051..34eb674bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,11 +42,6 @@ allprojects { url = uri("https://jitpack.io") } - maven { - name = "IntellectualSites" - url = uri("https://mvn.intellectualsites.com/content/groups/public/") - } - maven { name = "EngineHub" url = uri("https://maven.enginehub.org/repo/") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b860d763c..7c98faf64 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,6 @@ vault = "1.7.1" placeholderapi = "2.11.1" luckperms = "5.3" essentialsx = "2.19.2" -hyperverse = "0.6.0-SNAPSHOT" mvdwapi = "3.1.1" # Third party @@ -73,7 +72,6 @@ vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" } luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" } essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" } -hyperverse = { group = "se.hyperver.hyperverse", name = "Core", version.ref = "hyperverse" } # Third party prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" }