diff --git a/api/src/main/java/kr/toxicity/model/api/BetterModel.java b/api/src/main/java/kr/toxicity/model/api/BetterModel.java index 7442092..1369a10 100644 --- a/api/src/main/java/kr/toxicity/model/api/BetterModel.java +++ b/api/src/main/java/kr/toxicity/model/api/BetterModel.java @@ -9,7 +9,13 @@ /** * A dummy class for BetterModel plugin instance. */ -public class BetterModel { +public final class BetterModel { + + /** + * Private initializer + */ + private BetterModel() {} + /** * Checks running platform is Paper. */ diff --git a/api/src/main/java/kr/toxicity/model/api/event/ModelDamagedEvent.java b/api/src/main/java/kr/toxicity/model/api/event/ModelDamagedEvent.java index 44cb519..aeb66b3 100644 --- a/api/src/main/java/kr/toxicity/model/api/event/ModelDamagedEvent.java +++ b/api/src/main/java/kr/toxicity/model/api/event/ModelDamagedEvent.java @@ -10,7 +10,7 @@ @Getter @Setter -public class ModelDamagedEvent extends EntityEvent implements Cancellable { +public final class ModelDamagedEvent extends EntityEvent implements Cancellable { public static final HandlerList HANDLER_LIST = new HandlerList(); diff --git a/api/src/main/java/kr/toxicity/model/api/event/ModelInteractEvent.java b/api/src/main/java/kr/toxicity/model/api/event/ModelInteractEvent.java index a87563b..ce3c629 100644 --- a/api/src/main/java/kr/toxicity/model/api/event/ModelInteractEvent.java +++ b/api/src/main/java/kr/toxicity/model/api/event/ModelInteractEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; @Getter -public class ModelInteractEvent extends PlayerEvent implements Cancellable { +public final class ModelInteractEvent extends PlayerEvent implements Cancellable { public static final HandlerList HANDLER_LIST = new HandlerList(); diff --git a/build.gradle.kts b/build.gradle.kts index f122995..3b64c12 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin("jvm") version "2.1.0" id("org.jetbrains.dokka") version "2.0.0" id("io.github.goooler.shadow") version "8.1.8" - id("io.papermc.paperweight.userdev") version "2.0.0-beta.12" apply false + id("io.papermc.paperweight.userdev") version "2.0.0-beta.13" apply false id("xyz.jpenilla.run-paper") version "2.3.1" id("xyz.jpenilla.resource-factory-bukkit-convention") version "1.2.0" id("com.modrinth.minotaur") version "2.+" @@ -22,7 +22,7 @@ allprojects { apply(plugin = "kotlin") apply(plugin = "org.jetbrains.dokka") group = "kr.toxicity.model" - version = "1.3.2" + (buildNumber?.let { "-SNAPSHOT-$it" } ?: "") + version = "1.3.3" + (buildNumber?.let { "-SNAPSHOT-$it" } ?: "") repositories { mavenCentral() maven("https://repo.papermc.io/repository/maven-public/") diff --git a/changelog/1.3.3.md b/changelog/1.3.3.md new file mode 100644 index 0000000..e385ee5 --- /dev/null +++ b/changelog/1.3.3.md @@ -0,0 +1 @@ +# BetterModel 1.3.3 diff --git a/nms/v1_19_R3/src/main/kotlin/kr/toxicity/model/nms/v1_19_R3/HitBoxImpl.kt b/nms/v1_19_R3/src/main/kotlin/kr/toxicity/model/nms/v1_19_R3/HitBoxImpl.kt index 191050e..38ac449 100644 --- a/nms/v1_19_R3/src/main/kotlin/kr/toxicity/model/nms/v1_19_R3/HitBoxImpl.kt +++ b/nms/v1_19_R3/src/main/kotlin/kr/toxicity/model/nms/v1_19_R3/HitBoxImpl.kt @@ -74,6 +74,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + updatingSectionStatus = false super.remove(reason) listener.remove(this) } diff --git a/nms/v1_20_R1/src/main/kotlin/kr/toxicity/model/nms/v1_20_R1/HitBoxImpl.kt b/nms/v1_20_R1/src/main/kotlin/kr/toxicity/model/nms/v1_20_R1/HitBoxImpl.kt index e6ed4b0..3ea5594 100644 --- a/nms/v1_20_R1/src/main/kotlin/kr/toxicity/model/nms/v1_20_R1/HitBoxImpl.kt +++ b/nms/v1_20_R1/src/main/kotlin/kr/toxicity/model/nms/v1_20_R1/HitBoxImpl.kt @@ -74,6 +74,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + updatingSectionStatus = false super.remove(reason) listener.remove(this) } diff --git a/nms/v1_20_R2/src/main/kotlin/kr/toxicity/model/nms/v1_20_R2/HitBoxImpl.kt b/nms/v1_20_R2/src/main/kotlin/kr/toxicity/model/nms/v1_20_R2/HitBoxImpl.kt index 441db62..8d9bfa1 100644 --- a/nms/v1_20_R2/src/main/kotlin/kr/toxicity/model/nms/v1_20_R2/HitBoxImpl.kt +++ b/nms/v1_20_R2/src/main/kotlin/kr/toxicity/model/nms/v1_20_R2/HitBoxImpl.kt @@ -74,6 +74,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + updatingSectionStatus = false super.remove(reason) listener.remove(this) } diff --git a/nms/v1_20_R3/src/main/kotlin/kr/toxicity/model/nms/v1_20_R3/HitBoxImpl.kt b/nms/v1_20_R3/src/main/kotlin/kr/toxicity/model/nms/v1_20_R3/HitBoxImpl.kt index 5569d9a..66b7ba9 100644 --- a/nms/v1_20_R3/src/main/kotlin/kr/toxicity/model/nms/v1_20_R3/HitBoxImpl.kt +++ b/nms/v1_20_R3/src/main/kotlin/kr/toxicity/model/nms/v1_20_R3/HitBoxImpl.kt @@ -74,6 +74,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + updatingSectionStatus = false super.remove(reason) listener.remove(this) } diff --git a/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/HitBoxImpl.kt b/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/HitBoxImpl.kt index 12b8604..39e4ecc 100644 --- a/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/HitBoxImpl.kt +++ b/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/HitBoxImpl.kt @@ -75,6 +75,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + updatingSectionStatus = false super.remove(reason) listener.remove(this) } diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/HitBoxImpl.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/HitBoxImpl.kt index 4f67b5e..1ad276c 100644 --- a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/HitBoxImpl.kt +++ b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/HitBoxImpl.kt @@ -76,6 +76,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + if (BetterModel.IS_PAPER) `moonrise$setUpdatingSectionStatus`(false) super.remove(reason) listener.remove(this) } diff --git a/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/HitBoxImpl.kt b/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/HitBoxImpl.kt index 8ad426b..8709354 100644 --- a/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/HitBoxImpl.kt +++ b/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/HitBoxImpl.kt @@ -77,6 +77,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + if (BetterModel.IS_PAPER) `moonrise$setUpdatingSectionStatus`(false) super.remove(reason) listener.remove(this) } diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/HitBoxImpl.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/HitBoxImpl.kt index 0b31e3d..f36e74e 100644 --- a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/HitBoxImpl.kt +++ b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/HitBoxImpl.kt @@ -77,6 +77,7 @@ class HitBoxImpl( } override fun remove(reason: RemovalReason) { + if (BetterModel.IS_PAPER) `moonrise$setUpdatingSectionStatus`(false) super.remove(reason) listener.remove(this) }