-
Notifications
You must be signed in to change notification settings - Fork 32
Clean log and fix mod incompatibility #135
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
Open
anastarawneh
wants to merge
2
commits into
AsoDesu:main
Choose a base branch
from
anastarawneh:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
30 changes: 30 additions & 0 deletions
30
src/main/java/net/asodev/islandutils/mixins/resources/FontManagerMixin.java
This file contains hidden or 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,30 @@ | ||
| package net.asodev.islandutils.mixins.resources; | ||
|
|
||
| import com.mojang.blaze3d.font.GlyphProvider; | ||
| import net.minecraft.client.gui.font.FontManager; | ||
| import net.minecraft.client.gui.font.providers.GlyphProviderDefinition; | ||
| import net.minecraft.server.packs.resources.ResourceManager; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.Executor; | ||
|
|
||
| @Mixin(FontManager.class) | ||
| public class FontManagerMixin { | ||
| @Inject(method = "safeLoad", at = @At("HEAD"), cancellable = true) | ||
| public void load(FontManager.BuilderId builderId, GlyphProviderDefinition.Loader loader, ResourceManager resourceManager, Executor executor, CallbackInfoReturnable<CompletableFuture<Optional<GlyphProvider>>> cir) { | ||
| if (builderId.pack().equals("islandutils")) { | ||
| cir.setReturnValue(CompletableFuture.supplyAsync(() -> { | ||
| try { | ||
| return Optional.of(loader.load(resourceManager)); | ||
| } catch (Exception exception) { | ||
| return Optional.empty(); | ||
| } | ||
| }, executor)); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is certainly a solution, but it is also an edge case
i'm gonna take a look at it and see if there's a bit of a better, more concrete solution that won't make this susceptible to happening again with a different character.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to have a similar implementation and extract the real characters without a dummy resource pack, which should negate the need for any changes on your end. I coded this as a quick fix since I can't release an update for some time. The medal is the only character I'm using that conflicts with IslandUtils.
On second thought, however, I think my pack loaded after because of alphabetical order, so other mods might potentially still cause similar conflicts. I tried to find a way to check the origin resource pack of the glyph but I got nowhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apparently I did something that can fix this issue a while ago, and I completely forgot about it:
https://github.com/anastarawneh/MCCINametagMod/blob/e220774376f366bd981f023927827676c104ba78/src/main/java/me/anastarawneh/mccinametagmod/util/Util.java
You can read the actual
font/icon.jsonfile and parse it manually. The chances that another mod is also using the samemcc:fonts/icon.jsonidentifier is incredibly low, so there should be no overlap.Regardless, I fixed the issue on my end, and I will upload an updated version soon.