diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
4 files changed, 50 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt index 0bdf25a71..fbe2f1e96 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt @@ -271,7 +271,7 @@ object EntityOutlineRenderer { // Add new features that need the entity outline logic here private fun isEnabled(): Boolean { if (isMissingMixin) return false - if (SkyHanniMod.feature.fishing.rareSeaCreatureHighlight) return true + if (SkyHanniMod.feature.fishing.rareCatches.highlight) return true if (SkyHanniMod.feature.misc.glowingDroppedItems.enabled) return true if (SkyHanniMod.feature.dungeon.highlightTeammates) return true if (SkyHanniMod.feature.misc.highlightPartyMembers.enabled) return true diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt index 306a54c50..d589df3ac 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt @@ -19,7 +19,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) { VERY_SPECIAL(LorenzColor.RED, 9),
;
- private val chatColorCode by lazy { color.getChatColor() }
+ val chatColorCode by lazy { color.getChatColor() }
private val rawName by lazy { name.replace("_", " ") }
private val normalName by lazy { "$chatColorCode§l$rawName" }
private val recombName by lazy { "$chatColorCode§l§ka§r $chatColorCode§l$chatColorCode§l$rawName" }
@@ -50,6 +50,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) { companion object {
fun getById(id: Int) = entries.firstOrNull { it.ordinal == id }
+ fun getByName(name: String) = entries.firstOrNull { it.name == name }
fun readItemRarity(itemStack: ItemStack): LorenzRarity? {
for (line in itemStack.getLore()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt index 5e0e50d3f..d2403d4c6 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt @@ -35,10 +35,10 @@ object SoundUtils { } } - fun createSound(name: String, pitch: Float): ISound { + fun createSound(name: String, pitch: Float, volume: Float = 50f): ISound { val sound: ISound = object : PositionedSound(ResourceLocation(name)) { init { - volume = 50f + this.volume = volume repeat = false repeatDelay = 0 attenuationType = ISound.AttenuationType.NONE @@ -56,6 +56,19 @@ object SoundUtils { clickSound.playSound() } + fun command(args: Array<String>) { + if (args.isEmpty()) { + LorenzUtils.chat("§c[SkyHanni] Specify a sound effect to test") + return + } + + val soundName = args[0] + val pitch = args.getOrNull(1)?.toFloat() ?: 1.0f + val volume = args.getOrNull(2)?.toFloat() ?: 50.0f + + createSound(soundName, pitch, volume).playSound() + } + fun playErrorSound() { errorSound.playSound() } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java new file mode 100644 index 000000000..52ed7f636 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java @@ -0,0 +1,32 @@ +package at.hannibal2.skyhanni.utils.jsonobjects;
+
+import at.hannibal2.skyhanni.utils.LorenzRarity;
+import com.google.gson.annotations.Expose;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+
+public class SeaCreatureJson {
+
+ public static Type TYPE = new TypeToken<Map<String, SeaCreatureJson.Variant>>(){}.getType();
+
+ public static class Variant {
+ @Expose
+ public String chat_color;
+ @Expose
+ public Map<String, SeaCreature> sea_creatures;
+ }
+
+ public static class SeaCreature {
+ @Expose
+ public String chat_message;
+ @Expose
+ public int fishing_experience;
+ @Expose
+ public Boolean rare;
+ @Expose
+ public LorenzRarity rarity;
+ }
+
+}
|