Skip to content

Commit

Permalink
Fixing bugs related to #7 and adding changelog.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DxsSucuk
DxsSucuk committed Oct 19, 2023
1 parent 660e021 commit e883e3d
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 29 deletions.
8 changes: 3 additions & 5 deletions src/main/java/de/presti/trollv4/api/RequestUtility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ private static InputStream GET(String url) {
int responseCode = con.getResponseCode();
if (responseCode == HttpsURLConnection.HTTP_OK) { // success
return con.getInputStream();
} else {
Main.getInstance().getLogger().warning("GET request not worked");
}
} catch (Exception exception) {
Main.getInstance().getLogger().warning("Error while sending GET request to " + url);
Main.getInstance().getLogger().warning("Error while sending GET request to " + url + "\nException: " + exception.getMessage());
}

return null;
Expand All @@ -38,7 +36,7 @@ public static JsonElement getJSON(String url) {
if (inputStream == null) return new JsonObject();
return new JsonParser().parse(new InputStreamReader(inputStream));
} catch (Exception exception) {
Main.getInstance().getLogger().warning("Error while getting JSON from " + url);
Main.getInstance().getLogger().warning("Error while getting JSON from " + url + "\nException: " + exception.getMessage());
}

return new JsonObject();
Expand All @@ -51,7 +49,7 @@ public static byte[] getBytes(String url) {

return IOUtils.toByteArray(inputStream);
} catch (Exception exception) {
Main.getInstance().getLogger().warning("Error while getting JSON from " + url);
Main.getInstance().getLogger().warning("Error while getting JSON from " + url + "\nException: " + exception.getMessage());
}

return new byte[0];
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/de/presti/trollv4/invs/InvManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public void run() {
@Override
public void run() {
items.add(SetItems.buildSkull(ArrayUtils.trolling.get(p.getName()),
"§2Youre Trolling §c" + ArrayUtils.trolling.get(p.getName())));
"§2You're Trolling §c" + ArrayUtils.trolling.get(p.getName()), false));

