Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Made the bookler clear its search bar when opening a chapter

Browse source
This commit is contained in:
Ellpeck 2016-11-08 23:48:25 +01:00
parent 57f16ec321
commit 3ad1da0a8c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
View file

@ -325,9 +325,7 @@ public final class BookletUtils{
public static void openIndexEntry(GuiBooklet booklet, IBookletEntry entry, int page, boolean resetTextField){ public static void openIndexEntry(GuiBooklet booklet, IBookletEntry entry, int page, boolean resetTextField){
if(resetTextField){ if(resetTextField){
booklet.searchField.setText(""); booklet.searchField.setText("");
if(entry instanceof BookletEntryAllSearch){ updateSearchBar(booklet);
entry.setChapters(ActuallyAdditionsAPI.ALL_CHAPTERS);
}
} }
if(booklet.currentEntrySet.getCurrentPage() != null){ if(booklet.currentEntrySet.getCurrentPage() != null){
@ -385,6 +383,10 @@ public final class BookletUtils{
if(booklet.currentEntrySet.getCurrentEntry() != null){ if(booklet.currentEntrySet.getCurrentEntry() != null){
if(booklet.currentEntrySet.getCurrentChapter() == null){ if(booklet.currentEntrySet.getCurrentChapter() == null){
if(place < booklet.currentEntrySet.getCurrentEntry().getChapters().size()){ if(place < booklet.currentEntrySet.getCurrentEntry().getChapters().size()){
//Clear the search bar when entering a chapter
booklet.searchField.setText("");
updateSearchBar(booklet);
IBookletChapter chap = booklet.currentEntrySet.getCurrentEntry().getChapters().get(place+(booklet.chapterButtons.length*booklet.currentEntrySet.getPageInIndex()-booklet.chapterButtons.length)); IBookletChapter chap = booklet.currentEntrySet.getCurrentEntry().getChapters().get(place+(booklet.chapterButtons.length*booklet.currentEntrySet.getPageInIndex()-booklet.chapterButtons.length));
openChapter(booklet, chap, chap.getPages()[0]); openChapter(booklet, chap, chap.getPages()[0]);
} }

2
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -96,7 +96,7 @@ container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level
container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor
container.nei.actuallyadditions.empowerer.name=Empowerer container.nei.actuallyadditions.empowerer.name=Empowerer
container.nei.actuallyadditions.booklet.name=ActAdd Manual container.nei.actuallyadditions.booklet.name=Actually Additions Manual
container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> says: container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> says:
container.nei.actuallyadditions.booklet.noText=Nothing, apparently! But that doesn't matter. Just click the button on the bottom to see the item inside the booklet and look through its pages to find some fancy stuff! container.nei.actuallyadditions.booklet.noText=Nothing, apparently! But that doesn't matter. Just click the button on the bottom to see the item inside the booklet and look through its pages to find some fancy stuff!