diff options
| author | nea <romangraef@gmail.com> | 2022-09-29 03:30:34 +0200 |
|---|---|---|
| committer | nea <romangraef@gmail.com> | 2022-09-29 03:30:34 +0200 |
| commit | 4899eed752d17a1f61df88e7e6bcad6c8cbfc6d0 (patch) | |
| tree | 7b95ede83eaa4609bc1ab4427d4a146cade3e682 | |
| parent | 99a4e5748471800dde82c02d5421d1db681c9838 (diff) | |
| parent | 66a24df5731ad31ea9cbee5e80879e4169009ae7 (diff) | |
| download | NotEnoughUpdates-4899eed752d17a1f61df88e7e6bcad6c8cbfc6d0.tar.gz NotEnoughUpdates-4899eed752d17a1f61df88e7e6bcad6c8cbfc6d0.tar.bz2 NotEnoughUpdates-4899eed752d17a1f61df88e7e6bcad6c8cbfc6d0.zip | |
Merge remote-tracking branch 'origin/master' into fix/letsencryptssl
3 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d6c2b23..639d3965 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,7 @@ on: - "COPYING" - "COPYING.LESSER" - ".gitignore" + - "Update Notes" pull_request: branches: - "*" @@ -17,6 +18,7 @@ on: - "COPYING" - "COPYING.LESSER" - ".gitignore" + - "Update Notes" workflow_dispatch: jobs: build: diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index dbff2be2..14078069 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -1460,7 +1460,7 @@ public class NEUOverlay extends Gui { if (index < getSlotsXSize() * getSlotsYSize()) { int actualIndex = index + getSlotsXSize() * getSlotsYSize() * page; List<JsonObject> searchedItems = getSearchedItems(); - if (actualIndex < searchedItems.size()) { + if (0 <= actualIndex && actualIndex < searchedItems.size()) { return searchedItems.get(actualIndex); } else { return null; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java index 93e9f516..bef07399 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java @@ -294,7 +294,7 @@ public class StorageManager { private boolean shouldRenderStorageOverlayCached = false; - private static final Pattern WINDOW_REGEX = Pattern.compile(".+ Backpack (?:\u2726 )?\\((\\d+)/(\\d+)\\)"); + private static final Pattern WINDOW_REGEX = Pattern.compile(".+ Backpack (?:✦ )?\\(Slot #(\\d+)\\)"); private static final Pattern ECHEST_WINDOW_REGEX = Pattern.compile("Ender Chest \\((\\d+)/(\\d+)\\)"); public void loadConfig(File file) { |