diff --git a/src/main/java/slimeknights/mantle/client/book/data/PageDataModule.java b/src/main/java/slimeknights/mantle/client/book/data/PageDataModule.java new file mode 100644 index 0000000..e93fe04 --- /dev/null +++ b/src/main/java/slimeknights/mantle/client/book/data/PageDataModule.java @@ -0,0 +1,6 @@ +package slimeknights.mantle.client.book.data; + +public class PageDataModule extends PageData { + /** Module required to load this section, see {@link slimeknights.mantle.pulsar.control.PulseManager#isPulseLoaded(String)} for more details */ + public String module = ""; +} diff --git a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java index 7cfabea..b418dab 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java @@ -58,7 +58,7 @@ public class SectionData implements IDataItem { String data = source.resourceToString(pagesInfo); if(!data.isEmpty()) { try { - pages = new ArrayList<>(Arrays.asList(BookLoader.GSON.fromJson(data, PageData[].class))); + pages = getPages(data); } catch(Exception e) { pages = new ArrayList<>(); PageData pdError = new PageData(true); @@ -81,6 +81,15 @@ public class SectionData implements IDataItem { icon.location = source.getResourceLocation(icon.file, true); } + /** + * Gets a list of pages from the given data + * @param data JSON data + * @return ArrayList of pages for the book + */ + protected ArrayList getPages(String data) { + return new ArrayList<>(Arrays.asList(BookLoader.GSON.fromJson(data, PageData[].class))); + } + public void update(@Nullable GuiBook.AdvancementCache advancementCache) { } diff --git a/src/main/java/slimeknights/mantle/client/book/data/SectionDataModule.java b/src/main/java/slimeknights/mantle/client/book/data/SectionDataModule.java index 20e3687..88f7351 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/SectionDataModule.java +++ b/src/main/java/slimeknights/mantle/client/book/data/SectionDataModule.java @@ -1,5 +1,27 @@ package slimeknights.mantle.client.book.data; +import slimeknights.mantle.client.book.BookLoader; +import slimeknights.mantle.client.book.repository.ModuleFileRepository; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.function.Predicate; +import java.util.stream.Collectors; + public class SectionDataModule extends SectionData { + /** Module required to load this section, see {@link slimeknights.mantle.pulsar.control.PulseManager#isPulseLoaded(String)} for more details */ public String module = ""; + + @Override + protected ArrayList getPages(String data) { + // this should always be the case, but just for safety + if(source instanceof ModuleFileRepository) { + // just filters out pages where the module is not loaded + Predicate manager = ((ModuleFileRepository)source).getManager(); + return new ArrayList<>(Arrays.stream(BookLoader.GSON.fromJson(data, PageDataModule[].class)) + .filter((page)->page.module.isEmpty() || manager.test(page.module)) + .collect(Collectors.toList())); + } + return super.getPages(data); + } } diff --git a/src/main/java/slimeknights/mantle/client/book/repository/ModuleFileRepository.java b/src/main/java/slimeknights/mantle/client/book/repository/ModuleFileRepository.java index dfb32df..0ab17b9 100644 --- a/src/main/java/slimeknights/mantle/client/book/repository/ModuleFileRepository.java +++ b/src/main/java/slimeknights/mantle/client/book/repository/ModuleFileRepository.java @@ -31,4 +31,12 @@ public class ModuleFileRepository extends FileRepository { .filter((section)->section.module.isEmpty() || manager.test(section.module)) .collect(Collectors.toList()); } + + /** + * Gets the manager used to determine if a module is available + * @return Predicate to test a module availability + */ + public Predicate getManager() { + return manager; + } } diff --git a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java index 3af1a34..b3beaea 100644 --- a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java +++ b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java @@ -274,7 +274,7 @@ public class PulseManager { */ private static boolean isPulseLoaded(Map pulses, String pulseId) { for(Map.Entry entry : pulses.entrySet()) { - if (entry.getValue().getId().equals(pulseId)) { + if (entry.getValue().getId().equalsIgnoreCase(pulseId)) { return true; } }