Skip to content
Open
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
39 changes: 26 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ import org.apache.tools.ant.filters.ReplaceTokens

buildscript {
repositories {
jcenter()
mavenCentral()

// used for shadowjar
maven {
url "https://plugins.gradle.org/m2/"
}
}

dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plugin version is severely outdated.

}
}

Expand All @@ -17,8 +22,8 @@ allprojects {
group = pluginGroup
version = pluginVersion

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
Comment on lines +25 to +26

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is 10 major versions behind, are you okay?


repositories {
mavenCentral()
Expand All @@ -32,11 +37,11 @@ allprojects {
}
maven {
// WorldEdit
url = 'http://maven.sk89q.com/repo/'
url = 'https://maven.sk89q.com/repo/'
}
maven {
// ProtocolLib
url "http://repo.dmulloy2.net/nexus/repository/public/"
url "https://repo.dmulloy2.net/nexus/repository/public/"
}
// PaperLib
maven {
Expand All @@ -50,6 +55,7 @@ allprojects {

processResources {
from(sourceSets.main.resources.srcDirs) {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
filter ReplaceTokens, tokens: [version: version]
}
}
Expand All @@ -64,18 +70,25 @@ dependencies {
//shadow 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT'
shadow 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please target latest minecraft, 1.21.10

shadow 'com.github.MilkBowl:VaultAPI:1.7'
compile 'net.wesjd:anvilgui:1.5.0-SNAPSHOT'
compile 'com.github.Mezy:BiomeMapping:master-SNAPSHOT'
compile "io.papermc:paperlib:1.0.5"
shadow 'com.comphenix.protocol:ProtocolLib:4.4.0'
compile project('Support-WorldEdit-6')
compile project('Support-WorldEdit-7')

implementation 'net.wesjd:anvilgui:1.5.0-SNAPSHOT'
implementation 'com.github.Mezy:BiomeMapping:master-SNAPSHOT'
implementation "io.papermc:paperlib:1.0.5"

// this should be on the server anyway
compileOnly 'com.comphenix.protocol:ProtocolLib:4.4.0'

implementation project('Support-WorldEdit-6')
implementation project('Support-WorldEdit-7')
}

shadowJar {
project.configurations.implementation.canBeResolved = true
configurations = [project.configurations.implementation]

classifier = ''
configurations = [project.configurations.compile]
relocate 'io.papermc.lib', 'com.gmail.val59000mc.paperlib'
minimize()
}

build.dependsOn(shadowJar)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No newline at EOF

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pluginGroup=com.gmail.val59000mc
pluginVersion=1.19.2
pluginVersion=1.20.0

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No newline at EOF.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Gradle version is severely out of date. We should be using at least Gradle 9.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would agree, but since this is voluntary work I do not care about updating my stuff to latest. Can break stuff in production anyway. Our system is still on 1.16..

zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
53 changes: 33 additions & 20 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

173 changes: 89 additions & 84 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/java/com/gmail/val59000mc/UhcCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class UhcCore extends JavaPlugin{
private Updater updater;

@Override
public void onEnable(){
public void onEnable() {
pl = this;

loadServerVersion();
Expand Down
Loading