Skip to content

Commit

Permalink
Merge pull request #232 from LifeIsAParadox/update-mod-to-1.11.1
Browse files Browse the repository at this point in the history
update mod to 1.11.1
  • Loading branch information
LifeIsAParadox authored Aug 7, 2023
2 parents f052d24 + 9bb935a commit f46f40d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# Release 1.11.1

## Highlight
* Fixes made to the mod to ensure it works with the latest Hypixel changes by @AzureAaron
* Overlay for all TP items by @Julienraptor01 and @kevinthegreat1

## What's Changed
* Update buildrelease.yml by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/223
* Mixins refactor by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/213
* add cache for beta builds by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/224
* Add Overlays for ALL forms of TP by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/220
* Fix Croesus Helper by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/226
* Fix broken Hypixel detection by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/231
* Random refactors by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/229
* Fix dungeons death counter in the tab hud by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/233


**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.11.0...v1.11.1
___
# Release 1.11.0

## Highlight
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ betterinject_version=0.1.3
occlusionculling_version = 0.0.7-SNAPSHOT

# Mod Properties
mod_version = 1.11.0
mod_version = 1.11.1
maven_group = me.xmrvizzy
archives_base_name = skyblocker
modrinth_id=y6DuFGwJ
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
public class FairySouls {
private static final Logger LOGGER = LoggerFactory.getLogger(FairySouls.class);
private static CompletableFuture<Void> fairySoulsLoaded;
private static int maxSouls = 0;
private static final Map<String, Set<BlockPos>> fairySouls = new HashMap<>();
private static final Map<String, Map<String, Set<BlockPos>>> foundFairies = new HashMap<>();

Expand All @@ -45,7 +46,7 @@ public static CompletableFuture<Void> runAsyncAfterFairySoulsLoad(Runnable runna
}

public static int getFairySoulsSize(@Nullable String location) {
return location == null ? fairySouls.values().stream().mapToInt(Set::size).sum() : fairySouls.get(location).size();
return location == null ? maxSouls : fairySouls.get(location).size();
}

public static void init() {
Expand All @@ -54,6 +55,9 @@ public static void init() {
BufferedReader reader = new BufferedReader(new FileReader(NEURepo.LOCAL_REPO_DIR.resolve("constants").resolve("fairy_souls.json").toFile()));
for (Map.Entry<String, JsonElement> fairySoulJson : JsonParser.parseReader(reader).getAsJsonObject().asMap().entrySet()) {
if (fairySoulJson.getKey().equals("//") || fairySoulJson.getKey().equals("Max Souls")) {
if (fairySoulJson.getKey().equals("Max Souls")) {
maxSouls = fairySoulJson.getValue().getAsInt();
}
continue;
}
ImmutableSet.Builder<BlockPos> fairySoulsForLocation = ImmutableSet.builder();
Expand Down

0 comments on commit f46f40d

Please sign in to comment.