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: Personal Compactor Overlay #1869

Merged
merged 65 commits into from
Sep 7, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented May 23, 2024

Dependencies

What

Adds a personal compactor/deletor overlay that shows what items are inside of it.
Also adds a fakeInventory renderable, with a texture that can be customized with a texture pack.

Images

image

Changelog New Features

  • Added Personal Compactor/Deletor Overlay. - Empa
    • Shows what items are currently inside the personal compactor/deletor, and whether the accessory is turned on or off.

Changelog Technical Details

  • Added fakeInventory, paddingContainer and drawInsideFixedSizedImage. - Empa
  • Changed RenderableTooltips to be more consistent with the vanilla ones. - Empa

ItsEmpa added 12 commits May 19, 2024 10:31
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>
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>
@ItsEmpa ItsEmpa marked this pull request as ready for review May 23, 2024 18:52
@hannibal002 hannibal002 added this to the Version 0.26 milestone May 24, 2024
@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.

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

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 29, 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/data/GuiEditManager.kt
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added Merge Conflicts There are open merge conflicts with the beta branch. and removed Merge Conflicts There are open merge conflicts with the beta branch. labels May 29, 2024
Copy link

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

CalMWolfs and others added 3 commits May 29, 2024 18:13
…-compactor-overlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 29, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
…actor-overlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jul 28, 2024
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 11, 2024
Copy link

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

…actor-overlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 14, 2024
Copy link

Conflicts have been resolved! 🎉

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 Aug 23, 2024
@jani270 jani270 modified the milestones: Version 0.28, Version 0.27 Aug 23, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 24, 2024
Copy link

Conflicts have been resolved! 🎉

@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Aug 24, 2024
@hannibal002 hannibal002 merged commit f40863a into hannibal002:beta Sep 7, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Sep 7, 2024
MTOnline69 pushed a commit to MTOnline69/SkyHanni that referenced this pull request Sep 11, 2024
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
@ItsEmpa ItsEmpa deleted the personal-compactor-overlay branch October 12, 2024 15:57
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.

4 participants