From bb75fd7b83b238f1f922ffc64b2a0a535c5524b7 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Tue, 6 Jul 2021 17:13:01 -0400 Subject: Format --- .../skyblockhud/tracker/TrackerFileLoader.java | 376 ++++++++++++--------- 1 file changed, 223 insertions(+), 153 deletions(-) (limited to 'src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java') diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java index d7f751298..4accb2596 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java @@ -2,6 +2,12 @@ package com.thatgravyboat.skyblockhud.tracker; import com.google.gson.*; import com.thatgravyboat.skyblockhud.location.Locations; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,162 +16,226 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ResourceLocation; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class TrackerFileLoader { - private static final Gson gson = new GsonBuilder().create(); - - public static ItemStack getDisplayItem(JsonObject jsonObject){ - int meta = jsonObject.get("meta").getAsInt(); - String displayItemId = jsonObject.get("item").getAsString(); - Item item = Item.itemRegistry.getObject(new ResourceLocation(displayItemId)); - ItemStack stack = new ItemStack(item, 0, meta); - if (jsonObject.has("skullData") && displayItemId.equals("minecraft:skull") && meta == 3){ - stack.setTagInfo("SkullOwner",getSkullTag(jsonObject.getAsJsonObject("skullData"))); - } - if (jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean()) stack.setTagInfo("ench", new NBTTagList()); - return stack; - } - - public static NBTBase getSkullTag(JsonObject skullObject){ - NBTTagCompound skullOwner = new NBTTagCompound(); - NBTTagCompound properties = new NBTTagCompound(); - NBTTagList textures = new NBTTagList(); - NBTTagCompound value = new NBTTagCompound(); - - skullOwner.setString("Id", skullObject.get("id").getAsString()); - - value.setString("Value", skullObject.get("texture").getAsString()); - textures.appendTag(value); - - properties.setTag("textures",textures); - - skullOwner.setTag("Properties", properties); - return skullOwner; - } - - private static void loadTrackers(JsonObject object){ - for (JsonElement element : object.get("trackers").getAsJsonArray()) { - JsonObject tracker = element.getAsJsonObject(); - StringBuilder builder = new StringBuilder(); - tracker.get("location").getAsJsonArray().forEach(loc -> builder.append(loc.getAsString())); - String location = builder.toString(); - - - Map stacks = new HashMap<>(); - for (JsonElement drop :tracker.get("drops").getAsJsonArray()) { - JsonObject dropObject = drop.getAsJsonObject(); - - //Display Item Creation - ItemStack stack = getDisplayItem(dropObject.getAsJsonObject("displayItem")); - String itemId = dropObject.get("id").getAsString(); - - stacks.put(itemId, stack); - } - - String event = tracker.has("event") ? tracker.get("event").getAsString() : null; - - Map> events = new HashMap<>(); - events.put(event, stacks); - - if (TrackerHandler.trackers.containsKey(location)){ - TrackerHandler.trackers.get(location).dropTrackers.put(event, stacks); - }else { - TrackerHandler.trackers.putIfAbsent(location, new TrackerHandler.TrackerData(events)); - } - - tracker.get("location").getAsJsonArray().forEach(loc -> TrackerHandler.trackerIds.put(Locations.get(loc.getAsString()), location)); - } - } - - private static JsonElement getTrackerFile(){ - List trackerStats = new ArrayList<>(); - TrackerHandler.trackers.forEach((locations, trackerData) -> - trackerData.dropTrackers.forEach((event, drops) -> { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("location", locations); - - if (event == null) jsonObject.add("event", new JsonNull()); - else jsonObject.addProperty("event", event); - - JsonObject dropsData = new JsonObject(); - drops.forEach((s, stack) -> dropsData.addProperty(s, stack.stackSize)); - jsonObject.add("drops", dropsData); - trackerStats.add(jsonObject); - } - )); - JsonArray stats = new JsonArray(); - trackerStats.forEach(stats::add); - return stats; + private static final Gson gson = new GsonBuilder().create(); + + public static ItemStack getDisplayItem(JsonObject jsonObject) { + int meta = jsonObject.get("meta").getAsInt(); + String displayItemId = jsonObject.get("item").getAsString(); + Item item = Item.itemRegistry.getObject( + new ResourceLocation(displayItemId) + ); + ItemStack stack = new ItemStack(item, 0, meta); + if ( + jsonObject.has("skullData") && + displayItemId.equals("minecraft:skull") && + meta == 3 + ) { + stack.setTagInfo( + "SkullOwner", + getSkullTag(jsonObject.getAsJsonObject("skullData")) + ); } - - public static void loadTrackersFile(){ - try { - ResourceLocation trackers = new ResourceLocation("skyblockhud:data/trackers.json"); - InputStream is = Minecraft.getMinecraft().getResourceManager().getResource(trackers).getInputStream(); - - try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { - loadTrackers(gson.fromJson(reader, JsonObject.class)); - } - }catch (Exception ignored){} + if ( + jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean() + ) stack.setTagInfo("ench", new NBTTagList()); + return stack; + } + + public static NBTBase getSkullTag(JsonObject skullObject) { + NBTTagCompound skullOwner = new NBTTagCompound(); + NBTTagCompound properties = new NBTTagCompound(); + NBTTagList textures = new NBTTagList(); + NBTTagCompound value = new NBTTagCompound(); + + skullOwner.setString("Id", skullObject.get("id").getAsString()); + + value.setString("Value", skullObject.get("texture").getAsString()); + textures.appendTag(value); + + properties.setTag("textures", textures); + + skullOwner.setTag("Properties", properties); + return skullOwner; + } + + private static void loadTrackers(JsonObject object) { + for (JsonElement element : object.get("trackers").getAsJsonArray()) { + JsonObject tracker = element.getAsJsonObject(); + StringBuilder builder = new StringBuilder(); + tracker + .get("location") + .getAsJsonArray() + .forEach(loc -> builder.append(loc.getAsString())); + String location = builder.toString(); + + Map stacks = new HashMap<>(); + for (JsonElement drop : tracker.get("drops").getAsJsonArray()) { + JsonObject dropObject = drop.getAsJsonObject(); + + //Display Item Creation + ItemStack stack = getDisplayItem( + dropObject.getAsJsonObject("displayItem") + ); + String itemId = dropObject.get("id").getAsString(); + + stacks.put(itemId, stack); + } + + String event = tracker.has("event") + ? tracker.get("event").getAsString() + : null; + + Map> events = new HashMap<>(); + events.put(event, stacks); + + if (TrackerHandler.trackers.containsKey(location)) { + TrackerHandler.trackers.get(location).dropTrackers.put(event, stacks); + } else { + TrackerHandler.trackers.putIfAbsent( + location, + new TrackerHandler.TrackerData(events) + ); + } + + tracker + .get("location") + .getAsJsonArray() + .forEach( + loc -> + TrackerHandler.trackerIds.put( + Locations.get(loc.getAsString()), + location + ) + ); } - - public static boolean loadTrackerStatsFile(File configDirectory){ - File configFile = new File(configDirectory, "sbh-trackers-stats.json"); - - try { - if (configFile.createNewFile()){ - return true; - } - - try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) { - JsonObject json = gson.fromJson(reader, JsonObject.class); - if (json.has("trackerStats")){ - json.getAsJsonArray("trackerStats").forEach(element -> { - if (element.isJsonObject()){ - JsonObject object = element.getAsJsonObject(); - String location = object.get("location").getAsString(); - Map> trackers = TrackerHandler.trackers.get(location).dropTrackers; - - JsonElement event = object.get("event"); - String eventString = event == null || event.isJsonNull() ? null : event.getAsString(); - Map drops = trackers.get(eventString); - - if (drops != null) { - for (Map.Entry drop :object.getAsJsonObject("drops").entrySet()) { - if (drops.containsKey(drop.getKey())) { - drops.get(drop.getKey()).stackSize = drop.getValue().getAsInt(); - } - } - drops = TrackerHandler.sortTrackers(drops); - trackers.put(eventString, drops); - } - } - }); + } + + private static JsonElement getTrackerFile() { + List trackerStats = new ArrayList<>(); + TrackerHandler.trackers.forEach( + (locations, trackerData) -> + trackerData.dropTrackers.forEach( + (event, drops) -> { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty("location", locations); + + if (event == null) jsonObject.add( + "event", + new JsonNull() + ); else jsonObject.addProperty("event", event); + + JsonObject dropsData = new JsonObject(); + drops.forEach( + (s, stack) -> dropsData.addProperty(s, stack.stackSize) + ); + jsonObject.add("drops", dropsData); + trackerStats.add(jsonObject); + } + ) + ); + JsonArray stats = new JsonArray(); + trackerStats.forEach(stats::add); + return stats; + } + + public static void loadTrackersFile() { + try { + ResourceLocation trackers = new ResourceLocation( + "skyblockhud:data/trackers.json" + ); + InputStream is = Minecraft + .getMinecraft() + .getResourceManager() + .getResource(trackers) + .getInputStream(); + + try ( + BufferedReader reader = new BufferedReader( + new InputStreamReader(is, StandardCharsets.UTF_8) + ) + ) { + loadTrackers(gson.fromJson(reader, JsonObject.class)); + } + } catch (Exception ignored) {} + } + + public static boolean loadTrackerStatsFile(File configDirectory) { + File configFile = new File(configDirectory, "sbh-trackers-stats.json"); + + try { + if (configFile.createNewFile()) { + return true; + } + + try ( + BufferedReader reader = new BufferedReader( + new InputStreamReader( + new FileInputStream(configFile), + StandardCharsets.UTF_8 + ) + ) + ) { + JsonObject json = gson.fromJson(reader, JsonObject.class); + if (json.has("trackerStats")) { + json + .getAsJsonArray("trackerStats") + .forEach( + element -> { + if (element.isJsonObject()) { + JsonObject object = element.getAsJsonObject(); + String location = object.get("location").getAsString(); + Map> trackers = TrackerHandler.trackers.get( + location + ) + .dropTrackers; + + JsonElement event = object.get("event"); + String eventString = event == null || event.isJsonNull() + ? null + : event.getAsString(); + Map drops = trackers.get(eventString); + + if (drops != null) { + for (Map.Entry drop : object + .getAsJsonObject("drops") + .entrySet()) { + if (drops.containsKey(drop.getKey())) { + drops.get(drop.getKey()).stackSize = + drop.getValue().getAsInt(); + } + } + drops = TrackerHandler.sortTrackers(drops); + trackers.put(eventString, drops); + } } - } - } catch(Exception ignored) {} - return false; - } - - public static void saveTrackerStatsFile(File configDirectory){ - File configFile = new File(configDirectory, "sbh-trackers-stats.json"); - - try { - configFile.createNewFile(); - - try(BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) { - JsonObject json = new JsonObject(); - json.add("trackerStats", getTrackerFile()); - writer.write(gson.toJson(json)); - } - } catch(IOException ignored) {} - } - + } + ); + } + } + } catch (Exception ignored) {} + return false; + } + + public static void saveTrackerStatsFile(File configDirectory) { + File configFile = new File(configDirectory, "sbh-trackers-stats.json"); + + try { + configFile.createNewFile(); + + try ( + BufferedWriter writer = new BufferedWriter( + new OutputStreamWriter( + new FileOutputStream(configFile), + StandardCharsets.UTF_8 + ) + ) + ) { + JsonObject json = new JsonObject(); + json.add("trackerStats", getTrackerFile()); + writer.write(gson.toJson(json)); + } + } catch (IOException ignored) {} + } } -- cgit From a8e475fa0a7977f64f072548459d592274169d66 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Tue, 6 Jul 2021 17:15:21 -0400 Subject: Format v2 --- .../skyblockhud/tracker/TrackerFileLoader.java | 435 +++++++++++---------- 1 file changed, 224 insertions(+), 211 deletions(-) (limited to 'src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java') diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java index 4accb2596..7035feee1 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java @@ -18,224 +18,237 @@ import net.minecraft.util.ResourceLocation; public class TrackerFileLoader { - private static final Gson gson = new GsonBuilder().create(); - - public static ItemStack getDisplayItem(JsonObject jsonObject) { - int meta = jsonObject.get("meta").getAsInt(); - String displayItemId = jsonObject.get("item").getAsString(); - Item item = Item.itemRegistry.getObject( - new ResourceLocation(displayItemId) - ); - ItemStack stack = new ItemStack(item, 0, meta); - if ( - jsonObject.has("skullData") && - displayItemId.equals("minecraft:skull") && - meta == 3 - ) { - stack.setTagInfo( - "SkullOwner", - getSkullTag(jsonObject.getAsJsonObject("skullData")) - ); - } - if ( - jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean() - ) stack.setTagInfo("ench", new NBTTagList()); - return stack; - } - - public static NBTBase getSkullTag(JsonObject skullObject) { - NBTTagCompound skullOwner = new NBTTagCompound(); - NBTTagCompound properties = new NBTTagCompound(); - NBTTagList textures = new NBTTagList(); - NBTTagCompound value = new NBTTagCompound(); - - skullOwner.setString("Id", skullObject.get("id").getAsString()); - - value.setString("Value", skullObject.get("texture").getAsString()); - textures.appendTag(value); - - properties.setTag("textures", textures); - - skullOwner.setTag("Properties", properties); - return skullOwner; - } - - private static void loadTrackers(JsonObject object) { - for (JsonElement element : object.get("trackers").getAsJsonArray()) { - JsonObject tracker = element.getAsJsonObject(); - StringBuilder builder = new StringBuilder(); - tracker - .get("location") - .getAsJsonArray() - .forEach(loc -> builder.append(loc.getAsString())); - String location = builder.toString(); - - Map stacks = new HashMap<>(); - for (JsonElement drop : tracker.get("drops").getAsJsonArray()) { - JsonObject dropObject = drop.getAsJsonObject(); - - //Display Item Creation - ItemStack stack = getDisplayItem( - dropObject.getAsJsonObject("displayItem") + private static final Gson gson = new GsonBuilder().create(); + + public static ItemStack getDisplayItem(JsonObject jsonObject) { + int meta = jsonObject.get("meta").getAsInt(); + String displayItemId = jsonObject.get("item").getAsString(); + Item item = Item.itemRegistry.getObject( + new ResourceLocation(displayItemId) ); - String itemId = dropObject.get("id").getAsString(); + ItemStack stack = new ItemStack(item, 0, meta); + if ( + jsonObject.has("skullData") && + displayItemId.equals("minecraft:skull") && + meta == 3 + ) { + stack.setTagInfo( + "SkullOwner", + getSkullTag(jsonObject.getAsJsonObject("skullData")) + ); + } + if ( + jsonObject.has("enchanted") && + jsonObject.get("enchanted").getAsBoolean() + ) stack.setTagInfo("ench", new NBTTagList()); + return stack; + } - stacks.put(itemId, stack); - } + public static NBTBase getSkullTag(JsonObject skullObject) { + NBTTagCompound skullOwner = new NBTTagCompound(); + NBTTagCompound properties = new NBTTagCompound(); + NBTTagList textures = new NBTTagList(); + NBTTagCompound value = new NBTTagCompound(); - String event = tracker.has("event") - ? tracker.get("event").getAsString() - : null; + skullOwner.setString("Id", skullObject.get("id").getAsString()); - Map> events = new HashMap<>(); - events.put(event, stacks); + value.setString("Value", skullObject.get("texture").getAsString()); + textures.appendTag(value); - if (TrackerHandler.trackers.containsKey(location)) { - TrackerHandler.trackers.get(location).dropTrackers.put(event, stacks); - } else { - TrackerHandler.trackers.putIfAbsent( - location, - new TrackerHandler.TrackerData(events) - ); - } - - tracker - .get("location") - .getAsJsonArray() - .forEach( - loc -> - TrackerHandler.trackerIds.put( - Locations.get(loc.getAsString()), - location - ) + properties.setTag("textures", textures); + + skullOwner.setTag("Properties", properties); + return skullOwner; + } + + private static void loadTrackers(JsonObject object) { + for (JsonElement element : object.get("trackers").getAsJsonArray()) { + JsonObject tracker = element.getAsJsonObject(); + StringBuilder builder = new StringBuilder(); + tracker + .get("location") + .getAsJsonArray() + .forEach(loc -> builder.append(loc.getAsString())); + String location = builder.toString(); + + Map stacks = new HashMap<>(); + for (JsonElement drop : tracker.get("drops").getAsJsonArray()) { + JsonObject dropObject = drop.getAsJsonObject(); + + //Display Item Creation + ItemStack stack = getDisplayItem( + dropObject.getAsJsonObject("displayItem") + ); + String itemId = dropObject.get("id").getAsString(); + + stacks.put(itemId, stack); + } + + String event = tracker.has("event") + ? tracker.get("event").getAsString() + : null; + + Map> events = new HashMap<>(); + events.put(event, stacks); + + if (TrackerHandler.trackers.containsKey(location)) { + TrackerHandler.trackers + .get(location) + .dropTrackers.put(event, stacks); + } else { + TrackerHandler.trackers.putIfAbsent( + location, + new TrackerHandler.TrackerData(events) + ); + } + + tracker + .get("location") + .getAsJsonArray() + .forEach( + loc -> + TrackerHandler.trackerIds.put( + Locations.get(loc.getAsString()), + location + ) + ); + } + } + + private static JsonElement getTrackerFile() { + List trackerStats = new ArrayList<>(); + TrackerHandler.trackers.forEach( + (locations, trackerData) -> + trackerData.dropTrackers.forEach( + (event, drops) -> { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty("location", locations); + + if (event == null) jsonObject.add( + "event", + new JsonNull() + ); else jsonObject.addProperty("event", event); + + JsonObject dropsData = new JsonObject(); + drops.forEach( + (s, stack) -> + dropsData.addProperty(s, stack.stackSize) + ); + jsonObject.add("drops", dropsData); + trackerStats.add(jsonObject); + } + ) ); + JsonArray stats = new JsonArray(); + trackerStats.forEach(stats::add); + return stats; } - } - - private static JsonElement getTrackerFile() { - List trackerStats = new ArrayList<>(); - TrackerHandler.trackers.forEach( - (locations, trackerData) -> - trackerData.dropTrackers.forEach( - (event, drops) -> { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("location", locations); - - if (event == null) jsonObject.add( - "event", - new JsonNull() - ); else jsonObject.addProperty("event", event); - - JsonObject dropsData = new JsonObject(); - drops.forEach( - (s, stack) -> dropsData.addProperty(s, stack.stackSize) + + public static void loadTrackersFile() { + try { + ResourceLocation trackers = new ResourceLocation( + "skyblockhud:data/trackers.json" ); - jsonObject.add("drops", dropsData); - trackerStats.add(jsonObject); - } - ) - ); - JsonArray stats = new JsonArray(); - trackerStats.forEach(stats::add); - return stats; - } - - public static void loadTrackersFile() { - try { - ResourceLocation trackers = new ResourceLocation( - "skyblockhud:data/trackers.json" - ); - InputStream is = Minecraft - .getMinecraft() - .getResourceManager() - .getResource(trackers) - .getInputStream(); - - try ( - BufferedReader reader = new BufferedReader( - new InputStreamReader(is, StandardCharsets.UTF_8) - ) - ) { - loadTrackers(gson.fromJson(reader, JsonObject.class)); - } - } catch (Exception ignored) {} - } - - public static boolean loadTrackerStatsFile(File configDirectory) { - File configFile = new File(configDirectory, "sbh-trackers-stats.json"); - - try { - if (configFile.createNewFile()) { - return true; - } - - try ( - BufferedReader reader = new BufferedReader( - new InputStreamReader( - new FileInputStream(configFile), - StandardCharsets.UTF_8 - ) - ) - ) { - JsonObject json = gson.fromJson(reader, JsonObject.class); - if (json.has("trackerStats")) { - json - .getAsJsonArray("trackerStats") - .forEach( - element -> { - if (element.isJsonObject()) { - JsonObject object = element.getAsJsonObject(); - String location = object.get("location").getAsString(); - Map> trackers = TrackerHandler.trackers.get( - location - ) - .dropTrackers; - - JsonElement event = object.get("event"); - String eventString = event == null || event.isJsonNull() - ? null - : event.getAsString(); - Map drops = trackers.get(eventString); - - if (drops != null) { - for (Map.Entry drop : object - .getAsJsonObject("drops") - .entrySet()) { - if (drops.containsKey(drop.getKey())) { - drops.get(drop.getKey()).stackSize = - drop.getValue().getAsInt(); - } - } - drops = TrackerHandler.sortTrackers(drops); - trackers.put(eventString, drops); - } + InputStream is = Minecraft + .getMinecraft() + .getResourceManager() + .getResource(trackers) + .getInputStream(); + + try ( + BufferedReader reader = new BufferedReader( + new InputStreamReader(is, StandardCharsets.UTF_8) + ) + ) { + loadTrackers(gson.fromJson(reader, JsonObject.class)); + } + } catch (Exception ignored) {} + } + + public static boolean loadTrackerStatsFile(File configDirectory) { + File configFile = new File(configDirectory, "sbh-trackers-stats.json"); + + try { + if (configFile.createNewFile()) { + return true; + } + + try ( + BufferedReader reader = new BufferedReader( + new InputStreamReader( + new FileInputStream(configFile), + StandardCharsets.UTF_8 + ) + ) + ) { + JsonObject json = gson.fromJson(reader, JsonObject.class); + if (json.has("trackerStats")) { + json + .getAsJsonArray("trackerStats") + .forEach( + element -> { + if (element.isJsonObject()) { + JsonObject object = element.getAsJsonObject(); + String location = object + .get("location") + .getAsString(); + Map> trackers = TrackerHandler.trackers.get( + location + ) + .dropTrackers; + + JsonElement event = object.get("event"); + String eventString = event == null || + event.isJsonNull() + ? null + : event.getAsString(); + Map drops = trackers.get( + eventString + ); + + if (drops != null) { + for (Map.Entry drop : object + .getAsJsonObject("drops") + .entrySet()) { + if ( + drops.containsKey(drop.getKey()) + ) { + drops.get(drop.getKey()) + .stackSize = + drop.getValue().getAsInt(); + } + } + drops = + TrackerHandler.sortTrackers(drops); + trackers.put(eventString, drops); + } + } + } + ); } - } - ); - } - } - } catch (Exception ignored) {} - return false; - } - - public static void saveTrackerStatsFile(File configDirectory) { - File configFile = new File(configDirectory, "sbh-trackers-stats.json"); - - try { - configFile.createNewFile(); - - try ( - BufferedWriter writer = new BufferedWriter( - new OutputStreamWriter( - new FileOutputStream(configFile), - StandardCharsets.UTF_8 - ) - ) - ) { - JsonObject json = new JsonObject(); - json.add("trackerStats", getTrackerFile()); - writer.write(gson.toJson(json)); - } - } catch (IOException ignored) {} - } + } + } catch (Exception ignored) {} + return false; + } + + public static void saveTrackerStatsFile(File configDirectory) { + File configFile = new File(configDirectory, "sbh-trackers-stats.json"); + + try { + configFile.createNewFile(); + + try ( + BufferedWriter writer = new BufferedWriter( + new OutputStreamWriter( + new FileOutputStream(configFile), + StandardCharsets.UTF_8 + ) + ) + ) { + JsonObject json = new JsonObject(); + json.add("trackerStats", getTrackerFile()); + writer.write(gson.toJson(json)); + } + } catch (IOException ignored) {} + } } -- cgit From c04ca523f9fb9f7adefa74587db61f76deeae9f0 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Tue, 6 Jul 2021 17:20:49 -0400 Subject: Increase line width --- .../skyblockhud/tracker/TrackerFileLoader.java | 116 ++++++--------------- 1 file changed, 29 insertions(+), 87 deletions(-) (limited to 'src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java') diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java index 7035feee1..ba2210106 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java @@ -23,24 +23,15 @@ public class TrackerFileLoader { public static ItemStack getDisplayItem(JsonObject jsonObject) { int meta = jsonObject.get("meta").getAsInt(); String displayItemId = jsonObject.get("item").getAsString(); - Item item = Item.itemRegistry.getObject( - new ResourceLocation(displayItemId) - ); + Item item = Item.itemRegistry.getObject(new ResourceLocation(displayItemId)); ItemStack stack = new ItemStack(item, 0, meta); - if ( - jsonObject.has("skullData") && - displayItemId.equals("minecraft:skull") && - meta == 3 - ) { - stack.setTagInfo( - "SkullOwner", - getSkullTag(jsonObject.getAsJsonObject("skullData")) - ); + if (jsonObject.has("skullData") && displayItemId.equals("minecraft:skull") && meta == 3) { + stack.setTagInfo("SkullOwner", getSkullTag(jsonObject.getAsJsonObject("skullData"))); } - if ( - jsonObject.has("enchanted") && - jsonObject.get("enchanted").getAsBoolean() - ) stack.setTagInfo("ench", new NBTTagList()); + if (jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean()) stack.setTagInfo( + "ench", + new NBTTagList() + ); return stack; } @@ -65,10 +56,7 @@ public class TrackerFileLoader { for (JsonElement element : object.get("trackers").getAsJsonArray()) { JsonObject tracker = element.getAsJsonObject(); StringBuilder builder = new StringBuilder(); - tracker - .get("location") - .getAsJsonArray() - .forEach(loc -> builder.append(loc.getAsString())); + tracker.get("location").getAsJsonArray().forEach(loc -> builder.append(loc.getAsString())); String location = builder.toString(); Map stacks = new HashMap<>(); @@ -76,42 +64,27 @@ public class TrackerFileLoader { JsonObject dropObject = drop.getAsJsonObject(); //Display Item Creation - ItemStack stack = getDisplayItem( - dropObject.getAsJsonObject("displayItem") - ); + ItemStack stack = getDisplayItem(dropObject.getAsJsonObject("displayItem")); String itemId = dropObject.get("id").getAsString(); stacks.put(itemId, stack); } - String event = tracker.has("event") - ? tracker.get("event").getAsString() - : null; + String event = tracker.has("event") ? tracker.get("event").getAsString() : null; Map> events = new HashMap<>(); events.put(event, stacks); if (TrackerHandler.trackers.containsKey(location)) { - TrackerHandler.trackers - .get(location) - .dropTrackers.put(event, stacks); + TrackerHandler.trackers.get(location).dropTrackers.put(event, stacks); } else { - TrackerHandler.trackers.putIfAbsent( - location, - new TrackerHandler.TrackerData(events) - ); + TrackerHandler.trackers.putIfAbsent(location, new TrackerHandler.TrackerData(events)); } tracker .get("location") .getAsJsonArray() - .forEach( - loc -> - TrackerHandler.trackerIds.put( - Locations.get(loc.getAsString()), - location - ) - ); + .forEach(loc -> TrackerHandler.trackerIds.put(Locations.get(loc.getAsString()), location)); } } @@ -124,16 +97,13 @@ public class TrackerFileLoader { JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("location", locations); - if (event == null) jsonObject.add( + if (event == null) jsonObject.add("event", new JsonNull()); else jsonObject.addProperty( "event", - new JsonNull() - ); else jsonObject.addProperty("event", event); + event + ); JsonObject dropsData = new JsonObject(); - drops.forEach( - (s, stack) -> - dropsData.addProperty(s, stack.stackSize) - ); + drops.forEach((s, stack) -> dropsData.addProperty(s, stack.stackSize)); jsonObject.add("drops", dropsData); trackerStats.add(jsonObject); } @@ -146,20 +116,10 @@ public class TrackerFileLoader { public static void loadTrackersFile() { try { - ResourceLocation trackers = new ResourceLocation( - "skyblockhud:data/trackers.json" - ); - InputStream is = Minecraft - .getMinecraft() - .getResourceManager() - .getResource(trackers) - .getInputStream(); + ResourceLocation trackers = new ResourceLocation("skyblockhud:data/trackers.json"); + InputStream is = Minecraft.getMinecraft().getResourceManager().getResource(trackers).getInputStream(); - try ( - BufferedReader reader = new BufferedReader( - new InputStreamReader(is, StandardCharsets.UTF_8) - ) - ) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { loadTrackers(gson.fromJson(reader, JsonObject.class)); } } catch (Exception ignored) {} @@ -175,10 +135,7 @@ public class TrackerFileLoader { try ( BufferedReader reader = new BufferedReader( - new InputStreamReader( - new FileInputStream(configFile), - StandardCharsets.UTF_8 - ) + new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8) ) ) { JsonObject json = gson.fromJson(reader, JsonObject.class); @@ -189,37 +146,25 @@ public class TrackerFileLoader { element -> { if (element.isJsonObject()) { JsonObject object = element.getAsJsonObject(); - String location = object - .get("location") - .getAsString(); - Map> trackers = TrackerHandler.trackers.get( - location - ) + String location = object.get("location").getAsString(); + Map> trackers = TrackerHandler.trackers.get(location) .dropTrackers; JsonElement event = object.get("event"); - String eventString = event == null || - event.isJsonNull() + String eventString = event == null || event.isJsonNull() ? null : event.getAsString(); - Map drops = trackers.get( - eventString - ); + Map drops = trackers.get(eventString); if (drops != null) { for (Map.Entry drop : object .getAsJsonObject("drops") .entrySet()) { - if ( - drops.containsKey(drop.getKey()) - ) { - drops.get(drop.getKey()) - .stackSize = - drop.getValue().getAsInt(); + if (drops.containsKey(drop.getKey())) { + drops.get(drop.getKey()).stackSize = drop.getValue().getAsInt(); } } - drops = - TrackerHandler.sortTrackers(drops); + drops = TrackerHandler.sortTrackers(drops); trackers.put(eventString, drops); } } @@ -239,10 +184,7 @@ public class TrackerFileLoader { try ( BufferedWriter writer = new BufferedWriter( - new OutputStreamWriter( - new FileOutputStream(configFile), - StandardCharsets.UTF_8 - ) + new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8) ) ) { JsonObject json = new JsonObject(); -- cgit From 98ee5a2ae8090c061b1e61e7955d793416991822 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Tue, 6 Jul 2021 17:24:20 -0400 Subject: 140? --- .../skyblockhud/tracker/TrackerFileLoader.java | 29 ++++++---------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java') diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java index ba2210106..858770a98 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java @@ -28,10 +28,7 @@ public class TrackerFileLoader { if (jsonObject.has("skullData") && displayItemId.equals("minecraft:skull") && meta == 3) { stack.setTagInfo("SkullOwner", getSkullTag(jsonObject.getAsJsonObject("skullData"))); } - if (jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean()) stack.setTagInfo( - "ench", - new NBTTagList() - ); + if (jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean()) stack.setTagInfo("ench", new NBTTagList()); return stack; } @@ -97,10 +94,7 @@ public class TrackerFileLoader { JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("location", locations); - if (event == null) jsonObject.add("event", new JsonNull()); else jsonObject.addProperty( - "event", - event - ); + if (event == null) jsonObject.add("event", new JsonNull()); else jsonObject.addProperty("event", event); JsonObject dropsData = new JsonObject(); drops.forEach((s, stack) -> dropsData.addProperty(s, stack.stackSize)); @@ -134,9 +128,7 @@ public class TrackerFileLoader { } try ( - BufferedReader reader = new BufferedReader( - new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8) - ) + BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)) ) { JsonObject json = gson.fromJson(reader, JsonObject.class); if (json.has("trackerStats")) { @@ -147,19 +139,14 @@ public class TrackerFileLoader { if (element.isJsonObject()) { JsonObject object = element.getAsJsonObject(); String location = object.get("location").getAsString(); - Map> trackers = TrackerHandler.trackers.get(location) - .dropTrackers; + Map> trackers = TrackerHandler.trackers.get(location).dropTrackers; JsonElement event = object.get("event"); - String eventString = event == null || event.isJsonNull() - ? null - : event.getAsString(); + String eventString = event == null || event.isJsonNull() ? null : event.getAsString(); Map drops = trackers.get(eventString); if (drops != null) { - for (Map.Entry drop : object - .getAsJsonObject("drops") - .entrySet()) { + for (Map.Entry drop : object.getAsJsonObject("drops").entrySet()) { if (drops.containsKey(drop.getKey())) { drops.get(drop.getKey()).stackSize = drop.getValue().getAsInt(); } @@ -183,9 +170,7 @@ public class TrackerFileLoader { configFile.createNewFile(); try ( - BufferedWriter writer = new BufferedWriter( - new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8) - ) + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8)) ) { JsonObject json = new JsonObject(); json.add("trackerStats", getTrackerFile()); -- cgit From 804767ebfc26e2a1252bc327def02389b35dfc6e Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Tue, 6 Jul 2021 17:27:11 -0400 Subject: fine --- .../skyblockhud/tracker/TrackerFileLoader.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java') diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java index 858770a98..624ca60d0 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java @@ -78,10 +78,7 @@ public class TrackerFileLoader { TrackerHandler.trackers.putIfAbsent(location, new TrackerHandler.TrackerData(events)); } - tracker - .get("location") - .getAsJsonArray() - .forEach(loc -> TrackerHandler.trackerIds.put(Locations.get(loc.getAsString()), location)); + tracker.get("location").getAsJsonArray().forEach(loc -> TrackerHandler.trackerIds.put(Locations.get(loc.getAsString()), location)); } } @@ -127,9 +124,7 @@ public class TrackerFileLoader { return true; } - try ( - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)) - ) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) { JsonObject json = gson.fromJson(reader, JsonObject.class); if (json.has("trackerStats")) { json @@ -169,9 +164,7 @@ public class TrackerFileLoader { try { configFile.createNewFile(); - try ( - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8)) - ) { + try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) { JsonObject json = new JsonObject(); json.add("trackerStats", getTrackerFile()); writer.write(gson.toJson(json)); -- cgit