Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Ghost Profit Tracker #1753

Merged
merged 43 commits into from
Nov 24, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented May 10, 2024

Dependencies

What

WIP

Removes the Ghost Counter and replaces it with a Ghost Profit Tracker, to keep it consistent with other profit trackers, and to fix various issues with it.

TODO:

  • Migrate data from ghost counter to ghost profit tracker
  • Rename configs to ghost profit tracker
  • Store allowed items in repo
  • Remove old ghost counter code

Changelog New Features

  • Added Ghost Profit Tracker. - Empa
    • Replaces the outdated and buggy Ghost Counter.

ItsEmpa added 3 commits May 10, 2024 12:05
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 24, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 24, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 29, 2024
ItsEmpa added 3 commits May 31, 2024 12:55
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 31, 2024
Copy link

github-actions bot commented Jun 5, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 5, 2024
CalMWolfs added 2 commits June 6, 2024 09:58
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 5, 2024
Copy link

github-actions bot commented Jun 5, 2024

Conflicts have been resolved! 🎉

…gs, and add todo for migration

Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
@ItsEmpa ItsEmpa marked this pull request as ready for review October 2, 2024 13:01
@hannibal002 hannibal002 added this to the Version 0.28 milestone Oct 2, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 3, 2024
Copy link

github-actions bot commented Oct 3, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 11, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 12, 2024
Copy link

Conflicts have been resolved! 🎉

Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

SkyHanni 0.28.Beta.12: Caught a RepoError in GhostTracker at RepositoryReloadEvent: Repo file 'constants/GhostDrops.json' not found.
 
Caused by at.hannibal2.skyhanni.data.repo.RepoError: Repo file 'constants/GhostDrops.json' not found.
	at SH.data.repo.RepoUtils.getConstant(RepoUtils.kt:98)
	at SH.features.combat.ghosttracker.GhostTracker.onRepoReload(GhostTracker.kt:397)
	at SH.data.repo.RepoManager.reloadRepository$lambda$9(RepoManager.kt:195)
	at SH.utils.DelayedRun.onThread$lambda$2(DelayedRun.kt:45)
	at SH.data.repo.RepoManager.reloadRepository(RepoManager.kt:189)
	at SH.data.repo.RepoManager.reloadLocalRepo(RepoManager.kt:96)
	at SH.config.commands.Commands.devTest$lambda$199$lambda$198(Commands.kt:631)
	at net.minecraftforge.client.ClientCommandHandler.executeCommand(ClientCommandHandler.java:72)
	at MC.client.gui.GuiScreen.sendChatMessage(GuiScreen.java:446)
	at MC.client.gui.GuiScreen.sendChatMessage(GuiScreen.java:437)
	at MC.client.gui.GuiChat.keyTyped(GuiChat.java:111)
	at MC.client.gui.GuiScreen.handleKeyboardInput(GuiScreen.java:578)
	at MC.client.gui.GuiScreen.handleInput(GuiScreen.java:534)
	at MC.client.Minecraft.runTick(Minecraft.java:1674)
	at MC.client.Minecraft.runGameLoop(Minecraft.java:1024)
	at MC.client.Minecraft.run(Minecraft.java:349)
	at MC.client.main.Main.main(Main.java:124)

@ItsEmpa ItsEmpa requested a review from hannibal002 November 13, 2024 07:52
@github-actions github-actions bot added the Detekt Has detekt problem label Nov 16, 2024
Copy link

One or more Detekt Failures were detected:

  • GhostTracker.kt#L120: Repo pattern itemDropPattern failed regex test: §5§l+20 Kill Combo §r§8§r§3+15☯ Combat Wisdom pattern: §6§lRARE DROP! §r§9(?<item>[^§]*) §r§b\([+](?:§.)*(?<mf>\d*)% §r§b✯ Magic Find§r§b\).

@github-actions github-actions bot added Merge Conflicts There are open merge conflicts with the beta branch. and removed Detekt Has detekt problem labels Nov 16, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
#	versions/1.8.9/detekt/baseline.xml
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 19, 2024
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the code looks good

but the kill detection doesnt work
image

@github-actions github-actions bot added the Detekt Has detekt problem label Nov 24, 2024
Copy link

One or more Detekt Failures were detected:

  • GhostTracker.kt#L235: The loop contains more than one break or continue statement. The code should be refactored to increase readability.

Signed-off-by: Empa <itsempa@users.noreply.github.com>
@ItsEmpa ItsEmpa requested a review from hannibal002 November 24, 2024 09:21
Copy link

One or more Detekt Failures were detected:

@github-actions github-actions bot removed the Detekt Has detekt problem label Nov 24, 2024
@hannibal002 hannibal002 enabled auto-merge (squash) November 24, 2024 21:00
@hannibal002 hannibal002 merged commit 18edaea into hannibal002:beta Nov 24, 2024
6 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Nov 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants