Skip to content

Map chickens to custom playunlimited entity #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NicklasMatzulla wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Map chickens to custom playunlimited entity #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d6bdca
Map chickens to playunlimited entity
NicklasMatzulla Sep 6, 2025
db9020c
Load .mcaddon packs
NicklasMatzulla Sep 6, 2025
0ef30bb
Assign unique runtime ID for PlayUnlimited entity
NicklasMatzulla Sep 6, 2025
ffefafb
Advertise and map custom core_rings entity
NicklasMatzulla Sep 6, 2025
e85bc13
Replace chicken Bedrock identifier
NicklasMatzulla Sep 6, 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
7 changes: 7 additions & 0 deletions core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ public final class EntityDefinitions {
public static final EntityDefinition<ChestBoatEntity> CHERRY_CHEST_BOAT;
public static final EntityDefinition<MinecartEntity> CHEST_MINECART;
public static final EntityDefinition<ChickenEntity> CHICKEN;
public static final EntityDefinition<ArmorStandEntity> CORE_RINGS;
public static final EntityDefinition<AbstractFishEntity> COD;
public static final EntityDefinition<CommandBlockMinecartEntity> COMMAND_BLOCK_MINECART;
public static final EntityDefinition<CowEntity> COW;
Expand Down Expand Up @@ -651,6 +652,10 @@ public final class EntityDefinitions {
.addTranslator(MetadataTypes.ROTATIONS, ArmorStandEntity::setLeftLegRotation)
.addTranslator(MetadataTypes.ROTATIONS, ArmorStandEntity::setRightLegRotation)
.build();
CORE_RINGS = EntityDefinition.inherited(ArmorStandEntity::new, ARMOR_STAND)
.identifier("playunlimited:core_rings")
.build(false);
Registries.JAVA_ENTITY_IDENTIFIERS.get().put("playunlimited:core_rings", CORE_RINGS);
PLAYER = EntityDefinition.<PlayerEntity>inherited(null, livingEntityBase)
.type(EntityType.PLAYER)
.height(1.8f).width(0.6f)
Expand Down Expand Up @@ -973,10 +978,12 @@ public final class EntityDefinitions {
.build();
CHICKEN = EntityDefinition.inherited(ChickenEntity::new, ageableEntityBase)
.type(EntityType.CHICKEN)
.identifier("playunlimited:playunlimited")
.height(0.7f).width(0.4f)
.properties(VanillaEntityProperties.CLIMATE_VARIANT)
.addTranslator(MetadataTypes.CHICKEN_VARIANT, ChickenEntity::setVariant)
.build();
Registries.JAVA_ENTITY_IDENTIFIERS.get().put("playunlimited:playunlimited", CHICKEN);
COW = EntityDefinition.inherited(CowEntity::new, ageableEntityBase)
.type(EntityType.COW)
.height(1.4f).width(0.9f)
Expand Down
12 changes: 12 additions & 0 deletions core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,18 @@ public void setBoots(GeyserItemStack boots) {
public void setHand(GeyserItemStack hand) {
super.setHand(hand);
updateSecondEntityStatus(true);

if (!hand.isEmpty() && hand.asItem() == Items.GRASS_BLOCK) {
if (this.definition != EntityDefinitions.CORE_RINGS) {
despawnEntity();
this.definition = EntityDefinitions.CORE_RINGS;
spawnEntity();
}
} else if (this.definition == EntityDefinitions.CORE_RINGS) {
despawnEntity();
this.definition = EntityDefinitions.ARMOR_STAND;
spawnEntity();
}
}

@Override
Expand Down
30 changes: 30 additions & 0 deletions core/src/main/java/org/geysermc/geyser/registry/Registries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import org.cloudburstmc.nbt.NbtMap;
import org.cloudburstmc.nbt.NbtMapBuilder;
import org.cloudburstmc.nbt.NbtType;
import org.cloudburstmc.protocol.bedrock.data.biome.BiomeDefinitions;
import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.PotionMixData;
import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
Expand Down Expand Up @@ -71,6 +72,7 @@
import java.util.EnumMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
Expand Down Expand Up @@ -206,6 +208,34 @@ public static void load() {
// (by using the Items or Blocks class, which loads all the blocks)

BEDROCK_ENTITY_IDENTIFIERS.load();
// Add custom entity identifiers for PlayUnlimited entities
NbtMap identifiers = BEDROCK_ENTITY_IDENTIFIERS.get();
List<NbtMap> idList = new ArrayList<>(identifiers.getList("idlist", NbtType.COMPOUND));
int nextRid = idList.stream().mapToInt(map -> map.getInt("rid")).max().orElse(-1) + 1;

for (int i = 0; i < idList.size(); i++) {
NbtMap map = idList.get(i);
if ("minecraft:chicken".equals(map.getString("id"))) {
idList.set(i, NbtMap.builder()
.putString("id", "playunlimited:playunlimited")
.putShort("bid", map.getShort("bid"))
.putInt("rid", map.getInt("rid"))
.putBoolean("summonable", true)
.putBoolean("hasSpawnEgg", map.getBoolean("hasSpawnEgg"))
.build());
break;
}
}

idList.add(NbtMap.builder()
.putString("id", "playunlimited:core_rings")
.putShort("bid", (short) 0)
.putInt("rid", nextRid)
.putBoolean("summonable", true)
.putBoolean("hasSpawnEgg", false)
.build());

BEDROCK_ENTITY_IDENTIFIERS.set(NbtMap.builder().putList("idlist", NbtType.COMPOUND, idList).build());
BIOMES_NBT.load();
BIOMES.load();
BIOME_IDENTIFIERS.load();
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class ResourcePackLoader implements RegistryLoader<Path, Map<UUID, Resour
.expireAfterWrite(15, TimeUnit.MINUTES)
.build();

static final PathMatcher PACK_MATCHER = FileSystems.getDefault().getPathMatcher("glob:**.{zip,mcpack}");
static final PathMatcher PACK_MATCHER = FileSystems.getDefault().getPathMatcher("glob:**.{zip,mcpack,mcaddon}");

private static final boolean SHOW_RESOURCE_PACK_LENGTH_WARNING = Boolean.parseBoolean(System.getProperty("Geyser.ShowResourcePackLengthWarning", "true"));

Expand Down Expand Up @@ -156,7 +156,7 @@ public Map<UUID, ResourcePackHolder> load(Path directory) {
*/
public static GeyserResourcePack.Builder readPack(Path path) throws IllegalArgumentException {
if (!PACK_MATCHER.matches(path)) {
throw new IllegalArgumentException("Resource pack " + path.getFileName() + " must be a .zip or .mcpack file!");
throw new IllegalArgumentException("Resource pack " + path.getFileName() + " must be a .zip, .mcpack or .mcaddon file!");
}

ResourcePackManifest manifest = readManifest(path, path.getFileName().toString());
Expand Down