Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configurations.all {

dependencies {
implementation(platform(libs.mycelium.bom))
implementation(libs.slf4j.api)
compileOnly(libs.adventure)
compileOnly(libs.minestom)

Expand Down
6 changes: 5 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ dependencyResolutionManagement {
}
versionCatalogs {
create("libs") {
version("bom", "1.6.4")
version("bom", "1.6.7")
version("slf4j", "2.0.18")

library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom")

library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
library("minestom","net.minestom", "minestom").withoutVersion()
library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion()
library("cyano", "net.onelitefeather", "cyano").withoutVersion()
Expand Down
171 changes: 0 additions & 171 deletions src/main/java/net/theevilreaper/aves/i18n/AvesTranslationRegistry.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private void updateMaxPages() {
*/
@Override
public void unregister() {
Set<Player> viewers = this.builder.getInventory().getViewers();
Set<? extends Player> viewers = this.builder.getInventory().getViewers();
//Check if the inventory contains viewer and when close the inventories for the viewers to prevent issue
if (!viewers.isEmpty()) {
viewers.forEach(Player::closeInventory);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
package net.theevilreaper.aves.inventory;

import net.theevilreaper.aves.i18n.AvesTranslationRegistry;
import net.theevilreaper.aves.i18n.TextData;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import net.kyori.adventure.translation.GlobalTranslator;
import net.kyori.adventure.translation.TranslationRegistry;
import net.minestom.server.inventory.InventoryType;
import net.minestom.testing.Env;
import net.minestom.testing.extension.MicrotusExtension;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import java.text.MessageFormat;
import java.util.Locale;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand All @@ -34,22 +25,4 @@ void testGlobalTranslatedBuilder() {
assertNull(builder.getDataLayout());
}

@Test
void testGlobalTranslatedBuilderWithRegistry(Env env) {
TranslationRegistry translationRegistry = TranslationRegistry.create(Key.key("test", "test"));
translationRegistry.register("title", Locale.ENGLISH, new MessageFormat("TEST"));
GlobalTranslator.translator().addSource(new AvesTranslationRegistry(translationRegistry));

var builder = new GlobalTranslatedInventoryBuilder(InventoryType.CHEST_2_ROW);

builder.setTitleData(new TextData("title"));
builder.setLayout(InventoryLayout.fromType(builder.getType()));
String serialize = PlainTextComponentSerializer.plainText().serialize(builder.getInventory(Locale.ENGLISH).getTitle());
assertTrue(serialize.equalsIgnoreCase("TEST"));
assertNotNull(builder.getTitleData());
assertNotNull(builder.getLayout());
assertNull(builder.getDataLayout());
}


}
47 changes: 0 additions & 47 deletions src/test/java/net/theevilreaper/aves/item/TranslatedItemTest.java
Original file line number Diff line number Diff line change
@@ -1,63 +1,16 @@
package net.theevilreaper.aves.item;

import net.minestom.server.component.DataComponents;
import net.theevilreaper.aves.i18n.AvesTranslationRegistry;
import net.theevilreaper.aves.inventory.util.InventoryConstants;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import net.kyori.adventure.translation.GlobalTranslator;
import net.kyori.adventure.translation.TranslationRegistry;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import org.junit.jupiter.api.Test;

import java.text.MessageFormat;
import java.util.List;
import java.util.Locale;

import static org.junit.jupiter.api.Assertions.*;

class TranslatedItemTest {

@Test
void testRendererAves() {
var item = TranslatedItem.of(ItemStack.of(Material.ACACIA_BUTTON));
item.setDisplayName("key", "Argument 1", "Argument 2");
TranslationRegistry translationRegistry = TranslationRegistry.create(Key.key("test", "test"));
translationRegistry.register("key", Locale.ENGLISH, new MessageFormat("<arg:0> <arg:1>"));
GlobalTranslator.translator().addSource(new AvesTranslationRegistry(translationRegistry));
Component displayName = item.get(Locale.ENGLISH).get(DataComponents.CUSTOM_NAME);
assertNotNull(displayName);
assertTrue(PlainTextComponentSerializer.plainText().serialize(displayName).equalsIgnoreCase("Argument 1 Argument 2"));
}

@Test
void testRenderer() {
var item = TranslatedItem.of(ItemStack.of(Material.ACACIA_BUTTON));
item.setDisplayName("key", "Argument 1", "Argument 2");
TranslationRegistry translationRegistry = TranslationRegistry.create(Key.key("test", "test"));
translationRegistry.register("key", Locale.ENGLISH, new MessageFormat("{0} {1}"));
GlobalTranslator.translator().addSource(translationRegistry);
Component displayName = item.get(Locale.ENGLISH).get(DataComponents.CUSTOM_NAME);
assertNotNull(displayName);
assertTrue(PlainTextComponentSerializer.plainText().serialize(displayName).equalsIgnoreCase("Argument 1 Argument 2"));
}

@Test
void testRendererLore() {
var item = TranslatedItem.of(ItemStack.of(Material.ACACIA_BUTTON));
item.setDisplayName("key", "Argument 1", "Argument 2");
item.setLore("key", "Argument 1", "Argument 2");
TranslationRegistry translationRegistry = TranslationRegistry.create(Key.key("test", "test"));
translationRegistry.register("key", Locale.ENGLISH, new MessageFormat("{0} {1}"));
GlobalTranslator.translator().addSource(translationRegistry);
List<Component> lore = item.get(Locale.ENGLISH).get(DataComponents.LORE);
assertNotNull(lore);
assertFalse(lore.isEmpty());
assertLinesMatch(lore.stream().map(PlainTextComponentSerializer.plainText()::serialize).toList(), List.of("Argument 1 Argument 2"));
}

@Test
void testSetterMethods() {
var item = TranslatedItem.of(ItemStack.of(Material.ACACIA_BUTTON));
Expand Down
Loading