aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorCuzImClicks <bruno778.whiteelfie@gmail.com>2021-03-16 19:08:48 +0100
committerCuzImClicks <bruno778.whiteelfie@gmail.com>2021-03-16 19:08:48 +0100
commit894b747c4ae2b2da7c4a12142cf69bd2fef2cb7a (patch)
tree6acb4f56e3acca0536f2365647b07d04ac108782 /src/main
parentdc597028f0575eaca3b71dd7139ca62fc56e4a24 (diff)
downloadSkyblockMod-894b747c4ae2b2da7c4a12142cf69bd2fef2cb7a.tar.gz
SkyblockMod-894b747c4ae2b2da7c4a12142cf69bd2fef2cb7a.tar.bz2
SkyblockMod-894b747c4ae2b2da7c4a12142cf69bd2fef2cb7a.zip
implemented requested changes
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/DefenitlyNotAJoikedInstallerFrame.java7
-rw-r--r--src/main/java/me/Danker/features/SlayerESP.java2
-rw-r--r--src/main/java/me/Danker/features/loot/LootTracker.java6
-rw-r--r--src/main/java/me/Danker/gui/DisplayGui.java4
4 files changed, 8 insertions, 11 deletions
diff --git a/src/main/java/DefenitlyNotAJoikedInstallerFrame.java b/src/main/java/DefenitlyNotAJoikedInstallerFrame.java
index e4c9b64..3aabca8 100644
--- a/src/main/java/DefenitlyNotAJoikedInstallerFrame.java
+++ b/src/main/java/DefenitlyNotAJoikedInstallerFrame.java
@@ -1,3 +1,5 @@
+import me.Danker.DankersSkyblockMod;
+
import javax.imageio.ImageIO;
import javax.swing.*;
import java.awt.*;
@@ -424,7 +426,8 @@ public class DefenitlyNotAJoikedInstallerFrame extends JFrame implements ActionL
inSubFolder = true;
}
- File newFile = new File(modsFolder, "Danker's Skyblock Mod-"+getVersionFromMcmodInfo()+".jar");
+ File newFile = new File(modsFolder, getVersionFromMcmodInfo() + ".Danker.s.Skyblock.Mod.-." + DankersSkyblockMod.VERSION + ".jar");
+
if (thisFile.equals(newFile)) {
showErrorMessage("You are opening this file from where the file should be installed... there's nothing to be done!");
return;
@@ -462,7 +465,7 @@ public class DefenitlyNotAJoikedInstallerFrame extends JFrame implements ActionL
return;
}
- showMessage("Danker's SkyblockMod has been successfully installed into your mods folder.");
+ showMessage("Danker's Skyblock Mod has been successfully installed into your mods folder.");
dispose();
System.exit(0);
}
diff --git a/src/main/java/me/Danker/features/SlayerESP.java b/src/main/java/me/Danker/features/SlayerESP.java
index b917c23..5f1783c 100644
--- a/src/main/java/me/Danker/features/SlayerESP.java
+++ b/src/main/java/me/Danker/features/SlayerESP.java
@@ -84,7 +84,7 @@ public class SlayerESP {
if (message.contains("SLAYER QUEST STARTED!")) {
slayerStarted = true;
}
- if (message.contains("NICE! SLAYER QUEST COMPLETE!") || message.contains("SLAYER QUEST FAILED!")) {
+ if (message.contains("NICE! SLAYER BOSS SLAIN!") || message.contains("SLAYER QUEST COMPLETE!") || message.contains("SLAYER QUEST FAILED!")) {
slayerActive = false;
slayerStarted = false;
zombie = null;
diff --git a/src/main/java/me/Danker/features/loot/LootTracker.java b/src/main/java/me/Danker/features/loot/LootTracker.java
index 6430bc2..f76725e 100644
--- a/src/main/java/me/Danker/features/loot/LootTracker.java
+++ b/src/main/java/me/Danker/features/loot/LootTracker.java
@@ -1006,13 +1006,7 @@ public class LootTracker {
bagOfCashSession++;
ConfigHandler.writeIntConfig("ghosts", "bagOfCash", bagOfCashs);
}
-
-
-
}
-
-
-
}
@SubscribeEvent
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index f38c29e..38459ee 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -60,6 +60,7 @@ public class DisplayGui extends GuiScreen {
fishingFestival = new GuiButton(0, width / 2 + 10, (int) (height * 0.4), 100, 20, "Fishing Festival");
fishingSpooky = new GuiButton(0, width / 2 + 130, (int) (height * 0.4), 100, 20, "Fishing Spooky");
mythological = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), 95, 20, "Mythological");
+ ghost = new GuiButton(0, width / 2 + 5, (int) (height * 0.5), 95, 20, "Ghost");
catacombsF1 = new GuiButton(0, width / 2 - 205, (int) (height * 0.65), 50, 20, "F1");
catacombsF2 = new GuiButton(0, width / 2 - 145, (int) (height * 0.65), 50, 20, "F2");
catacombsF3 = new GuiButton(0, width / 2 - 85, (int) (height * 0.65), 50, 20, "F3");
@@ -67,8 +68,7 @@ public class DisplayGui extends GuiScreen {
catacombsF5 = new GuiButton(0, width / 2 + 35, (int) (height * 0.65), 50, 20, "F5");
catacombsF6 = new GuiButton(0, width / 2 + 95, (int) (height * 0.65), 50, 20, "F6");
catacombsF7 = new GuiButton(0, width / 2 + 155, (int) (height * 0.65), 50, 20, "F7");
- ghost = new GuiButton(0, width / 2 + 5, (int) (height * 0.5), 95, 20, "Ghost");
-
+
this.buttonList.add(showSession);
this.buttonList.add(off);
this.buttonList.add(auto);