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

Fixed booklet showing achievements about a million times if the item is wildcard

Browse source
This commit is contained in:
Ellpeck 2016-08-09 21:11:42 +02:00
parent 2590e4b4b3
commit dc82f09583
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ public final class BookletUtils{
return; return;
} }
ArrayList<String> infoList = null; List<TheAchievements> achievements = null;
for(BookletPage page : booklet.currentEntrySet.getCurrentChapter().getPages()){ for(BookletPage page : booklet.currentEntrySet.getCurrentChapter().getPages()){
if(page != null && page.getItemStacksForPage() != null){ if(page != null && page.getItemStacksForPage() != null){
for(ItemStack stack : page.getItemStacksForPage()){ for(ItemStack stack : page.getItemStacksForPage()){
@ -148,12 +148,12 @@ public final class BookletUtils{
} }
else{ else{
if(mouseX >= booklet.guiLeft+booklet.xSize+1 && mouseX < booklet.guiLeft+booklet.xSize+1+22 && mouseY >= booklet.guiTop-18 && mouseY < booklet.guiTop-18+21){ if(mouseX >= booklet.guiLeft+booklet.xSize+1 && mouseX < booklet.guiLeft+booklet.xSize+1+22 && mouseY >= booklet.guiTop-18 && mouseY < booklet.guiTop-18+21){
if(infoList == null){ if(achievements == null){
infoList = new ArrayList<String>(); achievements = new ArrayList<TheAchievements>();
infoList.add(TextFormatting.GOLD+"Achievements related to this chapter:"); }
if(!achievements.contains(achievement)){
achievements.add(achievement);
} }
infoList.add("-"+StringUtil.localize(achievement.chieve.statId));
infoList.add(TextFormatting.GRAY+"("+achievement.chieve.getDescription()+")");
} }
} }
} }
@ -163,10 +163,22 @@ public final class BookletUtils{
} }
} }
if(achievements != null){
List<String> infoList = null;
for(TheAchievements achievement : achievements){
if(infoList == null){
infoList = new ArrayList<String>();
infoList.add(TextFormatting.GOLD+"Achievements related to this chapter:");
}
infoList.add("-"+StringUtil.localize(achievement.chieve.statId));
infoList.add(TextFormatting.GRAY+"("+achievement.chieve.getDescription()+")");
}
if(infoList != null){ if(infoList != null){
booklet.drawHoveringText(infoList, mouseX, mouseY); booklet.drawHoveringText(infoList, mouseX, mouseY);
} }
} }
}
/** /**
* Pre-renders the booklet page, including * Pre-renders the booklet page, including

3
src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java
View file

@ -64,6 +64,9 @@ public class WorldData{
public static void load(World world){ public static void load(World world){
if(!world.isRemote && world instanceof WorldServer){ if(!world.isRemote && world instanceof WorldServer){
//Just to be sure it actually gets cleared all the time
PLAYER_SAVE_DATA.clear();
WorldData data = new WorldData(new WorldSpecificSaveHandler((WorldServer)world, world.getSaveHandler()), world.provider.getDimension()); WorldData data = new WorldData(new WorldSpecificSaveHandler((WorldServer)world, world.getSaveHandler()), world.provider.getDimension());
WORLD_DATA.put(data.dimension, data); WORLD_DATA.put(data.dimension, data);