aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/thatgravyboat/skyblockhud/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/thatgravyboat/skyblockhud/handlers')
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java24
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java75
2 files changed, 56 insertions, 43 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
index d7d3a41..e53e937 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
@@ -22,9 +22,9 @@ public class CooldownHandler {
private static final Map<String, Cooldown> COOLDOWNS = new HashMap<>();
public static Matcher getAbility(NBTTagCompound nbt) {
- if (nbt != null && nbt.hasKey("ExtraAttributes") && nbt.getCompoundTag("ExtraAttributes").hasKey("uuid") && nbt.hasKey("display")){
+ if (nbt != null && nbt.hasKey("ExtraAttributes") && nbt.getCompoundTag("ExtraAttributes").hasKey("uuid") && nbt.hasKey("display")) {
NBTTagCompound display = nbt.getCompoundTag("display");
- if (display != null && display.hasKey("Lore")){
+ if (display != null && display.hasKey("Lore")) {
NBTTagList lore = display.getTagList("Lore", 8);
List<String> loreList = new ArrayList<>();
for (int i = 0; i < lore.tagCount(); i++) {
@@ -32,7 +32,7 @@ public class CooldownHandler {
if (!loreLine.isEmpty()) loreList.add(loreLine);
}
Matcher abilityMatcher = ABILITY_REGEX.matcher(String.join(" ", loreList));
- if (abilityMatcher.find()){
+ if (abilityMatcher.find()) {
return abilityMatcher;
}
}
@@ -41,11 +41,11 @@ public class CooldownHandler {
}
private static void addCooldown(IAbility ability) {
- COOLDOWNS.putIfAbsent(ability.getAbility(), new Cooldown(ability.getAbilityTime()*20));
+ COOLDOWNS.putIfAbsent(ability.getAbility(), new Cooldown(ability.getAbilityTime() * 20));
}
@SubscribeEvent
- public void tick(TickEvent.ClientTickEvent event){
+ public void tick(TickEvent.ClientTickEvent event) {
if (SkyblockHud.config.misc.hideItemCooldowns) return;
if (event.phase.equals(TickEvent.Phase.END)) {
COOLDOWNS.values().forEach(Cooldown::tick);
@@ -56,9 +56,9 @@ public class CooldownHandler {
@SubscribeEvent
public void onPlayerInteract(PlayerInteractEvent event) {
if (SkyblockHud.config.misc.hideItemCooldowns) return;
- if (event.action.equals(PlayerInteractEvent.Action.RIGHT_CLICK_AIR) || event.action.equals(PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK)){
+ if (event.action.equals(PlayerInteractEvent.Action.RIGHT_CLICK_AIR) || event.action.equals(PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK)) {
if (event.entityPlayer.getHeldItem() != null) {
- IAbility ability = (IAbility)((Object) event.entityPlayer.getHeldItem());
+ IAbility ability = (IAbility) ((Object) event.entityPlayer.getHeldItem());
if (ability.getAbility() != null) {
addCooldown(ability);
}
@@ -66,8 +66,8 @@ public class CooldownHandler {
}
}
- public static float getAbilityTime(ItemStack stack){
- IAbility ability = (IAbility)((Object) stack);
+ public static float getAbilityTime(ItemStack stack) {
+ IAbility ability = (IAbility) ((Object) stack);
if (ability.getAbility() != null) {
return COOLDOWNS.containsKey(ability.getAbility()) ? COOLDOWNS.get(ability.getAbility()).getTime() : -1f;
}
@@ -75,10 +75,11 @@ public class CooldownHandler {
}
private static class Cooldown {
+
public int current;
public final int end;
- Cooldown(int end){
+ Cooldown(int end) {
this.end = end;
}
@@ -91,8 +92,7 @@ public class CooldownHandler {
}
public float getTime() {
- return current/(float)end;
+ return current / (float) end;
}
}
-
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java
index 71079b6..9eaa421 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java
@@ -34,16 +34,16 @@ public class WarpHandler {
}
@SubscribeEvent
- public void profileChange(ProfileSwitchedEvent event){
- if (profile != null && !profile.equals(event.profile)){
+ public void profileChange(ProfileSwitchedEvent event) {
+ if (profile != null && !profile.equals(event.profile)) {
load();
}
profile = event.profile;
}
@SubscribeEvent
- public void profileJoined(ProfileJoinedEvent event){
- if (profile != null && !profile.equals(event.profile)){
+ public void profileJoined(ProfileJoinedEvent event) {
+ if (profile != null && !profile.equals(event.profile)) {
load();
}
profile = event.profile;
@@ -53,24 +53,24 @@ public class WarpHandler {
public void onGuiClosed(GuiOpenEvent event) {
boolean changed = false;
GuiScreen currentScreen = Minecraft.getMinecraft().currentScreen;
- if (currentScreen instanceof GuiChest){
+ if (currentScreen instanceof GuiChest) {
GuiChestAccessor accessor = (GuiChestAccessor) currentScreen;
- if (accessor.getLowerChestInventory().getDisplayName().getUnformattedText().contains("Fast Travel")){
+ if (accessor.getLowerChestInventory().getDisplayName().getUnformattedText().contains("Fast Travel")) {
for (int i = 9; i < Math.min(36, accessor.getLowerChestInventory().getSizeInventory()); i++) {
ItemStack stack = accessor.getLowerChestInventory().getStackInSlot(i);
- if (stack != null && stack.getItem().equals(Items.skull) && stack.getTagCompound().hasKey("display")){
+ if (stack != null && stack.getItem().equals(Items.skull) && stack.getTagCompound().hasKey("display")) {
NBTTagList lore = stack.getTagCompound().getCompoundTag("display").getTagList("Lore", 8);
String warpLine = Utils.removeColor(lore.getStringTagAt(0)).trim();
if (warpLine.equals("Unknown island!")) continue;
- String disabledLine = Utils.removeColor(lore.getStringTagAt(lore.tagCount()-1)).trim();
+ String disabledLine = Utils.removeColor(lore.getStringTagAt(lore.tagCount() - 1)).trim();
Warp warp = Warp.fromId(warpLine.replace("/warp", "").trim());
if (warp != null && !disabledLine.equals("Warp not unlocked!")) {
- if (PLAYER_WARPS.put(profile, warp)){
+ if (PLAYER_WARPS.put(profile, warp)) {
changed = true;
}
}
@@ -84,14 +84,18 @@ public class WarpHandler {
public static void save() {
JsonObject json = new JsonObject();
JsonArray array = new JsonArray();
- PLAYER_WARPS.asMap().forEach((profile, warps) -> {
- JsonObject profileObject = new JsonObject();
- profileObject.addProperty("profile", profile);
- JsonArray warpArray = new JsonArray();
- warps.forEach(warp -> warpArray.add(new JsonPrimitive(warp.name())));
- profileObject.add("warps", warpArray);
- array.add(profileObject);
- });
+ PLAYER_WARPS
+ .asMap()
+ .forEach(
+ (profile, warps) -> {
+ JsonObject profileObject = new JsonObject();
+ profileObject.addProperty("profile", profile);
+ JsonArray warpArray = new JsonArray();
+ warps.forEach(warp -> warpArray.add(new JsonPrimitive(warp.name())));
+ profileObject.add("warps", warpArray);
+ array.add(profileObject);
+ }
+ );
json.add("profileWarps", array);
warpConfig = new File(SkyblockHud.configDirectory, "sbh-warps.json");
@@ -111,15 +115,25 @@ public class WarpHandler {
if (warpConfig.createNewFile()) return true;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(warpConfig), StandardCharsets.UTF_8))) {
JsonObject json = GSON.fromJson(reader, JsonObject.class);
- json.get("profileWarps").getAsJsonArray().forEach(jsonElement -> {
- JsonObject profileObject = jsonElement.getAsJsonObject();
- List<Warp> warps = new ArrayList<>();
- profileObject.get("warps").getAsJsonArray().forEach(warpId -> {
- Warp warp = Warp.safeValueOf(warpId.getAsString());
- if (warp != null) warps.add(warp);
- });
- PLAYER_WARPS.putAll(profileObject.get("profile").getAsString(), warps);
- });
+ json
+ .get("profileWarps")
+ .getAsJsonArray()
+ .forEach(
+ jsonElement -> {
+ JsonObject profileObject = jsonElement.getAsJsonObject();
+ List<Warp> warps = new ArrayList<>();
+ profileObject
+ .get("warps")
+ .getAsJsonArray()
+ .forEach(
+ warpId -> {
+ Warp warp = Warp.safeValueOf(warpId.getAsString());
+ if (warp != null) warps.add(warp);
+ }
+ );
+ PLAYER_WARPS.putAll(profileObject.get("profile").getAsString(), warps);
+ }
+ );
}
} catch (Exception ignored) {}
return false;
@@ -149,24 +163,23 @@ public class WarpHandler {
public String warpId;
- Warp(String warpId){
+ Warp(String warpId) {
this.warpId = warpId;
}
- public static Warp fromId(String id){
+ public static Warp fromId(String id) {
for (Warp value : Warp.values()) {
if (value.warpId.equals(id)) return value;
}
return null;
}
- public static Warp safeValueOf(String value){
+ public static Warp safeValueOf(String value) {
try {
return Warp.valueOf(value);
- }catch (Exception e) {
+ } catch (Exception e) {
return null;
}
}
}
-
}
generated by cgit (git 2.46.0) at 2024-12-12 18:37:11 +0000