Skip to content

Update TNIL reference, and update codebase to utilize updated TNIL. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
creatorfromhell merged 1 commit into from
Jun 8, 2025
Merged

Update TNIL reference, and update codebase to utilize updated TNIL. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Bukkit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNML</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
</parent>

<artifactId>TNML-Bukkit</artifactId>
Expand Down Expand Up @@ -97,7 +97,7 @@
<groupId>net.tnemc</groupId>
<artifactId>TNIL-Bukkit</artifactId>
<version>${tnil.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
Expand All @@ -108,7 +108,7 @@
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>TNML-CORE</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 4 additions & 3 deletions Bukkit/src/net/tnemc/menu/bukkit/BukkitInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ public Inventory build(final MenuPlayer player, final Menu menu, final int page)

for(final Map.Entry<Integer, Icon> entry : playerPage.getIcons(player.identifier()).entrySet()) {

final ItemStack stack = (ItemStack)entry.getValue().getItem(player).locale();

final ItemStack stack = (ItemStack)entry.getValue().getItem(player).cacheLocale();
if(entry.getValue().pdcApplicaton()) {

setNoGrab(stack, plugin);
Expand All @@ -100,7 +101,7 @@ public Inventory build(final MenuPlayer player, final Menu menu, final int page)

for(final Map.Entry<Integer, Icon> entry : menu.pages.get(page).getIcons().entrySet()) {

final ItemStack stack = (ItemStack)entry.getValue().getItem(player).locale();
final ItemStack stack = (ItemStack)entry.getValue().getItem(player).cacheLocale();
if(entry.getValue().pdcApplicaton()) {
setNoGrab(stack, plugin);
}
Expand Down Expand Up @@ -157,7 +158,7 @@ public void updateInventory(final int slot, final AbstractItemStack<?> item) {
if(player.getPlayer() != null) {
Bukkit.getScheduler().runTask(plugin, ()->{

final ItemStack stack = (ItemStack)item.locale();
final ItemStack stack = (ItemStack)item.cacheLocale();
setNoGrab(stack, plugin);
player.getPlayer().getOpenInventory().setItem(slot, stack);
});
Expand Down
2 changes: 1 addition & 1 deletion Bukkit/src/net/tnemc/menu/bukkit/BukkitMenuHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/

import net.tnemc.item.AbstractItemStack;
import net.tnemc.item.bukkit.BukkitHelper;
import net.tnemc.item.bukkit.BukkitItemStack;
import net.tnemc.item.bukkit.platform.BukkitHelper;
import net.tnemc.menu.bukkit.listener.BukkitChatListener;
import net.tnemc.menu.bukkit.listener.BukkitInventoryClickListener;
import net.tnemc.menu.bukkit.listener.BukkitInventoryCloseListener;
Expand Down
10 changes: 2 additions & 8 deletions Core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNML</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
</parent>

<artifactId>TNML-CORE</artifactId>
Expand All @@ -29,13 +29,7 @@
<groupId>net.tnemc</groupId>
<artifactId>TNIL-Core</artifactId>
<version>${tnil.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>19.0.0</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
Expand Down
8 changes: 4 additions & 4 deletions Core/src/net/tnemc/menu/core/manager/MenuManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import net.tnemc.item.providers.HelperMethods;
import net.tnemc.item.platform.registry.BaseHelper;
import net.tnemc.menu.core.Menu;
import net.tnemc.menu.core.compatibility.MenuPlayer;
import net.tnemc.menu.core.viewer.MenuViewer;
Expand Down Expand Up @@ -55,7 +55,7 @@ public class MenuManager {
*/
private static final MenuManager instance = new MenuManager();

private HelperMethods helper;
private BaseHelper helper;

//private constructor for MenuManager.
private MenuManager() {
Expand Down Expand Up @@ -177,7 +177,7 @@ public Map<UUID, Long> recentlyClosed() {
*
* @return The HelperMethods object associated with this MenuManager.
*/
public HelperMethods getHelper() {
public BaseHelper getHelper() {

return helper;
}
Expand All @@ -187,7 +187,7 @@ public HelperMethods getHelper() {
*
* @param helper The HelperMethods object to be set.
*/
public void setHelper(final HelperMethods helper) {
public void setHelper(final BaseHelper helper) {

this.helper = helper;
}
Expand Down
42 changes: 39 additions & 3 deletions Examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNML</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
</parent>

<artifactId>TNML-Example</artifactId>
Expand Down Expand Up @@ -35,18 +35,54 @@
<version>1.17-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>TNIL-Bukkit</artifactId>
<version>${tnil.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>TNML-CORE</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>TNML-Bukkit</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>${depend.adventure}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>${depend.adventure}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-json</artifactId>
<version>${depend.adventure}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>${depend.adventure}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
21 changes: 10 additions & 11 deletions Examples/src/net/tnemc/menu/example/bukkit/BukkitTNML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import net.tnemc.menu.core.builder.IconBuilder;
import net.tnemc.menu.core.builder.MenuBuilder;
import net.tnemc.menu.core.builder.PageBuilder;
import net.tnemc.menu.core.icon.action.impl.ChatAction;
import net.tnemc.menu.core.icon.action.impl.SwitchMenuAction;
import net.tnemc.menu.core.icon.constraints.IconStringConstraints;
import net.tnemc.menu.core.manager.MenuManager;
Expand Down Expand Up @@ -164,13 +163,13 @@ public void onEnable() {
.withPages(
new PageBuilder(1)
.withIcons(
new IconBuilder(menu.stackBuilder().display(Component.text("Example Icon")).of("RED_WOOL", 1))
new IconBuilder(menu.stackBuilder().customName(Component.text("Example Icon")).of("RED_WOOL", 1))
.withSlot(new SlotPos(2, 3))
.withConstraint(IconStringConstraints.ICON_MESSAGE, "You switched a menu!")
.withActions(new SwitchMenuAction("example2"))
.build(),

new IconBuilder(menu.stackBuilder().display(Component.text("Example Icon2")).of("GREEN_WOOL", 1))
new IconBuilder(menu.stackBuilder().customName(Component.text("Example Icon2")).of("GREEN_WOOL", 1))
.withSlot(new SlotPos(2, 6))
.withConstraint(IconStringConstraints.ICON_MESSAGE, "Please type: hello")
.build()
Expand All @@ -185,26 +184,26 @@ public void onEnable() {
.withPages(
new PageBuilder(1)
.withIcons(
new IconBuilder(menu.stackBuilder().display(Component.text("Example2 Icon")).of("STONE", 1))
new IconBuilder(menu.stackBuilder().customName(Component.text("Example2 Icon")).of("STONE", 1))
.withSlot(new SlotPos(2, 5))
.withConstraint(IconStringConstraints.ICON_MESSAGE, "You switched a menu and found the new button!")
.withActions(new SwitchMenuAction("example"))
.build(),
new IconBuilder(menu.stackBuilder().display(Component.text("Dynamic Input-based Icon")).of("STONE", 1))
new IconBuilder(menu.stackBuilder().customName(Component.text("Dynamic Input-based Icon")).of("STONE", 1))
.withItemProvider(player->{
final Optional<MenuViewer> viewer = MenuManager.instance().findViewer(player.identifier());
if(viewer.isPresent()) {
final Optional<Object> display = viewer.get().findData("example-data");
if(display.isPresent()) {
return menu.stackBuilder().display(Component.text((String)display.get())).of("GRASS", 1);
return menu.stackBuilder().customName(Component.text((String)display.get())).of("GRASS", 1);
}
}
return menu.stackBuilder().display(Component.text("Default Display")).of("STONE", 1);
return menu.stackBuilder().customName(Component.text("Default Display")).of("STONE", 1);
})
.withSlot(new SlotPos(2, 2))
.build(),

new IconBuilder(menu.stackBuilder().display(Component.text("Default State")).of("BLACK_WOOL", 1))
new IconBuilder(menu.stackBuilder().customName(Component.text("Default State")).of("BLACK_WOOL", 1))
.withStateID("TEST-STATE")
.withDefaultState("STATE-0")
.withStateHandler(currentState->{
Expand All @@ -219,9 +218,9 @@ public void onEnable() {
return "STATE-0";
}
})
.withState("STATE-1", menu.stackBuilder().display(Component.text("State 1")).of("BROWN_WOOL", 1))
.withState("STATE-2", menu.stackBuilder().display(Component.text("State 2")).of("BLUE_WOOL", 1))
.withState("STATE-3", menu.stackBuilder().display(Component.text("State 3")).of("GREEN_WOOL", 1))
.withState("STATE-1", menu.stackBuilder().customName(Component.text("State 1")).of("BROWN_WOOL", 1))
.withState("STATE-2", menu.stackBuilder().customName(Component.text("State 2")).of("BLUE_WOOL", 1))
.withState("STATE-3", menu.stackBuilder().customName(Component.text("State 3")).of("GREEN_WOOL", 1))
.build()
).build()
).build();
Expand Down
6 changes: 3 additions & 3 deletions Folia/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNML</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
</parent>

<artifactId>TNML-Folia</artifactId>
Expand Down Expand Up @@ -39,12 +39,12 @@
<groupId>net.tnemc</groupId>
<artifactId>TNIL-Paper</artifactId>
<version>${tnil.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>TNML-Paper</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Folia/src/net/tnemc/menu/folia/FoliaInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void updateInventory(final int slot, final AbstractItemStack<?> item) {
if(player.getPlayer() != null) {
Bukkit.getGlobalRegionScheduler().run(plugin, (scheduledTask)->{

final ItemStack stack = (ItemStack)item.locale();
final ItemStack stack = (ItemStack)item.cacheLocale();
setNoGrab(stack, plugin);
player.getPlayer().getOpenInventory().setItem(slot, stack);
});
Expand Down
2 changes: 1 addition & 1 deletion Folia/src/net/tnemc/menu/folia/FoliaMenuHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/

import net.tnemc.item.AbstractItemStack;
import net.tnemc.item.paper.PaperHelper;
import net.tnemc.item.paper.PaperItemStack;
import net.tnemc.item.paper.platform.PaperHelper;
import net.tnemc.menu.core.MenuHandler;
import net.tnemc.menu.core.manager.MenuManager;
import net.tnemc.menu.folia.listener.FoliaChatListener;
Expand Down
6 changes: 3 additions & 3 deletions Paper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNML</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
</parent>

<artifactId>TNML-Paper</artifactId>
Expand Down Expand Up @@ -39,12 +39,12 @@
<groupId>net.tnemc</groupId>
<artifactId>TNIL-Paper</artifactId>
<version>${tnil.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>TNML-CORE</artifactId>
<version>1.6.0.0-SNAPSHOT-15</version>
<version>1.7.0.0-SNAPSHOT-2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions Paper/src/net/tnemc/menu/paper/PaperInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public Inventory build(final MenuPlayer player, final Menu menu, final int page)

for(final Map.Entry<Integer, Icon> entry : playerPage.getIcons(player.identifier()).entrySet()) {

final ItemStack stack = (ItemStack)entry.getValue().getItem(player).locale();
final ItemStack stack = (ItemStack)entry.getValue().getItem(player).cacheLocale();
if(entry.getValue().pdcApplicaton()) {

setNoGrab(stack, plugin);
Expand All @@ -100,7 +100,7 @@ public Inventory build(final MenuPlayer player, final Menu menu, final int page)

for(final Map.Entry<Integer, Icon> entry : menu.pages.get(page).getIcons().entrySet()) {

final ItemStack stack = (ItemStack)entry.getValue().getItem(player).locale();
final ItemStack stack = (ItemStack)entry.getValue().getItem(player).cacheLocale();
if(entry.getValue().pdcApplicaton()) {

setNoGrab(stack, plugin);
Expand Down Expand Up @@ -158,7 +158,7 @@ public void updateInventory(final int slot, final AbstractItemStack<?> item) {
if(player.getPlayer() != null) {
Bukkit.getScheduler().runTask(plugin, ()->{

final ItemStack stack = (ItemStack)item.locale();
final ItemStack stack = (ItemStack)item.cacheLocale();
setNoGrab(stack, plugin);
player.getPlayer().getOpenInventory().setItem(slot, stack);
});
Expand Down
2 changes: 1 addition & 1 deletion Paper/src/net/tnemc/menu/paper/PaperMenuHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/

import net.tnemc.item.AbstractItemStack;
import net.tnemc.item.paper.PaperHelper;
import net.tnemc.item.paper.PaperItemStack;
import net.tnemc.item.paper.platform.PaperHelper;
import net.tnemc.menu.core.MenuHandler;
import net.tnemc.menu.core.manager.MenuManager;
import net.tnemc.menu.paper.listener.PaperChatListener;
Expand Down
Loading