forked from hannibal002/SkyHanni
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'beta' of https://github.com/hannibal002/SkyHanni into i…
…tem-stack-size-playergeneral
- Loading branch information
Showing
25 changed files
with
592 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package at.hannibal2.skyhanni.config.features.mining; | ||
|
|
||
| import at.hannibal2.skyhanni.config.FeatureToggle; | ||
| import com.google.gson.annotations.Expose; | ||
| import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; | ||
| import io.github.moulberry.moulconfig.annotations.ConfigOption; | ||
|
|
||
| public class MiningEventConfig { | ||
|
|
||
| // @Expose | ||
| // @ConfigOption(name = "Enabled", desc = "Show information about upcoming Dwarven Mines and Crystal Hollows mining events, also enables you sending data.") | ||
| // @ConfigEditorBoolean | ||
| // @FeatureToggle | ||
| // public boolean enabled = true; | ||
| // | ||
| // @Expose | ||
| // @ConfigOption(name = "Show Outside Mining Islands", desc = "Shows the event tracker when you are not inside of the Dwarven Mines or Crystal Hollows.") | ||
| // @ConfigEditorBoolean | ||
| // public boolean outsideMining = true; | ||
| // | ||
| // @Expose | ||
| // @ConfigOption(name = "What to Show", desc = "Choose which island's events are shown in the gui.") | ||
| // @ConfigEditorDropdown | ||
| // public ShowType showType = ShowType.BOTH; | ||
| // | ||
| // @Expose | ||
| // @ConfigOption(name = "Show Warnings For Events", desc = "Shows the warnings when select mining events are about to start.") | ||
| // @ConfigEditorBoolean | ||
| // @FeatureToggle | ||
| // public boolean showWarnings = false; | ||
|
|
||
| //todo remove when released | ||
| @Expose | ||
| @ConfigOption(name = "Send Test data", desc = "Sends test data to make sure the api works.") | ||
| @ConfigEditorBoolean | ||
| @FeatureToggle | ||
| public boolean sendData = true; | ||
|
|
||
| // @Expose | ||
| // @ConfigOption(name = "Events to Warn for", desc = "Choose which mining events you get warned about.") | ||
| // @ConfigEditorDraggableList | ||
| // public List<MiningEvent> eventsToWarn = new ArrayList<>(Collections.singletonList(MiningEvent.DOUBLE_POWDER)); | ||
|
|
||
| public enum ShowType { | ||
| BOTH("Both Mining Islands"), | ||
| CRYSTAL("Crystal Hollows Only"), | ||
| DWARVEN("Dwarven Mines Only") | ||
| ; | ||
|
|
||
| private final String str; | ||
|
|
||
| ShowType(String str) { | ||
| this.str = str; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return str; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package at.hannibal2.skyhanni.data | ||
|
|
||
| import at.hannibal2.skyhanni.events.BossbarUpdateEvent | ||
| import at.hannibal2.skyhanni.events.LorenzTickEvent | ||
| import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent | ||
| import net.minecraft.entity.boss.BossStatus | ||
| import net.minecraftforge.fml.common.eventhandler.SubscribeEvent | ||
|
|
||
| object BossbarData { | ||
| private var bossbar: String? = null | ||
| private var previousServerBossbar = "" | ||
|
|
||
| fun getBossbar() = bossbar ?: "" | ||
|
|
||
| @SubscribeEvent | ||
| fun onWorldChange(event: LorenzWorldChangeEvent) { | ||
| val oldBossbar = bossbar ?: return | ||
| previousServerBossbar = oldBossbar | ||
| bossbar = null | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| fun onTick(event: LorenzTickEvent) { | ||
| val bossbarLine = BossStatus.bossName ?: return | ||
| if (bossbarLine.isBlank() || bossbarLine.isEmpty()) return | ||
| if (bossbarLine == bossbar) return | ||
| if (bossbarLine == previousServerBossbar) return | ||
| if (previousServerBossbar.isNotEmpty()) previousServerBossbar = "" | ||
|
|
||
| bossbar = bossbarLine | ||
| BossbarUpdateEvent(bossbarLine).postAndCatch() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.