Merge pull request #22 from FrankHeijden/feature/velocity

Initial Velocity support
This commit is contained in:
Frank van der Heijden 2021-07-21 20:29:35 +02:00 committed by GitHub
commit f21306021d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 1748 additions and 50 deletions

View file

@ -5,7 +5,7 @@ archivesBaseName = rootProject.name + '-Bukkit'
dependencies {
implementation 'co.aikar:acf-paper:0.5.0-SNAPSHOT'
implementation 'org.bstats:bstats-bukkit:1.8'
implementation 'org.bstats:bstats-bukkit:2.2.1'
implementation project(":Common")
compileOnly 'com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT'
}
@ -18,7 +18,7 @@ processResources {
}
shadowJar {
relocate 'org.bstats.bukkit', dependencyDir + '.bstats'
relocate 'org.bstats', dependencyDir + '.bstats'
relocate 'co.aikar.commands', dependencyDir + '.acf'
relocate 'co.aikar.locales', dependencyDir + '.locales'
}

View file

@ -3,7 +3,7 @@ package net.frankheijden.serverutils.bukkit.entities;
import java.io.File;
import java.io.InputStream;
import net.frankheijden.serverutils.bukkit.ServerUtils;
import net.frankheijden.serverutils.common.config.YamlConfig;
import net.frankheijden.serverutils.common.config.ServerUtilsConfig;
import net.frankheijden.serverutils.common.providers.ResourceProvider;
public class BukkitResourceProvider implements ResourceProvider {
@ -20,12 +20,12 @@ public class BukkitResourceProvider implements ResourceProvider {
}
@Override
public YamlConfig load(InputStream is) {
public ServerUtilsConfig load(InputStream is) {
return new BukkitYamlConfig(is);
}
@Override
public YamlConfig load(File file) {
public ServerUtilsConfig load(File file) {
return new BukkitYamlConfig(file);
}
}

View file

@ -8,11 +8,11 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.frankheijden.serverutils.common.config.YamlConfig;
import net.frankheijden.serverutils.common.config.ServerUtilsConfig;
import org.bukkit.configuration.MemorySection;
import org.bukkit.configuration.file.YamlConfiguration;
public class BukkitYamlConfig implements YamlConfig {
public class BukkitYamlConfig implements ServerUtilsConfig {
private final MemorySection config;
private File file = null;