Skip to content

Commit

Permalink
prerelease changes (Moulberry#215)
Browse files Browse the repository at this point in the history
  • Loading branch information
jani270 authored Aug 9, 2022
1 parent a1b3727 commit 197e463
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 17 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ NotEnoughUpdates (NEU) is a feature rich 1.8.9 Minecraft forge mod for Hypixel S
## Features

- An [item list](https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO) containing information and recipes about every item in skyblock.
- A dungeons minimap.
- Dungeon loot profit checker.
- Item overlays for Treecapitator, Builder's Wand, Block Zapper, and Bonemerang.
- An in-game skyblock profile viewer accessed with `/pv [player]`.
Expand Down
1 change: 1 addition & 0 deletions Update Notes/2.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
- Added Trophy Reward Overlay - hannibal2
- Added power stone feature - hannibal2
- Added abiphone warning - hannibal2
- Added blur limit at 100 - nopo

### **Bug Fixes:**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
public class NotEnoughUpdates {
public static final String MODID = "notenoughupdates";
public static final String VERSION = "2.1.0-REL";
public static final int VERSION_ID = 20200;
public static final int PRE_VERSION_ID = 0;
public static final int HOTFIX_VERSION_ID = 1;
public static final int VERSION_ID = 20000;
public static final int PRE_VERSION_ID = 1;
public static final int HOTFIX_VERSION_ID = 0;
/**
* Registers the biomes for the crystal hollows here so optifine knows they exists
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
break;
case 8:
mapDesc = "Simple gray border";
mapCredit = "TomEngMaster";
mapCredit = "Lucy";
break;
case 9:
mapDesc = "Viney wood border";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,8 @@ public void drawTimer() {
SBEvent firstEvent = null;
List<SBEvent> nextFavourites = new ArrayList<>();
List<Long> nextFavouritesTime = new ArrayList<>();
long timeUntilMajor = 0;
SBEvent nextMajorEvent = null;
long timeUntilMayor = 0;
SBEvent nextMayorEvent = null;

List<String> eventFavourites = NotEnoughUpdates.INSTANCE.config.hidden.eventFavourites;

Expand All @@ -889,10 +889,10 @@ public void drawTimer() {
}
}

if (nextMajorEvent == null && !sbEvent.id.split(":")[0].equals("jacob_farming") &&
if (nextMayorEvent == null && !sbEvent.id.split(":")[0].equals("jacob_farming") &&
!sbEvent.id.equals("dark_auction")) {
nextMajorEvent = sbEvent;
timeUntilMajor = timeUntilMillis;
nextMayorEvent = sbEvent;
timeUntilMayor = timeUntilMillis;
}

if (firstEvent == null) {
Expand All @@ -919,7 +919,7 @@ public void drawTimer() {
}
}

if (nextFavourites.size() >= 3 && nextMajorEvent != null) {
if (nextFavourites.size() >= 3 && nextMayorEvent != null) {
break out;
}
}
Expand Down Expand Up @@ -1000,18 +1000,18 @@ public void drawTimer() {
if (sbEvent.id.split(":")[0].equals("jacob_farming") && sbEvent.desc != null) {
tooltipToDisplay.addAll(sbEvent.desc);
}
if (nextMajorEvent != null || i < nextFavourites.size() - 1) {
if (nextMayorEvent != null || i < nextFavourites.size() - 1) {
tooltipToDisplay.add("");
}
}
if (nextMajorEvent != null) {
tooltipToDisplay.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Next Major:");
tooltipToDisplay.add(nextMajorEvent.display);
if (nextMayorEvent != null) {
tooltipToDisplay.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Next Mayor:");
tooltipToDisplay.add(nextMayorEvent.display);
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Starts in: " + EnumChatFormatting.YELLOW +
prettyTime(timeUntilMajor, false));
if (nextMajorEvent.lastsFor >= 0) {
prettyTime(timeUntilMayor, false));
if (nextMayorEvent.lastsFor >= 0) {
tooltipToDisplay.add(EnumChatFormatting.GRAY + "Lasts for: " + EnumChatFormatting.YELLOW +
prettyTime(nextMajorEvent.lastsFor, true));
prettyTime(nextMayorEvent.lastsFor, true));
}
}

Expand Down

0 comments on commit 197e463

Please sign in to comment.