trueog/MobHeads-OG
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Ktfmt (Kotlin-style) using Spotless

Browse Source
This commit is contained in:
SKBotNL committed 2025-06-17 23:38:48 +02:00
1 parent 3f1d2d1028
commit 72263e0c2f
6 files changed
+1790 -1174
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle.kts
+10
View File
@@ -3,6 +3,7 @@ import java.io.BufferedReader
plugins {
kotlin("jvm") version "2.1.21"
id("com.gradleup.shadow") version "8.3.6"
id("com.diffplug.spotless") version "7.0.4"
eclipse
}
@@ -48,6 +49,7 @@ kotlin {
}
tasks.build {
dependsOn(tasks.spotlessApply)
dependsOn(tasks.shadowJar)
}
@@ -87,3 +89,11 @@ java {
vendor = JvmVendorSpec.GRAAL_VM
}
}
spotless {
kotlin {
ktfmt().kotlinlangStyle().configure {
it.setMaxWidth(120)
}
}
}
src/main/kotlin/net/trueog/mobHeadsOG/Config.kt
+26 -23
View File
@@ -1,17 +1,15 @@
package net.trueog.mobHeadsOG
import java.io.File
import org.bukkit.configuration.file.YamlConfiguration
import org.bukkit.entity.EntityType
import java.io.File
class Config {
val dropChances: MutableMap<EntityType, Double> = mutableMapOf()
var chargedCreeperChance: Double = 0.0
/**
* @return True if successful
*/
/** @return True if successful */
fun load(): Boolean {
val file = File(MobHeadsOG.plugin.dataFolder, "config.yml")
if (!file.exists()) {
@@ -26,32 +24,37 @@ class Config {
}
for (key in dropChancesSection.getKeys(false)) {
if (key.lowercase() == "charged_creeper") {
val dropChance = try {
val dropChance =
try {
dropChancesSection.get(key) as Double
} catch (_: ClassCastException) {
MobHeadsOG.plugin.logger.severe("Failed to parse the drop chance of $key as a valid double")
return false
}
chargedCreeperChance = dropChance
continue
}
val entityType =
try {
EntityType.valueOf(key.uppercase())
} catch (_: IllegalArgumentException) {
MobHeadsOG.plugin.logger.severe("Failed to parse $key as a valid EntityType")
return false
}
val dropChance =
try {
dropChancesSection.get(key) as Double
} catch (_: ClassCastException) {
MobHeadsOG.plugin.logger.severe("Failed to parse the drop chance of $key as a valid double")
return false
}
chargedCreeperChance = dropChance
continue
}
val entityType = try {
EntityType.valueOf(key.uppercase())
} catch (_: IllegalArgumentException) {
MobHeadsOG.plugin.logger.severe("Failed to parse $key as a valid EntityType")
return false
}
val dropChance = try {
dropChancesSection.get(key) as Double
} catch (_: ClassCastException) {
MobHeadsOG.plugin.logger.severe("Failed to parse the drop chance of $key as a valid double")
return false
}
if (dropChance > 1 || dropChance < 0) {
MobHeadsOG.plugin.logger.severe("The drop chance of $key is not a valid chance (the drop chance must not be smaller than 0 and not bigger than 1)")
MobHeadsOG.plugin.logger.severe(
"The drop chance of $key is not a valid chance (the drop chance must not be smaller than 0 and not bigger than 1)"
)
return false
}
src/main/kotlin/net/trueog/mobHeadsOG/Events.kt
+10 -14
View File
@@ -1,5 +1,6 @@
package net.trueog.mobHeadsOG
import java.util.*
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.TextDecoration
import org.bukkit.Bukkit.createProfile
@@ -20,7 +21,6 @@ import org.bukkit.inventory.meta.SkullMeta
import org.bukkit.metadata.FixedMetadataValue
import org.bukkit.persistence.PersistentDataType
import org.bukkit.profile.PlayerTextures
import java.util.*
class Events : Listener {
val customMobHeadKey = NamespacedKey(MobHeadsOG.plugin, "customMobHead")
@@ -36,11 +36,12 @@ class Events : Listener {
return
}
val dropChance = if (event.entityType == EntityType.CREEPER && (event.entity as Creeper).isPowered) {
MobHeadsOG.config.chargedCreeperChance
} else {
MobHeadsOG.config.dropChances[event.entityType]
}
val dropChance =
if (event.entityType == EntityType.CREEPER && (event.entity as Creeper).isPowered) {
MobHeadsOG.config.chargedCreeperChance
} else {
MobHeadsOG.config.dropChances[event.entityType]
}
if (dropChance == null) {
return
@@ -92,9 +93,7 @@ class Events : Listener {
headMeta.persistentDataContainer.set(customMobHeadKey, PersistentDataType.STRING, stringRepresentation)
headMeta.displayName(
Component.text("${Heads.getNameForEntity(event.entity)} Head").decoration(
TextDecoration.ITALIC, false
)
Component.text("${Heads.getNameForEntity(event.entity)} Head").decoration(TextDecoration.ITALIC, false)
)
textures.setSkin(skinUrl, PlayerTextures.SkinModel.CLASSIC)
profile.setTextures(textures)
@@ -146,9 +145,7 @@ class Events : Listener {
headMeta.persistentDataContainer.set(customMobHeadKey, PersistentDataType.STRING, customMobHeadData)
headMeta.displayName(
Component.text("${Heads.getNameForEntity(customMobHeadData)} Head").decoration(
TextDecoration.ITALIC, false
)
Component.text("${Heads.getNameForEntity(customMobHeadData)} Head").decoration(TextDecoration.ITALIC, false)
)
textures.setSkin(skinUrl, PlayerTextures.SkinModel.CLASSIC)
profile.setTextures(textures)
@@ -156,7 +153,6 @@ class Events : Listener {
headMeta.playerProfile = profile
head.itemMeta = headMeta
event.block.world.dropItemNaturally(event.block.location, head)
event.block.type = Material.AIR
}
@@ -180,4 +176,4 @@ class Events : Listener {
event.player.sendActionBar(MobHeadsOG.mm.deserialize("<yellow>$name Head"))
}
}
}
src/main/kotlin/net/trueog/mobHeadsOG/Fish.kt
+173 -45
View File
@@ -27,53 +27,141 @@ object Fish {
TOMATO_CLOWNFISH, // Red-White Kob
TRIGGERFISH, // Gray-White Sunstreak
YELLOWTAIL_PARROTFISH, // Cyan-Yellow Dasher
YELLOW_TANG // Yellow Flopper
YELLOW_TANG, // Yellow Flopper
}
fun getSpecialFishType(fish: TropicalFish): SpecialFishType? {
if (fish.bodyColor == DyeColor.ORANGE && fish.patternColor == DyeColor.GRAY && fish.pattern === TropicalFish.Pattern.STRIPEY) {
if (
fish.bodyColor == DyeColor.ORANGE &&
fish.patternColor == DyeColor.GRAY &&
fish.pattern === TropicalFish.Pattern.STRIPEY
) {
return SpecialFishType.ANEMONE
} else if (fish.bodyColor == DyeColor.GRAY && fish.patternColor == DyeColor.GRAY && fish.pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
fish.bodyColor == DyeColor.GRAY &&
fish.patternColor == DyeColor.GRAY &&
fish.pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.BLACK_TANG
} else if (fish.bodyColor == DyeColor.GRAY && fish.patternColor == DyeColor.BLUE && fish.pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
fish.bodyColor == DyeColor.GRAY &&
fish.patternColor == DyeColor.BLUE &&
fish.pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.BLUE_TANG
} else if (fish.bodyColor == DyeColor.WHITE && fish.patternColor == DyeColor.GRAY && fish.pattern == TropicalFish.Pattern.CLAYFISH) {
} else if (
fish.bodyColor == DyeColor.WHITE &&
fish.patternColor == DyeColor.GRAY &&
fish.pattern == TropicalFish.Pattern.CLAYFISH
) {
return SpecialFishType.BUTTERFLYFISH
} else if (fish.bodyColor == DyeColor.BLUE && fish.patternColor == DyeColor.GRAY && fish.pattern == TropicalFish.Pattern.SUNSTREAK) {
} else if (
fish.bodyColor == DyeColor.BLUE &&
fish.patternColor == DyeColor.GRAY &&
fish.pattern == TropicalFish.Pattern.SUNSTREAK
) {
return SpecialFishType.CICHLID
} else if (fish.bodyColor == DyeColor.ORANGE && fish.patternColor == DyeColor.WHITE && fish.pattern == TropicalFish.Pattern.KOB) {
} else if (
fish.bodyColor == DyeColor.ORANGE &&
fish.patternColor == DyeColor.WHITE &&
fish.pattern == TropicalFish.Pattern.KOB
) {
return SpecialFishType.CLOWNFISH
} else if (fish.bodyColor == DyeColor.PINK && fish.patternColor == DyeColor.LIGHT_BLUE && fish.pattern == TropicalFish.Pattern.SPOTTY) {
} else if (
fish.bodyColor == DyeColor.PINK &&
fish.patternColor == DyeColor.LIGHT_BLUE &&
fish.pattern == TropicalFish.Pattern.SPOTTY
) {
return SpecialFishType.COTTON_CANDY_BETTA
} else if (fish.bodyColor == DyeColor.PURPLE && fish.patternColor == DyeColor.YELLOW && fish.pattern == TropicalFish.Pattern.BLOCKFISH) {
} else if (
fish.bodyColor == DyeColor.PURPLE &&
fish.patternColor == DyeColor.YELLOW &&
fish.pattern == TropicalFish.Pattern.BLOCKFISH
) {
return SpecialFishType.DOTTYBACK
} else if (fish.bodyColor == DyeColor.WHITE && fish.patternColor == DyeColor.RED && fish.pattern == TropicalFish.Pattern.CLAYFISH) {
} else if (
fish.bodyColor == DyeColor.WHITE &&
fish.patternColor == DyeColor.RED &&
fish.pattern == TropicalFish.Pattern.CLAYFISH
) {
return SpecialFishType.EMPEROR_RED_SNAPPER
} else if (fish.bodyColor == DyeColor.WHITE && fish.patternColor == DyeColor.YELLOW && fish.pattern == TropicalFish.Pattern.SPOTTY) {
} else if (
fish.bodyColor == DyeColor.WHITE &&
fish.patternColor == DyeColor.YELLOW &&
fish.pattern == TropicalFish.Pattern.SPOTTY
) {
return SpecialFishType.GOATFISH
} else if (fish.bodyColor == DyeColor.WHITE && fish.patternColor == DyeColor.GRAY && fish.pattern == TropicalFish.Pattern.GLITTER) {
} else if (
fish.bodyColor == DyeColor.WHITE &&
fish.patternColor == DyeColor.GRAY &&
fish.pattern == TropicalFish.Pattern.GLITTER
) {
return SpecialFishType.MOORISH_IDOL
} else if (fish.bodyColor == DyeColor.WHITE && fish.patternColor == DyeColor.ORANGE && fish.pattern == TropicalFish.Pattern.CLAYFISH) {
} else if (
fish.bodyColor == DyeColor.WHITE &&
fish.patternColor == DyeColor.ORANGE &&
fish.pattern == TropicalFish.Pattern.CLAYFISH
) {
return SpecialFishType.ORNATE_BUTTERFLYFISH
} else if (fish.bodyColor == DyeColor.CYAN && fish.patternColor == DyeColor.PINK && fish.pattern == TropicalFish.Pattern.DASHER) {
} else if (
fish.bodyColor == DyeColor.CYAN &&
fish.patternColor == DyeColor.PINK &&
fish.pattern == TropicalFish.Pattern.DASHER
) {
return SpecialFishType.PARROTFISH
} else if (fish.bodyColor == DyeColor.LIME && fish.patternColor == DyeColor.LIGHT_BLUE && fish.pattern == TropicalFish.Pattern.BRINELY) {
} else if (
fish.bodyColor == DyeColor.LIME &&
fish.patternColor == DyeColor.LIGHT_BLUE &&
fish.pattern == TropicalFish.Pattern.BRINELY
) {
return SpecialFishType.QUEEN_ANGELFISH
} else if (fish.bodyColor == DyeColor.RED && fish.patternColor == DyeColor.WHITE && fish.pattern == TropicalFish.Pattern.BETTY) {
} else if (
fish.bodyColor == DyeColor.RED &&
fish.patternColor == DyeColor.WHITE &&
fish.pattern == TropicalFish.Pattern.BETTY
) {
return SpecialFishType.RED_CICHLID
} else if (fish.bodyColor == DyeColor.GRAY && fish.patternColor == DyeColor.RED && fish.pattern == TropicalFish.Pattern.SNOOPER) {
} else if (
fish.bodyColor == DyeColor.GRAY &&
fish.patternColor == DyeColor.RED &&
fish.pattern == TropicalFish.Pattern.SNOOPER
) {
return SpecialFishType.RED_LIPPED_BLENNY
} else if (fish.bodyColor == DyeColor.RED && fish.patternColor == DyeColor.WHITE && fish.pattern == TropicalFish.Pattern.BLOCKFISH) {
} else if (
fish.bodyColor == DyeColor.RED &&
fish.patternColor == DyeColor.WHITE &&
fish.pattern == TropicalFish.Pattern.BLOCKFISH
) {
return SpecialFishType.RED_SNAPPER
} else if (fish.bodyColor == DyeColor.WHITE && fish.patternColor == DyeColor.YELLOW && fish.pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
fish.bodyColor == DyeColor.WHITE &&
fish.patternColor == DyeColor.YELLOW &&
fish.pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.THREADFIN
} else if (fish.bodyColor == DyeColor.RED && fish.patternColor == DyeColor.WHITE && fish.pattern == TropicalFish.Pattern.KOB) {
} else if (
fish.bodyColor == DyeColor.RED &&
fish.patternColor == DyeColor.WHITE &&
fish.pattern == TropicalFish.Pattern.KOB
) {
return SpecialFishType.TOMATO_CLOWNFISH
} else if (fish.bodyColor == DyeColor.GRAY && fish.patternColor == DyeColor.WHITE && fish.pattern == TropicalFish.Pattern.SUNSTREAK) {
} else if (
fish.bodyColor == DyeColor.GRAY &&
fish.patternColor == DyeColor.WHITE &&
fish.pattern == TropicalFish.Pattern.SUNSTREAK
) {
return SpecialFishType.TRIGGERFISH
} else if (fish.bodyColor == DyeColor.CYAN && fish.patternColor == DyeColor.YELLOW && fish.pattern == TropicalFish.Pattern.DASHER) {
} else if (
fish.bodyColor == DyeColor.CYAN &&
fish.patternColor == DyeColor.YELLOW &&
fish.pattern == TropicalFish.Pattern.DASHER
) {
return SpecialFishType.YELLOWTAIL_PARROTFISH
} else if (fish.bodyColor == DyeColor.YELLOW && fish.patternColor == DyeColor.YELLOW && fish.pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
fish.bodyColor == DyeColor.YELLOW &&
fish.patternColor == DyeColor.YELLOW &&
fish.pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.YELLOW_TANG
}
return null
@@ -82,53 +170,93 @@ object Fish {
fun getSpecialFishType(
bodyColor: DyeColor,
patternColor: DyeColor,
pattern: TropicalFish.Pattern
pattern: TropicalFish.Pattern,
): SpecialFishType? {
if (bodyColor == DyeColor.ORANGE && patternColor == DyeColor.GRAY && pattern === TropicalFish.Pattern.STRIPEY) {
return SpecialFishType.ANEMONE
} else if (bodyColor == DyeColor.GRAY && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
bodyColor == DyeColor.GRAY && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.BLACK_TANG
} else if (bodyColor == DyeColor.GRAY && patternColor == DyeColor.BLUE && pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
bodyColor == DyeColor.GRAY && patternColor == DyeColor.BLUE && pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.BLUE_TANG
} else if (bodyColor == DyeColor.WHITE && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.CLAYFISH) {
} else if (
bodyColor == DyeColor.WHITE && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.CLAYFISH
) {
return SpecialFishType.BUTTERFLYFISH
} else if (bodyColor == DyeColor.BLUE && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.SUNSTREAK) {
} else if (
bodyColor == DyeColor.BLUE && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.SUNSTREAK
) {
return SpecialFishType.CICHLID
} else if (bodyColor == DyeColor.ORANGE && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.KOB) {
} else if (
bodyColor == DyeColor.ORANGE && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.KOB
) {
return SpecialFishType.CLOWNFISH
} else if (bodyColor == DyeColor.PINK && patternColor == DyeColor.LIGHT_BLUE && pattern == TropicalFish.Pattern.SPOTTY) {
} else if (
bodyColor == DyeColor.PINK && patternColor == DyeColor.LIGHT_BLUE && pattern == TropicalFish.Pattern.SPOTTY
) {
return SpecialFishType.COTTON_CANDY_BETTA
} else if (bodyColor == DyeColor.PURPLE && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.BLOCKFISH) {
} else if (
bodyColor == DyeColor.PURPLE && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.BLOCKFISH
) {
return SpecialFishType.DOTTYBACK
} else if (bodyColor == DyeColor.WHITE && patternColor == DyeColor.RED && pattern == TropicalFish.Pattern.CLAYFISH) {
} else if (
bodyColor == DyeColor.WHITE && patternColor == DyeColor.RED && pattern == TropicalFish.Pattern.CLAYFISH
) {
return SpecialFishType.EMPEROR_RED_SNAPPER
} else if (bodyColor == DyeColor.WHITE && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.SPOTTY) {
} else if (
bodyColor == DyeColor.WHITE && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.SPOTTY
) {
return SpecialFishType.GOATFISH
} else if (bodyColor == DyeColor.WHITE && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.GLITTER) {
} else if (
bodyColor == DyeColor.WHITE && patternColor == DyeColor.GRAY && pattern == TropicalFish.Pattern.GLITTER
) {
return SpecialFishType.MOORISH_IDOL
} else if (bodyColor == DyeColor.WHITE && patternColor == DyeColor.ORANGE && pattern == TropicalFish.Pattern.CLAYFISH) {
} else if (
bodyColor == DyeColor.WHITE && patternColor == DyeColor.ORANGE && pattern == TropicalFish.Pattern.CLAYFISH
) {
return SpecialFishType.ORNATE_BUTTERFLYFISH
} else if (bodyColor == DyeColor.CYAN && patternColor == DyeColor.PINK && pattern == TropicalFish.Pattern.DASHER) {
} else if (
bodyColor == DyeColor.CYAN && patternColor == DyeColor.PINK && pattern == TropicalFish.Pattern.DASHER
) {
return SpecialFishType.PARROTFISH
} else if (bodyColor == DyeColor.LIME && patternColor == DyeColor.LIGHT_BLUE && pattern == TropicalFish.Pattern.BRINELY) {
} else if (
bodyColor == DyeColor.LIME && patternColor == DyeColor.LIGHT_BLUE && pattern == TropicalFish.Pattern.BRINELY
) {
return SpecialFishType.QUEEN_ANGELFISH
} else if (bodyColor == DyeColor.RED && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.BETTY) {
} else if (
bodyColor == DyeColor.RED && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.BETTY
) {
return SpecialFishType.RED_CICHLID
} else if (bodyColor == DyeColor.GRAY && patternColor == DyeColor.RED && pattern == TropicalFish.Pattern.SNOOPER) {
} else if (
bodyColor == DyeColor.GRAY && patternColor == DyeColor.RED && pattern == TropicalFish.Pattern.SNOOPER
) {
return SpecialFishType.RED_LIPPED_BLENNY
} else if (bodyColor == DyeColor.RED && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.BLOCKFISH) {
} else if (
bodyColor == DyeColor.RED && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.BLOCKFISH
) {
return SpecialFishType.RED_SNAPPER
} else if (bodyColor == DyeColor.WHITE && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
bodyColor == DyeColor.WHITE && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.THREADFIN
} else if (bodyColor == DyeColor.RED && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.KOB) {
return SpecialFishType.TOMATO_CLOWNFISH
} else if (bodyColor == DyeColor.GRAY && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.SUNSTREAK) {
} else if (
bodyColor == DyeColor.GRAY && patternColor == DyeColor.WHITE && pattern == TropicalFish.Pattern.SUNSTREAK
) {
return SpecialFishType.TRIGGERFISH
} else if (bodyColor == DyeColor.CYAN && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.DASHER) {
} else if (
bodyColor == DyeColor.CYAN && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.DASHER
) {
return SpecialFishType.YELLOWTAIL_PARROTFISH
} else if (bodyColor == DyeColor.YELLOW && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.FLOPPER) {
} else if (
bodyColor == DyeColor.YELLOW && patternColor == DyeColor.YELLOW && pattern == TropicalFish.Pattern.FLOPPER
) {
return SpecialFishType.YELLOW_TANG
}
return null
}
}
}
src/main/kotlin/net/trueog/mobHeadsOG/Heads.kt
+1570 -1085
View File
File diff suppressed because it is too large. Load diff
src/main/kotlin/net/trueog/mobHeadsOG/MobHeadsOG.kt
+1 -7
View File
@@ -9,13 +9,7 @@ import org.bukkit.plugin.java.JavaPlugin
class MobHeadsOG : JavaPlugin() {
companion object {
lateinit var plugin: MobHeadsOG
val mm = MiniMessage.builder()
.tags(
TagResolver.builder()
.resolver(StandardTags.color())
.build()
)
.build()
val mm = MiniMessage.builder().tags(TagResolver.builder().resolver(StandardTags.color()).build()).build()
lateinit var config: Config
}