From 19e1dd2937113bc3cb05b3dbd1c66914aad08f96 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Sun, 19 Mar 2023 19:38:08 +0100 Subject: [PATCH 1/6] Add pagination precondition --- .../toolbox/pagination/api/PaginationApi.java | 2 +- .../pagination/api/PaginationApiImpl.java | 15 ++++-- .../precondition/ContentCondition.java | 15 ++++++ .../precondition/HeaderCondition.java | 14 ++++++ .../precondition/NullPlayerCondition.java | 15 ++++++ Tasks/build.gradle | 21 --------- build.gradle | 47 +++++++++++++++++-- settings.gradle | 2 +- 8 files changed, 100 insertions(+), 31 deletions(-) create mode 100644 Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/ContentCondition.java create mode 100644 Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java create mode 100644 Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/NullPlayerCondition.java diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java index 3adb373..3b23724 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java @@ -16,7 +16,7 @@ public interface PaginationApi { *
  • empty String if you want just the header to be filled only with "="
    • * @throws IllegalArgumentException if one of its conditions is met:
      *
    1. header length is more than 50 characters
      2. - *
    2. content is empty
      3. + *
    3. content is empty/blank
      4. *
    4. playerEntity or content are null
      5. *
    */ diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java index 2d0477d..2e27090 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java @@ -1,18 +1,27 @@ package fr.altarik.toolbox.pagination.api; import fr.altarik.toolbox.pagination.PaginatedContent; +import fr.altarik.toolbox.pagination.precondition.ContentCondition; +import fr.altarik.toolbox.pagination.precondition.HeaderCondition; +import fr.altarik.toolbox.pagination.precondition.NullPlayerCondition; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Pair; import java.util.HashMap; import java.util.Map; +import java.util.function.Predicate; public class PaginationApiImpl implements PaginationApi { - - Map> paginatedContent = new HashMap<>(); - + private final Map> paginatedContent = new HashMap<>(); + private final Predicate playerCondition = new NullPlayerCondition().negate(); + private final Predicate headerCondition = new HeaderCondition().negate(); + private final Predicate contentCondition = new ContentCondition().negate(); @Override public void createTable(ServerPlayerEntity playerEntity, String content, String header) { + if(playerCondition.test(playerEntity) || headerCondition.test(header) || contentCondition.test(content)) { + throw new IllegalArgumentException("Preconditions aren't satisfied"); + } + // TODO: 01/03/2023 } } diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/ContentCondition.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/ContentCondition.java new file mode 100644 index 0000000..a5d2542 --- /dev/null +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/ContentCondition.java @@ -0,0 +1,15 @@ +package fr.altarik.toolbox.pagination.precondition; + +import java.util.function.Predicate; + +/** + * This predicate returns true if the String is not null or + * if its content is not blank (empty or only contains whitespaces) + */ +public class ContentCondition implements Predicate { + @Override + public boolean test(String s) { + return s != null && !s.isBlank(); + } + +} diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java new file mode 100644 index 0000000..d39cde5 --- /dev/null +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java @@ -0,0 +1,14 @@ +package fr.altarik.toolbox.pagination.precondition; + +import java.util.function.Predicate; + +/** + * This predicate returns true if header is not null, not blank (not empty excluding whitespaces) + * and if its length doesn't exceed 50 characters. + */ +public class HeaderCondition implements Predicate { + @Override + public boolean test(String header) { + return header != null && !header.isBlank() && header.length() <= 50; + } +} diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/NullPlayerCondition.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/NullPlayerCondition.java new file mode 100644 index 0000000..16e8dfb --- /dev/null +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/NullPlayerCondition.java @@ -0,0 +1,15 @@ +package fr.altarik.toolbox.pagination.precondition; + +import net.minecraft.server.network.ServerPlayerEntity; + +import java.util.function.Predicate; + +/** + * This predicate returns true if the player isn't null, false otherwise + */ +public class NullPlayerCondition implements Predicate { + @Override + public boolean test(ServerPlayerEntity player) { + return player != null; + } +} diff --git a/Tasks/build.gradle b/Tasks/build.gradle index 77c4a5a..2d673a0 100644 --- a/Tasks/build.gradle +++ b/Tasks/build.gradle @@ -1,24 +1,3 @@ -plugins { - id 'fabric-loom' - -} - -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - tasks.withType(JavaCompile).configureEach { // ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly diff --git a/build.gradle b/build.gradle index 7ab39e6..a33d141 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,12 @@ plugins { id 'java' - id 'fabric-loom' version '1.1-SNAPSHOT' apply false + id 'fabric-loom' version '1.1-SNAPSHOT' } allprojects { apply plugin: 'java' apply plugin: 'maven-publish' + apply plugin: 'fabric-loom' group = project.maven_group version = project.maven_version @@ -46,13 +47,45 @@ allprojects { } } } + + processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } + } + + tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + + // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too + // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. + // We'll use that if it's available, but otherwise we'll use the older option. + def targetVersion = 17 + if (JavaVersion.current().isJava9Compatible()) { + it.options.release = targetVersion + } + } + + dependencies { + testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}" + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + } + } subprojects { dependencies { - testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } java { @@ -66,11 +99,15 @@ subprojects { } -jar { +dependencies { + include allprojects.collect { project -> project } +} + +/*jar { dependsOn subprojects.jar subprojects.each { project -> from(project.jar) { into("META-INF/jars/") } } -} +}*/ diff --git a/settings.gradle b/settings.gradle index 16f164b..3f9b534 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,4 +10,4 @@ pluginManagement { } rootProject.name = 'Toolbox' -include(':Tasks', ':Database', /* ':Pagination' */) +include(':Tasks', ':Database', ':Pagination') From be9c4de0978a21ad83d1b0922868f064eec3b6e4 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Sun, 19 Mar 2023 19:53:54 +0100 Subject: [PATCH 2/6] Fix HeaderCondition Signed-off-by: Quentin Legot --- .../fr/altarik/toolbox/pagination/PaginatedContent.java | 5 +++++ .../fr/altarik/toolbox/pagination/api/PaginationApi.java | 1 + .../altarik/toolbox/pagination/api/PaginationApiImpl.java | 6 ++++-- .../toolbox/pagination/precondition/HeaderCondition.java | 5 ++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java index ca07c3a..50eb02c 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java @@ -1,4 +1,9 @@ package fr.altarik.toolbox.pagination; public class PaginatedContent { + + public PaginatedContent(String header, String content) { + // TODO: 19/03/2023 + } + } diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java index 3b23724..36f4f07 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java @@ -2,6 +2,7 @@ package fr.altarik.toolbox.pagination.api; import net.minecraft.server.network.ServerPlayerEntity; +@SuppressWarnings("unused") // Api usage public interface PaginationApi { /** diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java index 2e27090..93e7972 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java @@ -12,6 +12,9 @@ import java.util.Map; import java.util.function.Predicate; public class PaginationApiImpl implements PaginationApi { + /** + * Integer represent relative tts of the paginated content, decreased by 1 every seconds + */ private final Map> paginatedContent = new HashMap<>(); private final Predicate playerCondition = new NullPlayerCondition().negate(); private final Predicate headerCondition = new HeaderCondition().negate(); @@ -21,7 +24,6 @@ public class PaginationApiImpl implements PaginationApi { if(playerCondition.test(playerEntity) || headerCondition.test(header) || contentCondition.test(content)) { throw new IllegalArgumentException("Preconditions aren't satisfied"); } - - // TODO: 01/03/2023 + paginatedContent.put(playerEntity, new Pair<>(900, new PaginatedContent(header, content))); } } diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java index d39cde5..9b9ee5e 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/precondition/HeaderCondition.java @@ -3,12 +3,11 @@ package fr.altarik.toolbox.pagination.precondition; import java.util.function.Predicate; /** - * This predicate returns true if header is not null, not blank (not empty excluding whitespaces) - * and if its length doesn't exceed 50 characters. + * This predicate returns true if its length doesn't exceed 50 characters. */ public class HeaderCondition implements Predicate { @Override public boolean test(String header) { - return header != null && !header.isBlank() && header.length() <= 50; + return header.length() <= 50; } } From 5a1e741eac7d63688a3159ea3836175f3f8b6148 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Thu, 23 Mar 2023 01:12:46 +0100 Subject: [PATCH 3/6] Add command and page display Signed-off-by: Quentin Legot --- .../toolbox/pagination/PaginatedContent.java | 64 ++++++++++++++++++- .../toolbox/pagination/Pagination.java | 2 +- .../toolbox/pagination/api/PaginationApi.java | 10 +++ .../pagination/api/PaginationApiImpl.java | 39 ++++++++++- .../pagination/command/CommandsRegister.java | 25 +++++++- 5 files changed, 135 insertions(+), 5 deletions(-) diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java index 50eb02c..706605f 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java @@ -1,9 +1,71 @@ package fr.altarik.toolbox.pagination; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.ClickEvent; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + public class PaginatedContent { + private final List pages; + private final String header; + public PaginatedContent(String header, String content) { - // TODO: 19/03/2023 + this.header = header; + pages = new ArrayList<>(); + List secondSplit = new ArrayList<>(); + for(String elem : Stream.of(content.split("\n")).collect(Collectors.toCollection(ArrayList::new))) { + if(elem.length() > 50) { + secondSplit.add(elem.substring(0, 50)); + secondSplit.add(elem.substring(51, elem.length() - 1)); + } else { + secondSplit.add(elem); + } + } + int line = 0; + List currentPage = new ArrayList<>(); + for(String elem : secondSplit) { + line++; + currentPage.add(elem); + if(line == 8 || elem.isEmpty()) { + pages.add(new Page(currentPage)); + line = 0; + currentPage = new ArrayList<>(); + } + } + } + + public void display(ServerPlayerEntity playerEntity, int page) { + if(page >= this.pages.size()) { + throw new IllegalArgumentException("There's " + this.pages.size() + " paginated pages but you wanted page n°" + page); + } else if(page < 0) { + throw new IllegalArgumentException("argument page is lower than 0"); + } else { + playerEntity.sendMessage(Text.literal(header)); + for(String s : pages.get(page).lines) { + playerEntity.sendMessage(Text.literal(s)); + } + MutableText left = Text.literal("<").styled( + style -> style + .withColor(Formatting.YELLOW) + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/table page " + (page - 1))) + ); + MutableText right = Text.literal(">").styled( + style -> style + .withColor(Formatting.YELLOW) + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/table page " + (page + 1))) + ); + playerEntity.sendMessage(left.append(" " + page + " ").append(right)); + } + } + + private record Page(List lines) { } } diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/Pagination.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/Pagination.java index 009e005..8e4b19e 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/Pagination.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/Pagination.java @@ -19,7 +19,7 @@ public class Pagination implements ModInitializer { @Override public void onInitialize() { - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> new CommandsRegister().register(dispatcher, environment.dedicated)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> new CommandsRegister(this).register(dispatcher, environment.dedicated)); } public @NotNull PaginationApi getApi() { diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java index 36f4f07..34f8f23 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApi.java @@ -23,4 +23,14 @@ public interface PaginationApi { */ void createTable(ServerPlayerEntity playerEntity, String content, String header); + /** + * Display the given page for the given player + * @param player display the content of this player + * @param page display this page + * @throws IllegalArgumentException if page is invalid + * @throws NullPointerException if player is null or paginated content for the player doesn't exist (or have expired) + * @see fr.altarik.toolbox.pagination.PaginatedContent#display(ServerPlayerEntity, int) + */ + void display(ServerPlayerEntity player, int page); + } diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java index 93e7972..8a2abf9 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/api/PaginationApiImpl.java @@ -4,10 +4,14 @@ import fr.altarik.toolbox.pagination.PaginatedContent; import fr.altarik.toolbox.pagination.precondition.ContentCondition; import fr.altarik.toolbox.pagination.precondition.HeaderCondition; import fr.altarik.toolbox.pagination.precondition.NullPlayerCondition; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Pair; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.function.Predicate; @@ -15,15 +19,46 @@ public class PaginationApiImpl implements PaginationApi { /** * Integer represent relative tts of the paginated content, decreased by 1 every seconds */ - private final Map> paginatedContent = new HashMap<>(); + public final Map> paginatedContent = new HashMap<>(); private final Predicate playerCondition = new NullPlayerCondition().negate(); private final Predicate headerCondition = new HeaderCondition().negate(); private final Predicate contentCondition = new ContentCondition().negate(); + + public PaginationApiImpl() { + ServerTickEvents.START_SERVER_TICK.register(this::serverTick); + } + @Override public void createTable(ServerPlayerEntity playerEntity, String content, String header) { if(playerCondition.test(playerEntity) || headerCondition.test(header) || contentCondition.test(content)) { throw new IllegalArgumentException("Preconditions aren't satisfied"); } - paginatedContent.put(playerEntity, new Pair<>(900, new PaginatedContent(header, content))); + PaginatedContent paginatedContent1 = new PaginatedContent(header, content); + paginatedContent.put(playerEntity, new Pair<>(18000, paginatedContent1)); + paginatedContent1.display(playerEntity, 0); + } + + @Override + public void display(ServerPlayerEntity player, int page) { + if(player == null) + throw new NullPointerException("Player is null"); + Pair pair = paginatedContent.get(player); + if(pair == null) + throw new NullPointerException("No paginated page for player " + player.getCustomName()); + pair.getRight().display(player, page); + } + + private void serverTick(MinecraftServer server) { + List toRemove = new ArrayList<>(); + for(Map.Entry> content : paginatedContent.entrySet()) { + if(content.getValue().getLeft() == 0) { + toRemove.add(content.getKey()); + } else { + content.getValue().setLeft(content.getValue().getLeft() - 1); + } + } + for(ServerPlayerEntity player : toRemove) { + paginatedContent.remove(player); + } } } diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java index ae295a4..fa01f2e 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java @@ -2,19 +2,42 @@ package fr.altarik.toolbox.pagination.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.IntegerArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import fr.altarik.toolbox.pagination.Pagination; +import fr.altarik.toolbox.pagination.api.PaginationApi; import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.Text; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; public class CommandsRegister { + private final PaginationApi api; + + public CommandsRegister(Pagination instance) { + this.api = instance.getApi(); + } + public void register(CommandDispatcher dispatcher, boolean dedicated) { dispatcher.register(literal("table") .then(literal("page") - .then(argument("page", IntegerArgumentType.integer())) + .then(argument("page", IntegerArgumentType.integer()) + .executes(this::selectPageCommand) + ) ) ); } + private int selectPageCommand(CommandContext context) throws CommandSyntaxException { + try { + int page = IntegerArgumentType.getInteger(context, "page"); + api.display(context.getSource().getPlayerOrThrow(), page); + } catch(NullPointerException | IllegalArgumentException e) { + context.getSource().sendFeedback(Text.literal("Error: " + e.getMessage()), false); + } + return 0; + } + } From f2359c75f4a5c820874d1798926e32005fcffba2 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Thu, 23 Mar 2023 01:33:03 +0100 Subject: [PATCH 4/6] Fix build and reduce memory footprint by fixing max memory usage to 2G instead of 4G Signed-off-by: Quentin Legot --- Pagination/build.gradle | 35 ----------------------------------- Tasks/build.gradle | 15 --------------- build.gradle | 15 +++------------ gradle.properties | 2 +- 4 files changed, 4 insertions(+), 63 deletions(-) diff --git a/Pagination/build.gradle b/Pagination/build.gradle index 75f7707..e69de29 100644 --- a/Pagination/build.gradle +++ b/Pagination/build.gradle @@ -1,35 +0,0 @@ -plugins { - id 'fabric-loom' -} - -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - - // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too - // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. - // We'll use that if it's available, but otherwise we'll use the older option. - def targetVersion = 17 - if (JavaVersion.current().isJava9Compatible()) { - it.options.release = targetVersion - } -} \ No newline at end of file diff --git a/Tasks/build.gradle b/Tasks/build.gradle index 2d673a0..e69de29 100644 --- a/Tasks/build.gradle +++ b/Tasks/build.gradle @@ -1,15 +0,0 @@ -tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - - // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too - // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. - // We'll use that if it's available, but otherwise we'll use the older option. - def targetVersion = 17 - if (JavaVersion.current().isJava9Compatible()) { - it.options.release = targetVersion - } -} diff --git a/build.gradle b/build.gradle index a33d141..d168d1d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,8 @@ plugins { - id 'java' - id 'fabric-loom' version '1.1-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' apply false } allprojects { - apply plugin: 'java' apply plugin: 'maven-publish' apply plugin: 'fabric-loom' @@ -35,7 +33,7 @@ allprojects { mavenJava(MavenPublication) { from components.java } - } + } repositories { maven { name 'altarik' @@ -78,13 +76,6 @@ allprojects { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - } - -} - -subprojects { - - dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } @@ -100,7 +91,7 @@ subprojects { } dependencies { - include allprojects.collect { project -> project } + include subprojects.collect { project -> project } } /*jar { diff --git a/gradle.properties b/gradle.properties index f76810d..16c0d2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx4G +org.gradle.jvmargs=-Xmx2G junit_version=5.9.0 From 5992aaa5a02dfbc0fd6d4f2128e59cb5ef6888b6 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Thu, 23 Mar 2023 01:52:02 +0100 Subject: [PATCH 5/6] Added a test command and made some fixes Signed-off-by: Quentin Legot --- .../toolbox/pagination/PaginatedContent.java | 6 +++-- .../pagination/command/CommandsRegister.java | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java index 706605f..e7034c5 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java @@ -32,18 +32,20 @@ public class PaginatedContent { List currentPage = new ArrayList<>(); for(String elem : secondSplit) { line++; - currentPage.add(elem); + if(!elem.isEmpty()) + currentPage.add(elem); if(line == 8 || elem.isEmpty()) { pages.add(new Page(currentPage)); line = 0; currentPage = new ArrayList<>(); } } + pages.add(new Page(currentPage)); } public void display(ServerPlayerEntity playerEntity, int page) { if(page >= this.pages.size()) { - throw new IllegalArgumentException("There's " + this.pages.size() + " paginated pages but you wanted page n°" + page); + throw new IllegalArgumentException("There's " + this.pages.size() + " paginated pages but you wanted page n°" + (page + 1)); } else if(page < 0) { throw new IllegalArgumentException("argument page is lower than 0"); } else { diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java index fa01f2e..8c32487 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/command/CommandsRegister.java @@ -26,10 +26,36 @@ public class CommandsRegister { .then(argument("page", IntegerArgumentType.integer()) .executes(this::selectPageCommand) ) + ).then(literal("test") + .requires(source -> source.isExecutedByPlayer() && source.hasPermissionLevel(3)) + .executes(this::testPageCommand) ) ); } + /** + * Simply a debug command + */ + private int testPageCommand(CommandContext context) { + api.createTable(context.getSource().getPlayer(), """ + first line + Second line + + second page + dqdq + dqdqd + qdqdq + dqdq + dqdq + dqdq + dqdqd + third page + dqdqd + dqdqd + d""", "My header"); + return 0; + } + private int selectPageCommand(CommandContext context) throws CommandSyntaxException { try { int page = IntegerArgumentType.getInteger(context, "page"); From d82c8cecad98759315d61228bcaf5a2bf8cae580 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Thu, 23 Mar 2023 02:15:37 +0100 Subject: [PATCH 6/6] Added some "=" to headers and footers Signed-off-by: Quentin Legot --- .../toolbox/pagination/PaginatedContent.java | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java index e7034c5..95ac763 100644 --- a/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java +++ b/Pagination/src/main/java/fr/altarik/toolbox/pagination/PaginatedContent.java @@ -17,7 +17,7 @@ public class PaginatedContent { private final String header; public PaginatedContent(String header, String content) { - this.header = header; + this.header = buildHeader(header); pages = new ArrayList<>(); List secondSplit = new ArrayList<>(); for(String elem : Stream.of(content.split("\n")).collect(Collectors.toCollection(ArrayList::new))) { @@ -43,6 +43,11 @@ public class PaginatedContent { pages.add(new Page(currentPage)); } + private String buildHeader(String header) { + int numberOfEq = (50 - header.length()) / 2; + return "=".repeat(numberOfEq) + header + "=".repeat(numberOfEq); + } + public void display(ServerPlayerEntity playerEntity, int page) { if(page >= this.pages.size()) { throw new IllegalArgumentException("There's " + this.pages.size() + " paginated pages but you wanted page n°" + (page + 1)); @@ -53,20 +58,35 @@ public class PaginatedContent { for(String s : pages.get(page).lines) { playerEntity.sendMessage(Text.literal(s)); } - MutableText left = Text.literal("<").styled( - style -> style - .withColor(Formatting.YELLOW) - .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/table page " + (page - 1))) - ); - MutableText right = Text.literal(">").styled( - style -> style - .withColor(Formatting.YELLOW) - .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/table page " + (page + 1))) - ); - playerEntity.sendMessage(left.append(" " + page + " ").append(right)); + + playerEntity.sendMessage(buildFooter(page)); } } + private Text buildFooter(int page) { + String strPage = String.valueOf(page + 1); + int numberOfEq = (46 - strPage.length()) / 2; + MutableText left = Text.literal("<").styled( + style -> style + .withColor(Formatting.YELLOW) + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/table page " + (page - 1))) + ); + MutableText middle = Text.literal(" " + strPage + " ").styled(style -> style.withColor(Formatting.RESET)); + MutableText right = Text.literal(">").styled( + style -> style + .withColor(Formatting.YELLOW) + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/table page " + (page + 1))) + ); + return Text.literal("=".repeat(numberOfEq)) + .append(left) + .append(middle) + .append(right) + .append( + Text.literal("=".repeat(numberOfEq)) + .styled(style -> style.withColor(Formatting.RESET)) + ); + } + private record Page(List lines) { }