diff options
| author | jani270 <69345714+jani270@users.noreply.github.com> | 2023-07-05 17:31:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-05 17:31:47 +0200 |
| commit | d4c242bf976431722d7928883526e79ac74845eb (patch) | |
| tree | b7a8b9b534cca0e099fb0d6bb32080bdb4fe3cad /src/main/java/at/hannibal2/skyhanni | |
| parent | d12f0d3d6935b516066bd750322b61230b194910 (diff) | |
| download | skyhanni-d4c242bf976431722d7928883526e79ac74845eb.tar.gz skyhanni-d4c242bf976431722d7928883526e79ac74845eb.tar.bz2 skyhanni-d4c242bf976431722d7928883526e79ac74845eb.zip | |
Added support for chumcap bucket to the chum bucket hider (#301)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java | 8 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/ChumBucketHider.kt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java index 789c849bc..f9e3fe207 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java @@ -98,24 +98,24 @@ public class Fishing { public int barnTimerAlertTime = 330; @Expose - @ConfigOption(name = "Chum Bucket Hider", desc = "") + @ConfigOption(name = "Chum/Chumcap Bucket Hider", desc = "") @Accordion public ChumBucketHider chumBucketHider = new ChumBucketHider(); public static class ChumBucketHider { @Expose - @ConfigOption(name = "Enable", desc = "Hide the Chum Bucket name tags for other players.") + @ConfigOption(name = "Enable", desc = "Hide the Chum/Chumcap Bucket name tags for other players.") @ConfigEditorBoolean public Property<Boolean> enabled = Property.of(true); @Expose - @ConfigOption(name = "Hide Bucket", desc = "Hide the Chum Bucket.") + @ConfigOption(name = "Hide Bucket", desc = "Hide the Chum/Chumcap Bucket.") @ConfigEditorBoolean public Property<Boolean> hideBucket = Property.of(false); @Expose - @ConfigOption(name = "Hide Own", desc = "Hides your own Chum Bucket.") + @ConfigOption(name = "Hide Own", desc = "Hides your own Chum/Chumcap Bucket.") @ConfigEditorBoolean public Property<Boolean> hideOwn = Property.of(false); } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ChumBucketHider.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ChumBucketHider.kt index 5e648d638..98934941f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ChumBucketHider.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ChumBucketHider.kt @@ -38,7 +38,7 @@ class ChumBucketHider { val name = entity.name // First text line - if (name.endsWith("'s Chum Bucket")) { + if (name.endsWith("'s Chum Bucket") || name.endsWith("'s Chumcap Bucket")) { if (name.contains(LorenzUtils.getPlayerName()) && !config.hideOwn.get()) return titleEntity.add(entity) hiddenEntities.add(entity) @@ -61,7 +61,7 @@ class ChumBucketHider { // Chum Bucket if (config.hideBucket.get()) { - if (entity.inventory.any { it != null && it.name == "§fEmpty Chum Bucket" }) { + if (entity.inventory.any { it != null && (it.name == "§fEmpty Chum Bucket" || it.name == "§aEmpty Chumcap Bucket")}) { val entityLocation = entity.getLorenzVec() for (title in titleEntity) { if (entityLocation.equalsIgnoreY(title.getLorenzVec())) { |