diff --git a/build.gradle.kts b/build.gradle.kts index 234f33b..2e171c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,9 @@ +import java.util.* + plugins { id("java-library") id("maven-publish") - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.github.johnrengelman.shadow") version "8.1.1" } java { @@ -22,7 +24,7 @@ repositories { } dependencies { - compileOnly(group = "org.spigotmc", name = "spigot-api", version = "1.20.1-R0.1-SNAPSHOT") + compileOnly(group = "org.spigotmc", name = "spigot-api", version = "1.20.4-R0.1-SNAPSHOT") compileOnly(group = "com.sk89q.worldedit", name = "worldedit-core", version = "7.1.0") compileOnly(group = "com.sk89q.worldguard", name = "worldguard-bukkit", version = "7.0.0") compileOnly(group = "com.palmergames.bukkit.towny", name = "towny", version = "0.98.2.0") @@ -31,7 +33,7 @@ dependencies { } compileOnly(group = "com.github.MilkBowl", name = "VaultAPI", version = "1.7.1") compileOnly(group = "com.google.guava", name = "guava", version = "23.0") - implementation(group = "org.bstats", name = "bstats-bukkit", version = "3.0.0") + implementation(group = "org.bstats", name = "bstats-bukkit", version = "3.0.2") } tasks { @@ -50,7 +52,7 @@ tasks { } shadowJar { archiveClassifier.set("") - archiveFileName.set("${rootProject.name.toUpperCase()}-${project.version}.jar") + archiveFileName.set("${rootProject.name.uppercase(Locale.getDefault())}-${project.version}.jar") relocate("org.bstats", "${project.group}.${rootProject.name}.lib.bstats") } build { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/griefcraft/bukkit/EntityBlockState.java b/src/main/java/com/griefcraft/bukkit/EntityBlockState.java index 2cfd6cc..59807fe 100644 --- a/src/main/java/com/griefcraft/bukkit/EntityBlockState.java +++ b/src/main/java/com/griefcraft/bukkit/EntityBlockState.java @@ -146,6 +146,11 @@ public BlockData getBlockData() { return null; } + @Override + public BlockState copy() { + return null; + } + @Override public void setBlockData(BlockData arg0) { // TODO Auto-generated method stub diff --git a/src/main/java/com/griefcraft/util/MaterialUtil.java b/src/main/java/com/griefcraft/util/MaterialUtil.java index 432c32f..496d949 100644 --- a/src/main/java/com/griefcraft/util/MaterialUtil.java +++ b/src/main/java/com/griefcraft/util/MaterialUtil.java @@ -15,7 +15,7 @@ public static Material getMaterialById(int id) { case 1: return Material.STONE; case 2: - return Material.GRASS; + return Material.GRASS_BLOCK; case 3: return Material.DIRT; case 4: