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

Made Booklet opening more configurable

Browse source
This commit is contained in:
Ellpeck 2015-11-24 17:50:27 +01:00
parent 88d6c18708
commit e46c4f217a
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java
View file

@ -72,11 +72,15 @@ public class GuiBooklet extends GuiScreen{
private boolean mousePressed; private boolean mousePressed;
public GuiScreen parentScreen; public GuiScreen parentScreen;
private boolean tryOpenMainPage;
private boolean saveOnClose;
public GuiBooklet(GuiScreen parentScreen){ public GuiBooklet(GuiScreen parentScreen, boolean tryOpenMainPage, boolean saveOnClose){
this.xSize = 146; this.xSize = 146;
this.ySize = 180; this.ySize = 180;
this.parentScreen = parentScreen; this.parentScreen = parentScreen;
this.tryOpenMainPage = tryOpenMainPage;
this.saveOnClose = saveOnClose;
} }
public void drawHoveringText(List list, int x, int y){ public void drawHoveringText(List list, int x, int y){
@ -266,8 +270,7 @@ public class GuiBooklet extends GuiScreen{
this.currentChapter = null; this.currentChapter = null;
this.currentIndexEntry = null; this.currentIndexEntry = null;
// So that the First Page will still open if used via something like NEI before if(this.tryOpenMainPage && !PersistentClientData.getBoolean("BookAlreadyOpened")){
if(this.parentScreen == null && !PersistentClientData.getBoolean("BookAlreadyOpened")){
BookletUtils.openIndexEntry(this, InitBooklet.chapterIntro.entry, 1, true); BookletUtils.openIndexEntry(this, InitBooklet.chapterIntro.entry, 1, true);
BookletUtils.openChapter(this, InitBooklet.chapterIntro, null); BookletUtils.openChapter(this, InitBooklet.chapterIntro, null);
@ -301,8 +304,10 @@ public class GuiBooklet extends GuiScreen{
@Override @Override
public void onGuiClosed(){ public void onGuiClosed(){
if(this.saveOnClose){
PersistentClientData.saveBookPage(this); PersistentClientData.saveBookPage(this);
} }
}
@Override @Override
public boolean doesGuiPauseGame(){ public boolean doesGuiPauseGame(){

2
src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java
View file

@ -143,7 +143,7 @@ public class GuiHandler implements IGuiHandler{
case CLOUD: case CLOUD:
return new GuiSmileyCloud(tile, x, y, z, world); return new GuiSmileyCloud(tile, x, y, z, world);
case BOOK: case BOOK:
return new GuiBooklet(null); return new GuiBooklet(null, true, true);
case DIRECTIONAL_BREAKER: case DIRECTIONAL_BREAKER:
return new GuiDirectionalBreaker(entityPlayer.inventory, tile); return new GuiDirectionalBreaker(entityPlayer.inventory, tile);
case RANGED_COLLECTOR: case RANGED_COLLECTOR:

2
src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java
View file

@ -68,7 +68,7 @@ public class NeiScreenEvents{
if(isPage && event.button.id == NEI_BUTTON_ID){ if(isPage && event.button.id == NEI_BUTTON_ID){
for(BookletPage page : InitBooklet.pagesWithItemStackData){ for(BookletPage page : InitBooklet.pagesWithItemStackData){
if(ItemUtil.contains(page.getItemStacksForPage(), ((INeiRecipeHandler)handler).getStackForInfo(theGui.page), true)){ if(ItemUtil.contains(page.getItemStacksForPage(), ((INeiRecipeHandler)handler).getStackForInfo(theGui.page), true)){
GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen); GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen, false, true);
Minecraft.getMinecraft().displayGuiScreen(book); Minecraft.getMinecraft().displayGuiScreen(book);
BookletUtils.openIndexEntry(book, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); BookletUtils.openIndexEntry(book, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true);
BookletUtils.openChapter(book, page.getChapter(), page); BookletUtils.openChapter(book, page.getChapter(), page);