GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-31 04:36:33 +00:00
Code Issues Releases Activity

Implement CustomEntityDefinition, part one

Browse Source
This commit is contained in:
Eclipse
2025-10-27 13:39:16 +01:00
committed by onebeastchris
parent e398c545f9
commit a3869cf5f8
11 changed files with 104 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/src/main/java/org/geysermc/geyser/api/entity/CustomEntityDefinition.java
View File

@@ -29,12 +29,6 @@ import org.checkerframework.checker.index.qual.Positive;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.common.returnsreceiver.qual.This;
import org.geysermc.geyser.api.GeyserApi;
import org.geysermc.geyser.api.predicate.MinecraftPredicate;
import org.geysermc.geyser.api.predicate.PredicateStrategy;
import org.geysermc.geyser.api.predicate.context.entity.EntitySpawnContext;
import org.geysermc.geyser.api.util.GenericBuilder;
import java.util.List;
public interface CustomEntityDefinition {
@@ -47,15 +41,11 @@ public interface CustomEntityDefinition {
float offset();
List<MinecraftPredicate<? super EntitySpawnContext>> predicates();
PredicateStrategy predicateStrategy();
static Builder builder(@NonNull String bedrockIdentifier, @NonNull JavaEntityType vanillaType) {
return GeyserApi.api().provider(Builder.class, bedrockIdentifier, vanillaType);
}
interface Builder extends GenericBuilder<CustomEntityDefinition> {
interface Builder {
@This
Builder width(@Positive float width);
@@ -69,12 +59,6 @@ public interface CustomEntityDefinition {
@This
Builder offset(@Positive float offset);
@This
Builder predicate(@NonNull MinecraftPredicate<? super EntitySpawnContext> predicate);
@This
Builder predicateStrategy(@NonNull PredicateStrategy strategy);
@Override
CustomEntityDefinition build();
}

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

@@ -48,7 +48,7 @@ public interface JavaEntityType {
return GeyserApi.api().provider(JavaEntityType.class, javaIdentifier);
}
static JavaEntityType create(@NonNull Identifier javaIdentifier, @NonNegative int javaId) {
static JavaEntityType createAndRegister(@NonNull Identifier javaIdentifier, @NonNegative int javaId) {
return GeyserApi.api().provider(JavaEntityType.class, javaIdentifier, javaId);
}
}

42
api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomEntitiesEvent.java Normal file
View File

@@ -0,0 +1,42 @@
/*
* Copyright (c) 2025 GeyserMC. http://geysermc.org
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @author GeyserMC
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.api.event.lifecycle;
import org.geysermc.event.Event;
import org.geysermc.geyser.api.entity.CustomEntityDefinition;
import java.util.List;
public interface GeyserDefineCustomEntitiesEvent extends Event {
List<CustomEntityDefinition> existingCustomEntityDefinitions();
default void register(CustomEntityDefinition.Builder builder) {
register(builder.build());
}
void register(CustomEntityDefinition customEntityDefinition);
}