GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-23 08:49:23 +00:00
Code Issues Releases Activity

Move CustomEntityDefinition into custom package

Browse Source
This commit is contained in:
onebeastchris
2025-11-10 16:09:32 +01:00
parent a3869cf5f8
commit 11e6b50d53
13 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/main/java/org/geysermc/geyser/api/entity/JavaEntityType.java
View File

@@ -30,18 +30,25 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.GeyserApi; import org.geysermc.geyser.api.GeyserApi;
import org.geysermc.geyser.api.util.Identifier; import org.geysermc.geyser.api.util.Identifier;
/**
* Represents a Java edition entity type
*/
public interface JavaEntityType { public interface JavaEntityType {
Identifier javaIdentifier(); /**
* @return the identifier of the type
*/
Identifier identifier();
/**
* @return the
*/
int javaId(); int javaId();
boolean isUnregistered();
boolean vanilla(); boolean vanilla();
default boolean is(Identifier javaIdentifier) { default boolean is(Identifier javaIdentifier) {
return javaIdentifier().equals(javaIdentifier); return identifier().equals(javaIdentifier);
} }
static JavaEntityType ofVanilla(@NonNull Identifier javaIdentifier) { static JavaEntityType ofVanilla(@NonNull Identifier javaIdentifier) {

6
api/src/main/java/org/geysermc/geyser/api/entity/CustomEntityDefinition.java → api/src/main/java/org/geysermc/geyser/api/entity/custom/CustomEntityDefinition.java
View File

@@ -23,17 +23,17 @@
* @link https://github.com/GeyserMC/Geyser * @link https://github.com/GeyserMC/Geyser
*/ */
package org.geysermc.geyser.api.entity; package org.geysermc.geyser.api.entity.custom;
import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.Positive;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.common.returnsreceiver.qual.This; import org.checkerframework.common.returnsreceiver.qual.This;
import org.geysermc.geyser.api.GeyserApi; import org.geysermc.geyser.api.GeyserApi;
import org.geysermc.geyser.api.util.Identifier;
public interface CustomEntityDefinition { public interface CustomEntityDefinition {
// TODO Identifier Identifier bedrockIdentifier();
String bedrockIdentifier();
float width(); float width();

2
api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomEntitiesEvent.java
View File

@@ -26,7 +26,7 @@
package org.geysermc.geyser.api.event.lifecycle; package org.geysermc.geyser.api.event.lifecycle;
import org.geysermc.event.Event; import org.geysermc.event.Event;
import org.geysermc.geyser.api.entity.CustomEntityDefinition; import org.geysermc.geyser.api.entity.custom.CustomEntityDefinition;
import java.util.List; import java.util.List;

2
core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
View File

@@ -30,7 +30,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes; import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag; import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.entity.CustomEntityDefinition; import org.geysermc.geyser.api.entity.custom.CustomEntityDefinition;
import org.geysermc.geyser.api.entity.property.GeyserEntityProperty; import org.geysermc.geyser.api.entity.property.GeyserEntityProperty;
import org.geysermc.geyser.api.entity.property.type.GeyserFloatEntityProperty; import org.geysermc.geyser.api.entity.property.type.GeyserFloatEntityProperty;
import org.geysermc.geyser.api.entity.property.type.GeyserStringEnumProperty; import org.geysermc.geyser.api.entity.property.type.GeyserStringEnumProperty;

2
core/src/main/java/org/geysermc/geyser/entity/GeyserCustomEntityDefinition.java
View File

@@ -32,7 +32,7 @@ import lombok.ToString;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.Positive;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.entity.CustomEntityDefinition; import org.geysermc.geyser.api.entity.custom.CustomEntityDefinition;
import org.geysermc.geyser.api.entity.JavaEntityType; import org.geysermc.geyser.api.entity.JavaEntityType;
import org.geysermc.geyser.api.predicate.MinecraftPredicate; import org.geysermc.geyser.api.predicate.MinecraftPredicate;
import org.geysermc.geyser.api.predicate.PredicateStrategy; import org.geysermc.geyser.api.predicate.PredicateStrategy;

5
core/src/main/java/org/geysermc/geyser/entity/GeyserEntityType.java
View File

@@ -46,7 +46,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
public record GeyserEntityType(Identifier javaIdentifier, int javaId) implements JavaEntityType { public record GeyserEntityType(Identifier identifier, int javaId) implements JavaEntityType {
private static final Identifier UNREGISTERED = IdentifierImpl.of(Constants.GEYSER_CUSTOM_NAMESPACE, "unregistered_sadface"); private static final Identifier UNREGISTERED = IdentifierImpl.of(Constants.GEYSER_CUSTOM_NAMESPACE, "unregistered_sadface");
private static final Map<BuiltinEntityType, GeyserEntityType> VANILLA = new EnumMap<>(BuiltinEntityType.class); private static final Map<BuiltinEntityType, GeyserEntityType> VANILLA = new EnumMap<>(BuiltinEntityType.class);
@@ -67,9 +67,8 @@ public record GeyserEntityType(Identifier javaIdentifier, int javaId) implements
this(UNREGISTERED, javaId); this(UNREGISTERED, javaId);
} }
@Override
public boolean isUnregistered() { public boolean isUnregistered() {
return javaIdentifier.equals(UNREGISTERED); return identifier.equals(UNREGISTERED);
} }
@Override @Override

4
core/src/main/java/org/geysermc/geyser/entity/VanillaEntityDefinition.java
View File

@@ -138,7 +138,7 @@ public class VanillaEntityDefinition<T extends Entity> extends EntityDefinition<
if (type == null) { if (type == null) {
throw new IllegalStateException("Missing entity type!"); throw new IllegalStateException("Missing entity type!");
} else if (bedrockIdentifier == null) { } else if (bedrockIdentifier == null) {
bedrockIdentifier = type.javaIdentifier().toString(); bedrockIdentifier = type.identifier().toString();
} }
} }
@@ -153,7 +153,7 @@ public class VanillaEntityDefinition<T extends Entity> extends EntityDefinition<
VanillaEntityDefinition<T> definition = new VanillaEntityDefinition<>(factory, type, bedrockIdentifier, width, height, offset, registeredProperties, translators); VanillaEntityDefinition<T> definition = new VanillaEntityDefinition<>(factory, type, bedrockIdentifier, width, height, offset, registeredProperties, translators);
if (register && definition.entityType() != null) { if (register && definition.entityType() != null) {
Registries.ENTITY_DEFINITIONS.get().putIfAbsent(definition.entityType(), definition); Registries.ENTITY_DEFINITIONS.get().putIfAbsent(definition.entityType(), definition);
Registries.JAVA_ENTITY_IDENTIFIERS.get().putIfAbsent(type.javaIdentifier().toString(), definition); Registries.JAVA_ENTITY_IDENTIFIERS.get().putIfAbsent(type.identifier().toString(), definition);
} }
return definition; return definition;
} }

2
core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
View File

@@ -669,6 +669,8 @@ public class Entity implements GeyserEntity {
return this.valid; return this.valid;
} }
/** /**
* Update the suggestion that the client currently has on their screen for this entity (for example, "Feed" or "Ride") * Update the suggestion that the client currently has on their screen for this entity (for example, "Feed" or "Ride")
*/ */

2
core/src/main/java/org/geysermc/geyser/item/hashing/RegistryHasher.java
View File

@@ -111,7 +111,7 @@ public interface RegistryHasher<DirectType> extends MinecraftHasher<Integer> {
RegistryHasher<?> ENTITY_TYPE = registry(JavaRegistries.ENTITY_TYPE); RegistryHasher<?> ENTITY_TYPE = registry(JavaRegistries.ENTITY_TYPE);
MinecraftHasher<EntityType> ENTITY_TYPE_KEY = IDENTIFIER.cast(type -> GeyserEntityType.of(type).javaIdentifier()); MinecraftHasher<EntityType> ENTITY_TYPE_KEY = IDENTIFIER.cast(type -> GeyserEntityType.of(type).identifier());
MinecraftHasher<BlockEntityType> BLOCK_ENTITY_TYPE_KEY = enumRegistry(); MinecraftHasher<BlockEntityType> BLOCK_ENTITY_TYPE_KEY = enumRegistry();

1
core/src/main/java/org/geysermc/geyser/registry/Registries.java
View File

@@ -37,7 +37,6 @@ import org.cloudburstmc.protocol.bedrock.data.biome.BiomeDefinitions;
import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.PotionMixData; import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.PotionMixData;
import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket; import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.entity.CustomEntityDefinition;
import org.geysermc.geyser.api.entity.JavaEntityType; import org.geysermc.geyser.api.entity.JavaEntityType;
import org.geysermc.geyser.entity.GeyserCustomEntityDefinition; import org.geysermc.geyser.entity.GeyserCustomEntityDefinition;
import org.geysermc.geyser.entity.VanillaEntityDefinition; import org.geysermc.geyser.entity.VanillaEntityDefinition;

2
core/src/main/java/org/geysermc/geyser/registry/loader/ProviderRegistryLoader.java
View File

@@ -34,7 +34,7 @@ import org.geysermc.geyser.api.block.custom.component.GeometryComponent;
import org.geysermc.geyser.api.block.custom.component.MaterialInstance; import org.geysermc.geyser.api.block.custom.component.MaterialInstance;
import org.geysermc.geyser.api.block.custom.nonvanilla.JavaBlockState; import org.geysermc.geyser.api.block.custom.nonvanilla.JavaBlockState;
import org.geysermc.geyser.api.command.Command; import org.geysermc.geyser.api.command.Command;
import org.geysermc.geyser.api.entity.CustomEntityDefinition; import org.geysermc.geyser.api.entity.custom.CustomEntityDefinition;
import org.geysermc.geyser.api.entity.JavaEntityType; import org.geysermc.geyser.api.entity.JavaEntityType;
import org.geysermc.geyser.api.event.EventRegistrar; import org.geysermc.geyser.api.event.EventRegistrar;
import org.geysermc.geyser.api.extension.Extension; import org.geysermc.geyser.api.extension.Extension;

2
core/src/main/java/org/geysermc/geyser/session/cache/registry/JavaRegistries.java vendored
View File

@@ -189,7 +189,7 @@ public class JavaRegistries {
} }
private static RegistryEntryData<GeyserEntityType> wrap(GeyserEntityType type) { private static RegistryEntryData<GeyserEntityType> wrap(GeyserEntityType type) {
return new RegistryEntryData<>(type.javaId(), MinecraftKey.identifierToKey(type.javaIdentifier()), type); return new RegistryEntryData<>(type.javaId(), MinecraftKey.identifierToKey(type.identifier()), type);
} }
} }

2
core/src/main/java/org/geysermc/geyser/util/EntityUtils.java
View File

@@ -366,7 +366,7 @@ public final class EntityUtils {
return "Player"; // the player's name is always shown instead return "Player"; // the player's name is always shown instead
} }
// this works at least with all 1.20.5 entities, except the killer bunny since that's not an entity type. // this works at least with all 1.20.5 entities, except the killer bunny since that's not an entity type.
Identifier typeName = type.javaIdentifier(); Identifier typeName = type.identifier();
return translatedEntityName(typeName.namespace(), typeName.path(), session); return translatedEntityName(typeName.namespace(), typeName.path(), session);
} }