From aca006bb4d379b6afe79357f24957f035184636e Mon Sep 17 00:00:00 2001 From: nopothegamer <40329022+nopothegamer@users.noreply.github.com> Date: Sat, 18 Dec 2021 21:27:48 +1100 Subject: added pv icons + changed mines of divan waypoint color (#31) * istg if you give me 170 commits i will end someone(added stranded pv icon + added an icon for gamemodes that neu doesnt know about) * Change the mines of divan waypoints to blue because it was hard to see the gold waypoint gold blocks everywhere --- .../miscfeatures/CrystalMetalDetectorSolver.java | 2 +- .../profileviewer/GuiProfileViewer.java | 30 +++++++++++++++++++++ .../assets/notenoughupdates/pv_stranded.png | Bin 0 -> 242 bytes .../assets/notenoughupdates/pv_unknown.png | Bin 0 -> 1814 bytes 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/notenoughupdates/pv_stranded.png create mode 100644 src/main/resources/assets/notenoughupdates/pv_unknown.png (limited to 'src/main') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java index f20081ad..8d73e28d 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java @@ -104,7 +104,7 @@ public class CrystalMetalDetectorSolver { } public static void render(float partialTicks) { - int beaconRGB = 0xffdf00; + int beaconRGB = 0x1fd8f1; if (SBInfo.getInstance().getLocation() != null && SBInfo.getInstance().getLocation().equals("crystal_hollows") && SBInfo.getInstance().location.equals("Mines of Divan")) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java index 81453a8d..227d52d0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java @@ -74,6 +74,8 @@ public class GuiProfileViewer extends GuiScreen { public static final ResourceLocation pv_elements = new ResourceLocation("notenoughupdates:pv_elements.png"); public static final ResourceLocation pv_ironman = new ResourceLocation("notenoughupdates:pv_ironman.png"); public static final ResourceLocation pv_bingo = new ResourceLocation("notenoughupdates:pv_bingo.png"); + public static final ResourceLocation pv_stranded = new ResourceLocation("notenoughupdates:pv_stranded.png"); + public static final ResourceLocation pv_unknown = new ResourceLocation("notenoughupdates:pv_unknown.png"); public static final ResourceLocation resource_packs = new ResourceLocation("minecraft:textures/gui/resource_packs.png"); public static final ResourceLocation icons = new ResourceLocation("textures/gui/icons.png"); @@ -213,6 +215,21 @@ public class GuiProfileViewer extends GuiScreen { Minecraft.getMinecraft().getTextureManager().bindTexture(pv_bingo); Utils.drawTexturedRect(guiLeft - 16 - 5, guiTop + sizeY + 5, 16, 16, GL11.GL_NEAREST); } + //stranded icon + if (currProfileInfo != null && currProfileInfo.has("game_mode") && currProfileInfo.get("game_mode").getAsString().equals("stranded")) { + GlStateManager.color(1, 1, 1, 1); + Minecraft.getMinecraft().getTextureManager().bindTexture(pv_stranded); + Utils.drawTexturedRect(guiLeft - 16 - 5, guiTop + sizeY + 5, 16, 16, GL11.GL_NEAREST); + } + //icon if game mode is unknown + if (currProfileInfo != null && currProfileInfo.has("game_mode") && + !currProfileInfo.get("game_mode").getAsString().equals("stranded") && + !currProfileInfo.get("game_mode").getAsString().equals("bingo") && + !currProfileInfo.get("game_mode").getAsString().equals("ironman")) { + GlStateManager.color(1, 1, 1, 1); + Minecraft.getMinecraft().getTextureManager().bindTexture(pv_unknown); + Utils.drawTexturedRect(guiLeft - 16 - 5, guiTop + sizeY + 5, 16, 16, GL11.GL_NEAREST); + } //Render Open In Skycrypt button renderBlurredBackground(width, height, guiLeft + 100 + 6 + 2, guiTop + sizeY + 3 + 2, 100 - 4, 20 - 4); Minecraft.getMinecraft().getTextureManager().bindTexture(pv_dropdown); @@ -250,6 +267,19 @@ public class GuiProfileViewer extends GuiScreen { Minecraft.getMinecraft().getTextureManager().bindTexture(pv_bingo); Utils.drawTexturedRect(guiLeft - 16 - 5, guiTop + sizeY + 2 + 23 + dropdownOptionSize * yIndex, 16, 16, GL11.GL_NEAREST); } + if (currProfileInfo != null && currProfileInfo.has("game_mode") && currProfileInfo.get("game_mode").getAsString().equals("stranded")) { + GlStateManager.color(1, 1, 1, 1); + Minecraft.getMinecraft().getTextureManager().bindTexture(pv_stranded); + Utils.drawTexturedRect(guiLeft - 16 - 5, guiTop + sizeY + 2 + 23 + dropdownOptionSize * yIndex, 16, 16, GL11.GL_NEAREST); + } + if (currProfileInfo != null && currProfileInfo.has("game_mode") && + !currProfileInfo.get("game_mode").getAsString().equals("stranded") && + !currProfileInfo.get("game_mode").getAsString().equals("bingo") && + !currProfileInfo.get("game_mode").getAsString().equals("ironman")) { + GlStateManager.color(1, 1, 1, 1); + Minecraft.getMinecraft().getTextureManager().bindTexture(pv_unknown); + Utils.drawTexturedRect(guiLeft - 16 - 5, guiTop + sizeY + 2 + 23 + dropdownOptionSize * yIndex, 16, 16, GL11.GL_NEAREST); + } } } diff --git a/src/main/resources/assets/notenoughupdates/pv_stranded.png b/src/main/resources/assets/notenoughupdates/pv_stranded.png new file mode 100644 index 00000000..41b7a7cd Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/pv_stranded.png differ diff --git a/src/main/resources/assets/notenoughupdates/pv_unknown.png b/src/main/resources/assets/notenoughupdates/pv_unknown.png new file mode 100644 index 00000000..d6ce3a00 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/pv_unknown.png differ -- cgit