diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 93f386d2..1828a41b 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -9,9 +9,9 @@ eclipse { } dependencies { - implementation project(path: ':DynmapCoreAPI', configuration: 'shadow') + implementation project(':DynmapCoreAPI') implementation 'javax.servlet:javax.servlet-api:3.1' - implementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117' + implementation'org.eclipse.jetty:jetty-server:9.4.26.v20200117' implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' implementation 'com.googlecode.json-simple:json-simple:1.1.1' implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES diff --git a/README.md b/README.md index 540127f5..c693f8c9 100644 --- a/README.md +++ b/README.md @@ -45,19 +45,27 @@ The following target platforms are supported, and you can find them at the links | Server type | Version | Dynmap JAR | Where? | | ------------ | ------- | ---------- | ------ | -| Spigot/PaperMC | ≤1.18.2 | `Dynmap--spigot.jar` | [SpigotMC](https://www.spigotmc.org/resources/dynmap.274/) | -| Spigot/PaperMC | ≤1.18.2 | `Dynmap--spigot.jar` | [Bukkit](https://dev.bukkit.org/projects/dynmap) | +| Spigot/PaperMC | ≤1.20.1 | `Dynmap--spigot.jar` | [SpigotMC](https://www.spigotmc.org/resources/dynmap.274/) | +| Spigot/PaperMC | ≤1.20.1 | `Dynmap--spigot.jar` | [Bukkit](https://dev.bukkit.org/projects/dynmap) | | Forge | 1.12.2 | `Dynmap--forge-1.12.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge)| | Forge | 1.14.4 | `Dynmap--forge-1.14.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge)| | Forge | 1.15.2 | `Dynmap--forge-1.15.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge)| | Forge | 1.16.5 | `Dynmap--forge-1.16.5.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Forge | 1.17.1 | `Dynmap--forge-1.17.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Forge | 1.18, 1.18.1 | `Dynmap--forge-1.18.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Forge | 1.18.2 | `Dynmap--forge-1.18.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Forge | 1.19, 1.19.1 | `Dynmap--forge-1.19.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Forge | 1.19.2 | `Dynmap--forge-1.19.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Forge | 1.19.3, 1.19.4 | `Dynmap--forge-1.19.3.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Forge | 1.20, 1.20.1 | `Dynmap--forge-1.20.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.15.2 | `Dynmap--fabric-1.15.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.16.4, 1.16.5 | `Dynmap--fabric-1.16.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.17.1 | `Dynmap--fabric-1.17.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Fabric | 1.18, 1.18.1 | `Dynmap--fabric-1.18.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.18.2 | `Dynmap--fabric-1.18.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Fabric | 1.19 | `Dynmap--fabric-1.19.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Fabric | 1.19.1, 1.19.2 | `Dynmap--fabric-1.19.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Fabric | 1.19.3 | `Dynmap--fabric-1.19.3.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Fabric | 1.19.4 | `Dynmap--fabric-1.19.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | +| Fabric | 1.20, 1.20.1 | `Dynmap--fabric-1.20.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | # Data Storage Dynmap supports the following storage backends: diff --git a/build.gradle b/build.gradle index fe149ac5..05d18326 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.6-beta-1' + version = '3.6-beta-2' } diff --git a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs index 41340a84..119203f5 100644 --- a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs +++ b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Tue Jun 13 11:04:15 CDT 2023 +#Tue Jun 20 20:08:06 CDT 2023 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.nullReference=warning eclipse.preferences.version=1 diff --git a/dynmap-api/build.gradle b/dynmap-api/build.gradle index 2761d599..a61c1c06 100644 --- a/dynmap-api/build.gradle +++ b/dynmap-api/build.gradle @@ -9,8 +9,8 @@ eclipse { description = "dynmap-api" dependencies { - implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT' - implementation project(":DynmapCoreAPI") + compileOnly group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT' + compileOnly project(":DynmapCoreAPI") } jar { diff --git a/oldbuilds/build.gradle b/oldbuilds/build.gradle index a9d84877..858161d6 100644 --- a/oldbuilds/build.gradle +++ b/oldbuilds/build.gradle @@ -25,7 +25,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.6-beta-1' + version = '3.6-beta-2' } diff --git a/spigot/build.gradle b/spigot/build.gradle index f1158ba6..a5292e4c 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -17,21 +17,21 @@ repositories { } dependencies { - compileOnly group: 'org.bukkit', name: 'bukkit', version: '1.10.2-R0.1-SNAPSHOT' - compileOnly 'com.nijikokun.bukkit:Permissions:3.1.6' - compileOnly 'me.lucko.luckperms:luckperms-api:4.3' - compileOnly 'net.luckperms:api:5.0' + implementation('org.bukkit:bukkit:1.10.2-R0.1-SNAPSHOT') { transitive = false } + compileOnly('com.nijikokun.bukkit:Permissions:3.1.6') { transitive = false } + compileOnly('me.lucko.luckperms:luckperms-api:4.3') { transitive = false } + compileOnly('net.luckperms:api:5.0') { transitive = false } compileOnly('com.github.MilkBowl:VaultAPI:1.7') { transitive = false } - compileOnly 'net.skinsrestorer:skinsrestorer-api:14.2.+' - implementation project(":dynmap-api") - implementation project(path: ":DynmapCore", configuration: "shadow") - compileOnly group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1' - compileOnly group: 'de.bananaco', name: 'bPermissions', version: '2.9.1' - compileOnly group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6' - compileOnly group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1' + compileOnly('net.skinsrestorer:skinsrestorer-api:14.2.+') { transitive = false } + implementation(project(":dynmap-api")) { transitive = false } + implementation(project(path: ":DynmapCore", configuration: "shadow")) { transitive = false } + compileOnly('ru.tehkode:PermissionsEx:1.19.1') { transitive = false } + compileOnly('de.bananaco:bPermissions:2.9.1') { transitive = false } + compileOnly('com.platymuus.bukkit.permissions:PermissionsBukkit:1.6') { transitive = false } + compileOnly('org.anjocaido:EssentialsGroupManager:2.10.1') { transitive = false } implementation group: 'org.bstats', name: 'bstats-bukkit', version: '2.2.1' - compileOnly group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' - compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.8.9' + compileOnly('com.googlecode.json-simple:json-simple:1.1.1') { transitive = false } + compileOnly('com.google.code.gson:gson:2.8.9') { transitive = false } implementation(project(':bukkit-helper')) { transitive = false }