diff --git a/gradle.properties b/gradle.properties index 376bd4f..d13b06d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx8G org.gradle.parallel=true -mod_version=3.0.0 +mod_version=3.0.1 maven_group=dev.xdpxi archives_base_name=xdlib \ No newline at end of file diff --git a/installer/versions/1.21/bukkit.jar b/installer/versions/1.21/bukkit.jar index 5a35434..4153f04 100644 Binary files a/installer/versions/1.21/bukkit.jar and b/installer/versions/1.21/bukkit.jar differ diff --git a/installer/versions/1.21/bungee.jar b/installer/versions/1.21/bungee.jar index 5a35434..4153f04 100644 Binary files a/installer/versions/1.21/bungee.jar and b/installer/versions/1.21/bungee.jar differ diff --git a/installer/versions/1.21/fabric.jar b/installer/versions/1.21/fabric.jar index 5a35434..4153f04 100644 Binary files a/installer/versions/1.21/fabric.jar and b/installer/versions/1.21/fabric.jar differ diff --git a/installer/versions/1.21/neo.jar b/installer/versions/1.21/neo.jar index 5a35434..4153f04 100644 Binary files a/installer/versions/1.21/neo.jar and b/installer/versions/1.21/neo.jar differ diff --git a/installer/versions/1.21/velo.jar b/installer/versions/1.21/velo.jar index 5a35434..4153f04 100644 Binary files a/installer/versions/1.21/velo.jar and b/installer/versions/1.21/velo.jar differ diff --git a/src/client/java/dev/xdpxi/xdlib/CustomScreen.java b/src/client/java/dev/xdpxi/xdlib/CustomScreen.java deleted file mode 100644 index 874d6be..0000000 --- a/src/client/java/dev/xdpxi/xdlib/CustomScreen.java +++ /dev/null @@ -1,112 +0,0 @@ -package dev.xdpxi.xdlib; - -import dev.xdpxi.xdlib.api.mod.loader; -import dev.xdpxi.xdlib.config.configManager; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.toast.SystemToast; -import net.minecraft.text.MutableText; -import net.minecraft.text.Style; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class CustomScreen extends Screen { - private static final Logger LOGGER = LoggerFactory.getLogger("xdlib"); - private static boolean shownToast = false; - private final Screen parent; - private final MutableText changelogText; - - public CustomScreen(Text title, Screen parent) { - super(title); - this.parent = parent; - this.changelogText = createChangelogText(); - } - - @Override - protected void init() { - if (!configManager.configData.isDisableTitlePopups()) { - showPopups(); - } - - int centerX = this.width / 2; - int centerY = this.height / 2 - 20; - - ButtonWidget buttonWidget = ButtonWidget.builder(Text.literal("Dismiss"), (btn) -> { - close(); - }).dimensions(centerX - 60, centerY + 170, 120, 20).build(); - this.addDrawableChild(buttonWidget); - } - - private void showPopups() { - if (!shownToast) { - shownToast = true; - if (loader.isModLoaded("iris") || loader.isModLoaded("optifine")) { - LOGGER.warn("[XDLib] - Does not support shaders!"); - this.client.getToastManager().add( - new SystemToast(SystemToast.Type.NARRATOR_TOGGLE, Text.of("XD's Library"), Text.of("Does not support shaders!")) - ); - } - if (!loader.isModLoaded("cloth-config")) { - LOGGER.warn("[XDLib] - Recommends the use of 'cloth-config'"); - this.client.getToastManager().add( - new SystemToast(SystemToast.Type.NARRATOR_TOGGLE, Text.of("XD's Library"), Text.of("Recommends the use of 'cloth-config'")) - ); - } - if (updateChecker.isUpdate()) { - this.client.getToastManager().add( - new SystemToast(SystemToast.Type.NARRATOR_TOGGLE, Text.of("XD's Library"), Text.of("An update is available!")) - ); - } - } - } - - @Override - public void render(DrawContext context, int mouseX, int mouseY, float delta) { - if (this.client == null || this.textRenderer == null) { - return; - } - - super.render(context, mouseX, mouseY, delta); - - int centerX = this.width / 2; - int buttonY = this.height / 2; - if (changelogText != null) { - int boxWidth = 625; - int boxHeight = 350; - int boxX = centerX - boxWidth / 2; - int boxY = buttonY - boxHeight / 2; - - context.fill(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF333333); - context.drawBorder(boxX, boxY, boxWidth, boxHeight, 0xFF000000); - - if (this.textRenderer != null) { - context.drawTextWrapped(this.textRenderer, this.changelogText, boxX + 5, boxY + 5, boxWidth - 10, 0xFFFFFFFF); - } - } else { - LOGGER.error("Changelog text is null. Skipping changelog rendering."); - } - } - - private MutableText createChangelogText() { - MutableText text = Text.literal("Changelog:\n\n") - .setStyle(Style.EMPTY.withColor(Formatting.WHITE).withBold(true)); - - text.append(Text.literal("- Cleaned 'Client' Code\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - text.append(Text.literal("- Cleaned 'Changelog' Code\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - text.append(Text.literal("- Added 'UpdateChecker'\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - text.append(Text.literal("- Updated 'Installer' -> '#27'\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - text.append(Text.literal("- Updated 'BadgeRenderer'\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - text.append(Text.literal("- Removed '1.21.3' Support\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - text.append(Text.literal("- Removed '1.21.2' Support\n").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withBold(false))); - - return text; - } - - @Override - public void close() { - this.client.setScreen(this.parent); - } -} \ No newline at end of file diff --git a/src/client/java/dev/xdpxi/xdlib/mixin/client/TitleScreenMixin.java b/src/client/java/dev/xdpxi/xdlib/mixin/client/TitleScreenMixin.java index 799ba00..3032549 100644 --- a/src/client/java/dev/xdpxi/xdlib/mixin/client/TitleScreenMixin.java +++ b/src/client/java/dev/xdpxi/xdlib/mixin/client/TitleScreenMixin.java @@ -1,6 +1,5 @@ package dev.xdpxi.xdlib.mixin.client; -import dev.xdpxi.xdlib.CustomScreen; import dev.xdpxi.xdlib.config.changelogConfig; import dev.xdpxi.xdlib.config.configManager; import dev.xdpxi.xdlib.support; @@ -22,7 +21,7 @@ public class TitleScreenMixin { private static boolean Shown = false; @Unique - private static int version = 11; + private static int version = 12; @Inject(method = "init", at = @At("TAIL")) public void onInit(CallbackInfo ci) { @@ -34,46 +33,23 @@ public void onInit(CallbackInfo ci) { boolean disableChangelog = configManager.configData.isDisableChangelog(); if (((firstStartup || changelogEveryStartup) && !Shown) && !disableChangelog) { - CompletableFuture.supplyAsync(() -> { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - return 0; - }).thenAcceptAsync(result -> { - Shown = true; - - changelogConfig.ConfigData configData = config.read(); - configData.setVersion(version); - config.write(configData); - - MinecraftClient client = MinecraftClient.getInstance(); - Screen currentScreen = client.currentScreen; - - client.execute(() -> client.setScreen(new CustomScreen(Text.empty(), currentScreen))); - }, MinecraftClient.getInstance()); + // do nothing } else { if (!Shown) { - showPopups(); + CompletableFuture.supplyAsync(() -> { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + return 0; + }).thenAcceptAsync(result -> { + Shown = true; + MinecraftClient client = MinecraftClient.getInstance(); + Screen currentScreen = client.currentScreen; + client.execute(() -> client.setScreen(new support(Text.empty(), currentScreen))); + }, MinecraftClient.getInstance()); } } } - - @Unique - private void showPopups() { - CompletableFuture.supplyAsync(() -> { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - return 0; - }).thenAcceptAsync(result -> { - Shown = true; - MinecraftClient client = MinecraftClient.getInstance(); - Screen currentScreen = client.currentScreen; - client.execute(() -> client.setScreen(new support(Text.empty(), currentScreen))); - }, MinecraftClient.getInstance()); - } } \ No newline at end of file diff --git a/src/main/java/dev/xdpxi/xdlib/plugin/velocity.java b/src/main/java/dev/xdpxi/xdlib/plugin/velocity.java index d39833b..7f84c00 100644 --- a/src/main/java/dev/xdpxi/xdlib/plugin/velocity.java +++ b/src/main/java/dev/xdpxi/xdlib/plugin/velocity.java @@ -10,7 +10,7 @@ import java.nio.file.Path; -@Plugin(id = "xdlib", name = "XDLib", version = "3.0.0", description = "This is a library for many uses and is included as an player counter for XDPXI's mods and modpacks!", url = "https://xdpxi.vercel.app/mc/xdlib", authors = {"XDPXI"}) +@Plugin(id = "xdlib", name = "XDLib", version = "3.0.1", description = "This is a library for many uses and is included as an player counter for XDPXI's mods and modpacks!", url = "https://xdpxi.vercel.app/mc/xdlib", authors = {"XDPXI"}) public class velocity { private final Logger logger; private final ProxyServer proxyServer; diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 626f32d..ddf482d 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: XDLib -version: '3.0.0' +version: '3.0.1' main: dev.xdpxi.xdlib.plugin.bungee author: XDPXI description: This is a library for many uses and is included as an player counter for XDPXI's mods and modpacks! \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 562efb7..cdfe876 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: XDLib -version: '3.0.0' +version: '3.0.1' main: dev.xdpxi.xdlib.plugin.xdlib api-version: '1.21' prefix: XDLib