Skip to content

Commit efc4781

Browse files
committed
Fix minor issues
1 parent 3abe241 commit efc4781

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

protocolize-api/src/main/java/dev/simplix/protocolize/api/ComponentConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public interface ComponentConverter<T> {
2121

2222
T fromNbt(Tag<?> tag);
2323

24-
void disableItalic(T component);
24+
T disableItalic(T component);
2525

2626
}

protocolize-api/src/main/java/dev/simplix/protocolize/api/SimpleMappingProvider.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ public synchronized void registerMapping(Object mappable, ProtocolMapping mappin
2929

3030
@Override
3131
public <T extends ProtocolMapping> T mapping(Object mappable, int protocolVersion) {
32-
return (T) mappingMultimap.get(mappable).parallelStream()
33-
.filter(protocolMapping -> protocolMapping.inRange(protocolVersion))
34-
.findFirst().orElse(null);
32+
for (ProtocolMapping mapping : mappingMultimap.get(mappable)) {
33+
if (mapping.inRange(protocolVersion)) {
34+
return (T) mapping;
35+
}
36+
}
37+
return null;
3538
}
3639

3740
@Override

protocolize-api/src/main/java/dev/simplix/protocolize/api/chat/ChatElementImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static <T> ChatElement<T> ofNbt(Tag<?> tag) {
3232

3333
@Override
3434
public ChatElement<T> disableItalic() {
35-
componentConverter.disableItalic(component);
35+
component = componentConverter.disableItalic(component);
3636
return this;
3737
}
3838

protocolize-bungeecord/src/main/java/dev/simplix/protocolize/bungee/providers/BungeeCordComponentConverterProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ public BaseComponent[] fromNbt(Tag<?> tag) {
7171

7272
@SneakyThrows
7373
@Override
74-
public void disableItalic(BaseComponent[] component) {
74+
public BaseComponent[] disableItalic(BaseComponent[] component) {
7575
for (BaseComponent c : component) {
7676
if (c.isItalicRaw() == null) {
7777
c.setItalic(false);
7878
}
7979
}
80+
return component;
8081
}
8182

8283
}

protocolize-velocity/src/main/java/dev/simplix/protocolize/velocity/providers/VelocityComponentConverterProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@ public Component fromNbt(Tag<?> tag) {
6969
}
7070

7171
@Override
72-
public void disableItalic(Component component) {
72+
public Component disableItalic(Component component) {
7373
if (component.decoration(TextDecoration.ITALIC) == TextDecoration.State.NOT_SET) {
74-
component.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE);
74+
return component.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE);
7575
}
76+
return component;
7677
}
7778

7879
}

0 commit comments

Comments
 (0)