mirror of
https://github.com/TotalFreedomMC/TF-PlotSquared.git
synced 2024-12-23 00:15:06 +00:00
Merge branch 'breaking' into UntrustedVisit
This commit is contained in:
commit
91108a5df9
4 changed files with 11 additions and 10 deletions
|
@ -48,10 +48,10 @@ shadowJar {
|
|||
include(dependency(":Core"))
|
||||
// update notification stuff
|
||||
include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT"))
|
||||
include(dependency("com.squareup.retrofit2:retrofit:2.4.0"))
|
||||
include(dependency("com.squareup.okhttp3:okhttp:3.14.0"))
|
||||
include(dependency("com.squareup.okio:okio:2.2.2"))
|
||||
include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.30"))
|
||||
include(dependency("com.squareup.retrofit2:retrofit:2.6.2"))
|
||||
include(dependency("com.squareup.okhttp3:okhttp:4.2.2"))
|
||||
include(dependency("com.squareup.okio:okio:2.4.1"))
|
||||
include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50"))
|
||||
include(dependency("io.papermc:paperlib:1.0.2"))
|
||||
include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
|
||||
}
|
||||
|
|
|
@ -2046,13 +2046,14 @@ import java.util.regex.Pattern;
|
|||
if (type == Material.AIR) {
|
||||
type = offType;
|
||||
}
|
||||
// in the following, lb needs to have the material of the item in hand i.e. type
|
||||
lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
|
||||
if (type.isBlock()) {
|
||||
location = BukkitUtil
|
||||
.getLocation(block.getRelative(event.getBlockFace()).getLocation());
|
||||
eventType = PlayerBlockEventType.PLACE_BLOCK;
|
||||
break;
|
||||
}
|
||||
lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
|
||||
if (type.toString().toLowerCase().endsWith("egg")) {
|
||||
eventType = PlayerBlockEventType.SPAWN_MOB;
|
||||
} else {
|
||||
|
|
|
@ -5,7 +5,7 @@ def textVersion = "3.0.2"
|
|||
|
||||
dependencies {
|
||||
implementation("org.yaml:snakeyaml:1.25")
|
||||
implementation("com.google.code.gson:gson:2.8.0") {
|
||||
implementation("com.google.code.gson:gson:2.8.6") {
|
||||
because("Minecraft uses GSON 2.8.0")
|
||||
force = true
|
||||
}
|
||||
|
@ -15,9 +15,9 @@ dependencies {
|
|||
annotationProcessor("org.projectlombok:lombok:1.18.8")
|
||||
testAnnotationProcessor("org.projectlombok:lombok:1.18.8")
|
||||
implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")
|
||||
implementation("com.squareup.okhttp3:okhttp:3.14.0")
|
||||
implementation("com.squareup.okio:okio:2.2.2")
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.30")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.2.2")
|
||||
implementation("com.squareup.okio:okio:2.4.1")
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")
|
||||
}
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
|
|
|
@ -11,7 +11,7 @@ buildscript {
|
|||
}
|
||||
configurations.all {
|
||||
resolutionStrategy {
|
||||
force("org.ow2.asm:asm:7.1")
|
||||
force("org.ow2.asm:asm:7.2")
|
||||
force("org.jetbrains:annotations:17.0.0")
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue