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

Minion Features to Kotlin #436

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Jul 6, 2024

ports minion features to kotlin and cleans them up, still a wip. its currently in a semi functional state, but it still has a bunch of work to be done

ItsEmpa added 5 commits July 4, 2024 16:41
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>
# Conflicts:
#	src/main/java/me/partlysanestudios/partlysaneskies/features/economy/minioncalculator/ProfitMinionCalculator.java
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@Su386yt
Copy link
Member

Su386yt commented Jul 6, 2024

Final PSS kotlin rewrite in progress???

@Su386yt
Copy link
Member

Su386yt commented Jul 6, 2024

Thank you so much (both of you lol @j10a1n15 as well)

@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Jul 6, 2024

getting there yes

ItsEmpa added 11 commits July 6, 2024 18:14
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
h
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>
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>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Copy link

This pull request has conflicts, please resolve those before the pull request can be reviewed.

# Conflicts:
#	src/main/java/me/partlysanestudios/partlysaneskies/features/economy/minioncalculator/MinionData.java
#	src/main/java/me/partlysanestudios/partlysaneskies/features/economy/minioncalculator/ProfitMinionCalculator.java
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/PartlySaneSkies.kt
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/mainmenu/MainMenuOptionMenu.kt
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/mainmenu/PSSMainMenu.kt
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/utils/StringUtils.kt
Copy link

Conflicts have been resolved!

Copy link

This pull request has conflicts, please resolve those before the pull request can be reviewed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants