Skip to content

Commit dbb8000

Browse files
vLuckyyyvLuckyyy
committed
Move to root feature package and fix
Signed-off-by: Martin Sulikowski <vLuckyyy.biznes@gmail.com>
1 parent 9c34134 commit dbb8000

10 files changed

Lines changed: 36 additions & 34 deletions

File tree

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/ItemFlagCommand.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemFlagCommand.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit;
1+
package com.eternalcode.core.feature.itemedit;
22

33
import com.eternalcode.annotations.scan.command.DescriptionDocs;
44
import com.eternalcode.core.injector.annotations.Inject;
55
import com.eternalcode.core.notice.NoticeService;
66
import com.eternalcode.core.placeholder.Placeholders;
7+
import com.eternalcode.multification.shared.Formatter;
78
import dev.rollczi.litecommands.annotations.argument.Arg;
9+
import dev.rollczi.litecommands.annotations.command.Command;
810
import dev.rollczi.litecommands.annotations.context.Context;
911
import dev.rollczi.litecommands.annotations.execute.Execute;
1012
import dev.rollczi.litecommands.annotations.permission.Permission;
11-
import dev.rollczi.litecommands.annotations.command.Command;
1213
import org.bukkit.entity.Player;
1314
import org.bukkit.inventory.ItemFlag;
1415
import org.bukkit.inventory.ItemStack;
1516
import org.bukkit.inventory.meta.ItemMeta;
16-
import com.eternalcode.multification.shared.Formatter;
1717

1818
@Command(name = "itemflag")
1919
@Permission("eternalcore.itemflag")
@@ -43,8 +43,8 @@ void execute(@Context Player player, @Arg ItemFlag flag) {
4343

4444
if (meta.hasItemFlag(flag)) {
4545
meta.removeItemFlags(flag);
46-
this.noticeService.player(player.getUniqueId(),
47-
translation -> translation.itemEdit().itemFlagRemovedMessage(), formatter);
46+
hand.setItemMeta(meta);
47+
this.noticeService.player(player.getUniqueId(), translation -> translation.itemEdit().itemFlagRemovedMessage(), formatter);
4848
return;
4949
}
5050

@@ -68,5 +68,4 @@ void clear(@Context Player player) {
6868
hand.setItemMeta(meta);
6969
this.noticeService.player(player.getUniqueId(), translation -> translation.itemEdit().itemFlagClearedMessage());
7070
}
71-
7271
}

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/ItemLoreArgument.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemLoreArgument.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit;
1+
package com.eternalcode.core.feature.itemedit;
22

33
import com.eternalcode.core.bridge.litecommand.argument.AbstractViewerArgument;
44
import com.eternalcode.core.injector.annotations.Inject;
@@ -17,7 +17,7 @@
1717
@LiteArgument(type = int.class, name = ItemLoreArgument.KEY)
1818
class ItemLoreArgument extends AbstractViewerArgument<Integer> {
1919

20-
private static final List<Integer> suggestions = List.of(0, 1, 2, 3, 4, 5);
20+
private static final List<Integer> suggestions = List.of(1, 2, 3, 4, 5, 6); // Sugeruj numery od 1 do 6
2121
static final String KEY = "item-lore";
2222

2323
@Inject
@@ -30,11 +30,11 @@ public ParseResult<Integer> parse(Invocation<CommandSender> invocation, String a
3030
try {
3131
int value = Integer.parseInt(argument);
3232

33-
if (value < 0) {
33+
if (value < 1) {
3434
return ParseResult.failure(translation.argument().numberBiggerThanOrEqualZero());
3535
}
3636

37-
return ParseResult.success(value);
37+
return ParseResult.success(value - 1);
3838
}
3939
catch (NumberFormatException exception) {
4040
return ParseResult.failure(translation.argument().numberBiggerThanOrEqualZero());

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/ItemLoreCommand.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemLoreCommand.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit;
1+
package com.eternalcode.core.feature.itemedit;
22

33
import com.eternalcode.annotations.scan.command.DescriptionDocs;
44
import com.eternalcode.commons.adventure.AdventureUtil;
55
import com.eternalcode.core.injector.annotations.Inject;
66
import com.eternalcode.core.notice.NoticeService;
77
import dev.rollczi.litecommands.annotations.argument.Arg;
8+
import dev.rollczi.litecommands.annotations.command.Command;
89
import dev.rollczi.litecommands.annotations.context.Context;
9-
import dev.rollczi.litecommands.annotations.join.Join;
1010
import dev.rollczi.litecommands.annotations.execute.Execute;
11+
import dev.rollczi.litecommands.annotations.join.Join;
1112
import dev.rollczi.litecommands.annotations.permission.Permission;
12-
import dev.rollczi.litecommands.annotations.command.Command;
13+
import java.util.ArrayList;
14+
import java.util.List;
1315
import net.kyori.adventure.text.minimessage.MiniMessage;
14-
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
1516
import org.bukkit.Material;
1617
import org.bukkit.entity.Player;
1718
import org.bukkit.inventory.ItemStack;
1819
import org.bukkit.inventory.meta.ItemMeta;
1920

20-
import java.util.ArrayList;
21-
import java.util.List;
22-
2321
@Command(name = "itemlore")
2422
@Permission("eternalcore.itemlore")
2523
class ItemLoreCommand {
@@ -44,19 +42,14 @@ void execute(@Context Player player, @Arg(ItemLoreArgument.KEY) int line, @Join
4442
}
4543

4644
ItemMeta itemMeta = itemStack.getItemMeta();
47-
4845
List<String> lore = itemMeta.getLore();
4946
lore = lore == null ? new ArrayList<>() : new ArrayList<>(lore);
5047

5148
while (lore.size() <= line) {
5249
lore.add("");
5350
}
5451

55-
// Serialize using GsonComponentSerializer for modern Minecraft versions
56-
String json = GsonComponentSerializer.gson().serialize(
57-
AdventureUtil.resetItalic(this.miniMessage.deserialize(text))
58-
);
59-
lore.set(line, json);
52+
lore.set(line, AdventureUtil.SECTION_SERIALIZER.serialize(AdventureUtil.resetItalic(this.miniMessage.deserialize(text))));
6053

6154
itemMeta.setLore(lore);
6255
itemStack.setItemMeta(itemMeta);
@@ -95,7 +88,11 @@ void remove(@Context Player player, @Arg(ItemLoreArgument.KEY) int line) {
9588
itemMeta.setLore(lore);
9689
itemStack.setItemMeta(itemMeta);
9790

98-
this.noticeService.player(player.getUniqueId(), translation -> translation.itemEdit().itemLoreLineRemoved());
91+
this.noticeService.create()
92+
.player(player.getUniqueId())
93+
.notice(translation -> translation.itemEdit().itemLoreLineRemoved())
94+
.placeholder("{LINE}", String.valueOf(line + 1))
95+
.send();
9996
}
10097

10198
@Execute(name = "clear")

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/ItemNameCommand.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemNameCommand.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit;
1+
package com.eternalcode.core.feature.itemedit;
22

33
import com.eternalcode.annotations.scan.command.DescriptionDocs;
44
import com.eternalcode.commons.adventure.AdventureUtil;
@@ -10,6 +10,7 @@
1010
import dev.rollczi.litecommands.annotations.permission.Permission;
1111
import dev.rollczi.litecommands.annotations.command.Command;
1212
import net.kyori.adventure.text.minimessage.MiniMessage;
13+
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
1314
import org.bukkit.Material;
1415
import org.bukkit.entity.Player;
1516
import org.bukkit.inventory.ItemStack;
@@ -32,15 +33,13 @@ class ItemNameCommand {
3233
@DescriptionDocs(description = "Sets name of item in hand", arguments = "<name>")
3334
void execute(@Context Player player, @Join String name) {
3435
ItemStack itemStack = this.validateItemFromMainHand(player);
35-
36+
3637
if (itemStack == null) {
3738
this.noticeService.player(player.getUniqueId(), translation -> translation.argument().noItem());
38-
3939
return;
4040
}
4141

4242
ItemMeta itemMeta = itemStack.getItemMeta();
43-
4443
String serialized = AdventureUtil.SECTION_SERIALIZER.serialize(this.miniMessage.deserialize(name));
4544

4645
itemMeta.setDisplayName(serialized);
@@ -59,11 +58,11 @@ void clear(@Context Player player) {
5958
ItemStack itemStack = this.validateItemFromMainHand(player);
6059

6160
if (itemStack == null) {
61+
this.noticeService.player(player.getUniqueId(), translation -> translation.argument().noItem());
6262
return;
6363
}
6464

6565
ItemMeta itemMeta = itemStack.getItemMeta();
66-
6766
itemMeta.setDisplayName(null);
6867
itemStack.setItemMeta(itemMeta);
6968

@@ -79,5 +78,4 @@ private ItemStack validateItemFromMainHand(Player player) {
7978

8079
return itemStack;
8180
}
82-
8381
}

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/messages/ENItemEditMessages.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/ENItemEditMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit.messages;
1+
package com.eternalcode.core.feature.itemedit.messages;
22

33
import com.eternalcode.multification.notice.Notice;
44
import lombok.Getter;

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/messages/ItemEditMessages.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/ItemEditMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit.messages;
1+
package com.eternalcode.core.feature.itemedit.messages;
22

33
import com.eternalcode.multification.notice.Notice;
44

eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/item/itemedit/messages/PLItemEditMessages.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/messages/PLItemEditMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.core.feature.essentials.item.itemedit.messages;
1+
package com.eternalcode.core.feature.itemedit.messages;
22

33
import com.eternalcode.multification.notice.Notice;
44
import lombok.Getter;

‎eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.eternalcode.core.feature.adminchat.messages.AdminChatMessages;
66
import com.eternalcode.core.feature.afk.messages.AfkMessages;
77
import com.eternalcode.core.feature.automessage.messages.AutoMessageMessages;
8-
import com.eternalcode.core.feature.essentials.item.itemedit.messages.ItemEditMessages;
8+
import com.eternalcode.core.feature.itemedit.messages.ItemEditMessages;
99
import com.eternalcode.core.feature.helpop.messages.HelpOpSection;
1010
import com.eternalcode.core.feature.home.messages.HomeMessages;
1111
import com.eternalcode.core.feature.jail.messages.JailMessages;

‎eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.eternalcode.core.feature.adminchat.messages.ENAdminChatMessages;
66
import com.eternalcode.core.feature.afk.messages.ENAfkMessages;
77
import com.eternalcode.core.feature.automessage.messages.ENAutoMessageMessages;
8+
import com.eternalcode.core.feature.itemedit.messages.ENItemEditMessages;
89
import com.eternalcode.core.feature.helpop.messages.ENHelpOpMessages;
910
import com.eternalcode.core.feature.home.messages.ENHomeMessages;
1011
import com.eternalcode.core.feature.jail.messages.ENJailMessages;
@@ -114,6 +115,9 @@ public class ENTranslation extends AbstractTranslation {
114115
})
115116
public ENFormatSection format = new ENFormatSection();
116117

118+
@Description("# This section is responsible for all messages related to item editing.")
119+
public ENItemEditMessages itemEdit = new ENItemEditMessages();
120+
117121
@Getter
118122
@Contextual
119123
public static class ENFormatSection implements Format {

‎eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.eternalcode.core.feature.adminchat.messages.PLAdminChatMessages;
66
import com.eternalcode.core.feature.afk.messages.PLAfkMessages;
77
import com.eternalcode.core.feature.automessage.messages.PLAutoMessageMessages;
8+
import com.eternalcode.core.feature.itemedit.messages.PLItemEditMessages;
89
import com.eternalcode.core.feature.helpop.messages.PLHelpOpMessages;
910
import com.eternalcode.core.feature.home.messages.PLHomeMessages;
1011
import com.eternalcode.core.feature.jail.messages.PLJailMessages;
@@ -111,6 +112,9 @@ public class PLTranslation extends AbstractTranslation {
111112
})
112113
public PLFormatSection format = new PLFormatSection();
113114

115+
@Description("# Ta sekcja odpowiada za wiadomości dotyczące edytowanie itemow")
116+
public PLItemEditMessages itemEdit = new PLItemEditMessages();
117+
114118
@Getter
115119
@Contextual
116120
public static class PLFormatSection implements Format {

0 commit comments

Comments
 (0)