Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mv5 #273

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Mv5 #273

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:

jobs:
test:
uses: Multiverse/Multiverse-Core/.github/workflows/generic.test.yml@main
uses: Multiverse/Multiverse-Core/.github/workflows/generic.test.yml@MV5 # todo: Change back to main before release
with:
plugin_name: multiverse-netherportals
39 changes: 30 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ plugins {
id 'java-library'
id 'maven-publish'
id 'checkstyle'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'com.gradleup.shadow' version '8.3.5'
}

version = System.getenv('GITHUB_VERSION') ?: 'local'
group = 'com.onarandombox.multiversenetherportals'
group = 'org.mvplugins.multiverse.netherportals'
description = 'Multiverse-NetherPortals'

java.sourceCompatibility = JavaVersion.VERSION_11
compileJava {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

repositories {
mavenLocal()
Expand All @@ -24,17 +27,23 @@ repositories {
name = 'onarandombox'
url = uri('https://repo.onarandombox.com/content/groups/public')
}

maven {
// todo: remove before mv5 release
name = 'benwoo1110'
url = uri('https://repo.c0ding.party/multiverse-beta')
}
}

dependencies {
// Spigot
implementation 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
implementation'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT'

// Multiverse-Core
implementation 'com.onarandombox.multiversecore:multiverse-core:4.3.11'
implementation 'org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT'

// Multiverse-Portals
implementation 'com.onarandombox.multiverseportals:multiverse-portals:4.2.2'
implementation 'org.mvplugins.multiverse.portals:multiverse-portals:5.0.0-SNAPSHOT'

// Utils
api('com.dumptruckman.minecraft:Logging:1.1.1') {
Expand Down Expand Up @@ -113,13 +122,25 @@ javadoc {
project.configurations.api.canBeResolved = true

shadowJar {
relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.multiverseportals.util.MVPLogging'
relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.multiverseportals.util.DebugFileLogger'
relocate 'com.dumptruckman.minecraft.util.Logging', 'org.mvplugins.multiverse.netherportals.util.MVPLogging'
relocate 'com.dumptruckman.minecraft.util.DebugLog', 'org.mvplugins.multiverse.netherportals.util.DebugFileLogger'

configurations = [project.configurations.api]

archiveFileName = "$baseName-$version.$extension"
archiveClassifier.set('')
}

build.dependsOn shadowJar
jar.enabled = false


tasks.register('runHabitatGenerator', JavaExec) {
classpath = configurations["compileClasspath"]
mainClass.set('org.mvplugins.multiverse.external.jvnet.hk2.generator.HabitatGenerator')

args = [
'--file', "build/libs/multiverse-netherportals-$version" + ".jar",
'--locator', 'Multiverse-NetherPortals',
]
}
tasks.named("build") { finalizedBy("runHabitatGenerator") }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading