Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Updated bukkit/spigot build for minecraft 1.16.4

Browse source
This commit is contained in:
Thomas Janssen 2020-11-03 21:49:40 +01:00
parent 487ced7018
commit 5a0314e17c
7 changed files with 799 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

47
spigot/build.gradle
View file

@ -1,4 +1,3 @@
description = 'dynmap'
repositories {
@ -11,7 +10,7 @@ repositories {
}
dependencies {
compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
compile group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT'
compile 'com.nijikokun.bukkit:Permissions:3.1.6'
compile 'me.lucko.luckperms:luckperms-api:4.3'
compile 'net.luckperms:api:5.0'
@ -19,38 +18,41 @@ dependencies {
compileOnly 'com:skinsrestorer:13.7.5-20191221.213031-7@jar'
compile project(":dynmap-api")
compile project(path: ":DynmapCore", configuration: "shadow")
compile group: 'ru.tehkode', name: 'PermissionsEx', version:'1.19.1'
compile group: 'de.bananaco', name: 'bPermissions', version:'2.9.1'
compile group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version:'1.6'
compile group: 'org.anjocaido', name: 'EssentialsGroupManager', version:'2.10.1'
compile group: 'org.bstats', name: 'bstats-bukkit', version:'1.5'
compile group: 'com.googlecode.json-simple', name: 'json-simple', version:'1.1.1'
compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2'
compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
compile group: 'de.bananaco', name: 'bPermissions', version: '2.9.1'
compile group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6'
compile group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1'
compile group: 'org.bstats', name: 'bstats-bukkit', version: '1.5'
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
compile project(':bukkit-helper')
implementation(project(':bukkit-helper-113-2')) {
implementation(project(':bukkit-helper-113-2')) {
transitive = false
}
implementation(project(':bukkit-helper-114-1')) {
implementation(project(':bukkit-helper-114-1')) {
transitive = false
}
implementation(project(':bukkit-helper-115')) {
implementation(project(':bukkit-helper-115')) {
transitive = false
}
implementation(project(':bukkit-helper-116')) {
implementation(project(':bukkit-helper-116')) {
transitive = false
}
implementation(project(':bukkit-helper-116-2')) {
implementation(project(':bukkit-helper-116-2')) {
transitive = false
}
implementation(project(':bukkit-helper-116-3')) {
implementation(project(':bukkit-helper-116-3')) {
transitive = false
}
implementation(project(':bukkit-helper-116-4')) {
transitive = false
}
}
processResources {
// replace stuff in mcmod.info, nothing else
from('src/main/resources') {
include "plugin.yml"
from('src/main/resources') {
include "plugin.yml"
// replace version and mcversion
expand(
buildnumber: project.parent.ext.globals.buildNumber,
@ -60,14 +62,14 @@ processResources {
}
jar {
classifier = 'unshaded'
classifier = 'unshaded'
}
shadowJar {
dependencies {
include(dependency('org.bstats::'))
include(dependency(':dynmap-api'))
include(dependency(":DynmapCore"))
include(dependency(':dynmap-api'))
include(dependency(":DynmapCore"))
include(dependency(':bukkit-helper'))
include(dependency(':bukkit-helper-113-2'))
include(dependency(':bukkit-helper-114-1'))
@ -75,8 +77,9 @@ shadowJar {
include(dependency(':bukkit-helper-116'))
include(dependency(':bukkit-helper-116-2'))
include(dependency(':bukkit-helper-116-3'))
}
relocate('org.bstats', 'org.dynmap.bstats')
include(dependency(':bukkit-helper-116-4'))
}
relocate('org.bstats', 'org.dynmap.bstats')
destinationDir = file '../target'
archiveName = "Dynmap-${parent.version}-spigot.jar"
classifier = ''

41
spigot/src/main/java/org/dynmap/bukkit/Helper.java
View file

@ -5,12 +5,7 @@ import org.dynmap.Log;
import org.dynmap.bukkit.helper.BukkitVersionHelper;
import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
import org.dynmap.bukkit.helper.BukkitVersionHelperGlowstone;
import org.dynmap.bukkit.helper.v113_2.BukkitVersionHelperSpigot113_2;
import org.dynmap.bukkit.helper.v114_1.BukkitVersionHelperSpigot114_1;
import org.dynmap.bukkit.helper.v115.BukkitVersionHelperSpigot115;
import org.dynmap.bukkit.helper.v116.BukkitVersionHelperSpigot116;
import org.dynmap.bukkit.helper.v116_2.BukkitVersionHelperSpigot116_2;
import org.dynmap.bukkit.helper.v116_3.BukkitVersionHelperSpigot116_3;
import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4;
public class Helper {
@ -36,25 +31,25 @@ public class Helper {
Log.info("Loading Glowstone support");
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
}
else if (v.contains("(MC: 1.16)") || v.contains("(MC: 1.16.1")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116();
}
else if (v.contains("(MC: 1.16.2)")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116_2();
}
// else if (v.contains("(MC: 1.16)") || v.contains("(MC: 1.16.1")) {
// BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116();
// }
// else if (v.contains("(MC: 1.16.2)")) {
// BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116_2();
// }
else if (v.contains("(MC: 1.16.")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116_3();
}
else if (v.contains("(MC: 1.15)") || v.contains("(MC: 1.15.")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115();
}
else if (v.contains("(MC: 1.14)") || v.contains("(MC: 1.14.1)") || v.contains("(MC: 1.14.2)") ||
v.contains("(MC: 1.14.3)") || v.contains("(MC: 1.14.4)")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114_1();
}
else if (v.contains("(MC: 1.13.2)")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_2();
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116_4();
}
// else if (v.contains("(MC: 1.15)") || v.contains("(MC: 1.15.")) {
// BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115();
// }
// else if (v.contains("(MC: 1.14)") || v.contains("(MC: 1.14.1)") || v.contains("(MC: 1.14.2)") ||
// v.contains("(MC: 1.14.3)") || v.contains("(MC: 1.14.4)")) {
// BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114_1();
// }
// else if (v.contains("(MC: 1.13.2)")) {
// BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_2();
// }
else {
BukkitVersionHelper.helper = new BukkitVersionHelperCB();
}