GH-253 Add configurable placeholder settings and new placeholders #253

P1otrulla · 2025-08-11T17:32:08Z

Note: the location of the Permission annotation was changed specifically because in the current configuration /combat reload can be used by anyone on the server???

Introduces PlaceholderSettings to allow customization of placeholder output, specifically for isInCombat_formatted. Adds new placeholders isInCombat and isInCombat_formatted to FightTagPlaceholder, updates BridgeService and PluginConfig to support the new settings, and adjusts command permission annotation placement. Also updates build scripts and dependencies.

Please describe the changes made by this PR and why they need to be merged:

Introduces PlaceholderSettings to allow customization of placeholder output, specifically for isInCombat_formatted. Adds new placeholders isInCombat and isInCombat_formatted to FightTagPlaceholder, updates BridgeService and PluginConfig to support the new settings, and adjusts command permission annotation placement. Also updates build scripts and dependencies.

gemini-code-assist

Summary of Changes

Hello @P1otrulla, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces significant enhancements to the plugin's placeholder system, allowing for greater customization and flexibility. It adds new placeholders to display combat status and makes their output configurable through dedicated settings. Additionally, it refines command permission handling and updates build configurations to align with recent changes.

Highlights

Configurable Placeholder Settings: Introduced a new PlaceholderSettings class that allows for the customization of strings returned by certain placeholders, specifically isInCombat_formatted.
New Combat Status Placeholders: Added two new placeholders: isInCombat, which returns a boolean string ("true" or "false") indicating combat status, and isInCombat_formatted, which returns user-defined strings based on the combat state.
Configuration Integration for Placeholders: Updated the BridgeService to pass the new PlaceholderSettings to the FightTagPlaceholder and integrated these settings into the PluginConfig to enable user configuration.
Refined Command Permissions: The @Permission annotation for the EternalCombatReloadCommand was moved from the class level to the specific execute method, providing more precise permission control for the reload command.
Build Script Updates: The project version was updated to 2.2.1-SNAPSHOT, and the Minecraft version for the runServer task was adjusted from 1.21.4 to 1.21 in the build scripts.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in issue comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request introduces configurable placeholders for combat status, which is a great addition for server owners to customize their messages. The changes are well-structured, touching upon configuration, placeholder logic, and services. The refactoring of the command permission annotation from class-level to method-level is a good improvement for granularity. I have a couple of suggestions to improve the code further, mainly regarding an unused import and optimizing the new placeholder logic for better performance and maintainability.

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java

Took 14 minutes

…ring tests Took 10 minutes

CitralFlo · 2025-08-11T19:17:24Z

new.placeholder.mp4

buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java

P1otrulla · 2025-08-22T15:32:33Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces configurable settings for placeholders and adds new placeholders, which is a great enhancement. The refactoring of FightTagPlaceholder to use a switch expression improves readability, and the permission fix for the reload command is an important correction. I've provided a couple of suggestions to further improve the placeholder implementation: one to align with PlaceholderAPI's standard behavior for unknown placeholders, and another to simplify one of the helper methods for better conciseness.

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java

… and sends an empty string)

P1otrulla · 2025-08-22T16:33:35Z

Fully tested it's working

Jakubk15 · 2025-08-22T16:44:00Z

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java

-                .orElse("");
-        }
+    private String handleIsInCombat(OfflinePlayer player) {
+        return String.valueOf(this.isPlayerInCombat(player));


Use Boolean#toString

Suggested change

return String.valueOf(this.isPlayerInCombat(player));

return this.isPlayerInCombat(player).toString();

Jakubk15 · 2025-08-22T16:51:23Z

eternalcombat-plugin/build.gradle.kts

+        downloadPlugins.url("https://www.spigotmc.org/resources/packetevents-api.80279/download?version=599651")
+        downloadPlugins.url("https://www.spigotmc.org/resources/placeholderapi.6245/download?version=541946")


Are you sure you can download plugins from SpigotMC? Don't they have some sort of anti-CDN downloader?

gemini-code-assist bot reviewed Aug 11, 2025

View reviewed changes

rollback version

eb22799

gemini-code-assist bot reviewed Aug 11, 2025

View reviewed changes

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java Outdated Show resolved Hide resolved

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java Outdated Show resolved Hide resolved

P1otrulla added 3 commits August 11, 2025 19:35

Add papi plugin to runServer

5178b2d

remove unused import

57c3823

follow gemini's suggestion

de08b92

P1otrulla requested review from mydelkonivea, vLuckyyy, Jakubk15 and CitralFlo August 11, 2025 18:29

CitralFlo added 2 commits August 11, 2025 20:46

Add more comments for configuration, merge time combat placeholders

a266611

Took 14 minutes

change download source to spigot - got 503 on download from github du…

2e7eff6

…ring tests Took 10 minutes

CitralFlo removed their request for review August 11, 2025 19:54

P1otrulla requested a review from Rollczi August 11, 2025 20:09

P1otrulla changed the title ~~Add configurable placeholder settings and new placeholders~~ GH-253 Add configurable placeholder settings and new placeholders Aug 11, 2025

Rollczi requested changes Aug 16, 2025

View reviewed changes

follow Rollczi's suggestion -> refactored placeholder registry

572e483

P1otrulla requested a review from Rollczi August 22, 2025 15:30

gemini-code-assist bot reviewed Aug 22, 2025

View reviewed changes

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java Show resolved Hide resolved

...mbat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java Show resolved Hide resolved

empty string -> null (papi, when receiving null in the code, marks it…

34d408b

… and sends an empty string)

Jakubk15 approved these changes Aug 22, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

GH-253 Add configurable placeholder settings and new placeholders #253

GH-253 Add configurable placeholder settings and new placeholders #253

Uh oh!

P1otrulla commented Aug 11, 2025 •

edited

Loading

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

CitralFlo commented Aug 11, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

P1otrulla commented Aug 22, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

P1otrulla commented Aug 22, 2025

Uh oh!

Jakubk15 Aug 22, 2025

Uh oh!

Jakubk15 Aug 22, 2025

Uh oh!

Uh oh!

	return String.valueOf(this.isPlayerInCombat(player));
	return this.isPlayerInCombat(player).toString();

		downloadPlugins.url("https://www.spigotmc.org/resources/packetevents-api.80279/download?version=599651")
		downloadPlugins.url("https://www.spigotmc.org/resources/placeholderapi.6245/download?version=541946")

Uh oh!

GH-253 Add configurable placeholder settings and new placeholders #253

Are you sure you want to change the base?

GH-253 Add configurable placeholder settings and new placeholders #253

Uh oh!

Conversation

P1otrulla commented Aug 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

CitralFlo commented Aug 11, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

P1otrulla commented Aug 22, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

P1otrulla commented Aug 22, 2025

Uh oh!

Jakubk15 Aug 22, 2025

Choose a reason for hiding this comment

Uh oh!

Jakubk15 Aug 22, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

P1otrulla commented Aug 11, 2025 •

edited

Loading