new BukkitRunnable() {

Expand Down Expand Up @@ -328,7 +328,7 @@ public void run() {
@Override
public void run() {
items.add(SetItems.buildSkull(ArrayUtils.trolling.get(p.getName()),
"§2Youre Trolling §c" + ArrayUtils.trolling.get(p.getName())));
"§2You're Trolling §c" + ArrayUtils.trolling.get(p.getName()), false));

new BukkitRunnable() {

Expand Down Expand Up @@ -380,7 +380,7 @@ public static void setPageOneTrolls(Inventory inv) {
inv.setItem(34, SetItems.buildItem(Items.getItem("gui.trolls.lsd"), XMaterial.RED_MUSHROOM.parseMaterial(), "§cLag out the Game of the Player!"));
inv.setItem(37, SetItems.buildItem(Items.getItem("gui.trolls.guardian"), XMaterial.BLAZE_ROD.parseMaterial()));
inv.setItem(38, SetItems.buildItem(Items.getItem("gui.trolls.arrowspam"), XMaterial.BOW.parseMaterial()));
inv.setItem(39, SetItems.buildSkull("Herobrine", Items.getItem("gui.trolls.herobrine")));
inv.setItem(39, SetItems.buildSkull("Herobrine", Items.getItem("gui.trolls.herobrine"), true));
inv.setItem(40, SetItems.buildItem(Items.getItem("gui.trolls.tornado"), XMaterial.WHITE_WOOL.parseMaterial(), "§cDestroys the Map!"));
inv.setItem(41, SetItems.buildItem(Items.getItem("gui.trolls.fakeinv"), XMaterial.CHEST.parseMaterial()));
inv.setItem(42,
Expand All @@ -402,7 +402,7 @@ public static void setPageTwoTrolls(Inventory inv, Player p) {
@Override
public void run() {
items.add(SetItems.buildSkull(ArrayUtils.trolling.get(p.getName()),
"§2Youre Trolling §c" + ArrayUtils.trolling.get(p.getName())));
"§2You're Trolling §c" + ArrayUtils.trolling.get(p.getName()), false));

new BukkitRunnable() {

Expand Down Expand Up @@ -465,7 +465,7 @@ public void run() {
for (Player all : Bukkit.getOnlinePlayers()) {
if (i != 45) {
try {
items.add(SetItems.buildSkull(all.getName(), "§2" + all.getName()));
items.add(SetItems.buildSkull(all.getName(), "§2" + all.getName(), false));
} catch (Exception e) {
e.printStackTrace();
}
Expand All @@ -492,7 +492,7 @@ public void run() {
for (Player all : Bukkit.getOnlinePlayers()) {
if (i != 45) {
try {
cpinv.addItem(SetItems.buildSkull(all.getName(), "§2" + all.getName()));
cpinv.addItem(SetItems.buildSkull(all.getName(), "§2" + all.getName(), false));

} catch (Exception e) {
e.printStackTrace();
Expand Down
35 changes: 20 additions & 15 deletions src/main/java/de/presti/trollv4/invs/SetItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import com.cryptomorin.xseries.SkullUtils;
Expand All @@ -14,36 +15,40 @@

public class SetItems {

public static ItemStack buildSkull(String p, String name) {
public static ItemStack buildSkull(String p, String name, boolean forceOnlineLookup) {
ArrayList<String> lore = new ArrayList<String>();

String uuid = "";
UUID uuid = null;

try {
uuid = PlayerInfo.getUUID(p);
} catch (Exception e) {
uuid = "cracked";
}
Player player = Bukkit.getPlayer(p);

if (uuid == null || uuid.equalsIgnoreCase("") || uuid.isEmpty()) {
uuid = "cracked";
if (forceOnlineLookup) {
try {
String infoUUID = PlayerInfo.getUUID(p);
if (infoUUID != null)
uuid = UUID.fromString(infoUUID);
} catch (Exception ignore) {}
} else {
if (player != null) {
uuid = player.getUniqueId();
}
}

ItemStack skull = (uuid.equalsIgnoreCase("cracked") ? new ItemStack(XMaterial.PLAYER_HEAD.parseMaterial())
: SkullUtils.getSkull(UUID.fromString(uuid)));
ItemStack skull = uuid == null ? new ItemStack(XMaterial.PLAYER_HEAD.parseMaterial())
: SkullUtils.getSkull(uuid);

ItemMeta skullm = skull.getItemMeta();

if (Bukkit.getPlayer(p) != null) {
if (Bukkit.getPlayer(p).isOp()) {
if (player != null) {
if (player.isOp()) {
lore.add("§cThis User has OP!");
}

if (Bukkit.getPlayer(p).hasPermission("troll.player")) {
if (player.hasPermission("troll.player")) {
lore.add("§cThis User can acces the Troll Gui!");
}

skullm.setLore(lore);

}

skullm.setDisplayName(name);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/presti/trollv4/listener/GuiListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public void run() {
int i = 0;
for (Player all : Bukkit.getOnlinePlayers()) {
if (i > (45 * page)) {
items.add(SetItems.buildSkull(all.getName(), "§2" + all.getName()));
items.add(SetItems.buildSkull(all.getName(), "§2" + all.getName(), false));
}
i++;
}
Expand All @@ -269,7 +269,7 @@ public void run() {
for (Player all : Bukkit.getOnlinePlayers()) {
if (i > (45 * page)) {
e.getInventory()
.addItem(SetItems.buildSkull(all.getName(), "§2" + all.getName()));
.addItem(SetItems.buildSkull(all.getName(), "§2" + all.getName(), false));
}
i++;
}
Expand Down
44 changes: 43 additions & 1 deletion src/main/java/de/presti/trollv4/main/Changelog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,55 @@ public static void logGUI(Player p) {
Data.changelogRemove + "Fixed a bug related to the Selection GUI."
}
));
inv.setItem(35,

inv.setItem(37,
SetItems.buildItem("§2Version » §c4.5.10", XMaterial.PAPER,
new String[]{
Data.changelogAdd + "Adding a config value for the spooky world generation."
}
));

inv.setItem(38,
SetItems.buildItem("§2Version » §c4.5.11", XMaterial.PAPER,
new String[]{
Data.changelogChange + "NPC based trolls should work on every version now."
}
));

inv.setItem(40,
SetItems.buildItem("§2Version » §c4.5.12 §a+ §c4.5.13", XMaterial.PAPER,
new String[]{
Data.changelogAdd + "Added a warning if the whitelist is on while having community-surprise active.",
Data.changelogAdd + "Option for custom spookyworld name.",
Data.changelogChange + "Spooky world will now ONLY be created on start."
}
));

inv.setItem(41,
SetItems.buildItem("§2Version » §c4.5.14", XMaterial.PAPER,
new String[]{
Data.changelogAdd + "Added confirmation menu for desturctiv trolls.",
Data.changelogAdd + "Added vomit troll.",
Data.changelogAdd + "Added infinite loading screen troll."
}
));

inv.setItem(42,
SetItems.buildItem("§2Version » §c4.5.15 §a", XMaterial.PAPER,
new String[]{
Data.changelogAdd + "1.20 Support.",
Data.changelogChange + "A lot of code cleanup and dependency fixing."
}
));

inv.setItem(43,
SetItems.buildItem("§2Version » §c4.5.16", XMaterial.PAPER,
new String[]{
Data.changelogChange + "Bug fixing for cracked servers.",
Data.changelogChange + "Reducing console spamming."
}
));


inv.setItem(53, SetItems.buildItem("§3Credits", XMaterial.WRITABLE_BOOK));

Expand Down

0 comments on commit e883e3d

Please sign in to comment.