Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Prepare removal of our maven repository (#3451)

Browse Source
This commit is contained in:
Alex 2022-01-13 14:50:07 +01:00 committed by GitHub
parent bcfe7c58dd
commit d14d2caa2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bukkit/build.gradle.kts
View File

@ -40,7 +40,6 @@ dependencies {
compileOnly(libs.placeholderapi) compileOnly(libs.placeholderapi)
compileOnly(libs.luckperms) compileOnly(libs.luckperms)
compileOnly(libs.essentialsx) compileOnly(libs.essentialsx)
compileOnly(libs.hyperverse) { isTransitive = false }
compileOnly(libs.mvdwapi) { isTransitive = false } compileOnly(libs.mvdwapi) { isTransitive = false }
// Other libraries // Other libraries

5
Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java
View File

@ -29,7 +29,6 @@ import com.google.inject.AbstractModule;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.plotsquared.bukkit.managers.BukkitWorldManager; import com.plotsquared.bukkit.managers.BukkitWorldManager;
import com.plotsquared.bukkit.managers.HyperverseWorldManager;
import com.plotsquared.bukkit.managers.MultiverseWorldManager; import com.plotsquared.bukkit.managers.MultiverseWorldManager;
import com.plotsquared.core.util.PlatformWorldManager; import com.plotsquared.core.util.PlatformWorldManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -40,9 +39,7 @@ public class WorldManagerModule extends AbstractModule {
@Provides @Provides
@Singleton @Singleton
PlatformWorldManager<World> provideWorldManager() { PlatformWorldManager<World> provideWorldManager() {
if (Bukkit.getPluginManager().getPlugin("Hyperverse") != null) { if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) {
return new HyperverseWorldManager();
} else if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) {
return new MultiverseWorldManager(); return new MultiverseWorldManager();
} else { } else {
return new BukkitWorldManager(); return new BukkitWorldManager();

9
Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java
View File

@ -25,6 +25,7 @@
*/ */
package com.plotsquared.bukkit.managers; package com.plotsquared.bukkit.managers;
/*
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.bukkit.World; import org.bukkit.World;
import org.checkerframework.checker.nullness.qual.NonNull; 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.WorldFeatures;
import se.hyperver.hyperverse.world.WorldType; import se.hyperver.hyperverse.world.WorldType;
/** Hyperverse implementation is currently put on ice until Hyperverse is released on a stable line and deployed to the central
* Hyperverse specific manager that creates worlds repository.
* using Hyperverse's API
*/
@Singleton @Singleton
public class HyperverseWorldManager extends BukkitWorldManager { public class HyperverseWorldManager extends BukkitWorldManager {
@ -67,3 +67,4 @@ public class HyperverseWorldManager extends BukkitWorldManager {
} }
} }
*/

5
build.gradle.kts
View File

@ -42,11 +42,6 @@ allprojects {
url = uri("https://jitpack.io") url = uri("https://jitpack.io")
} }
maven {
name = "IntellectualSites"
url = uri("https://mvn.intellectualsites.com/content/groups/public/")
}
maven { maven {
name = "EngineHub" name = "EngineHub"
url = uri("https://maven.enginehub.org/repo/") url = uri("https://maven.enginehub.org/repo/")

2
gradle/libs.versions.toml
View File

@ -23,7 +23,6 @@ vault = "1.7.1"
placeholderapi = "2.11.1" placeholderapi = "2.11.1"
luckperms = "5.3" luckperms = "5.3"
essentialsx = "2.19.2" essentialsx = "2.19.2"
hyperverse = "0.6.0-SNAPSHOT"
mvdwapi = "3.1.1" mvdwapi = "3.1.1"
# Third party # 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" } placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" }
luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" } luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" }
essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" } essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" }
hyperverse = { group = "se.hyperver.hyperverse", name = "Core", version.ref = "hyperverse" }
# Third party # Third party
prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" } prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" }