Skip to content
This repository was archived by the owner on Feb 5, 2026. It is now read-only.

update dev branch #8

Merged
BuffOvrFlw merged 8 commits into from
Jun 14, 2025
Merged

update dev branch #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c30b53
Merge pull request #7 from SyNdicateFoundation/dev
BuffOvrFlw Jun 7, 2025
f802b05
Experimental Upstream update
Jun 7, 2025
0aaa4cd
Merge remote-tracking branch 'origin/main' into dev
Jun 7, 2025
049e982
Experimental Upstream update
Jun 10, 2025
d8639cb
Experimental Upstream update
Jun 10, 2025
2cab086
Entity Mapping & chat Fixes
Jun 10, 2025
8fb6b42
Remove Unnecessary Entity Maps
Jun 11, 2025
04ca402
Socket Backend Removal
Jun 14, 2025
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
3 changes: 2 additions & 1 deletion api/src/main/java/net/md_5/bungee/connection/LoginResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package net.md_5.bungee.connection;

import com.google.gson.Gson;
import lombok.AllArgsConstructor;
import lombok.Data;
import net.md_5.bungee.protocol.Property;

@Data
@AllArgsConstructor
public class LoginResult {

public static final Gson GSON = new Gson();
private String id;
private String name;
private Property[] properties;
Expand Down
4 changes: 0 additions & 4 deletions chat/src/main/java/net/md_5/bungee/api/chat/ClickEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ public final class ClickEvent {
*/
private final String value;

@Setter
@ApiStatus.Internal
private boolean v1_21_5 = false;

public enum Action {

/**
Expand Down
23 changes: 2 additions & 21 deletions chat/src/main/java/net/md_5/bungee/api/chat/HoverEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.md_5.bungee.api.chat.hover.content.Item;
import net.md_5.bungee.api.chat.hover.content.Text;
import net.md_5.bungee.chat.ComponentSerializer;
import net.md_5.bungee.chat.VersionedComponentSerializer;
import org.jetbrains.annotations.ApiStatus;

import java.util.ArrayList;
Expand Down Expand Up @@ -34,12 +35,6 @@ public final class HoverEvent {
@ApiStatus.Internal
private boolean legacy = false;

/**
* Returns whether this hover event is used for version above 1.21.4
*/
@ApiStatus.Internal
private boolean v1_21_5 = false;

/**
* Creates event with an action and a list of contents.
*
Expand Down Expand Up @@ -95,20 +90,6 @@ public static Class<?> getClass(HoverEvent.Action action, boolean array) {
}
}

/**
* Set the compatibility to 1.21.5, also modifies the underlying entities.
*
* @param v1_21_5 the compatibility to set
*/
@ApiStatus.Internal
public void setV1_21_5(boolean v1_21_5) {
this.v1_21_5 = v1_21_5;
for (Content content : contents) {
if (content instanceof Entity) {
((Entity) content).setV1_21_5(v1_21_5);
}
}
}

@Deprecated
public BaseComponent[] getValue() {
Expand All @@ -117,7 +98,7 @@ public BaseComponent[] getValue() {
return (BaseComponent[]) ((Text) content).getValue();
}

TextComponent component = new TextComponent(ComponentSerializer.toString(content));
TextComponent component = new TextComponent(VersionedComponentSerializer.getDefault().toString(content));
return new BaseComponent[]
{
component
Expand Down
16 changes: 0 additions & 16 deletions chat/src/main/java/net/md_5/bungee/api/chat/hover/content/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,6 @@ public class Entity extends Content {
* This is optional and will be hidden if null.
*/
private BaseComponent name;
/**
* True if this entity is for 1.21.5 or later
*/
@ApiStatus.Internal
private boolean v1_21_5;

/**
* Required for backwards compatibility.
*
* @param type the type of the entity, for example 'minecraft:pig'
* @param id for example '6cb1b229-ce5c-4179-af8d-eea185c25963'
* @param name the name of the entity
*/
public Entity(String type, @NonNull String id, BaseComponent name) {
this(type, id, name, false);
}

@Override
public HoverEvent.Action requiredAction() {
Expand Down
28 changes: 23 additions & 5 deletions chat/src/main/java/net/md_5/bungee/api/chat/hover/content/EntitySerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@

import com.google.gson.*;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.BaseComponentSerializer;

import java.lang.reflect.Type;
import java.util.UUID;

public class EntitySerializer implements JsonSerializer<Entity>, JsonDeserializer<Entity> {
import net.md_5.bungee.chat.ChatVersion;
import net.md_5.bungee.chat.VersionedComponentSerializer;

public class EntitySerializer extends BaseComponentSerializer implements JsonSerializer<Entity>, JsonDeserializer<Entity> {

public EntitySerializer(VersionedComponentSerializer serializer)
{
super( serializer );
}
private static UUID parseUUID(int[] array) {
return new UUID((long) array[0] << 32 | (long) array[1] & 0XFFFFFFFFL, (long) array[2] << 32 | (long) array[3] & 0XFFFFFFFFL);
}
Expand All @@ -26,16 +34,26 @@ public Entity deserialize(JsonElement element, Type type, JsonDeserializationCon
idString = uuid.getAsString();
}
return new Entity((value.has(newEntity ? "id" : "type")) ? value.get(newEntity ? "id" : "type").getAsString() : null,
idString, (value.has("name")) ? context.deserialize(value.get("name"), BaseComponent.class) : null,
newEntity
idString, ( value.has( "name" ) ) ? context.deserialize( value.get( "name" ), BaseComponent.class ) : null
);
}

@Override
public JsonElement serialize(Entity content, Type type, JsonSerializationContext context) {
JsonObject object = new JsonObject();
object.addProperty(content.isV1_21_5() ? "id" : "type", (content.getType() != null) ? content.getType() : "minecraft:pig");
object.addProperty(content.isV1_21_5() ? "uuid" : "id", content.getId());
switch ( serializer.getVersion() )
{
case V1_21_5:
object.addProperty( "id", ( content.getType() != null ) ? content.getType() : "minecraft:pig" );
object.addProperty( "uuid", content.getId() );
break;
case V1_16:
object.addProperty( "type", ( content.getType() != null ) ? content.getType() : "minecraft:pig" );
object.addProperty( "id", content.getId() );
break;
default:
throw new IllegalArgumentException( "Unknown version " + serializer.getVersion() );
}
if (content.getName() != null) {
object.add("name", context.serialize(content.getName()));
}
Expand Down
100 changes: 71 additions & 29 deletions chat/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentStyle;
Expand All @@ -13,8 +14,11 @@

import java.util.*;

@RequiredArgsConstructor
public class BaseComponentSerializer {

protected final VersionedComponentSerializer serializer;

protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context) {
component.applyStyle(context.deserialize(object, ComponentStyle.class));

Expand Down Expand Up @@ -49,7 +53,6 @@ protected void deserialize(JsonObject object, BaseComponent component, JsonDeser
component.setClickEvent(new ClickEvent(action, (clickEvent.has("value")) ? clickEvent.get("value").getAsString() : ""));
break;
}
component.getClickEvent().setV1_21_5(true);
} else {
component.setClickEvent(new ClickEvent(action, (clickEvent.has("value")) ? clickEvent.get("value").getAsString() : ""));
}
Expand Down Expand Up @@ -83,7 +86,6 @@ protected void deserialize(JsonObject object, BaseComponent component, JsonDeser
};
}
hoverEvent = new HoverEvent(action, new ArrayList<>(Arrays.asList(list)));
hoverEvent.setV1_21_5(newHoverEvent);
}
} else {
JsonElement value = hoverEventJson.get("value");
Expand Down Expand Up @@ -116,13 +118,13 @@ protected void deserialize(JsonObject object, BaseComponent component, JsonDeser

protected void serialize(JsonObject object, BaseComponent component, JsonSerializationContext context) {
boolean first = false;
if (ComponentSerializer.serializedComponents.get() == null) {
if (VersionedComponentSerializer.serializedComponents.get() == null) {
first = true;
ComponentSerializer.serializedComponents.set(Collections.newSetFromMap(new IdentityHashMap<BaseComponent, Boolean>()));
VersionedComponentSerializer.serializedComponents.set(Collections.newSetFromMap(new IdentityHashMap<BaseComponent, Boolean>()));
}
try {
Preconditions.checkArgument(!ComponentSerializer.serializedComponents.get().contains(component), "Component loop");
ComponentSerializer.serializedComponents.get().add(component);
Preconditions.checkArgument(!VersionedComponentSerializer.serializedComponents.get().contains(component), "Component loop");
VersionedComponentSerializer.serializedComponents.get().add(component);

ComponentStyleSerializer.serializeTo(component.getStyle(), object);

Expand All @@ -135,7 +137,36 @@ protected void serialize(JsonObject object, BaseComponent component, JsonSeriali
JsonObject clickEvent = new JsonObject();
String actionName = component.getClickEvent().getAction().toString().toLowerCase(Locale.ROOT);
clickEvent.addProperty("action", actionName.toLowerCase(Locale.ROOT));
if (component.getClickEvent().isV1_21_5()) {
switch ( serializer.getVersion() )

{
case V1_21_5:
ClickEvent.Action action = ClickEvent.Action.valueOf( actionName.toUpperCase( Locale.ROOT ) );
switch ( action )
{
case OPEN_URL:
clickEvent.addProperty( "url", component.getClickEvent().getValue() );
break;
case RUN_COMMAND:
case SUGGEST_COMMAND:
clickEvent.addProperty( "command", component.getClickEvent().getValue() );
break;
case CHANGE_PAGE:
clickEvent.addProperty( "page", Integer.parseInt( component.getClickEvent().getValue() ) );
break;
default:
clickEvent.addProperty( "value", component.getClickEvent().getValue() );
break;
}
object.add( "click_event", clickEvent );
break;
case V1_16:
clickEvent.addProperty( "value", component.getClickEvent().getValue() );
object.add( "clickEvent", clickEvent );
break;
default:
throw new IllegalArgumentException( "Unknown version " + serializer.getVersion() );
/*if (component.getClickEvent().isV1_21_5()) {
ClickEvent.Action action = ClickEvent.Action.valueOf(actionName.toUpperCase(Locale.ROOT));
switch (action) {
case OPEN_URL:
Expand All @@ -152,45 +183,56 @@ protected void serialize(JsonObject object, BaseComponent component, JsonSeriali
clickEvent.addProperty("value", component.getClickEvent().getValue());
break;
}
object.add("click_event", clickEvent);
} else {
clickEvent.addProperty("value", component.getClickEvent().getValue());
object.add("clickEvent", clickEvent);
object.add("click_event", clickEvent);*/
}

}
if (component.getHoverEvent() != null) {
JsonObject hoverEvent = new JsonObject();
hoverEvent.addProperty("action", component.getHoverEvent().getAction().toString().toLowerCase(Locale.ROOT));
boolean newFormat = component.getHoverEvent().isV1_21_5();
if (component.getHoverEvent().isLegacy()) {
hoverEvent.add("value", context.serialize(component.getHoverEvent().getContents().get(0)));
} else {
if (newFormat) {
if (component.getHoverEvent().getAction() == HoverEvent.Action.SHOW_ITEM || component.getHoverEvent().getAction() == HoverEvent.Action.SHOW_ENTITY) {
JsonObject inlined = context.serialize((component.getHoverEvent().getContents().size() == 1)
? component.getHoverEvent().getContents().get(0) : component.getHoverEvent().getContents()).getAsJsonObject();
inlined.entrySet().forEach(entry -> hoverEvent.add(entry.getKey(), entry.getValue()));
} else {
hoverEvent.add("value", context.serialize((component.getHoverEvent().getContents().size() == 1)
? component.getHoverEvent().getContents().get(0) : component.getHoverEvent().getContents()));
}
} else {
hoverEvent.add("contents", context.serialize((component.getHoverEvent().getContents().size() == 1)
? component.getHoverEvent().getContents().get(0) : component.getHoverEvent().getContents()));
switch (serializer.getVersion()) {
case V1_21_5:
if ( component.getHoverEvent().getAction() == HoverEvent.Action.SHOW_ITEM || component.getHoverEvent().getAction() == HoverEvent.Action.SHOW_ENTITY )
{
JsonObject inlined = context.serialize( ( component.getHoverEvent().getContents().size() == 1 )
? component.getHoverEvent().getContents().get( 0 ) : component.getHoverEvent().getContents() ).getAsJsonObject();
inlined.entrySet().forEach( entry -> hoverEvent.add( entry.getKey(), entry.getValue() ) );
} else
{
hoverEvent.add( "value", context.serialize( ( component.getHoverEvent().getContents().size() == 1 )
? component.getHoverEvent().getContents().get( 0 ) : component.getHoverEvent().getContents() ) );
}
break;
case V1_16:
hoverEvent.add( "contents", context.serialize( ( component.getHoverEvent().getContents().size() == 1 )
? component.getHoverEvent().getContents().get( 0 ) : component.getHoverEvent().getContents() ) );
break;
default:
throw new IllegalArgumentException( "Unknown version " + serializer.getVersion() );
}

}
object.add(newFormat ? "hover_event" : "hoverEvent", hoverEvent);
switch ( serializer.getVersion() )
{
case V1_21_5:
object.add( "hover_event", hoverEvent );
break;
case V1_16:
object.add( "hoverEvent", hoverEvent );
break;
default:
throw new IllegalArgumentException( "Unknown version " + serializer.getVersion() );
}
}

if (component.getExtra() != null) {
object.add("extra", context.serialize(component.getExtra()));
}
} finally {
ComponentSerializer.serializedComponents.get().remove(component);
VersionedComponentSerializer.serializedComponents.get().remove(component);
if (first) {
ComponentSerializer.serializedComponents.set(null);
VersionedComponentSerializer.serializedComponents.set(null);
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions chat/src/main/java/net/md_5/bungee/chat/ChatVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package net.md_5.bungee.chat;

import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
public enum ChatVersion{
V1_16,
V1_21_5;
}
Loading
Loading