djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

Fix downloading SDL screen loading bar being missing texture

Browse Source
This commit is contained in:
isXander
2023-10-22 22:16:41 +01:00
parent 94684887cc
commit d0b8f912f1
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/dev/isxander/controlify/gui/screen/DownloadingSDLScreen.java
View File

@ -13,13 +13,15 @@ import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.HoverEvent; import net.minecraft.network.chat.HoverEvent;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import java.nio.file.Path; import java.nio.file.Path;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
public class DownloadingSDLScreen extends Screen implements DontInteruptScreen { public class DownloadingSDLScreen extends Screen implements DontInteruptScreen {
private static final ResourceLocation GUI_BARS_LOCATION = new ResourceLocation("textures/gui/bars.png"); private static final ResourceLocation GREEN_BACK_BAR = new ResourceLocation("boss_bar/green_background");
private static final ResourceLocation GREEN_FRONT_BAR = new ResourceLocation("boss_bar/green_progress");
private final Screen screenOnFinish; private final Screen screenOnFinish;
private final Path nativePath; private final Path nativePath;
@ -71,7 +73,12 @@ public class DownloadingSDLScreen extends Screen implements DontInteruptScreen {
graphics.pose().popPose(); graphics.pose().popPose();
drawProgressBar(graphics, width / 2, (int) (30 + 9 * 2.5f + 40), (float) ((double) receivedBytes / totalBytes)); graphics.pose().pushPose();
graphics.pose().scale(2f, 2f, 1f);
drawBar(graphics, width / 2 / 2, (int) ((30 + 9 * 2.5f + 40) / 2), (float) ((double) receivedBytes / totalBytes));
graphics.pose().popPose();
String totalString = format.format(totalBytes / 1024f / 1024f); String totalString = format.format(totalBytes / 1024f / 1024f);
graphics.drawString( graphics.drawString(
@ -114,16 +121,13 @@ public class DownloadingSDLScreen extends Screen implements DontInteruptScreen {
finishDownload(); finishDownload();
} }
private static void drawProgressBar(GuiGraphics graphics, int centerX, int y, float progress) { private void drawBar(GuiGraphics graphics, int centerX, int y, float progress) {
int x = (int) (centerX - 182 * 2f / 2); int width = Mth.lerpDiscrete(1 - (float)Math.pow(1 - progress, 3), 0, 182);
graphics.pose().pushPose(); int x = centerX - 182 / 2;
graphics.pose().translate(x, y, 0); graphics.blitSprite(GREEN_BACK_BAR, 182, 5, 0, 0, x, y, 182, 5);
graphics.pose().scale(2f, 2f, 1f); if (width > 0) {
graphics.blitSprite(GREEN_FRONT_BAR, 182, 5, 0, 0, x, y, width, 5);
graphics.blit(GUI_BARS_LOCATION, 0, 0, 0, 30, 182, 5); }
graphics.blit(GUI_BARS_LOCATION, 0, 0, 0, 35, (int)(progress * 182), 5);
graphics.pose().popPose();
} }
} }