fix(ci): Use Java 11 in CI workflow for ForgeGradle compatibility #97
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
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,87 @@ | ||||||
| package dev.httxrafa.modflared.mixin.client; | ||||||
|
|
||||||
| import dev.httxrafa.modflared.Modflared; | ||||||
| import dev.httxrafa.modflared.interfaces.mixin.IServerData; | ||||||
| import dev.httxrafa.modflared.tunnel.TunnelStatus; | ||||||
| import net.minecraft.client.Minecraft; | ||||||
| import net.minecraft.client.gui.Gui; | ||||||
| import net.minecraft.client.gui.GuiMultiplayer; | ||||||
| import net.minecraft.client.gui.ServerListEntryNormal; | ||||||
| import net.minecraft.client.multiplayer.ServerData; | ||||||
| import net.minecraft.client.renderer.GlStateManager; | ||||||
| import net.minecraft.client.resources.I18n; | ||||||
| import net.minecraft.util.ResourceLocation; | ||||||
| import org.spongepowered.asm.mixin.Final; | ||||||
| import org.spongepowered.asm.mixin.Mixin; | ||||||
| import org.spongepowered.asm.mixin.Shadow; | ||||||
| import org.spongepowered.asm.mixin.Unique; | ||||||
| import org.spongepowered.asm.mixin.injection.At; | ||||||
| import org.spongepowered.asm.mixin.injection.Inject; | ||||||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||||||
|
|
||||||
| @Mixin(ServerListEntryNormal.class) | ||||||
| public abstract class ServerListEntryNormalMixin { | ||||||
|
|
||||||
| @Shadow | ||||||
| @Final | ||||||
| private GuiMultiplayer owner; | ||||||
|
|
||||||
| @Shadow | ||||||
| @Final | ||||||
| private ServerData server; | ||||||
|
|
||||||
| @Unique | ||||||
| private static final ResourceLocation MODFLARED_INDICATOR_TEXTURE = new ResourceLocation( | ||||||
| Modflared.MOD_ID, | ||||||
| "textures/gui/sprites/icon/indicator.png" | ||||||
| ); | ||||||
|
|
||||||
| @Unique | ||||||
| private static final int MODFLARED_INDICATOR_SIZE = 10; | ||||||
|
|
||||||
| @Unique | ||||||
| private static final int MODFLARED_INDICATOR_RIGHT_OFFSET = 28; | ||||||
|
|
||||||
| @Unique | ||||||
| private static final String MODFLARED_INDICATOR_TOOLTIP_KEY = "gui.multiplayer.tunnel.status.0"; | ||||||
|
|
||||||
| @Unique | ||||||
| private static final String MODFLARED_INDICATOR_TOOLTIP_FALLBACK = "Modflared in use"; | ||||||
|
|
||||||
| @Inject(method = "drawEntry", at = @At("TAIL")) | ||||||
| private void modflared$drawTunnelIndicator(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks, CallbackInfo callbackInfo) { | ||||||
| TunnelStatus tunnelStatus = ((IServerData) this.server).getTunnelStatus(); | ||||||
| if (tunnelStatus == null || tunnelStatus.getState() != TunnelStatus.State.USE) { | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| int indicatorX = x + listWidth - MODFLARED_INDICATOR_RIGHT_OFFSET; | ||||||
| int indicatorY = y + 11; | ||||||
|
|
||||||
| GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); | ||||||
| Minecraft.getMinecraft().getTextureManager().bindTexture(MODFLARED_INDICATOR_TEXTURE); | ||||||
| Gui.drawModalRectWithCustomSizedTexture( | ||||||
| indicatorX, | ||||||
| indicatorY, | ||||||
| 0.0F, | ||||||
| 0.0F, | ||||||
| MODFLARED_INDICATOR_SIZE, | ||||||
| MODFLARED_INDICATOR_SIZE, | ||||||
| MODFLARED_INDICATOR_SIZE, | ||||||
| MODFLARED_INDICATOR_SIZE | ||||||
| ); | ||||||
|
|
||||||
| if (mouseX >= indicatorX && mouseX <= indicatorX + MODFLARED_INDICATOR_SIZE && mouseY >= indicatorY && mouseY <= indicatorY + MODFLARED_INDICATOR_SIZE) { | ||||||
| this.owner.setHoveringText(modflared$translate(MODFLARED_INDICATOR_TOOLTIP_KEY, MODFLARED_INDICATOR_TOOLTIP_FALLBACK)); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| @Unique | ||||||
| private static String modflared$translate(String key, String fallback) { | ||||||
| String translated = I18n.format(key); | ||||||
| if (translated == null || translated.equals(key)) { | ||||||
|
There was a problem hiding this comment. The null check
Suggested change
|
||||||
| return fallback; | ||||||
| } | ||||||
| return translated; | ||||||
| } | ||||||
| } | ||||||
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
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
Oops, something went wrong.
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.
The version has been updated to
1.12.2-1here, but theModflared.javafile (line 25) still contains the old version string1.12.2-legacy.1. Since the@Modannotation inModflared.javarelies on that constant, the mod will still report the old version to Forge. Please ensure both are synchronized.