From 91e01c4b6762245e257f20f917cc629f3f72d176 Mon Sep 17 00:00:00 2001 From: Filip <37674069+1fxe@users.noreply.github.com> Date: Fri, 5 Mar 2021 01:36:07 +0000 Subject: [PATCH] Fixed notification delay and renamed to rpd see: https://github.com/1fxe/Resource-Pack-Display/issues/2#issue-822120498 --- README.md | 4 ++-- build.gradle | 10 +++++----- gradle.properties | 12 ++++++++++++ .../resourcepackdisplay/ResourcePackDisplay.java | 13 ++++++++----- .../mods/resourcepackdisplay/commands/Command.java | 2 +- .../dev/fxe/mods/resourcepackdisplay/ui/UI.java | 12 +++--------- 6 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 gradle.properties diff --git a/README.md b/README.md index 4553786..3a65b9a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
-# Resource Pack Display Revamp +# Resource Pack Display A revamp of [Canelex's Pack Display Mod](https://www.youtube.com/watch?v=LeDNOdOdGyk) with some extra features @@ -38,7 +38,7 @@ If you do not know how to install a Forge mod, then we recommended looking up "H #### Commands ``` -/rdp - Opens the Modcore config +/rpd - Opens the Modcore config gui - Opens a GUI so you can drag the display to your preferred location random - Chooses a random resource pack from your game and sets it reset - Resets the random resource pack duplicates list diff --git a/build.gradle b/build.gradle index 0ffc631..8728624 100644 --- a/build.gradle +++ b/build.gradle @@ -15,15 +15,15 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.0" -group= "dev.fxe" -archivesBaseName = "Resource Pack Display" +version = project.version +group= project.modGroup +archivesBaseName = project.archivesBaseName sourceCompatibility = targetCompatibility = 1.8 minecraft { - version = "1.8.9-11.15.1.2318-1.8.9" + version = project.forgeVersion runDir = "run" - mappings = "stable_22" + mappings = project.mcpVersion makeObfSourceJar = false } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e9ca1f1 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,12 @@ +modGroup=dev.fxe +modVersion=1.0-Beta +modBaseName=ResourcePackDisplay +forgeVersion=1.8.9-11.15.1.2318-1.8.9 +mcpVersion=stable_22 +tweakClass=dev.fxe.mods.resourcepackdisplay.tweaker.TweakClass + +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.configureoncommand=true +org.gradle.parallel.threads=4 +org.gradle.jvmargs=-Xmx4G \ No newline at end of file diff --git a/src/main/java/dev/fxe/mods/resourcepackdisplay/ResourcePackDisplay.java b/src/main/java/dev/fxe/mods/resourcepackdisplay/ResourcePackDisplay.java index 4721114..1fd4821 100644 --- a/src/main/java/dev/fxe/mods/resourcepackdisplay/ResourcePackDisplay.java +++ b/src/main/java/dev/fxe/mods/resourcepackdisplay/ResourcePackDisplay.java @@ -78,7 +78,7 @@ public Config getConfig() { } public void sendMessage(String message) { - MinecraftUtils.sendMessage(ChatColor.BLUE + "[RDP] ", + MinecraftUtils.sendMessage(ChatColor.BLUE + "[RPD] ", ChatColor.translateAlternateColorCodes('&', message)); } @@ -106,16 +106,19 @@ public void selectRandomPack() { ListenableFuture future = mc.scheduleResourcesRefresh(); Multithreading.runAsync(() -> { while (!future.isDone()) ; + try { + Thread.sleep(1000); + } catch (InterruptedException ignored) {} long end = System.currentTimeMillis(); Notifications.INSTANCE.pushNotification(MOD_NAME, - "Minecraft took " + (end - start) / 1000 + "s to load " + packName + "Minecraft took " + ((end-1000) - start) / 1000 + "s to load " + packName ); }); } } private void sendRandomPrompt() { - ChatComponentText text = new ChatComponentText(ChatColor.BLUE + "[RDP] " + + ChatComponentText text = new ChatComponentText(ChatColor.BLUE + "[RPD] " + ChatColor.RESET + "Select a new pack?"); ChatComponentText childComponent = new ChatComponentText(ChatColor.BLACK + " [" + ChatColor.GREEN + "Random" + ChatColor.BLACK + "] " + ChatColor.RESET); @@ -123,8 +126,8 @@ private void sendRandomPrompt() { "Reset" + ChatColor.BLACK + "] " + ChatColor.RESET); ChatStyle chatStyle = new ChatStyle(); ChatStyle chatStyleTwo = new ChatStyle(); - final String cmd = "/rdp random"; - final String cmd2 = "/rdp reset"; + final String cmd = "/rpd random"; + final String cmd2 = "/rpd reset"; chatStyle.setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, cmd)); chatStyle.setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(cmd))); chatStyleTwo.setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, cmd2)); diff --git a/src/main/java/dev/fxe/mods/resourcepackdisplay/commands/Command.java b/src/main/java/dev/fxe/mods/resourcepackdisplay/commands/Command.java index d6ddb76..effdfbc 100644 --- a/src/main/java/dev/fxe/mods/resourcepackdisplay/commands/Command.java +++ b/src/main/java/dev/fxe/mods/resourcepackdisplay/commands/Command.java @@ -24,7 +24,7 @@ public class Command extends CommandBase { @Override public String getCommandName() { - return "rdp"; + return "rpd"; } @Override diff --git a/src/main/java/dev/fxe/mods/resourcepackdisplay/ui/UI.java b/src/main/java/dev/fxe/mods/resourcepackdisplay/ui/UI.java index d1caeee..37c006c 100644 --- a/src/main/java/dev/fxe/mods/resourcepackdisplay/ui/UI.java +++ b/src/main/java/dev/fxe/mods/resourcepackdisplay/ui/UI.java @@ -52,14 +52,13 @@ public class UI { private static final int imageWidth = 32; private static final int textPadding = 5; - public static UI instance; private final Minecraft mc = Minecraft.getMinecraft(); private final ResourcePackRepository resourcePackRepository = mc.getResourcePackRepository(); private final FontRenderer fontRenderer = mc.fontRendererObj; private final HashMap packSize = new HashMap<>(); - // private static final HashMap packTexture = new HashMap<>(); private final ShaderManager shaderManager = new ShaderManager(Shaders.vert, Shaders.frag); + private final List packs = resourcePackRepository.getRepositoryEntries(); private ResourceLocation currentPack; public UI() { @@ -80,7 +79,6 @@ public static void drawPackDisplay() { int yOffset = 2; if (Config.displayPackName) { height += 9; - UI.instance.fontRenderer.drawString(currentPack.getPackName(), offset + textPadding, y + padding + yOffset, 0xffffff); @@ -95,10 +93,8 @@ public static void drawPackDisplay() { } if (Config.displayPackSize) { height += 9; - String size = UI.instance.getPackSize(currentPack); - if (!size.equalsIgnoreCase("")) - UI.instance.fontRenderer.drawString("Size: " + size, offset + textPadding, y + yOffset + padding, - 0xffffff); + UI.instance.fontRenderer.drawString("Size: " + UI.instance.getPackSize(currentPack), offset + textPadding, y + yOffset + padding, + 0xffffff); } if (Config.displayPackIcon) { @@ -158,8 +154,6 @@ private void loadTexture() { } private IResourcePack getCurrentPack() { - List packs = - resourcePackRepository.getRepositoryEntries(); return packs.size() > 0 ? packs.get(0).getResourcePack() : mc.mcDefaultResourcePack; }