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

Added Pages to Indexes to have more space for chapters available

Browse source
This commit is contained in:
Ellpeck 2015-08-29 10:59:03 +02:00
parent 64b27cfb8d
commit 19ee548771
2 changed files with 60 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/BookletChapter.java
View file

@ -8,10 +8,10 @@ public class BookletChapter{
public final IBookletPage[] pages; public final IBookletPage[] pages;
private final String unlocalizedName; private final String unlocalizedName;
public final BookletIndexEntry entry; public final BookletIndexEntry entry;
public int openPage;
public BookletChapter(String unlocalizedName, BookletIndexEntry entry, IBookletPage... pages){ public BookletChapter(String unlocalizedName, BookletIndexEntry entry, IBookletPage... pages){
this.pages = pages.clone(); this.pages = pages.clone();
this.unlocalizedName = unlocalizedName; this.unlocalizedName = unlocalizedName;
entry.addChapter(this); entry.addChapter(this);
this.entry = entry; this.entry = entry;

83
src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/GuiBooklet.java
View file

@ -31,6 +31,8 @@ public class GuiBooklet extends GuiScreen{
public IBookletPage currentPage; public IBookletPage currentPage;
public BookletChapter currentChapter; public BookletChapter currentChapter;
public BookletIndexEntry currentIndexEntry; public BookletIndexEntry currentIndexEntry;
public int pageOpenInIndex;
public int indexPageAmount;
private static final int BUTTON_ACHIEVEMENTS_ID = -2; private static final int BUTTON_ACHIEVEMENTS_ID = -2;
private static final int BUTTON_CONFIG_ID = -1; private static final int BUTTON_CONFIG_ID = -1;
@ -66,7 +68,7 @@ public class GuiBooklet extends GuiScreen{
this.currentPage = null; this.currentPage = null;
this.currentChapter = null; this.currentChapter = null;
this.currentIndexEntry = null; this.currentIndexEntry = null;
this.openIndexEntry(null); this.openIndexEntry(null, 1);
} }
private GuiButton getButton(int id){ private GuiButton getButton(int id){
@ -88,15 +90,22 @@ public class GuiBooklet extends GuiScreen{
if(this.currentChapter == null){ if(this.currentChapter == null){
this.drawCenteredString(this.fontRendererObj, this.currentIndexEntry.getLocalizedName(), this.guiLeft+this.xSize/2, this.guiTop-8, StringUtil.DECIMAL_COLOR_WHITE); this.drawCenteredString(this.fontRendererObj, this.currentIndexEntry.getLocalizedName(), this.guiLeft+this.xSize/2, this.guiTop-8, StringUtil.DECIMAL_COLOR_WHITE);
} }
else else{
this.drawCenteredString(this.fontRendererObj, this.currentChapter.getLocalizedName(), this.guiLeft+this.xSize/2, this.guiTop-8, StringUtil.DECIMAL_COLOR_WHITE); this.drawCenteredString(this.fontRendererObj, this.currentChapter.getLocalizedName(), this.guiLeft+this.xSize/2, this.guiTop-8, StringUtil.DECIMAL_COLOR_WHITE);
}
} }
else else{
this.drawCenteredString(this.fontRendererObj, StringUtil.localize("itemGroup."+ModUtil.MOD_ID_LOWER), this.guiLeft+this.xSize/2, this.guiTop-8, StringUtil.DECIMAL_COLOR_WHITE); this.drawCenteredString(this.fontRendererObj, StringUtil.localize("itemGroup."+ModUtil.MOD_ID_LOWER), this.guiLeft+this.xSize/2, this.guiTop-8, StringUtil.DECIMAL_COLOR_WHITE);
}
if(this.currentIndexEntry != null && this.currentChapter != null && this.currentPage != null){ if(this.currentIndexEntry != null){
this.drawCenteredString(this.unicodeRenderer, this.currentPage.getID()+"/"+this.currentChapter.pages.length, this.guiLeft+this.xSize/2, this.guiTop+172, StringUtil.DECIMAL_COLOR_WHITE); if(this.currentChapter != null && this.currentPage != null){
this.currentPage.renderPre(this, x, y); this.drawCenteredString(this.unicodeRenderer, this.currentPage.getID()+"/"+this.currentChapter.pages.length, this.guiLeft+this.xSize/2, this.guiTop+172, StringUtil.DECIMAL_COLOR_WHITE);
this.currentPage.renderPre(this, x, y);
}
else{
this.drawCenteredString(this.unicodeRenderer, this.pageOpenInIndex+"/"+this.indexPageAmount, this.guiLeft+this.xSize/2, this.guiTop+172, StringUtil.DECIMAL_COLOR_WHITE);
}
} }
super.drawScreen(x, y, f); super.drawScreen(x, y, f);
@ -146,60 +155,86 @@ public class GuiBooklet extends GuiScreen{
mc.displayGuiScreen(new GuiAAAchievements(this, mc.thePlayer.getStatFileWriter())); mc.displayGuiScreen(new GuiAAAchievements(this, mc.thePlayer.getStatFileWriter()));
} }
else if(button.id == BUTTON_FORWARD_ID){ else if(button.id == BUTTON_FORWARD_ID){
IBookletPage page = this.getNextPage(this.currentChapter, this.currentPage); if(this.currentIndexEntry != null){
if(page != null) this.currentPage = page; if(this.currentPage != null){
IBookletPage page = this.getNextPage(this.currentChapter, this.currentPage);
if(page != null) this.currentPage = page;
}
else{
this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex+1);
}
}
} }
else if(button.id == BUTTON_BACK_ID){ else if(button.id == BUTTON_BACK_ID){
IBookletPage page = this.getPrevPage(this.currentChapter, this.currentPage); if(this.currentIndexEntry != null){
if(page != null) this.currentPage = page; if(this.currentPage != null){
IBookletPage page = this.getPrevPage(this.currentChapter, this.currentPage);
if(page != null) this.currentPage = page;
}
else{
this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex-1);
}
}
} }
else if(button.id == BUTTON_RETURN_ID){ else if(button.id == BUTTON_RETURN_ID){
if(this.currentChapter != null){ if(this.currentChapter != null){
this.openIndexEntry(this.currentChapter.entry); this.openIndexEntry(this.currentChapter.entry, this.pageOpenInIndex);
this.currentChapter = null; }
else{
this.openIndexEntry(null, 1);
} }
else this.openIndexEntry(null);
} }
else if(button.id >= CHAPTER_BUTTONS_START){ else if(button.id >= CHAPTER_BUTTONS_START){
int actualButton = button.id-CHAPTER_BUTTONS_START; int actualButton = button.id-CHAPTER_BUTTONS_START;
if(this.currentIndexEntry != null){ if(this.currentIndexEntry != null){
if(this.currentChapter == null){ if(this.currentChapter == null){
if(actualButton < this.currentIndexEntry.chapters.size()){ if(actualButton < this.currentIndexEntry.chapters.size()){
this.openChapter(currentIndexEntry.chapters.get(actualButton)); this.openChapter(currentIndexEntry.chapters.get(actualButton+(12*this.pageOpenInIndex-12)));
} }
} }
} }
else{ else{
if(actualButton < InitBooklet.entries.size()){ if(actualButton < InitBooklet.entries.size()){
this.openIndexEntry(InitBooklet.entries.get(actualButton)); this.openIndexEntry(InitBooklet.entries.get(actualButton), 1);
} }
} }
} }
if(button.id == BUTTON_FORWARD_ID || button.id == BUTTON_BACK_ID){ if(button.id == BUTTON_FORWARD_ID || button.id == BUTTON_BACK_ID){
this.getButton(BUTTON_FORWARD_ID).visible = this.getNextPage(this.currentChapter, this.currentPage) != null; if(this.currentChapter != null && this.currentIndexEntry != null){
this.getButton(BUTTON_BACK_ID).visible = this.getPrevPage(this.currentChapter, this.currentPage) != null; if(this.currentPage != null){
this.getButton(BUTTON_FORWARD_ID).visible = this.getNextPage(this.currentChapter, this.currentPage) != null;
this.getButton(BUTTON_BACK_ID).visible = this.getPrevPage(this.currentChapter, this.currentPage) != null;
}
}
} }
} }
private void openIndexEntry(BookletIndexEntry entry){ private void openIndexEntry(BookletIndexEntry entry, int page){
this.currentPage = null;
this.currentChapter = null;
this.currentIndexEntry = entry; this.currentIndexEntry = entry;
this.indexPageAmount = entry == null ? 1 : entry.chapters.size()/12+1;
this.pageOpenInIndex = entry == null ? 1 : (this.indexPageAmount <= page ? this.indexPageAmount : page);
this.getButton(BUTTON_RETURN_ID).visible = entry != null; this.getButton(BUTTON_RETURN_ID).visible = entry != null;
this.getButton(BUTTON_FORWARD_ID).visible = false; this.getButton(BUTTON_FORWARD_ID).visible = this.pageOpenInIndex < this.indexPageAmount;
this.getButton(BUTTON_BACK_ID).visible = false; this.getButton(BUTTON_BACK_ID).visible = this.pageOpenInIndex > 1;
for(int i = 0; i < 12; i++){ for(int i = 0; i < 12; i++){
GuiButton button = this.getButton(CHAPTER_BUTTONS_START+i); GuiButton button = this.getButton(CHAPTER_BUTTONS_START+i);
if(entry == null){ if(entry == null){
boolean entryExists = InitBooklet.entries.size() > i; boolean entryExists = InitBooklet.entries.size() > i+(12*this.pageOpenInIndex-12);
button.visible = entryExists; button.visible = entryExists;
if(entryExists) button.displayString = InitBooklet.entries.get(i).getLocalizedName(); if(entryExists){
button.displayString = InitBooklet.entries.get(i+(12*this.pageOpenInIndex-12)).getLocalizedName();
}
} }
else{ else{
boolean entryExists = entry.chapters.size() > i; boolean entryExists = entry.chapters.size() > i+(12*this.pageOpenInIndex-12);
button.visible = entryExists; button.visible = entryExists;
if(entryExists) button.displayString = entry.chapters.get(i).getLocalizedName(); if(entryExists) button.displayString = entry.chapters.get(i+(12*this.pageOpenInIndex-12)).getLocalizedName();
} }
} }
} }