aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/thatgravyboat
diff options
context:
space:
mode:
authorThatGravyBoat <thatgravyboat@gmail.com>2021-09-27 14:18:53 -0230
committerThatGravyBoat <thatgravyboat@gmail.com>2021-09-27 14:18:53 -0230
commit06c495fd067ed5c16b34322d41e9674319e09506 (patch)
treeaa05fcfb4f3f16dba59435814c0513b8f68062ef /src/main/java/com/thatgravyboat
parentf1fd06d889162ac72395ef66043970cfe42cde5e (diff)
parent8f14ae49e5cfd329a70895e74ebb22bc7559f32e (diff)
downloadSkyblockHud-Death-Defied-06c495fd067ed5c16b34322d41e9674319e09506.tar.gz
SkyblockHud-Death-Defied-06c495fd067ed5c16b34322d41e9674319e09506.tar.bz2
SkyblockHud-Death-Defied-06c495fd067ed5c16b34322d41e9674319e09506.zip
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java # src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinRenderItem.java
Diffstat (limited to 'src/main/java/com/thatgravyboat')
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java1
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java75
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java1
7 files changed, 53 insertions, 41 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
index 9b3da58..99f04e9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
@@ -97,7 +97,9 @@ public class SkyblockHud {
((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
configDirectory = new File(event.getModConfigurationDirectory(), "skyblockhud");
- try { configDirectory.mkdir(); } catch (Exception ignored){}
+ try {
+ configDirectory.mkdir();
+ } catch (Exception ignored) {}
configFile = new File(configDirectory, "sbh-config.json");
@@ -194,7 +196,7 @@ public class SkyblockHud {
String stripped = message.replace("your profile was changed to:", "").replace("(co-op)", "").trim();
MinecraftForge.EVENT_BUS.post(new ProfileSwitchedEvent(stripped));
}
- if (message.startsWith("you are playing on profile:")){
+ if (message.startsWith("you are playing on profile:")) {
String stripped = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim();
MinecraftForge.EVENT_BUS.post(new ProfileJoinedEvent(stripped));
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java
index ba24a5d..f1d4d38 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java
@@ -6,7 +6,7 @@ public class ProfileJoinedEvent extends Event {
public String profile;
- public ProfileJoinedEvent(String profile){
+ public ProfileJoinedEvent(String profile) {
this.profile = profile;
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java
index e8561c6..408ac8a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java
@@ -6,8 +6,7 @@ public class ProfileSwitchedEvent extends Event {
public String profile;
- public ProfileSwitchedEvent(String profile){
+ public ProfileSwitchedEvent(String profile) {
this.profile = profile;
}
-
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java b/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java
index bd7e81f..4f330d9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java
@@ -1,7 +1,6 @@
package com.thatgravyboat.skyblockhud.api.item;
public interface IAbility {
-
String getAbility();
int getAbilityTime();
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
index 90333b5..e8ac1d3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
@@ -54,9 +54,9 @@ public class Commands {
break;
case "copySkin":
Entity entity = Minecraft.getMinecraft().objectMouseOver.entityHit;
- if (entity instanceof AbstractClientPlayer){
- clipboard = new StringSelection("http://textures.minecraft.net/texture/"+((AbstractClientPlayer) entity).getLocationSkin().getResourcePath().replace("skins/", ""));
- }else {
+ if (entity instanceof AbstractClientPlayer) {
+ clipboard = new StringSelection("http://textures.minecraft.net/texture/" + ((AbstractClientPlayer) entity).getLocationSkin().getResourcePath().replace("skins/", ""));
+ } else {
sendSBHMessage(sender, "Not a player!");
}
break;
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;
}
}
}
-
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java b/src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java
index a300f9e..0a1fb75 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java
@@ -7,7 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(GuiChest.class)
public interface GuiChestAccessor {
-
@Accessor
IInventory getLowerChestInventory();
}