GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Support 1.21.11 (#6040)

Browse Source
This commit is contained in:
Auri
2025-12-17 20:53:49 +00:00
committed by GitHub
parent d35667a7ec 2206c1bde2
commit 5d46e768e2
81 changed files with 1088 additions and 62224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -14,6 +14,7 @@ local.properties
.settings/
.loadpath
.recommenders
.classpath
# External tool builders
.externalToolBuilders/
@@ -98,6 +99,7 @@ local.properties
# Package Files #
*.jar
!gradle/wrapper/gradle-wrapper.jar
*.war
*.nar
*.ear

2
README.md
View File

@@ -15,7 +15,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
## Supported Versions
Geyser is currently supporting Minecraft Bedrock 1.21.90 - 1.21.130 and Minecraft Java 1.21.9 - 1.21.10. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
Geyser is currently supporting Minecraft Bedrock 1.21.111 - 1.21.130 and Minecraft Java 1.21.11. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
## Setting Up
Take a look [here](https://geysermc.org/wiki/geyser/setup/) for how to set up Geyser.

10
bootstrap/mod/fabric/build.gradle.kts
View File

@@ -8,6 +8,16 @@ architectury {
fabric()
}
loom {
mods {
create("geyser-fabric") {
sourceSet(sourceSets.main.get())
sourceSet("main", projects.mod)
sourceSet("main", projects.core)
}
}
}
dependencies {
modImplementation(libs.fabric.loader)
modApi(libs.fabric.api)

4
bootstrap/mod/fabric/src/main/resources/fabric.mod.json
View File

@@ -23,8 +23,8 @@
"geyser.mixins.json"
],
"depends": {
"fabricloader": ">=0.17.2",
"fabricloader": ">=0.18.2",
"fabric-api": "*",
"minecraft": ">=1.21.9"
"minecraft": ">=1.21.11"
}
}

10
bootstrap/mod/neoforge/build.gradle.kts
View File

@@ -8,6 +8,16 @@ architectury {
neoForge()
}
loom {
mods {
create("geyser-neoforge") {
sourceSet(sourceSets.main.get())
sourceSet("main", projects.mod)
sourceSet("main", projects.core)
}
}
}
// This is provided by "org.cloudburstmc.math.mutable" too, so yeet.
// NeoForge's class loader is *really* annoying.
provided("org.cloudburstmc.math", "api")

10
bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/PermissionUtils.java
View File

@@ -25,6 +25,9 @@
package org.geysermc.geyser.platform.neoforge;
import net.minecraft.server.permissions.Permission;
import net.minecraft.server.permissions.PermissionCheck;
import net.minecraft.server.permissions.Permissions;
import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent;
import net.neoforged.neoforge.server.permission.nodes.PermissionNode;
import net.neoforged.neoforge.server.permission.nodes.PermissionTypes;
@@ -71,7 +74,12 @@ public class PermissionUtils {
case FALSE -> false;
case NOT_SET -> {
if (player != null) {
yield player.createCommandSourceStack().hasPermission(Objects.requireNonNull(player.level()).getServer().operatorUserPermissionLevel());
yield player.createCommandSourceStack().permissions().hasPermission(
new Permission.HasCommandLevel(
Objects.requireNonNull(player.level())
.getServer().operatorUserPermissions().level()
)
);
}
yield false; // NeoForge javadocs say player is null in the case of an offline player.
}

6
bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml
View File

@@ -3,7 +3,7 @@ loaderVersion="[1,)"
license="MIT"
[[mods]]
modId="geyser_neoforge"
version="${version}"
version="${file.jarVersion}"
displayName="Geyser"
displayURL="https://geysermc.org/"
logoFile= "../assets/geyser/icon.png"
@@ -16,12 +16,12 @@ config = "geyser_neoforge.mixins.json"
[[dependencies.geyser_neoforge]]
modId="neoforge"
type="required"
versionRange="[21.9.14-beta,)"
versionRange="[21.11.0-beta,)"
ordering="NONE"
side="BOTH"
[[dependencies.geyser_neoforge]]
modId="minecraft"
type="required"
versionRange="[1.21.9,)"
versionRange="[1.21.11,)"
ordering="NONE"
side="BOTH"

1
bootstrap/spigot/build.gradle.kts
View File

@@ -87,5 +87,6 @@ modrinth {
tasks {
runServer {
minecraftVersion(libs.versions.runpaperversion.get())
jvmArgs("-Dcom.mojang.eula.agree=true")
}
}

4
bootstrap/standalone/build.gradle.kts
View File

@@ -34,6 +34,10 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
archiveBaseName.set("Geyser-Standalone")
transform(Log4j2PluginsCacheFileTransformer())
// https://gradleup.com/shadow/configuration/merging/#handling-duplicates-strategy
filesMatching("META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat") {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
}
tasks.named<JavaExec>("run") {

1
build-logic/build.gradle.kts
View File

@@ -25,4 +25,5 @@ dependencies {
implementation(libs.architectury.plugin)
implementation(libs.architectury.loom)
implementation(libs.minotaur)
implementation(libs.loom.companion)
}

2
build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
View File

@@ -22,7 +22,7 @@ indra {
}
dependencies {
compileOnly("org.checkerframework", "checker-qual", libs.checker.qual.get().version)
compileOnly("org.checkerframework:checker-qual:" + libs.checker.qual.get().version)
}
repositories {

2
build-logic/src/main/kotlin/geyser.modrinth-uploading-conventions.gradle.kts
View File

@@ -13,7 +13,7 @@ modrinth {
versionNumber.set(projectVersion(project))
versionType.set("beta")
changelog.set(System.getenv("CHANGELOG") ?: "")
gameVersions.addAll("1.21.9", libs.minecraft.get().version as String)
gameVersions.addAll(libs.minecraft.get().version as String)
failSilently.set(true)
syncBodyFrom.set(rootProject.file("README.md").readText())

6
build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts
View File

@@ -11,7 +11,11 @@ tasks {
"id" to "geyser",
"name" to "Geyser",
"version" to project.version,
"description" to project.description,
// Must be this for gradle :neoforge:runServer task to work
"file" to mapOf(
"jarVersion" to project.version
),
"description" to project.description as String,
"url" to "https://geysermc.org",
"author" to "GeyserMC"
)

6
build-logic/src/main/kotlin/geyser.publish-conventions.gradle.kts
View File

@@ -7,9 +7,3 @@ indra {
publishSnapshotsTo("geysermc", "https://repo.opencollab.dev/maven-snapshots")
publishReleasesTo("geysermc", "https://repo.opencollab.dev/maven-releases")
}
publishing {
// skip shadow jar from publishing. Workaround for https://github.com/johnrengelman/shadow/issues/651
val javaComponent = project.components["java"] as AdhocComponentWithVariants
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { skip() }
}

30
build-logic/src/main/kotlin/geyser.shadow-conventions.gradle.kts
View File

@@ -2,35 +2,37 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
id("geyser.base-conventions")
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}
shadow {
addShadowVariantIntoJavaComponent = false
}
tasks {
named<Jar>("jar") {
from(project.rootProject.file("LICENSE"))
}
val shadowJar = named<ShadowJar>("shadowJar") {
archiveBaseName.set(project.name)
archiveVersion.set("")
archiveClassifier.set("")
val currentProjectName = project.name // Capture project name at config time
val sJar: ShadowJar = this
doFirst {
providedDependencies[project.name]?.forEach { string ->
sJar.dependencies {
println("Excluding $string from ${project.name}")
exclude(dependency(string))
}
dependencies {
providedDependencies[currentProjectName]?.forEach { string ->
println("Excluding $string from $currentProjectName")
exclude(dependency(string))
}
sJar.dependencies {
exclude(dependency("org.checkerframework:checker-qual:.*"))
exclude(dependency("org.jetbrains:annotations:.*"))
}
exclude(dependency("org.checkerframework:checker-qual:.*"))
exclude(dependency("org.jetbrains:annotations:.*"))
}
}
named("build") {
dependsOn(shadowJar)
}
}
}

168
core/build.gradle.kts
View File

@@ -1,9 +1,18 @@
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.revwalk.RevWalk
import net.kyori.indra.git.RepositoryValueSource
import java.util.Properties
plugins {
// Allow blossom to mark sources root of templates
idea
eclipse
alias(libs.plugins.blossom)
id("geyser.publish-conventions")
id("io.freefair.lombok")
// Allows fabric/neoforge runServer gradle tasks to work correctly
id("dev.architectury.loom-companion")
}
dependencies {
@@ -69,9 +78,11 @@ dependencies {
}
// Test
testImplementation(platform("org.junit:junit-bom:6.0.0"))
testImplementation(libs.junit)
testImplementation(libs.gson.runtime) // Record support
testImplementation(libs.mockito)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
// Annotation Processors
compileOnly(projects.ap)
@@ -83,35 +94,114 @@ dependencies {
api(libs.bstats)
}
tasks.processResources {
// This is solely for backwards compatibility for other programs that used this file before the switch to gradle.
// It used to be generated by the maven Git-Commit-Id-Plugin
filesMatching("git.properties") {
val info = GitInfo()
expand(
"branch" to info.branch,
"buildNumber" to info.buildNumber,
"projectVersion" to info.version,
"commit" to info.commit,
"commitAbbrev" to info.commitAbbrev,
"commitMessage" to info.commitMessage,
"repository" to info.repository
)
abstract class CommitMessageValueSource : RepositoryValueSource.Parameterless<String>() {
override fun obtain(repository: Git): String? {
val headCommitId = repository.repository.resolve("HEAD")
if (headCommitId == null) {
return ""
}
RevWalk(repository.repository).use { walk ->
val commit = walk.parseCommit(headCommitId)
return commit.fullMessage
}
}
}
abstract class RepositoryUrlValueSource : RepositoryValueSource.Parameterless<String>() {
override fun obtain(repository: Git): String? {
return repository.repository.config.getString("remote", "origin", "url")
}
}
val gitBranch = indraGit.branchName().orElse("DEV")
val gitCommit = indraGit.commit()
val gitCommitName = gitCommit.map { it?.name ?: "0".repeat(40) }
val gitCommitAbbrev = gitCommit.map { it?.name?.substring(0, 7) ?: "0".repeat(7) }
val gitCommitMessage = indraGit.repositoryValue(CommitMessageValueSource::class.java).orElse("")
val gitRepositoryUrl = indraGit.repositoryValue(RepositoryUrlValueSource::class.java).orElse("").map {
it.replace("git@github.com:", "https://github.com/")
}
val gitRepositoryIsDev = gitBranch.zip(gitRepositoryUrl) { branch, repo ->
isDevBuild(branch, repo)
}
val gitVersion = gitBranch.zip(gitCommitAbbrev) { branch, commit ->
"git-${branch}-${commit}"
}
val projectVersionProvider = gitRepositoryIsDev.map { isDev ->
if (isDev) project.version.toString() else projectVersion(project).toString()
}
val finalVersion = projectVersionProvider.zip(gitVersion) { projVer, gitVer ->
"$projVer ($gitVer)"
}
val buildNumber = provider { buildNumber().toString() }
val gitPropertiesMap = mapOf(
"git.branch" to gitBranch,
"git.build.number" to buildNumber,
"git.build.version" to finalVersion,
"git.commit.id" to gitCommitName,
"git.commit.id.abbrev" to gitCommitAbbrev,
"git.commit.message.full" to gitCommitMessage,
"git.remote.origin.url" to gitRepositoryUrl
)
val generateGitProperties = tasks.register("generateGitProperties") {
description = "Generates git.properties from Git information."
group = "build"
inputs.properties(gitPropertiesMap)
val generatedPropsFile = layout.buildDirectory.file("generated/git/git.properties")
outputs.file(generatedPropsFile)
doLast {
val props = Properties()
gitPropertiesMap.forEach { (key, provider) ->
props[key] = provider.get()
}
generatedPropsFile.get().asFile.apply {
parentFile.mkdirs()
writer().use { props.store(it, null) }
// remove comment line
val lines = readLines()
if (lines.isNotEmpty()) {
writeText(lines.drop(1).joinToString("\n", postfix = "\n"))
}
}
}
}
tasks.processResources {
from(generateGitProperties) {
into(".")
}
}
tasks.named("sourcesJar") {
dependsOn(tasks.named("processResources"))
}
sourceSets {
main {
blossom {
val info = GitInfo()
javaSources {
property("version", info.version)
property("gitVersion", info.gitVersion)
property("buildNumber", info.buildNumber.toString())
property("branch", info.branch)
property("commit", info.commit)
property("repository", info.repository)
property("devVersion", info.isDev.toString())
property("version", finalVersion)
property("gitVersion", gitVersion)
property("buildNumber", buildNumber)
property("branch", gitBranch)
property("commit", gitCommitName)
property("repository", gitRepositoryUrl)
property("devVersion", gitRepositoryIsDev.map { it.toString() })
}
}
}
@@ -121,40 +211,6 @@ fun isDevBuild(branch: String, repository: String): Boolean {
return branch != "master" || repository.equals("https://github.com/GeyserMC/Geyser", ignoreCase = true).not()
}
inner class GitInfo {
val branch: String
val commit: String
val commitAbbrev: String
val gitVersion: String
val version: String
val buildNumber: Int
val commitMessage: String
val repository: String
val isDev: Boolean
init {
branch = indraGit.branchName() ?: "DEV"
val commit = indraGit.commit()
this.commit = commit?.name ?: "0".repeat(40)
commitAbbrev = commit?.name?.substring(0, 7) ?: "0".repeat(7)
gitVersion = "git-${branch}-${commitAbbrev}"
val git = indraGit.git()
commitMessage = git?.commit()?.message ?: ""
repository = git?.repository?.config?.getString("remote", "origin", "url") ?: ""
buildNumber = buildNumber()
isDev = isDevBuild(branch, repository)
val projectVersion = if (isDev) project.version else projectVersion(project)
version = "$projectVersion ($gitVersion)"
}
}
// Manual task to download the bedrock data files from the CloudburstMC/Data repository
// Invoke with ./gradlew :core:downloadBedrockData --suffix=1_20_70
// Set suffix to the current Bedrock version

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

@@ -115,15 +115,19 @@ import org.geysermc.geyser.entity.type.living.animal.TurtleEntity;
import org.geysermc.geyser.entity.type.living.animal.farm.ChickenEntity;
import org.geysermc.geyser.entity.type.living.animal.farm.CowEntity;
import org.geysermc.geyser.entity.type.living.animal.farm.PigEntity;
import org.geysermc.geyser.entity.type.living.animal.farm.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.CamelEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.CamelHuskEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.ChestedHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.HorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.LlamaEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.SkeletonHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.TraderLlamaEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.ZombieHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.AbstractNautilusEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.NautilusEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.ZombieNautilusEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.ParrotEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.TameableEntity;
@@ -196,6 +200,7 @@ public final class EntityDefinitions {
public static final EntityDefinition<BreezeEntity> BREEZE;
public static final EntityDefinition<AbstractWindChargeEntity> BREEZE_WIND_CHARGE;
public static final EntityDefinition<CamelEntity> CAMEL;
public static final EntityDefinition<CamelHuskEntity> CAMEL_HUSK;
public static final EntityDefinition<CatEntity> CAT;
public static final EntityDefinition<SpiderEntity> CAVE_SPIDER;
public static final EntityDefinition<BoatEntity> CHERRY_BOAT;
@@ -262,6 +267,7 @@ public final class EntityDefinitions {
public static final EntityDefinition<MinecartEntity> MINECART;
public static final EntityDefinition<MooshroomEntity> MOOSHROOM;
public static final EntityDefinition<ChestedHorseEntity> MULE;
public static final EntityDefinition<NautilusEntity> NAUTILUS;
public static final EntityDefinition<BoatEntity> OAK_BOAT;
public static final EntityDefinition<ChestBoatEntity> OAK_CHEST_BOAT;
public static final EntityDefinition<OcelotEntity> OCELOT;
@@ -269,6 +275,7 @@ public final class EntityDefinitions {
public static final EntityDefinition<BoatEntity> PALE_OAK_BOAT;
public static final EntityDefinition<ChestBoatEntity> PALE_OAK_CHEST_BOAT;
public static final EntityDefinition<PandaEntity> PANDA;
public static final EntityDefinition<AbstractSkeletonEntity> PARCHED;
public static final EntityDefinition<ParrotEntity> PARROT;
public static final EntityDefinition<PhantomEntity> PHANTOM;
public static final EntityDefinition<PigEntity> PIG;
@@ -324,6 +331,7 @@ public final class EntityDefinitions {
public static final EntityDefinition<ZoglinEntity> ZOGLIN;
public static final EntityDefinition<ZombieEntity> ZOMBIE;
public static final EntityDefinition<ZombieHorseEntity> ZOMBIE_HORSE;
public static final EntityDefinition<ZombieNautilusEntity> ZOMBIE_NAUTILUS;
public static final EntityDefinition<ZombieVillagerEntity> ZOMBIE_VILLAGER;
public static final EntityDefinition<ZombifiedPiglinEntity> ZOMBIFIED_PIGLIN;
@@ -829,6 +837,11 @@ public final class EntityDefinitions {
.height(1.8f).width(0.6f)
.offset(1.62f)
.build();
PARCHED = EntityDefinition.inherited(AbstractSkeletonEntity::new, mobEntityBase)
.type(EntityType.PARCHED)
.height(1.8f).width(0.6f)
.offset(1.62f)
.build();
VEX = EntityDefinition.inherited(VexEntity::new, mobEntityBase)
.type(EntityType.VEX)
.height(0.8f).width(0.4f)
@@ -1013,7 +1026,7 @@ public final class EntityDefinitions {
.heightAndWidth(0.6f)
.property(BeeEntity.NECTAR_PROPERTY)
.addTranslator(MetadataTypes.BYTE, BeeEntity::setBeeFlags)
.addTranslator(MetadataTypes.INT, BeeEntity::setAngerTime)
.addTranslator(MetadataTypes.LONG, BeeEntity::setAngerTime)
.build();
CHICKEN = EntityDefinition.inherited(ChickenEntity::new, ageableEntityBase)
.type(EntityType.CHICKEN)
@@ -1173,6 +1186,9 @@ public final class EntityDefinitions {
.addTranslator(MetadataTypes.BOOLEAN, CamelEntity::setDashing)
.addTranslator(MetadataTypes.LONG, CamelEntity::setLastPoseTick)
.build();
CAMEL_HUSK = EntityDefinition.inherited(CamelHuskEntity::new, CAMEL)
.type(EntityType.CAMEL_HUSK)
.build();
HORSE = EntityDefinition.inherited(HorseEntity::new, abstractHorseEntityBase)
.type(EntityType.HORSE)
.height(1.6f).width(1.3965f)
@@ -1213,6 +1229,25 @@ public final class EntityDefinitions {
.addTranslator(MetadataTypes.BYTE, TameableEntity::setTameableFlags)
.addTranslator(MetadataTypes.OPTIONAL_LIVING_ENTITY_REFERENCE, TameableEntity::setOwner)
.build();
// Nautilus
{
EntityDefinition<AbstractNautilusEntity> abstractNautilusBase = EntityDefinition.<AbstractNautilusEntity>inherited(null, tameableEntityBase) // No factory, is abstract
.width(0.95f).height(0.875f)
.addTranslator(MetadataTypes.BOOLEAN, AbstractNautilusEntity::setDashing)
.build();
NAUTILUS = EntityDefinition.inherited(NautilusEntity::new, abstractNautilusBase)
.type(EntityType.NAUTILUS)
.identifier("minecraft:nautilus")
.build();
ZOMBIE_NAUTILUS = EntityDefinition.inherited(ZombieNautilusEntity::new, abstractNautilusBase)
.type(EntityType.ZOMBIE_NAUTILUS)
.identifier("minecraft:zombie_nautilus")
.build();
}
CAT = EntityDefinition.inherited(CatEntity::new, tameableEntityBase)
.type(EntityType.CAT)
.height(0.35f).width(0.3f)
@@ -1233,7 +1268,7 @@ public final class EntityDefinitions {
// "Begging" on wiki.vg, "Interested" in Nukkit - the tilt of the head
.addTranslator(MetadataTypes.BOOLEAN, (wolfEntity, entityMetadata) -> wolfEntity.setFlag(EntityFlag.INTERESTED, ((BooleanEntityMetadata) entityMetadata).getPrimitiveValue()))
.addTranslator(MetadataTypes.INT, WolfEntity::setCollarColor)
.addTranslator(MetadataTypes.INT, WolfEntity::setWolfAngerTime)
.addTranslator(MetadataTypes.LONG, WolfEntity::setWolfAngerTime)
.addTranslator(MetadataTypes.WOLF_VARIANT, WolfEntity::setVariant)
.addTranslator(null) // sound variant; these aren't clientsided anyways... right??
.build();

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

@@ -71,6 +71,8 @@ import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEn
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentTypes;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Equippable;
import java.util.Collections;
import java.util.EnumMap;
@@ -797,9 +799,10 @@ public class Entity implements GeyserEntity {
@Override
public <T> void update(@NonNull GeyserEntityProperty<T> property, @Nullable T value) {
Objects.requireNonNull(property, "property must not be null!");
if (!(property instanceof PropertyType<T, ? extends EntityProperty> propertyType)) {
if (!(property instanceof PropertyType)) {
throw new IllegalArgumentException("Invalid property implementation! Got: " + property.getClass().getSimpleName());
}
PropertyType<T, ? extends EntityProperty> propertyType = (PropertyType<T, ?>) property;
int index = propertyDefinitions.getPropertyIndex(property.identifier().toString());
if (index < 0) {
throw new IllegalArgumentException("No property with the name " + property.identifier() + " has been registered.");

21
core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java
View File

@@ -353,6 +353,13 @@ public class LivingEntity extends Entity {
}
}
final Equippable equippable = itemStack.getComponent(DataComponentTypes.EQUIPPABLE);
if (equippable != null && equippable.equipOnInteract() && this.isAlive()) {
if (isEquippableInSlot(itemStack, equippable.slot()) && getItemInSlot(equippable.slot()).isEmpty()) {
return InteractionResult.SUCCESS;
}
}
return super.interact(hand);
}
@@ -524,6 +531,11 @@ public class LivingEntity extends Entity {
clientVehicle.getVehicleComponent().setWaterMovementEfficiency(AttributeUtils.calculateValue(javaAttribute));
}
}
case MOVEMENT_EFFICIENCY -> {
if (this instanceof ClientVehicle clientVehicle) {
clientVehicle.getVehicleComponent().setMovementEfficiency(AttributeUtils.calculateValue(javaAttribute));
}
}
}
}
}
@@ -550,6 +562,15 @@ public class LivingEntity extends Entity {
return false;
}
public final boolean isEquippableInSlot(GeyserItemStack item, EquipmentSlot var2) {
Equippable equippable = item.getComponent(DataComponentTypes.EQUIPPABLE);
if (equippable == null) {
return var2 == EquipmentSlot.MAIN_HAND && this.canUseSlot(EquipmentSlot.MAIN_HAND);
} else {
return var2 == equippable.slot() && this.canUseSlot(equippable.slot()) && EntityUtils.equipmentUsableByEntity(session, equippable, this.definition.entityType());
}
}
protected boolean canUseSlot(EquipmentSlot slot) {
return true;
}

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

@@ -29,7 +29,7 @@ import lombok.Getter;
import net.kyori.adventure.key.Key;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.living.animal.farm.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.inventory.GeyserItemStack;
import org.geysermc.geyser.item.Items;
import org.geysermc.geyser.session.GeyserSession;

4
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/BeeEntity.java
View File

@@ -39,7 +39,7 @@ import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.cache.tags.ItemTag;
import org.geysermc.geyser.session.cache.tags.Tag;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.LongEntityMetadata;
import java.util.UUID;
@@ -71,7 +71,7 @@ public class BeeEntity extends AnimalEntity {
updateBedrockEntityProperties();
}
public void setAngerTime(IntEntityMetadata entityMetadata) {
public void setAngerTime(LongEntityMetadata entityMetadata) {
// Converting "anger time" to a boolean
setFlag(EntityFlag.ANGRY, entityMetadata.getPrimitiveValue() > 0);
}

4
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/farm/TemperatureVariantAnimal.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/TemperatureVariantAnimal.java
View File

@@ -23,13 +23,11 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.entity.type.living.animal.farm;
package org.geysermc.geyser.entity.type.living.animal;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.properties.type.EnumProperty;
import org.geysermc.geyser.entity.type.living.animal.AnimalEntity;
import org.geysermc.geyser.entity.type.living.animal.VariantHolder;
import org.geysermc.geyser.impl.IdentifierImpl;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.cache.RegistryCache;

1
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/farm/ChickenEntity.java
View File

@@ -28,6 +28,7 @@ package org.geysermc.geyser.entity.type.living.animal.farm;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.item.type.Item;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.cache.registry.JavaRegistries;

1
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/farm/CowEntity.java
View File

@@ -31,6 +31,7 @@ import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.inventory.GeyserItemStack;
import org.geysermc.geyser.item.Items;
import org.geysermc.geyser.item.type.Item;

1
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/farm/PigEntity.java
View File

@@ -32,6 +32,7 @@ import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.Tickable;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.player.PlayerEntity;
import org.geysermc.geyser.entity.vehicle.BoostableVehicleComponent;
import org.geysermc.geyser.entity.vehicle.ClientVehicle;

47
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/CamelHuskEntity.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* 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.entity.type.living.animal.horse;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.item.type.Item;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.cache.tags.ItemTag;
import org.geysermc.geyser.session.cache.tags.Tag;
import java.util.UUID;
public class CamelHuskEntity extends CamelEntity {
public CamelHuskEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
}
@Override
protected @Nullable Tag<Item> getFoodTag() {
return ItemTag.CAMEL_HUSK_FOOD;
}
}

185
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/nautilus/AbstractNautilusEntity.java Normal file
View File

@@ -0,0 +1,185 @@
/*
* 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.entity.type.living.animal.nautilus;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.math.TrigMath;
import org.cloudburstmc.math.vector.Vector2f;
import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.living.animal.tameable.TameableEntity;
import org.geysermc.geyser.entity.vehicle.ClientVehicle;
import org.geysermc.geyser.entity.vehicle.NautilusVehicleComponent;
import org.geysermc.geyser.entity.vehicle.VehicleComponent;
import org.geysermc.geyser.input.InputLocksFlag;
import org.geysermc.geyser.inventory.GeyserItemStack;
import org.geysermc.geyser.item.Items;
import org.geysermc.geyser.item.enchantment.EnchantmentComponent;
import org.geysermc.geyser.item.type.Item;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.cache.tags.ItemTag;
import org.geysermc.geyser.session.cache.tags.Tag;
import org.geysermc.geyser.util.InteractiveTag;
import org.geysermc.geyser.util.ItemUtils;
import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentTypes;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.HolderSet;
import java.util.UUID;
public abstract class AbstractNautilusEntity extends TameableEntity implements ClientVehicle {
private HolderSet repairableItems = null;
private boolean isCurseOfBinding = false;
private final NautilusVehicleComponent vehicleComponent;
public AbstractNautilusEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw, float defSpeed) {
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
this.vehicleComponent = new NautilusVehicleComponent(this, 0.0f, defSpeed);
dirtyMetadata.put(EntityDataTypes.CONTAINER_SIZE, 2);
setFlag(EntityFlag.WASD_CONTROLLED, true);
}
@Override
protected @Nullable Tag<Item> getFoodTag() {
return ItemTag.NAUTILUS_FOOD;
}
@Override
public void setBody(GeyserItemStack stack) {
super.setBody(stack);
isCurseOfBinding = ItemUtils.hasEffect(session, stack, EnchantmentComponent.PREVENT_ARMOR_CHANGE);
repairableItems = stack.getComponent(DataComponentTypes.REPAIRABLE);
}
@NonNull
@Override
protected InteractiveTag testMobInteraction(@NonNull Hand hand, @NonNull GeyserItemStack itemInHand) {
if (getFlag(EntityFlag.ANGRY)) {
return InteractiveTag.NONE;
}
if (getFlag(EntityFlag.TAMED)) {
if (itemInHand.asItem().javaIdentifier().endsWith("_nautilus_armor") && getItemInSlot(EquipmentSlot.BODY).isEmpty() && !getFlag(EntityFlag.BABY)) {
return InteractiveTag.EQUIP_NAUTILUS_ARMOR;
}
if (itemInHand.is(Items.SHEARS) && !getItemInSlot(EquipmentSlot.BODY).isEmpty()
&& (!isCurseOfBinding || session.getGameMode().equals(GameMode.CREATIVE))) {
return InteractiveTag.REMOVE_NAUTILUS_ARMOR;
}
if (itemInHand.is(session, repairableItems) &&
!getItemInSlot(EquipmentSlot.BODY).isEmpty() && getItemInSlot(EquipmentSlot.BODY).isDamaged()) {
return InteractiveTag.REPAIR_WOLF_ARMOR;
}
if (itemInHand.isEmpty()) {
return InteractiveTag.RIDE_HORSE; // Does not appear to be a specific interaction for Nautilus; needs ProxyPass verification
}
} else if (getFlag(EntityFlag.BABY) || getFlag(EntityFlag.TAMED)) {
if (itemInHand.is(session, ItemTag.NAUTILUS_FOOD)) {
// Can feed either baby nautilus, or tamed nautilus
return InteractiveTag.FEED;
}
} else {
if (itemInHand.is(session, ItemTag.NAUTILUS_TAMING_ITEMS)) {
// Nautilus taming food and untamed - can tame
return InteractiveTag.TAME;
}
}
return super.testMobInteraction(hand, itemInHand);
}
@Override
protected void updateSaddled(boolean saddled) {
setFlag(EntityFlag.CAN_DASH, saddled);
super.updateSaddled(saddled);
if (this.passengers.contains(session.getPlayerEntity())) {
// We want to allow player to press jump again if pressing jump doesn't dismount the entity.
this.session.setLockInput(InputLocksFlag.JUMP, this.doesJumpDismount());
this.session.updateInputLocks();
}
}
@Override
public boolean doesJumpDismount() {
return !this.getFlag(EntityFlag.SADDLED);
}
public void setDashing(BooleanEntityMetadata entityMetadata) {
if (entityMetadata.getPrimitiveValue()) {
vehicleComponent.setDashCooldown(40);
}
}
@Override
public VehicleComponent<?> getVehicleComponent() {
return vehicleComponent;
}
@Override
public Vector3f getRiddenInput(Vector2f input) {
float x = input.getX();
float y = 0.0f;
float z = 0.0f;
if (input.getY() != 0.0f) {
float pitch = session.getPlayerEntity().getPitch();
z = TrigMath.cos(pitch * TrigMath.DEG_TO_RAD);
y = -TrigMath.sin(pitch * TrigMath.DEG_TO_RAD);
if (input.getY() < 0.0f) {
z *= -0.5f;
y *= -0.5f;
}
}
return Vector3f.from(x, y, z);
}
@Override
public float getVehicleSpeed() {
return vehicleComponent.isInWater() ? 0.0325F * vehicleComponent.getMoveSpeed() : 0.02F * vehicleComponent.getMoveSpeed();
}
@Override
public boolean isClientControlled() {
return getFlag(EntityFlag.SADDLED) && !this.passengers.isEmpty() && this.passengers.get(0) == session.getPlayerEntity();
}
@Override
protected boolean canUseSlot(EquipmentSlot slot) {
if (slot != EquipmentSlot.SADDLE && slot != EquipmentSlot.BODY) {
return super.canUseSlot(slot);
} else {
return isAlive() && !isBaby() && getFlag(EntityFlag.TAMED);
}
}
}

20
core/src/main/java/org/geysermc/geyser/registry/populator/conversion/Conversion827_819.java → core/src/main/java/org/geysermc/geyser/entity/type/living/animal/nautilus/NautilusEntity.java
View File

@@ -23,20 +23,16 @@
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.registry.populator.conversion;
package org.geysermc.geyser.entity.type.living.animal.nautilus;
import org.cloudburstmc.nbt.NbtMap;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
public class Conversion827_819 {
import java.util.UUID;
public static NbtMap remapBlock(NbtMap nbtMap) {
nbtMap = Conversion844_827.remapBlock(nbtMap);
final String name = nbtMap.getString("name");
if (name.endsWith("copper_chest")) {
return ConversionHelper.withName(nbtMap, "chest");
}
return nbtMap;
public class NautilusEntity extends AbstractNautilusEntity {
public NautilusEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw, 1.0f);
}
}

53
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/nautilus/ZombieNautilusEntity.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* 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.entity.type.living.animal.nautilus;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.VariantHolder;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.cache.registry.JavaRegistries;
import org.geysermc.geyser.session.cache.registry.JavaRegistryKey;
import java.util.UUID;
public class ZombieNautilusEntity extends AbstractNautilusEntity implements VariantHolder<TemperatureVariantAnimal.BuiltInVariant> {
public ZombieNautilusEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw, 1.1f);
}
@Override
public void setBedrockVariant(TemperatureVariantAnimal.BuiltInVariant variant) {
TemperatureVariantAnimal.TEMPERATE_VARIANT_PROPERTY.apply(propertyManager, variant);
updateBedrockEntityProperties();
}
@Override
public JavaRegistryKey<TemperatureVariantAnimal.BuiltInVariant> variantRegistry() {
return JavaRegistries.ZOMBIE_NAUTILUS_VARIANT;
}
}

9
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/tameable/WolfEntity.java
View File

@@ -51,6 +51,7 @@ import org.geysermc.geyser.util.ItemUtils;
import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.LongEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentTypes;
@@ -118,10 +119,10 @@ public class WolfEntity extends TameableEntity implements VariantIntHolder {
}
// 1.16+
public void setWolfAngerTime(IntEntityMetadata entityMetadata) {
int time = entityMetadata.getPrimitiveValue();
setFlag(EntityFlag.ANGRY, time != 0);
dirtyMetadata.put(EntityDataTypes.COLOR, time != 0 ? (byte) 0 : collarColor);
public void setWolfAngerTime(LongEntityMetadata entityMetadata) {
long time = entityMetadata.getPrimitiveValue();
setFlag(EntityFlag.ANGRY, time != -1L);
dirtyMetadata.put(EntityDataTypes.COLOR, time != -1L ? (byte) 0 : collarColor);
}
@Override

23
core/src/main/java/org/geysermc/geyser/entity/vehicle/HappyGhastVehicleComponent.java
View File

@@ -103,27 +103,4 @@ public class HappyGhastVehicleComponent extends VehicleComponent<HappyGhastEntit
travel(ctx, flyingSpeed * 5.0f / 3.0f);
vehicle.setMotion(vehicle.getMotion().mul(drag));
}
private Fluid checkForFluid(VehicleContext ctx) {
Fluid result = Fluid.EMPTY;
BoundingBox box = boundingBox.clone();
box.expand(-0.001);
Vector3d min = box.getMin();
Vector3d max = box.getMax();
BlockPositionIterator iter = BlockPositionIterator.fromMinMax(min.getFloorX(), min.getFloorY(), min.getFloorZ(), max.getFloorX(), max.getFloorY(), max.getFloorZ());
for (iter.reset(); iter.hasNext(); iter.next()) {
BlockState blockState = ctx.getBlock(iter);
if (blockState.is(Blocks.WATER)) {
return Fluid.WATER; // Water takes priority over lava
}
if (blockState.is(Blocks.LAVA)) {
result = Fluid.LAVA;
}
}
return result;
}
}

107
core/src/main/java/org/geysermc/geyser/entity/vehicle/NautilusVehicleComponent.java Normal file
View File

@@ -0,0 +1,107 @@
/*
* 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.entity.vehicle;
import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.type.living.animal.nautilus.AbstractNautilusEntity;
import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
import org.geysermc.geyser.util.MathUtils;
public class NautilusVehicleComponent extends VehicleComponent<AbstractNautilusEntity> {
private int dashCooldown;
public NautilusVehicleComponent(AbstractNautilusEntity vehicle, float stepHeight, float defSpeed) {
super(vehicle, stepHeight);
this.moveSpeed = defSpeed;
}
@Override
public boolean isPushedByFluid() {
return false;
}
@Override
public void tickVehicle() {
vehicle.setFlag(EntityFlag.HAS_DASH_COOLDOWN, this.dashCooldown > 0);
vehicle.updateBedrockMetadata();
super.tickVehicle();
if (this.dashCooldown > 0) {
this.dashCooldown--;
}
}
@Override
protected Vector3f getInputVector(VehicleComponent<AbstractNautilusEntity>.VehicleContext ctx, float speed, Vector3f input) {
Vector3f inputVelocity = super.getInputVector(ctx, speed, input);
SessionPlayerEntity player = vehicle.getSession().getPlayerEntity();
float jumpStrength = player.getVehicleJumpStrength();
player.setVehicleJumpStrength(0);
// We don't check for dash cooldown here since we already send a vehicle jump packet beforehand, which the server can send us back
// the metadata that set dash cooldown before we can handle the input vector.
if (jumpStrength > 0) {
final Vector3f viewVector = MathUtils.calculateViewVector(player.getPitch(), player.getYaw());
float movementMultiplier = getVelocityMultiplier(ctx);
float strength = (float) (movementMultiplier + movementEfficiency * (1 - movementMultiplier));
jumpStrength = (jumpStrength >= 90) ? 1.0F : (0.4F + 0.4F * jumpStrength / 90.0F);
inputVelocity = inputVelocity.add(viewVector.mul(((this.isInWater() ? 1.2F : 0.5F) * jumpStrength) * getMoveSpeed() * strength));
setDashCooldown(40);
}
return inputVelocity;
}
@Override
public void onDismount() {
vehicle.setFlag(EntityFlag.HAS_DASH_COOLDOWN, false);
vehicle.updateBedrockMetadata();
super.onDismount();
}
@Override
protected void updateRotation() {
float yaw = vehicle.getYaw() + MathUtils.wrapDegrees(getRiddenRotation().getX() - vehicle.getYaw()) * 0.5F;
vehicle.setYaw(yaw);
vehicle.setHeadYaw(yaw);
}
@Override
protected void waterMovement(VehicleComponent<AbstractNautilusEntity>.VehicleContext ctx) {
travel(ctx, vehicle.getVehicleSpeed());
this.vehicle.setMotion(this.vehicle.getMotion().mul(0.9f));
}
public void setDashCooldown(int cooldown) {
this.dashCooldown = this.dashCooldown == 0 ? cooldown : this.dashCooldown;
vehicle.setFlag(EntityFlag.HAS_DASH_COOLDOWN, this.dashCooldown > 0);
vehicle.updateBedrockMetadata();
}
}

36
core/src/main/java/org/geysermc/geyser/entity/vehicle/VehicleComponent.java
View File

@@ -70,12 +70,15 @@ public class VehicleComponent<T extends Entity & ClientVehicle> {
@Getter
protected final BoundingBox boundingBox;
@Getter
private boolean inWater;
protected float stepHeight;
@Getter @Setter
protected float moveSpeed;
protected double gravity;
@Getter @Setter
protected double waterMovementEfficiency;
protected double waterMovementEfficiency, movementEfficiency;
protected int effectLevitation;
protected boolean effectSlowFalling;
protected boolean effectWeaving;
@@ -86,6 +89,7 @@ public class VehicleComponent<T extends Entity & ClientVehicle> {
this.moveSpeed = (float) AttributeType.Builtin.MOVEMENT_SPEED.getDef();
this.gravity = AttributeType.Builtin.GRAVITY.getDef();
this.waterMovementEfficiency = AttributeType.Builtin.WATER_MOVEMENT_EFFICIENCY.getDef();
this.movementEfficiency = AttributeType.Builtin.WATER_MOVEMENT_EFFICIENCY.getDef();
double width = vehicle.getBoundingBoxWidth();
double height = vehicle.getBoundingBoxHeight();
@@ -176,6 +180,7 @@ public class VehicleComponent<T extends Entity & ClientVehicle> {
ctx.loadSurroundingBlocks();
ObjectDoublePair<Fluid> fluidHeight = updateFluidMovement(ctx);
inWater = fluidHeight.left() == Fluid.WATER;
switch (fluidHeight.left()) {
case WATER -> waterMovement(ctx);
case LAVA -> {
@@ -189,6 +194,10 @@ public class VehicleComponent<T extends Entity & ClientVehicle> {
}
}
public boolean isPushedByFluid() {
return true;
}
/**
* Update the rotation of the vehicle. Should be called once per tick, and before getInputVector.
*/
@@ -331,7 +340,7 @@ public class VehicleComponent<T extends Entity & ClientVehicle> {
fluidBlocks++;
}
if (!totalVelocity.equals(Vector3d.ZERO)) {
if (!totalVelocity.equals(Vector3d.ZERO) && isPushedByFluid()) {
Vector3f motion = vehicle.getMotion();
totalVelocity = javaNormalize(totalVelocity.mul(1.0 / fluidBlocks));
@@ -903,6 +912,29 @@ public class VehicleComponent<T extends Entity & ClientVehicle> {
return 1.0f;
}
protected Fluid checkForFluid(VehicleContext ctx) {
Fluid result = Fluid.EMPTY;
BoundingBox box = boundingBox.clone();
box.expand(-0.001);
Vector3d min = box.getMin();
Vector3d max = box.getMax();
BlockPositionIterator iter = BlockPositionIterator.fromMinMax(min.getFloorX(), min.getFloorY(), min.getFloorZ(), max.getFloorX(), max.getFloorY(), max.getFloorZ());
for (iter.reset(); iter.hasNext(); iter.next()) {
BlockState blockState = ctx.getBlock(iter);
if (blockState.is(Blocks.WATER)) {
return Fluid.WATER; // Water takes priority over lava
}
if (blockState.is(Blocks.LAVA)) {
result = Fluid.LAVA;
}
}
return result;
}
protected class VehicleContext {
private Vector3d centerPos;
private Vector3d cachePos;

3
core/src/main/java/org/geysermc/geyser/inventory/item/BedrockEnchantment.java
View File

@@ -70,7 +70,8 @@ public enum BedrockEnchantment {
SWIFT_SNEAK,
WIND_BURST,
DENSITY,
BREACH;
BREACH,
LUNGE;
private static final BedrockEnchantment[] VALUES = values();

7
core/src/main/java/org/geysermc/geyser/inventory/updater/HorseInventoryUpdater.java → core/src/main/java/org/geysermc/geyser/inventory/updater/MountInventoryUpdater.java
View File

@@ -34,8 +34,8 @@ import org.geysermc.geyser.translator.inventory.InventoryTranslator;
import java.util.Arrays;
public class HorseInventoryUpdater extends InventoryUpdater {
public static final HorseInventoryUpdater INSTANCE = new HorseInventoryUpdater();
public class MountInventoryUpdater extends InventoryUpdater {
public static final MountInventoryUpdater INSTANCE = new MountInventoryUpdater();
@Override
public void updateInventory(InventoryTranslator<?> translator, GeyserSession session, Inventory inventory) {
@@ -58,10 +58,11 @@ public class HorseInventoryUpdater extends InventoryUpdater {
return true;
InventorySlotPacket slotPacket = new InventorySlotPacket();
slotPacket.setContainerId(4); // Horse GUI?
slotPacket.setContainerId(inventory.getBedrockId());
slotPacket.setSlot(translator.javaSlotToBedrock(javaSlot));
slotPacket.setItem(inventory.getItem(javaSlot).getItemData(session));
session.sendUpstreamPacket(slotPacket);
return true;
}
}

163
core/src/main/java/org/geysermc/geyser/item/Items.java
View File

@@ -1193,92 +1193,96 @@ public final class Items {
public static final Item BLAZE_POWDER = register(new Item("blaze_powder", builder()));
public static final Item MAGMA_CREAM = register(new Item("magma_cream", builder()));
public static final Item BREWING_STAND = register(new BlockItem(builder(), Blocks.BREWING_STAND));
public static final Item CAULDRON = register(new BlockItem(builder(), Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, Blocks.LAVA_CAULDRON));
public static final Item CAULDRON = register(new BlockItem(builder(), Blocks.CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, Blocks.WATER_CAULDRON));
public static final Item ENDER_EYE = register(new Item("ender_eye", builder()));
public static final Item GLISTERING_MELON_SLICE = register(new Item("glistering_melon_slice", builder()));
public static final Item CHICKEN_SPAWN_EGG = register(new SpawnEggItem("chicken_spawn_egg", builder()));
public static final Item COW_SPAWN_EGG = register(new SpawnEggItem("cow_spawn_egg", builder()));
public static final Item PIG_SPAWN_EGG = register(new SpawnEggItem("pig_spawn_egg", builder()));
public static final Item SHEEP_SPAWN_EGG = register(new SpawnEggItem("sheep_spawn_egg", builder()));
public static final Item CAMEL_SPAWN_EGG = register(new SpawnEggItem("camel_spawn_egg", builder()));
public static final Item DONKEY_SPAWN_EGG = register(new SpawnEggItem("donkey_spawn_egg", builder()));
public static final Item HORSE_SPAWN_EGG = register(new SpawnEggItem("horse_spawn_egg", builder()));
public static final Item MULE_SPAWN_EGG = register(new SpawnEggItem("mule_spawn_egg", builder()));
public static final Item CAT_SPAWN_EGG = register(new SpawnEggItem("cat_spawn_egg", builder()));
public static final Item PARROT_SPAWN_EGG = register(new SpawnEggItem("parrot_spawn_egg", builder()));
public static final Item WOLF_SPAWN_EGG = register(new SpawnEggItem("wolf_spawn_egg", builder()));
public static final Item ARMADILLO_SPAWN_EGG = register(new SpawnEggItem("armadillo_spawn_egg", builder()));
public static final Item ALLAY_SPAWN_EGG = register(new SpawnEggItem("allay_spawn_egg", builder()));
public static final Item AXOLOTL_SPAWN_EGG = register(new SpawnEggItem("axolotl_spawn_egg", builder()));
public static final Item BAT_SPAWN_EGG = register(new SpawnEggItem("bat_spawn_egg", builder()));
public static final Item BEE_SPAWN_EGG = register(new SpawnEggItem("bee_spawn_egg", builder()));
public static final Item BLAZE_SPAWN_EGG = register(new SpawnEggItem("blaze_spawn_egg", builder()));
public static final Item BOGGED_SPAWN_EGG = register(new SpawnEggItem("bogged_spawn_egg", builder()));
public static final Item BREEZE_SPAWN_EGG = register(new SpawnEggItem("breeze_spawn_egg", builder()));
public static final Item CAT_SPAWN_EGG = register(new SpawnEggItem("cat_spawn_egg", builder()));
public static final Item CAMEL_SPAWN_EGG = register(new SpawnEggItem("camel_spawn_egg", builder()));
public static final Item CAVE_SPIDER_SPAWN_EGG = register(new SpawnEggItem("cave_spider_spawn_egg", builder()));
public static final Item CHICKEN_SPAWN_EGG = register(new SpawnEggItem("chicken_spawn_egg", builder()));
public static final Item FOX_SPAWN_EGG = register(new SpawnEggItem("fox_spawn_egg", builder()));
public static final Item GOAT_SPAWN_EGG = register(new SpawnEggItem("goat_spawn_egg", builder()));
public static final Item LLAMA_SPAWN_EGG = register(new SpawnEggItem("llama_spawn_egg", builder()));
public static final Item OCELOT_SPAWN_EGG = register(new SpawnEggItem("ocelot_spawn_egg", builder()));
public static final Item PANDA_SPAWN_EGG = register(new SpawnEggItem("panda_spawn_egg", builder()));
public static final Item POLAR_BEAR_SPAWN_EGG = register(new SpawnEggItem("polar_bear_spawn_egg", builder()));
public static final Item RABBIT_SPAWN_EGG = register(new SpawnEggItem("rabbit_spawn_egg", builder()));
public static final Item AXOLOTL_SPAWN_EGG = register(new SpawnEggItem("axolotl_spawn_egg", builder()));
public static final Item COD_SPAWN_EGG = register(new SpawnEggItem("cod_spawn_egg", builder()));
public static final Item COPPER_GOLEM_SPAWN_EGG = register(new SpawnEggItem("copper_golem_spawn_egg", builder()));
public static final Item COW_SPAWN_EGG = register(new SpawnEggItem("cow_spawn_egg", builder()));
public static final Item CREEPER_SPAWN_EGG = register(new SpawnEggItem("creeper_spawn_egg", builder()));
public static final Item DOLPHIN_SPAWN_EGG = register(new SpawnEggItem("dolphin_spawn_egg", builder()));
public static final Item DONKEY_SPAWN_EGG = register(new SpawnEggItem("donkey_spawn_egg", builder()));
public static final Item FROG_SPAWN_EGG = register(new SpawnEggItem("frog_spawn_egg", builder()));
public static final Item GLOW_SQUID_SPAWN_EGG = register(new SpawnEggItem("glow_squid_spawn_egg", builder()));
public static final Item NAUTILUS_SPAWN_EGG = register(new SpawnEggItem("nautilus_spawn_egg", builder()));
public static final Item PUFFERFISH_SPAWN_EGG = register(new SpawnEggItem("pufferfish_spawn_egg", builder()));
public static final Item SALMON_SPAWN_EGG = register(new SpawnEggItem("salmon_spawn_egg", builder()));
public static final Item SQUID_SPAWN_EGG = register(new SpawnEggItem("squid_spawn_egg", builder()));
public static final Item TADPOLE_SPAWN_EGG = register(new SpawnEggItem("tadpole_spawn_egg", builder()));
public static final Item TROPICAL_FISH_SPAWN_EGG = register(new SpawnEggItem("tropical_fish_spawn_egg", builder()));
public static final Item TURTLE_SPAWN_EGG = register(new SpawnEggItem("turtle_spawn_egg", builder()));
public static final Item ALLAY_SPAWN_EGG = register(new SpawnEggItem("allay_spawn_egg", builder()));
public static final Item MOOSHROOM_SPAWN_EGG = register(new SpawnEggItem("mooshroom_spawn_egg", builder()));
public static final Item SNIFFER_SPAWN_EGG = register(new SpawnEggItem("sniffer_spawn_egg", builder()));
public static final Item COPPER_GOLEM_SPAWN_EGG = register(new SpawnEggItem("copper_golem_spawn_egg", builder()));
public static final Item IRON_GOLEM_SPAWN_EGG = register(new SpawnEggItem("iron_golem_spawn_egg", builder()));
public static final Item SNOW_GOLEM_SPAWN_EGG = register(new SpawnEggItem("snow_golem_spawn_egg", builder()));
public static final Item TRADER_LLAMA_SPAWN_EGG = register(new SpawnEggItem("trader_llama_spawn_egg", builder()));
public static final Item VILLAGER_SPAWN_EGG = register(new SpawnEggItem("villager_spawn_egg", builder()));
public static final Item WANDERING_TRADER_SPAWN_EGG = register(new SpawnEggItem("wandering_trader_spawn_egg", builder()));
public static final Item BOGGED_SPAWN_EGG = register(new SpawnEggItem("bogged_spawn_egg", builder()));
public static final Item CAMEL_HUSK_SPAWN_EGG = register(new SpawnEggItem("camel_husk_spawn_egg", builder()));
public static final Item DROWNED_SPAWN_EGG = register(new SpawnEggItem("drowned_spawn_egg", builder()));
public static final Item HUSK_SPAWN_EGG = register(new SpawnEggItem("husk_spawn_egg", builder()));
public static final Item PARCHED_SPAWN_EGG = register(new SpawnEggItem("parched_spawn_egg", builder()));
public static final Item SKELETON_SPAWN_EGG = register(new SpawnEggItem("skeleton_spawn_egg", builder()));
public static final Item SKELETON_HORSE_SPAWN_EGG = register(new SpawnEggItem("skeleton_horse_spawn_egg", builder()));
public static final Item STRAY_SPAWN_EGG = register(new SpawnEggItem("stray_spawn_egg", builder()));
public static final Item WITHER_SPAWN_EGG = register(new SpawnEggItem("wither_spawn_egg", builder()));
public static final Item WITHER_SKELETON_SPAWN_EGG = register(new SpawnEggItem("wither_skeleton_spawn_egg", builder()));
public static final Item ZOMBIE_SPAWN_EGG = register(new SpawnEggItem("zombie_spawn_egg", builder()));
public static final Item ZOMBIE_HORSE_SPAWN_EGG = register(new SpawnEggItem("zombie_horse_spawn_egg", builder()));
public static final Item ZOMBIE_NAUTILUS_SPAWN_EGG = register(new SpawnEggItem("zombie_nautilus_spawn_egg", builder()));
public static final Item ZOMBIE_VILLAGER_SPAWN_EGG = register(new SpawnEggItem("zombie_villager_spawn_egg", builder()));
public static final Item CAVE_SPIDER_SPAWN_EGG = register(new SpawnEggItem("cave_spider_spawn_egg", builder()));
public static final Item SPIDER_SPAWN_EGG = register(new SpawnEggItem("spider_spawn_egg", builder()));
public static final Item BREEZE_SPAWN_EGG = register(new SpawnEggItem("breeze_spawn_egg", builder()));
public static final Item CREAKING_SPAWN_EGG = register(new SpawnEggItem("creaking_spawn_egg", builder()));
public static final Item CREEPER_SPAWN_EGG = register(new SpawnEggItem("creeper_spawn_egg", builder()));
public static final Item ELDER_GUARDIAN_SPAWN_EGG = register(new SpawnEggItem("elder_guardian_spawn_egg", builder()));
public static final Item GUARDIAN_SPAWN_EGG = register(new SpawnEggItem("guardian_spawn_egg", builder()));
public static final Item PHANTOM_SPAWN_EGG = register(new SpawnEggItem("phantom_spawn_egg", builder()));
public static final Item SILVERFISH_SPAWN_EGG = register(new SpawnEggItem("silverfish_spawn_egg", builder()));
public static final Item SLIME_SPAWN_EGG = register(new SpawnEggItem("slime_spawn_egg", builder()));
public static final Item WARDEN_SPAWN_EGG = register(new SpawnEggItem("warden_spawn_egg", builder()));
public static final Item WITCH_SPAWN_EGG = register(new SpawnEggItem("witch_spawn_egg", builder()));
public static final Item EVOKER_SPAWN_EGG = register(new SpawnEggItem("evoker_spawn_egg", builder()));
public static final Item PILLAGER_SPAWN_EGG = register(new SpawnEggItem("pillager_spawn_egg", builder()));
public static final Item RAVAGER_SPAWN_EGG = register(new SpawnEggItem("ravager_spawn_egg", builder()));
public static final Item VINDICATOR_SPAWN_EGG = register(new SpawnEggItem("vindicator_spawn_egg", builder()));
public static final Item VEX_SPAWN_EGG = register(new SpawnEggItem("vex_spawn_egg", builder()));
public static final Item BLAZE_SPAWN_EGG = register(new SpawnEggItem("blaze_spawn_egg", builder()));
public static final Item GHAST_SPAWN_EGG = register(new SpawnEggItem("ghast_spawn_egg", builder()));
public static final Item HAPPY_GHAST_SPAWN_EGG = register(new SpawnEggItem("happy_ghast_spawn_egg", builder()));
public static final Item HOGLIN_SPAWN_EGG = register(new SpawnEggItem("hoglin_spawn_egg", builder()));
public static final Item MAGMA_CUBE_SPAWN_EGG = register(new SpawnEggItem("magma_cube_spawn_egg", builder()));
public static final Item PIGLIN_SPAWN_EGG = register(new SpawnEggItem("piglin_spawn_egg", builder()));
public static final Item PIGLIN_BRUTE_SPAWN_EGG = register(new SpawnEggItem("piglin_brute_spawn_egg", builder()));
public static final Item STRIDER_SPAWN_EGG = register(new SpawnEggItem("strider_spawn_egg", builder()));
public static final Item ZOGLIN_SPAWN_EGG = register(new SpawnEggItem("zoglin_spawn_egg", builder()));
public static final Item ZOMBIFIED_PIGLIN_SPAWN_EGG = register(new SpawnEggItem("zombified_piglin_spawn_egg", builder()));
public static final Item ENDER_DRAGON_SPAWN_EGG = register(new SpawnEggItem("ender_dragon_spawn_egg", builder()));
public static final Item ENDERMAN_SPAWN_EGG = register(new SpawnEggItem("enderman_spawn_egg", builder()));
public static final Item ENDERMITE_SPAWN_EGG = register(new SpawnEggItem("endermite_spawn_egg", builder()));
public static final Item EVOKER_SPAWN_EGG = register(new SpawnEggItem("evoker_spawn_egg", builder()));
public static final Item FOX_SPAWN_EGG = register(new SpawnEggItem("fox_spawn_egg", builder()));
public static final Item FROG_SPAWN_EGG = register(new SpawnEggItem("frog_spawn_egg", builder()));
public static final Item GHAST_SPAWN_EGG = register(new SpawnEggItem("ghast_spawn_egg", builder()));
public static final Item HAPPY_GHAST_SPAWN_EGG = register(new SpawnEggItem("happy_ghast_spawn_egg", builder()));
public static final Item GLOW_SQUID_SPAWN_EGG = register(new SpawnEggItem("glow_squid_spawn_egg", builder()));
public static final Item GOAT_SPAWN_EGG = register(new SpawnEggItem("goat_spawn_egg", builder()));
public static final Item GUARDIAN_SPAWN_EGG = register(new SpawnEggItem("guardian_spawn_egg", builder()));
public static final Item HOGLIN_SPAWN_EGG = register(new SpawnEggItem("hoglin_spawn_egg", builder()));
public static final Item HORSE_SPAWN_EGG = register(new SpawnEggItem("horse_spawn_egg", builder()));
public static final Item HUSK_SPAWN_EGG = register(new SpawnEggItem("husk_spawn_egg", builder()));
public static final Item IRON_GOLEM_SPAWN_EGG = register(new SpawnEggItem("iron_golem_spawn_egg", builder()));
public static final Item LLAMA_SPAWN_EGG = register(new SpawnEggItem("llama_spawn_egg", builder()));
public static final Item MAGMA_CUBE_SPAWN_EGG = register(new SpawnEggItem("magma_cube_spawn_egg", builder()));
public static final Item MOOSHROOM_SPAWN_EGG = register(new SpawnEggItem("mooshroom_spawn_egg", builder()));
public static final Item MULE_SPAWN_EGG = register(new SpawnEggItem("mule_spawn_egg", builder()));
public static final Item OCELOT_SPAWN_EGG = register(new SpawnEggItem("ocelot_spawn_egg", builder()));
public static final Item PANDA_SPAWN_EGG = register(new SpawnEggItem("panda_spawn_egg", builder()));
public static final Item PARROT_SPAWN_EGG = register(new SpawnEggItem("parrot_spawn_egg", builder()));
public static final Item PHANTOM_SPAWN_EGG = register(new SpawnEggItem("phantom_spawn_egg", builder()));
public static final Item PIG_SPAWN_EGG = register(new SpawnEggItem("pig_spawn_egg", builder()));
public static final Item PIGLIN_SPAWN_EGG = register(new SpawnEggItem("piglin_spawn_egg", builder()));
public static final Item PIGLIN_BRUTE_SPAWN_EGG = register(new SpawnEggItem("piglin_brute_spawn_egg", builder()));
public static final Item PILLAGER_SPAWN_EGG = register(new SpawnEggItem("pillager_spawn_egg", builder()));
public static final Item POLAR_BEAR_SPAWN_EGG = register(new SpawnEggItem("polar_bear_spawn_egg", builder()));
public static final Item PUFFERFISH_SPAWN_EGG = register(new SpawnEggItem("pufferfish_spawn_egg", builder()));
public static final Item RABBIT_SPAWN_EGG = register(new SpawnEggItem("rabbit_spawn_egg", builder()));
public static final Item RAVAGER_SPAWN_EGG = register(new SpawnEggItem("ravager_spawn_egg", builder()));
public static final Item SALMON_SPAWN_EGG = register(new SpawnEggItem("salmon_spawn_egg", builder()));
public static final Item SHEEP_SPAWN_EGG = register(new SpawnEggItem("sheep_spawn_egg", builder()));
public static final Item SHULKER_SPAWN_EGG = register(new SpawnEggItem("shulker_spawn_egg", builder()));
public static final Item SILVERFISH_SPAWN_EGG = register(new SpawnEggItem("silverfish_spawn_egg", builder()));
public static final Item SKELETON_SPAWN_EGG = register(new SpawnEggItem("skeleton_spawn_egg", builder()));
public static final Item SKELETON_HORSE_SPAWN_EGG = register(new SpawnEggItem("skeleton_horse_spawn_egg", builder()));
public static final Item SLIME_SPAWN_EGG = register(new SpawnEggItem("slime_spawn_egg", builder()));
public static final Item SNIFFER_SPAWN_EGG = register(new SpawnEggItem("sniffer_spawn_egg", builder()));
public static final Item SNOW_GOLEM_SPAWN_EGG = register(new SpawnEggItem("snow_golem_spawn_egg", builder()));
public static final Item SPIDER_SPAWN_EGG = register(new SpawnEggItem("spider_spawn_egg", builder()));
public static final Item SQUID_SPAWN_EGG = register(new SpawnEggItem("squid_spawn_egg", builder()));
public static final Item STRAY_SPAWN_EGG = register(new SpawnEggItem("stray_spawn_egg", builder()));
public static final Item STRIDER_SPAWN_EGG = register(new SpawnEggItem("strider_spawn_egg", builder()));
public static final Item TADPOLE_SPAWN_EGG = register(new SpawnEggItem("tadpole_spawn_egg", builder()));
public static final Item TRADER_LLAMA_SPAWN_EGG = register(new SpawnEggItem("trader_llama_spawn_egg", builder()));
public static final Item TROPICAL_FISH_SPAWN_EGG = register(new SpawnEggItem("tropical_fish_spawn_egg", builder()));
public static final Item TURTLE_SPAWN_EGG = register(new SpawnEggItem("turtle_spawn_egg", builder()));
public static final Item VEX_SPAWN_EGG = register(new SpawnEggItem("vex_spawn_egg", builder()));
public static final Item VILLAGER_SPAWN_EGG = register(new SpawnEggItem("villager_spawn_egg", builder()));
public static final Item VINDICATOR_SPAWN_EGG = register(new SpawnEggItem("vindicator_spawn_egg", builder()));
public static final Item WANDERING_TRADER_SPAWN_EGG = register(new SpawnEggItem("wandering_trader_spawn_egg", builder()));
public static final Item WARDEN_SPAWN_EGG = register(new SpawnEggItem("warden_spawn_egg", builder()));
public static final Item WITCH_SPAWN_EGG = register(new SpawnEggItem("witch_spawn_egg", builder()));
public static final Item WITHER_SPAWN_EGG = register(new SpawnEggItem("wither_spawn_egg", builder()));
public static final Item WITHER_SKELETON_SPAWN_EGG = register(new SpawnEggItem("wither_skeleton_spawn_egg", builder()));
public static final Item WOLF_SPAWN_EGG = register(new SpawnEggItem("wolf_spawn_egg", builder()));
public static final Item ZOGLIN_SPAWN_EGG = register(new SpawnEggItem("zoglin_spawn_egg", builder()));
public static final Item CREAKING_SPAWN_EGG = register(new SpawnEggItem("creaking_spawn_egg", builder()));
public static final Item ZOMBIE_SPAWN_EGG = register(new SpawnEggItem("zombie_spawn_egg", builder()));
public static final Item ZOMBIE_HORSE_SPAWN_EGG = register(new SpawnEggItem("zombie_horse_spawn_egg", builder()));
public static final Item ZOMBIE_VILLAGER_SPAWN_EGG = register(new SpawnEggItem("zombie_villager_spawn_egg", builder()));
public static final Item ZOMBIFIED_PIGLIN_SPAWN_EGG = register(new SpawnEggItem("zombified_piglin_spawn_egg", builder()));
public static final Item EXPERIENCE_BOTTLE = register(new Item("experience_bottle", builder()));
public static final Item FIRE_CHARGE = register(new Item("fire_charge", builder()));
public static final Item WIND_CHARGE = register(new Item("wind_charge", builder()));
@@ -1321,6 +1325,7 @@ public final class Items {
public static final Item IRON_HORSE_ARMOR = register(new Item("iron_horse_armor", builder()));
public static final Item GOLDEN_HORSE_ARMOR = register(new Item("golden_horse_armor", builder()));
public static final Item DIAMOND_HORSE_ARMOR = register(new Item("diamond_horse_armor", builder()));
public static final Item NETHERITE_HORSE_ARMOR = register(new Item("netherite_horse_armor", builder()));
public static final Item LEATHER_HORSE_ARMOR = register(new DyeableArmorItem("leather_horse_armor", builder()));
public static final Item LEAD = register(new Item("lead", builder()));
public static final Item NAME_TAG = register(new Item("name_tag", builder()));
@@ -1357,6 +1362,13 @@ public final class Items {
public static final Item TIPPED_ARROW = register(new TippedArrowItem("tipped_arrow", builder()));
public static final Item LINGERING_POTION = register(new PotionItem("lingering_potion", builder()));
public static final Item SHIELD = register(new ShieldItem("shield", builder()));
public static final Item WOODEN_SPEAR = register(new Item("wooden_spear", builder().attackDamage(1.0)));
public static final Item STONE_SPEAR = register(new Item("stone_spear", builder().attackDamage(2.0)));
public static final Item COPPER_SPEAR = register(new Item("copper_spear", builder().attackDamage(2.0)));
public static final Item IRON_SPEAR = register(new Item("iron_spear", builder().attackDamage(3.0)));
public static final Item GOLDEN_SPEAR = register(new Item("golden_spear", builder().attackDamage(1.0)));
public static final Item DIAMOND_SPEAR = register(new Item("diamond_spear", builder().attackDamage(4.0)));
public static final Item NETHERITE_SPEAR = register(new Item("netherite_spear", builder().attackDamage(5.0)));
public static final Item TOTEM_OF_UNDYING = register(new Item("totem_of_undying", builder()));
public static final Item SHULKER_SHELL = register(new Item("shulker_shell", builder()));
public static final Item IRON_NUGGET = register(new Item("iron_nugget", builder()));
@@ -1387,6 +1399,11 @@ public final class Items {
public static final Item DISC_FRAGMENT_5 = register(new Item("disc_fragment_5", builder()));
public static final Item TRIDENT = register(new Item("trident", builder().attackDamage(9.0)));
public static final Item NAUTILUS_SHELL = register(new Item("nautilus_shell", builder()));
public static final Item IRON_NAUTILUS_ARMOR = register(new Item("iron_nautilus_armor", builder()));
public static final Item GOLDEN_NAUTILUS_ARMOR = register(new Item("golden_nautilus_armor", builder()));
public static final Item DIAMOND_NAUTILUS_ARMOR = register(new Item("diamond_nautilus_armor", builder()));
public static final Item NETHERITE_NAUTILUS_ARMOR = register(new Item("netherite_nautilus_armor", builder()));
public static final Item COPPER_NAUTILUS_ARMOR = register(new Item("copper_nautilus_armor", builder()));
public static final Item HEART_OF_THE_SEA = register(new Item("heart_of_the_sea", builder()));
public static final Item CROSSBOW = register(new CrossbowItem("crossbow", builder()));
public static final Item SUSPICIOUS_STEW = register(new Item("suspicious_stew", builder()));

40
core/src/main/java/org/geysermc/geyser/item/hashing/DataComponentHashers.java
View File

@@ -52,6 +52,7 @@ import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.GlobalPos;
import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
import org.geysermc.mcprotocollib.protocol.data.game.item.HashedStack;
import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.AttackRange;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.BlockStateProperties;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.BlocksAttacks;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Consumable;
@@ -68,15 +69,19 @@ import org.geysermc.mcprotocollib.protocol.data.game.item.component.HolderSet;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.IntComponentType;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ItemAttributeModifiers;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ItemEnchantments;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.KineticWeapon;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.LodestoneTracker;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.MobEffectDetails;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.MobEffectInstance;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.PiercingWeapon;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.PotionContents;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.SwingAnimation;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ToolData;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.TooltipDisplay;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.TypedEntityData;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Unit;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.UseCooldown;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.UseEffects;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Weapon;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.WritableBookContent;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.WrittenBookContent;
@@ -101,8 +106,14 @@ public class DataComponentHashers {
registerInt(DataComponentTypes.MAX_DAMAGE);
registerInt(DataComponentTypes.DAMAGE);
registerUnit(DataComponentTypes.UNBREAKABLE);
registerMap(DataComponentTypes.USE_EFFECTS, builder -> builder
.optional("can_sprint", MinecraftHasher.BOOL, UseEffects::canSprint, false)
.optional("interact_vibrations", MinecraftHasher.BOOL, UseEffects::interactVibrations, true)
.optional("speed_multiplier", MinecraftHasher.FLOAT, UseEffects::speedMultiplier, 0.2F)); // TODO test 1.21.11
register(DataComponentTypes.CUSTOM_NAME, ComponentHasher.COMPONENT);
register(DataComponentTypes.MINIMUM_ATTACK_CHARGE, MinecraftHasher.FLOAT);
register(DataComponentTypes.DAMAGE_TYPE, RegistryHasher.eitherHolderHasher(JavaRegistries.DAMAGE_TYPE));
register(DataComponentTypes.ITEM_NAME, ComponentHasher.COMPONENT);
register(DataComponentTypes.ITEM_MODEL, MinecraftHasher.KEY);
register(DataComponentTypes.LORE, ComponentHasher.COMPONENT.list());
@@ -154,6 +165,21 @@ public class DataComponentHashers {
registerMap(DataComponentTypes.WEAPON, builder -> builder
.optional("item_damage_per_attack", MinecraftHasher.INT, Weapon::itemDamagePerAttack, 1)
.optional("disable_blocking_for_seconds", MinecraftHasher.FLOAT, Weapon::disableBlockingForSeconds, 0.0F));
registerMap(DataComponentTypes.PIERCING_WEAPON, builder -> builder
.optional("deals_knockback", MinecraftHasher.BOOL, PiercingWeapon::dealsKnockback, true)
.optional("dismounts", MinecraftHasher.BOOL, PiercingWeapon::dealsKnockback, false)
.optionalNullable("sound", RegistryHasher.SOUND_EVENT, PiercingWeapon::sound)
.optionalNullable("hit_sound", RegistryHasher.SOUND_EVENT, PiercingWeapon::hitSound)); // TODO test 1.21.11
registerMap(DataComponentTypes.ATTACK_RANGE, builder -> builder
.optional("min_reach", MinecraftHasher.FLOAT, AttackRange::minRange, 0.0F)
.optional("max_reach", MinecraftHasher.FLOAT, AttackRange::maxRange, 3.0F)
.optional("min_creative_reach", MinecraftHasher.FLOAT, AttackRange::minCreativeRange, 0.0F)
.optional("max_creative_reach", MinecraftHasher.FLOAT, AttackRange::maxCreativeRange, 5.0F)
.optional("hitbox_margin", MinecraftHasher.FLOAT, AttackRange::hitboxMargin, 0.3F)
.optional("mob_factor", MinecraftHasher.FLOAT, AttackRange::mobFactor, 1.0F)); // TODO test 1.21.11
registerMap(DataComponentTypes.SWING_ANIMATION, builder -> builder
.optional("type", RegistryHasher.SWING_ANIMATION_TYPE, SwingAnimation::type, SwingAnimation.Type.WHACK)
.optional("duration", MinecraftHasher.INT, SwingAnimation::duration, 6)); // TODO test 1.21.11
registerMap(DataComponentTypes.ENCHANTABLE, builder -> builder
.accept("value", MinecraftHasher.INT, Function.identity()));
registerMap(DataComponentTypes.EQUIPPABLE, builder -> builder
@@ -184,6 +210,16 @@ public class DataComponentHashers {
.optionalNullable("bypassed_by", MinecraftHasher.TAG, BlocksAttacks::bypassedBy)
.optionalNullable("block_sound", RegistryHasher.SOUND_EVENT, BlocksAttacks::blockSound)
.optionalNullable("disabled_sound", RegistryHasher.SOUND_EVENT, BlocksAttacks::disableSound)); // TODO needs tests
registerMap(DataComponentTypes.KINETIC_WEAPON, builder -> builder
.optional("contact_cooldown_ticks", MinecraftHasher.INT, KineticWeapon::contactCooldownTicks, 10)
.optional("delay_ticks", MinecraftHasher.INT, KineticWeapon::contactCooldownTicks, 0)
.optionalNullable("dismount_conditions", RegistryHasher.KINETIC_WEAPON_CONDITION, KineticWeapon::dismountConditions)
.optionalNullable("knockback_conditions", RegistryHasher.KINETIC_WEAPON_CONDITION, KineticWeapon::knockbackConditions)
.optionalNullable("damage_conditions", RegistryHasher.KINETIC_WEAPON_CONDITION, KineticWeapon::damageConditions)
.optional("forward_movement", MinecraftHasher.FLOAT, KineticWeapon::forwardMovement, 0.0F)
.optional("damage_multiplier", MinecraftHasher.FLOAT, KineticWeapon::damageMultiplier, 1.0F)
.optionalNullable("sound", RegistryHasher.SOUND_EVENT, KineticWeapon::sound)
.optionalNullable("hit_sound", RegistryHasher.SOUND_EVENT, KineticWeapon::hitSound)); // TODO test 1.21.11
register(DataComponentTypes.STORED_ENCHANTMENTS, RegistryHasher.ITEM_ENCHANTMENTS);
registerInt(DataComponentTypes.DYED_COLOR);
@@ -267,8 +303,8 @@ public class DataComponentHashers {
register(DataComponentTypes.RABBIT_VARIANT, RegistryHasher.RABBIT_VARIANT);
register(DataComponentTypes.PIG_VARIANT, RegistryHasher.PIG_VARIANT);
register(DataComponentTypes.COW_VARIANT, RegistryHasher.COW_VARIANT);
register(DataComponentTypes.CHICKEN_VARIANT, MinecraftHasher.KEY
.registryCast((session, holder) -> holder.getOrCompute(id -> JavaRegistries.CHICKEN_VARIANT.key(session, id)))); // Why, Mojang?
register(DataComponentTypes.CHICKEN_VARIANT, RegistryHasher.eitherHolderHasher(JavaRegistries.CHICKEN_VARIANT));
register(DataComponentTypes.ZOMBIE_NAUTILUS_VARIANT, RegistryHasher.eitherHolderHasher(JavaRegistries.ZOMBIE_NAUTILUS_VARIANT)); // TODO test 1.21.11
register(DataComponentTypes.FROG_VARIANT, RegistryHasher.FROG_VARIANT);
register(DataComponentTypes.HORSE_VARIANT, RegistryHasher.HORSE_VARIANT);
register(DataComponentTypes.PAINTING_VARIANT, RegistryHasher.PAINTING_VARIANT.cast(Holder::id)); // This can and will throw when a direct holder was received, which is still possible due to a bug in 1.21.6.

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

@@ -67,10 +67,12 @@ import org.geysermc.mcprotocollib.protocol.data.game.item.component.InstrumentCo
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ItemAttributeModifiers;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ItemEnchantments;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.JukeboxPlayable;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.KineticWeapon;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.MobEffectDetails;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.MobEffectInstance;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ProvidesTrimMaterial;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.SuspiciousStewEffect;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.SwingAnimation;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.ToolData;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Unit;
import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
@@ -328,6 +330,13 @@ public interface RegistryHasher<DirectType> extends MinecraftHasher<Integer> {
.accept("base", FLOAT, BlocksAttacks.ItemDamageFunction::base)
.accept("factor", FLOAT, BlocksAttacks.ItemDamageFunction::factor));
MinecraftHasher<KineticWeapon.Condition> KINETIC_WEAPON_CONDITION = MinecraftHasher.mapBuilder(builder -> builder
.accept("max_duration_ticks", MinecraftHasher.INT, KineticWeapon.Condition::maxDurationTicks)
.optional("min_speed", MinecraftHasher.FLOAT, KineticWeapon.Condition::minSpeed, 0.0F)
.optional("min_relative_speed", MinecraftHasher.FLOAT, KineticWeapon.Condition::minRelativeSpeed, 0.0F));
MinecraftHasher<SwingAnimation.Type> SWING_ANIMATION_TYPE = MinecraftHasher.fromEnum();
MinecraftHasher<ProvidesTrimMaterial> PROVIDES_TRIM_MATERIAL = MinecraftHasher.either(TRIM_MATERIAL.holder(), ProvidesTrimMaterial::materialHolder, KEY, ProvidesTrimMaterial::materialLocation);
MinecraftHasher<ArmorTrim> ARMOR_TRIM = MinecraftHasher.mapBuilder(builder -> builder
@@ -455,6 +464,18 @@ public interface RegistryHasher<DirectType> extends MinecraftHasher<Integer> {
return hasher::hash;
}
/**
* Creates a hasher that hashes a {@code Holder<Key>}, also known as an {@code EitherHolder} in Mojmap.
*
* <p>Please note that a {@code Holder<Key>} is only a valid representation of an {@code EitherHolder} in MCPL if the stream codec of the {@code EitherHolder} does not support directly encoding unregistered values.</p>
*
* @param registry the registry the {@code Holder} is for.
* @return a hasher that hashes a {@code Holder<Key>} for the given registry.
*/
static MinecraftHasher<Holder<Key>> eitherHolderHasher(JavaRegistryKey<?> registry) {
return MinecraftHasher.KEY.registryCast((registries, holder) -> holder.getOrCompute(id -> registry.key(registries, id)));
}
class RegistryHasherWithDirectHasher<DirectType> implements RegistryHasher<DirectType> {
private final MinecraftHasher<Integer> id;
private final MinecraftHasher<Holder<DirectType>> holderHasher;

2
core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java
View File

@@ -166,7 +166,7 @@ public class CollisionManager {
}
// We need to parse the float as a string since casting a float to a double causes us to
// lose precision and thus, causes players to get stuck when walking near walls
double javaY = Double.parseDouble(Float.toString(bedrockPosition.getY() - EntityDefinitions.PLAYER.offset()));
double javaY = Double.parseDouble(Float.toString(bedrockPosition.getY())) - EntityDefinitions.PLAYER.offset();
Vector3d position = Vector3d.from(Double.parseDouble(Float.toString(bedrockPosition.getX())), javaY,
Double.parseDouble(Float.toString(bedrockPosition.getZ())));

12
core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
View File

@@ -29,9 +29,6 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819;
import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859;
import org.cloudburstmc.protocol.bedrock.codec.v860.Bedrock_v860;
@@ -86,9 +83,6 @@ public final class GameProtocol {
static {
// Strict ordering
register(Bedrock_v818.CODEC, "1.21.90", "1.21.91", "1.21.92");
register(Bedrock_v819.CODEC, "1.21.93", "1.21.94");
register(Bedrock_v827.CODEC, "1.21.100", "1.21.101");
register(Bedrock_v844.CODEC, "1.21.111", "1.21.112", "1.21.113", "1.21.114");
register(Bedrock_v859.CODEC, "1.21.120", "1.21.121", "1.21.122", "1.21.123");
register(Bedrock_v860.CODEC);
@@ -144,10 +138,6 @@ public final class GameProtocol {
/* Bedrock convenience methods to gatekeep features and easily remove the check on version removal */
public static boolean is1_21_100(GeyserSession session) {
return session.protocolVersion() == Bedrock_v827.CODEC.getProtocolVersion();
}
public static boolean is1_21_110orHigher(GeyserSession session) {
return is1_21_110orHigher(session.protocolVersion());
}
@@ -184,7 +174,7 @@ public final class GameProtocol {
* @return the supported Minecraft: Java Edition version
*/
public static String getJavaMinecraftVersion() {
return "1.21.10";
return DEFAULT_JAVA_CODEC.getMinecraftVersion();
}
/**

6
core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
View File

@@ -30,7 +30,6 @@ import org.cloudburstmc.math.vector.Vector2f;
import org.cloudburstmc.protocol.bedrock.BedrockDisconnectReasons;
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
import org.cloudburstmc.protocol.bedrock.codec.compat.BedrockCompat;
import org.cloudburstmc.protocol.bedrock.data.ExperimentData;
import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
import org.cloudburstmc.protocol.bedrock.data.ResourcePackType;
import org.cloudburstmc.protocol.bedrock.netty.codec.compression.CompressionStrategy;
@@ -293,11 +292,6 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
stackPacket.setGameVersion(session.getClientData().getGameVersion());
stackPacket.getResourcePacks().addAll(this.resourcePackLoadEvent.orderedPacks());
if (GameProtocol.is1_21_100(session)) {
// Support copper age drop features (or some of them) in 1.21.100
stackPacket.getExperiments().add(new ExperimentData("y_2025_drop_3", true));
}
session.sendUpstreamPacket(stackPacket);
}
case REFUSED -> session.disconnect("disconnectionScreen.resourcePack");

5
core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
View File

@@ -63,8 +63,6 @@ import org.geysermc.geyser.level.block.type.Block;
import org.geysermc.geyser.level.block.type.BlockState;
import org.geysermc.geyser.level.block.type.FlowerPotBlock;
import org.geysermc.geyser.registry.BlockRegistries;
import org.geysermc.geyser.registry.populator.conversion.Conversion827_819;
import org.geysermc.geyser.registry.populator.conversion.Conversion844_827;
import org.geysermc.geyser.registry.type.BlockMappings;
import org.geysermc.geyser.registry.type.GeyserBedrockBlock;
import org.geysermc.geyser.util.JsonUtils;
@@ -125,9 +123,6 @@ public final class BlockRegistryPopulator {
private static void registerBedrockBlocks() {
var blockMappers = ImmutableMap.<ObjectIntPair<String>, Remapper>builder()
.put(ObjectIntPair.of("1_21_90", Bedrock_v818.CODEC.getProtocolVersion()), Conversion827_819::remapBlock)
.put(ObjectIntPair.of("1_21_90", Bedrock_v819.CODEC.getProtocolVersion()), Conversion827_819::remapBlock)
.put(ObjectIntPair.of("1_21_100", Bedrock_v827.CODEC.getProtocolVersion()), Conversion844_827::remapBlock)
.put(ObjectIntPair.of("1_21_110", Bedrock_v844.CODEC.getProtocolVersion()), tag -> tag)
// 1.21.110 -> 1.21.12x doesn't change the block palette
.put(ObjectIntPair.of("1_21_110", Bedrock_v859.CODEC.getProtocolVersion()), tag -> tag)

101
core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View File

@@ -45,9 +45,6 @@ import org.cloudburstmc.nbt.NbtMap;
import org.cloudburstmc.nbt.NbtMapBuilder;
import org.cloudburstmc.nbt.NbtType;
import org.cloudburstmc.nbt.NbtUtils;
import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819;
import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859;
import org.cloudburstmc.protocol.bedrock.codec.v860.Bedrock_v860;
@@ -76,7 +73,6 @@ import org.geysermc.geyser.item.type.Item;
import org.geysermc.geyser.level.block.property.Properties;
import org.geysermc.geyser.registry.BlockRegistries;
import org.geysermc.geyser.registry.Registries;
import org.geysermc.geyser.registry.populator.conversion.Conversion844_827;
import org.geysermc.geyser.registry.type.BlockMappings;
import org.geysermc.geyser.registry.type.GeyserBedrockBlock;
import org.geysermc.geyser.registry.type.GeyserMappingItem;
@@ -125,84 +121,29 @@ public class ItemRegistryPopulator {
}
public static void populate() {
Map<Item, Item> eightTwoSevenFallbacks = new HashMap<>();
eightTwoSevenFallbacks.put(Items.ACACIA_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.BAMBOO_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.BIRCH_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.CHERRY_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.CRIMSON_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.DARK_OAK_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.JUNGLE_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.MANGROVE_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.OAK_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.PALE_OAK_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.SPRUCE_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.WARPED_SHELF, Items.CHISELED_BOOKSHELF);
eightTwoSevenFallbacks.put(Items.COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.EXPOSED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.WEATHERED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.OXIDIZED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.WAXED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.WAXED_EXPOSED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.WAXED_WEATHERED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.WAXED_OXIDIZED_COPPER_BARS, Items.IRON_BARS);
eightTwoSevenFallbacks.put(Items.COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.EXPOSED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.WEATHERED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.OXIDIZED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.WAXED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.WAXED_EXPOSED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.WAXED_WEATHERED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.WAXED_OXIDIZED_COPPER_GOLEM_STATUE, Items.ARMOR_STAND);
eightTwoSevenFallbacks.put(Items.COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.EXPOSED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.WEATHERED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.OXIDIZED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.WAXED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.WAXED_EXPOSED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.WAXED_WEATHERED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.WAXED_OXIDIZED_COPPER_LANTERN, Items.LANTERN);
eightTwoSevenFallbacks.put(Items.EXPOSED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.WEATHERED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.OXIDIZED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.WAXED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.WAXED_EXPOSED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.WAXED_WEATHERED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.WAXED_OXIDIZED_LIGHTNING_ROD, Items.LIGHTNING_ROD);
eightTwoSevenFallbacks.put(Items.COPPER_TORCH, Items.TORCH);
eightTwoSevenFallbacks.put(Items.COPPER_HORSE_ARMOR, Items.LEATHER_HORSE_ARMOR);
Map<Item, Item> eightOneNineFallbacks = new HashMap<>(eightTwoSevenFallbacks);
eightOneNineFallbacks.put(Items.COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.EXPOSED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.WEATHERED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.OXIDIZED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.WAXED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.WAXED_EXPOSED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.WAXED_WEATHERED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.WAXED_OXIDIZED_COPPER_CHEST, Items.CHEST);
eightOneNineFallbacks.put(Items.COPPER_HELMET, Items.LEATHER_HELMET);
eightOneNineFallbacks.put(Items.COPPER_CHESTPLATE, Items.LEATHER_CHESTPLATE);
eightOneNineFallbacks.put(Items.COPPER_LEGGINGS, Items.LEATHER_LEGGINGS);
eightOneNineFallbacks.put(Items.COPPER_BOOTS, Items.LEATHER_BOOTS);
eightOneNineFallbacks.put(Items.COPPER_NUGGET, Items.IRON_NUGGET);
eightOneNineFallbacks.put(Items.COPPER_SWORD, Items.STONE_SWORD);
eightOneNineFallbacks.put(Items.COPPER_PICKAXE, Items.STONE_PICKAXE);
eightOneNineFallbacks.put(Items.COPPER_SHOVEL, Items.STONE_SHOVEL);
eightOneNineFallbacks.put(Items.COPPER_AXE, Items.STONE_AXE);
eightOneNineFallbacks.put(Items.COPPER_HOE, Items.STONE_HOE);
eightOneNineFallbacks.put(Items.COPPER_GOLEM_SPAWN_EGG, Items.IRON_GOLEM_SPAWN_EGG);
Map<Item, Item> eightOneEightFallbacks = new HashMap<>(eightOneNineFallbacks);
eightOneEightFallbacks.put(Items.MUSIC_DISC_LAVA_CHICKEN, Items.MUSIC_DISC_CHIRP);
Map<Item, Item> eightFourFourFallbacks = new HashMap<>();
eightFourFourFallbacks.put(Items.WOODEN_SPEAR, Items.WOODEN_SWORD);
eightFourFourFallbacks.put(Items.STONE_SPEAR, Items.STONE_SWORD);
eightFourFourFallbacks.put(Items.COPPER_SPEAR, Items.COPPER_SWORD);
eightFourFourFallbacks.put(Items.IRON_SPEAR, Items.IRON_SWORD);
eightFourFourFallbacks.put(Items.GOLDEN_SPEAR, Items.GOLDEN_SWORD);
eightFourFourFallbacks.put(Items.DIAMOND_SPEAR, Items.DIAMOND_SWORD);
eightFourFourFallbacks.put(Items.NETHERITE_SPEAR, Items.NETHERITE_SWORD);
eightFourFourFallbacks.put(Items.COPPER_NAUTILUS_ARMOR, Items.COPPER_HORSE_ARMOR);
eightFourFourFallbacks.put(Items.IRON_NAUTILUS_ARMOR, Items.IRON_HORSE_ARMOR);
eightFourFourFallbacks.put(Items.GOLDEN_NAUTILUS_ARMOR, Items.GOLDEN_HORSE_ARMOR);
eightFourFourFallbacks.put(Items.DIAMOND_NAUTILUS_ARMOR, Items.DIAMOND_HORSE_ARMOR);
eightFourFourFallbacks.put(Items.NETHERITE_NAUTILUS_ARMOR, Items.DIAMOND_HORSE_ARMOR); // Any version without nautilus armor won't have netherite horse armor either
eightFourFourFallbacks.put(Items.NETHERITE_HORSE_ARMOR, Items.DIAMOND_HORSE_ARMOR);
eightFourFourFallbacks.put(Items.NAUTILUS_SPAWN_EGG, Items.PUFFERFISH_SPAWN_EGG);
eightFourFourFallbacks.put(Items.ZOMBIE_NAUTILUS_SPAWN_EGG, Items.PUFFERFISH_SPAWN_EGG);
eightFourFourFallbacks.put(Items.CAMEL_HUSK_SPAWN_EGG, Items.CAMEL_SPAWN_EGG);
eightFourFourFallbacks.put(Items.PARCHED_SPAWN_EGG, Items.SKELETON_SPAWN_EGG);
List<PaletteVersion> paletteVersions = new ArrayList<>(6);
paletteVersions.add(new PaletteVersion("1_21_90", Bedrock_v818.CODEC.getProtocolVersion(), eightOneEightFallbacks, Conversion844_827::remapItem));
paletteVersions.add(new PaletteVersion("1_21_93", Bedrock_v819.CODEC.getProtocolVersion(), eightOneNineFallbacks, Conversion844_827::remapItem));
paletteVersions.add(new PaletteVersion("1_21_100", Bedrock_v827.CODEC.getProtocolVersion(), eightTwoSevenFallbacks, Conversion844_827::remapItem));
paletteVersions.add(new PaletteVersion("1_21_110", Bedrock_v844.CODEC.getProtocolVersion()));
paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v859.CODEC.getProtocolVersion()));
paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v860.CODEC.getProtocolVersion()));
paletteVersions.add(new PaletteVersion("1_21_110", Bedrock_v844.CODEC.getProtocolVersion(), eightFourFourFallbacks));
paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v859.CODEC.getProtocolVersion(), eightFourFourFallbacks));
paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v860.CODEC.getProtocolVersion(), eightFourFourFallbacks));
paletteVersions.add(new PaletteVersion("1_21_130", Bedrock_v898.CODEC.getProtocolVersion()));
GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();

4
core/src/main/java/org/geysermc/geyser/registry/populator/TagRegistryPopulator.java
View File

@@ -70,10 +70,6 @@ public final class TagRegistryPopulator {
};
List<ObjectIntPair<String>> paletteVersions = List.of(
ObjectIntPair.of("1_21_90", Bedrock_v818.CODEC.getProtocolVersion()),
// Not a typo, it's the same file
ObjectIntPair.of("1_21_90", Bedrock_v819.CODEC.getProtocolVersion()),
ObjectIntPair.of("1_21_100", Bedrock_v827.CODEC.getProtocolVersion()),
ObjectIntPair.of("1_21_110", Bedrock_v844.CODEC.getProtocolVersion()),
ObjectIntPair.of("1_21_120", Bedrock_v859.CODEC.getProtocolVersion())
// TODO .130!

66
core/src/main/java/org/geysermc/geyser/registry/populator/conversion/Conversion844_827.java
View File

@@ -1,66 +0,0 @@
/*
* 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.registry.populator.conversion;
import org.cloudburstmc.nbt.NbtMap;
import org.cloudburstmc.nbt.NbtMapBuilder;
import org.geysermc.geyser.item.Items;
import org.geysermc.geyser.item.type.Item;
import org.geysermc.geyser.registry.type.GeyserMappingItem;
public class Conversion844_827 {
public static NbtMap remapBlock(NbtMap nbtMap) {
final String name = nbtMap.getString("name");
if (name.equals("minecraft:iron_chain") || name.endsWith("copper_chain")) {
return ConversionHelper.withName(nbtMap, "chain");
} else if (name.endsWith("lightning_rod")) {
NbtMapBuilder statesWithoutPoweredBit = nbtMap.getCompound("states").toBuilder();
statesWithoutPoweredBit.remove("powered_bit");
return nbtMap.toBuilder()
.putString("name", "minecraft:lightning_rod")
.putCompound("states", statesWithoutPoweredBit.build())
.build();
} else if (name.endsWith("_shelf") || name.endsWith("copper_golem_statue")) {
return ConversionHelper.withoutStates("unknown");
} else if (name.equals("minecraft:copper_torch")) {
return ConversionHelper.withName(nbtMap, "torch");
} else if (name.endsWith("copper_bars")) {
return ConversionHelper.withName(nbtMap, "iron_bars");
} else if (name.endsWith("copper_lantern")) {
return ConversionHelper.withName(nbtMap, "lantern");
}
return nbtMap;
}
public static GeyserMappingItem remapItem(Item item, GeyserMappingItem mapping) {
if (item == Items.IRON_CHAIN || item.javaIdentifier().endsWith("copper_chain")) {
return mapping.withBedrockIdentifier("minecraft:chain");
}
return mapping;
}
}

5
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View File

@@ -1800,11 +1800,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
// Needed for certain molang queries used in blocks and items
startGamePacket.getExperiments().add(new ExperimentData("experimental_molang_features", true));
// Enable 2025 Content Drop 3 features on 1.21.100
if (GameProtocol.is1_21_100(this)) {
startGamePacket.getExperiments().add(new ExperimentData("y_2025_drop_3", true));
}
startGamePacket.setVanillaVersion("*");
startGamePacket.setInventoriesServerAuthoritative(true);
startGamePacket.setServerEngine(""); // Do we want to fill this in?

3
core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java vendored
View File

@@ -35,7 +35,7 @@ import org.cloudburstmc.nbt.NbtType;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.entity.type.living.animal.FrogEntity;
import org.geysermc.geyser.entity.type.living.animal.VariantHolder;
import org.geysermc.geyser.entity.type.living.animal.farm.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.WolfEntity;
import org.geysermc.geyser.inventory.item.BannerPattern;
@@ -102,6 +102,7 @@ public final class RegistryCache implements JavaRegistryProvider {
register(JavaRegistries.PIG_VARIANT, TemperatureVariantAnimal.VARIANT_READER);
register(JavaRegistries.COW_VARIANT, TemperatureVariantAnimal.VARIANT_READER);
register(JavaRegistries.CHICKEN_VARIANT, TemperatureVariantAnimal.VARIANT_READER);
register(JavaRegistries.ZOMBIE_NAUTILUS_VARIANT, TemperatureVariantAnimal.VARIANT_READER);
// Load from MCProtocolLib's classloader
NbtMap tag = MinecraftProtocol.loadNetworkCodec();

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

@@ -30,7 +30,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.protocol.bedrock.data.TrimMaterial;
import org.cloudburstmc.protocol.bedrock.data.TrimPattern;
import org.geysermc.geyser.entity.type.living.animal.FrogEntity;
import org.geysermc.geyser.entity.type.living.animal.farm.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.TemperatureVariantAnimal;
import org.geysermc.geyser.entity.type.living.animal.tameable.CatEntity;
import org.geysermc.geyser.entity.type.living.animal.tameable.WolfEntity;
import org.geysermc.geyser.inventory.item.BannerPattern;
@@ -98,6 +98,7 @@ public class JavaRegistries {
public static final JavaRegistryKey<TemperatureVariantAnimal.BuiltInVariant> PIG_VARIANT = create("pig_variant");
public static final JavaRegistryKey<TemperatureVariantAnimal.BuiltInVariant> COW_VARIANT = create("cow_variant");
public static final JavaRegistryKey<TemperatureVariantAnimal.BuiltInVariant> CHICKEN_VARIANT = create("chicken_variant");
public static final JavaRegistryKey<TemperatureVariantAnimal.BuiltInVariant> ZOMBIE_NAUTILUS_VARIANT = create("zombie_nautilus_variant");
private static <T> JavaRegistryKey<T> create(String key, JavaRegistryKey.RegistryLookup<T> registryLookup) {
JavaRegistryKey<T> registry = new JavaRegistryKey<>(MinecraftKey.key(key), registryLookup);

1
core/src/main/java/org/geysermc/geyser/session/cache/tags/BlockTag.java vendored
View File

@@ -151,6 +151,7 @@ public final class BlockTag {
public static final Tag<Block> UNSTABLE_BOTTOM_CENTER = create("unstable_bottom_center");
public static final Tag<Block> MUSHROOM_GROW_BLOCK = create("mushroom_grow_block");
public static final Tag<Block> EDIBLE_FOR_SHEEP = create("edible_for_sheep");
public static final Tag<Block> CAN_GLIDE_THROUGH = create("can_glide_through");
public static final Tag<Block> INFINIBURN_OVERWORLD = create("infiniburn_overworld");
public static final Tag<Block> INFINIBURN_NETHER = create("infiniburn_nether");
public static final Tag<Block> INFINIBURN_END = create("infiniburn_end");

10
core/src/main/java/org/geysermc/geyser/session/cache/tags/ItemTag.java vendored
View File

@@ -122,11 +122,13 @@ public final class ItemTag {
public static final Tag<Item> WOLF_FOOD = create("wolf_food");
public static final Tag<Item> CAT_FOOD = create("cat_food");
public static final Tag<Item> HORSE_FOOD = create("horse_food");
public static final Tag<Item> ZOMBIE_HORSE_FOOD = create("zombie_horse_food");
public static final Tag<Item> HORSE_TEMPT_ITEMS = create("horse_tempt_items");
public static final Tag<Item> HARNESSES = create("harnesses");
public static final Tag<Item> HAPPY_GHAST_FOOD = create("happy_ghast_food");
public static final Tag<Item> HAPPY_GHAST_TEMPT_ITEMS = create("happy_ghast_tempt_items");
public static final Tag<Item> CAMEL_FOOD = create("camel_food");
public static final Tag<Item> CAMEL_HUSK_FOOD = create("camel_husk_food");
public static final Tag<Item> ARMADILLO_FOOD = create("armadillo_food");
public static final Tag<Item> CHICKEN_FOOD = create("chicken_food");
public static final Tag<Item> FROG_FOOD = create("frog_food");
@@ -144,6 +146,9 @@ public final class ItemTag {
public static final Tag<Item> PARROT_FOOD = create("parrot_food");
public static final Tag<Item> PARROT_POISONOUS_FOOD = create("parrot_poisonous_food");
public static final Tag<Item> AXOLOTL_FOOD = create("axolotl_food");
public static final Tag<Item> NAUTILUS_BUCKET_FOOD = create("nautilus_bucket_food");
public static final Tag<Item> NAUTILUS_FOOD = create("nautilus_food");
public static final Tag<Item> NAUTILUS_TAMING_ITEMS = create("nautilus_taming_items");
public static final Tag<Item> NON_FLAMMABLE_WOOD = create("non_flammable_wood");
public static final Tag<Item> BOATS = create("boats");
public static final Tag<Item> CHEST_BOATS = create("chest_boats");
@@ -190,6 +195,7 @@ public final class ItemTag {
public static final Tag<Item> HOES = create("hoes");
public static final Tag<Item> PICKAXES = create("pickaxes");
public static final Tag<Item> SHOVELS = create("shovels");
public static final Tag<Item> SPEARS = create("spears");
public static final Tag<Item> BREAKS_DECORATED_POTS = create("breaks_decorated_pots");
public static final Tag<Item> VILLAGER_PLANTABLE_SEEDS = create("villager_plantable_seeds");
public static final Tag<Item> VILLAGER_PICKS_UP = create("villager_picks_up");
@@ -208,7 +214,8 @@ public final class ItemTag {
public static final Tag<Item> ENCHANTABLE_CHEST_ARMOR = create("enchantable/chest_armor");
public static final Tag<Item> ENCHANTABLE_HEAD_ARMOR = create("enchantable/head_armor");
public static final Tag<Item> ENCHANTABLE_ARMOR = create("enchantable/armor");
public static final Tag<Item> ENCHANTABLE_SWORD = create("enchantable/sword");
public static final Tag<Item> ENCHANTABLE_MELEE_WEAPON = create("enchantable/melee_weapon");
public static final Tag<Item> ENCHANTABLE_SWEEPING = create("enchantable/sweeping");
public static final Tag<Item> ENCHANTABLE_FIRE_ASPECT = create("enchantable/fire_aspect");
public static final Tag<Item> ENCHANTABLE_SHARP_WEAPON = create("enchantable/sharp_weapon");
public static final Tag<Item> ENCHANTABLE_WEAPON = create("enchantable/weapon");
@@ -216,6 +223,7 @@ public final class ItemTag {
public static final Tag<Item> ENCHANTABLE_MINING_LOOT = create("enchantable/mining_loot");
public static final Tag<Item> ENCHANTABLE_FISHING = create("enchantable/fishing");
public static final Tag<Item> ENCHANTABLE_TRIDENT = create("enchantable/trident");
public static final Tag<Item> ENCHANTABLE_LUNGE = create("enchantable/lunge");
public static final Tag<Item> ENCHANTABLE_DURABILITY = create("enchantable/durability");
public static final Tag<Item> ENCHANTABLE_BOW = create("enchantable/bow");
public static final Tag<Item> ENCHANTABLE_EQUIPPABLE = create("enchantable/equippable");

8
core/src/main/java/org/geysermc/geyser/translator/inventory/horse/AbstractHorseInventoryTranslator.java → core/src/main/java/org/geysermc/geyser/translator/inventory/horse/AbstractMountInventoryTranslator.java
View File

@@ -26,17 +26,17 @@
package org.geysermc.geyser.translator.inventory.horse;
import org.geysermc.geyser.inventory.Container;
import org.geysermc.geyser.inventory.updater.HorseInventoryUpdater;
import org.geysermc.geyser.inventory.updater.MountInventoryUpdater;
import org.geysermc.geyser.inventory.updater.InventoryUpdater;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.inventory.BaseInventoryTranslator;
public abstract class AbstractHorseInventoryTranslator extends BaseInventoryTranslator<Container> {
public abstract class AbstractMountInventoryTranslator extends BaseInventoryTranslator<Container> {
private final InventoryUpdater updater;
public AbstractHorseInventoryTranslator(int size) {
public AbstractMountInventoryTranslator(int size) {
super(size);
this.updater = HorseInventoryUpdater.INSTANCE;
this.updater = MountInventoryUpdater.INSTANCE;
}
@Override

2
core/src/main/java/org/geysermc/geyser/translator/inventory/horse/ChestedHorseInventoryTranslator.java
View File

@@ -36,7 +36,7 @@ import org.geysermc.geyser.session.GeyserSession;
import java.util.Arrays;
public abstract class ChestedHorseInventoryTranslator extends AbstractHorseInventoryTranslator {
public abstract class ChestedHorseInventoryTranslator extends AbstractMountInventoryTranslator {
private final int chestSize;
private final int equipSlot;

4
core/src/main/java/org/geysermc/geyser/translator/inventory/horse/HorseInventoryTranslator.java → core/src/main/java/org/geysermc/geyser/translator/inventory/horse/MountInventoryTranslator.java
View File

@@ -30,8 +30,8 @@ import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.request.ItemSt
import org.geysermc.geyser.inventory.BedrockContainerSlot;
import org.geysermc.geyser.inventory.Container;
public class HorseInventoryTranslator extends AbstractHorseInventoryTranslator {
public HorseInventoryTranslator(int size) {
public class MountInventoryTranslator extends AbstractMountInventoryTranslator {
public MountInventoryTranslator(int size) {
super(size);
}

13
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockInventoryTransactionTranslator.java
View File

@@ -461,6 +461,14 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
}
}
}
case 3 -> {
if (session.getPlayerInventory().getItemInHand().getComponent(DataComponentTypes.PIERCING_WEAPON) != null && session.getGameMode() != GameMode.SPECTATOR) {
session.sendDownstreamPacket(new ServerboundPlayerActionPacket(PlayerAction.STAB, Vector3i.ZERO, org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction.DOWN, 0));
session.sendDownstreamPacket(new ServerboundSwingPacket(Hand.MAIN_HAND));
CooldownUtils.sendCooldown(session);
}
}
}
break;
case ITEM_RELEASE:
@@ -471,6 +479,11 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
}
break;
case ITEM_USE_ON_ENTITY:
// The player can only stab in this case, not attack!
if (session.getPlayerInventory().getItemInHand().getComponent(DataComponentTypes.PIERCING_WEAPON) != null && session.getGameMode() != GameMode.SPECTATOR) {
return;
}
Entity entity = session.getEntityCache().getEntityByGeyserId(packet.getRuntimeEntityId());
if (entity == null)
return;

3
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java
View File

@@ -32,6 +32,7 @@ import org.cloudburstmc.protocol.bedrock.packet.SetEntityLinkPacket;
import org.geysermc.geyser.entity.type.ChestBoatEntity;
import org.geysermc.geyser.entity.type.Entity;
import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.AbstractNautilusEntity;
import org.geysermc.geyser.item.Items;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.protocol.PacketTranslator;
@@ -122,7 +123,7 @@ public class BedrockInteractTranslator extends PacketTranslator<InteractPacket>
case OPEN_INVENTORY:
if (session.getInventoryHolder() == null) {
Entity ridingEntity = session.getPlayerEntity().getVehicle();
if (ridingEntity instanceof AbstractHorseEntity || ridingEntity instanceof ChestBoatEntity) {
if (ridingEntity instanceof AbstractHorseEntity || ridingEntity instanceof AbstractNautilusEntity || ridingEntity instanceof ChestBoatEntity) {
// This mob has an inventory of its own that we should open instead.
ServerboundPlayerCommandPacket openVehicleWindowPacket = new ServerboundPlayerCommandPacket(session.getPlayerEntity().getEntityId(), PlayerState.OPEN_VEHICLE_INVENTORY);
session.sendDownstreamGamePacket(openVehicleWindowPacket);

6
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockPlayerAuthInputTranslator.java
View File

@@ -40,6 +40,8 @@ import org.geysermc.geyser.entity.type.BoatEntity;
import org.geysermc.geyser.entity.type.Entity;
import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.LlamaEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.AbstractNautilusEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.NautilusEntity;
import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
import org.geysermc.geyser.entity.vehicle.ClientVehicle;
import org.geysermc.geyser.entity.vehicle.HorseVehicleComponent;
@@ -267,7 +269,7 @@ public final class BedrockPlayerAuthInputTranslator extends PacketTranslator<Pla
sendMovement = inClientPredictedVehicle && (vehicle.getPassengers().size() == 1 || session.getPlayerEntity().isRidingInFront());
}
if (vehicle instanceof AbstractHorseEntity horse && !vehicle.getFlag(EntityFlag.HAS_DASH_COOLDOWN)) {
if ((vehicle instanceof AbstractHorseEntity || vehicle instanceof AbstractNautilusEntity) && !vehicle.getFlag(EntityFlag.HAS_DASH_COOLDOWN)) {
// Behavior verified as of Java Edition 1.21.3
int currentJumpingTicks = session.getInputCache().getJumpingTicks();
if (currentJumpingTicks < 0) {
@@ -287,7 +289,7 @@ public final class BedrockPlayerAuthInputTranslator extends PacketTranslator<Pla
session.getInputCache().setJumpingTicks(-10);
session.getPlayerEntity().setVehicleJumpStrength(finalVehicleJumpStrength);
if (horse.getVehicleComponent() instanceof HorseVehicleComponent horseVehicleComponent) {
if (vehicle instanceof AbstractHorseEntity horse && horse.getVehicleComponent() instanceof HorseVehicleComponent horseVehicleComponent) {
horseVehicleComponent.setAllowStandSliding(true);
}
} else if (!wasJumping && holdingJump) {

77
core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaHorseScreenOpenTranslator.java → core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaMountScreenOpenTranslator.java
View File

@@ -37,53 +37,42 @@ import org.geysermc.geyser.entity.type.living.animal.horse.ChestedHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.LlamaEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.SkeletonHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.horse.ZombieHorseEntity;
import org.geysermc.geyser.entity.type.living.animal.nautilus.NautilusEntity;
import org.geysermc.geyser.inventory.Container;
import org.geysermc.geyser.inventory.InventoryHolder;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.inventory.InventoryTranslator;
import org.geysermc.geyser.translator.inventory.horse.DonkeyInventoryTranslator;
import org.geysermc.geyser.translator.inventory.horse.HorseInventoryTranslator;
import org.geysermc.geyser.translator.inventory.horse.MountInventoryTranslator;
import org.geysermc.geyser.translator.inventory.horse.LlamaInventoryTranslator;
import org.geysermc.geyser.translator.protocol.PacketTranslator;
import org.geysermc.geyser.translator.protocol.Translator;
import org.geysermc.geyser.util.InventoryUtils;
import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundHorseScreenOpenPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundMountScreenOpenPacket;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Translator(packet = ClientboundHorseScreenOpenPacket.class)
public class JavaHorseScreenOpenTranslator extends PacketTranslator<ClientboundHorseScreenOpenPacket> {
@Translator(packet = ClientboundMountScreenOpenPacket.class)
public class JavaMountScreenOpenTranslator extends PacketTranslator<ClientboundMountScreenOpenPacket> {
private static final String[] ACCEPTED_HORSE_ARMORS = new String[] {"minecraft:horsearmorleather", "minecraft:horsearmoriron",
"minecraft:horsearmorgold", "minecraft:horsearmordiamond", "minecraft:copper_horse_armor", "minecraft:netherite_horse_armor"};
private static final String[] ACCEPTED_NAUTILUS_ARMORS = new String[] {"minecraft:copper_nautilus_armor", "minecraft:iron_nautilus_armor",
"minecraft:golden_nautilus_armor", "minecraft:diamond_nautilus_armor", "minecraft:netherite_nautilus_armor"};
private static final NbtMap ARMOR_SLOT;
private static final NbtMap CARPET_SLOT;
private static final NbtMap SADDLE_SLOT;
private static final NbtMap SADDLE_SLOT, CARPET_SLOT;
private static final NbtMap HORSE_ARMOR_SLOT, NAUTILUS_ARMOR_SLOT;
static {
// Build the NBT mappings that Bedrock wants to lay out the GUI
String[] acceptedHorseArmorIdentifiers = new String[] {"minecraft:horsearmorleather", "minecraft:horsearmoriron",
"minecraft:horsearmorgold", "minecraft:horsearmordiamond"};
NbtMapBuilder armorBuilder = NbtMap.builder();
List<NbtMap> acceptedArmors = new ArrayList<>(4);
for (String identifier : acceptedHorseArmorIdentifiers) {
NbtMapBuilder acceptedItemBuilder = NbtMap.builder()
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", identifier);
acceptedArmors.add(NbtMap.builder().putCompound("slotItem", acceptedItemBuilder.build()).build());
}
armorBuilder.putList("acceptedItems", NbtType.COMPOUND, acceptedArmors);
NbtMapBuilder armorItem = NbtMap.builder()
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", "minecraft:horsearmoriron");
armorBuilder.putCompound("item", armorItem.build());
armorBuilder.putInt("slotNumber", 1);
ARMOR_SLOT = armorBuilder.build();
HORSE_ARMOR_SLOT = buildAcceptedArmorSlot(ACCEPTED_HORSE_ARMORS, "minecraft:horsearmoriron");
NAUTILUS_ARMOR_SLOT = buildAcceptedArmorSlot(ACCEPTED_NAUTILUS_ARMORS, "minecraft:nautilusarmor");
NbtMapBuilder carpetBuilder = NbtMap.builder();
NbtMapBuilder carpetItem = NbtMap.builder()
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", "minecraft:carpet");
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", "minecraft:carpet");
List<NbtMap> acceptedCarpet = Collections.singletonList(NbtMap.builder().putCompound("slotItem", carpetItem.build()).build());
carpetBuilder.putList("acceptedItems", NbtType.COMPOUND, acceptedCarpet);
carpetBuilder.putCompound("item", carpetItem.build());
@@ -92,8 +81,8 @@ public class JavaHorseScreenOpenTranslator extends PacketTranslator<ClientboundH
NbtMapBuilder saddleBuilder = NbtMap.builder();
NbtMapBuilder acceptedSaddle = NbtMap.builder()
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", "minecraft:saddle");
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", "minecraft:saddle");
List<NbtMap> acceptedItem = Collections.singletonList(NbtMap.builder().putCompound("slotItem", acceptedSaddle.build()).build());
saddleBuilder.putList("acceptedItems", NbtType.COMPOUND, acceptedItem);
saddleBuilder.putCompound("item", acceptedSaddle.build());
@@ -101,8 +90,28 @@ public class JavaHorseScreenOpenTranslator extends PacketTranslator<ClientboundH
SADDLE_SLOT = saddleBuilder.build();
}
private static NbtMap buildAcceptedArmorSlot(String[] accepted, String name) {
NbtMapBuilder armorBuilder = NbtMap.builder();
List<NbtMap> acceptedArmors = new ArrayList<>(4);
for (String identifier : accepted) {
NbtMapBuilder acceptedItemBuilder = NbtMap.builder()
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", identifier);
acceptedArmors.add(NbtMap.builder().putCompound("slotItem", acceptedItemBuilder.build()).build());
}
armorBuilder.putList("acceptedItems", NbtType.COMPOUND, acceptedArmors);
NbtMapBuilder armorItem = NbtMap.builder()
.putShort("Aux", Short.MAX_VALUE)
.putString("Name", name);
armorBuilder.putCompound("item", armorItem.build());
armorBuilder.putInt("slotNumber", 1);
return armorBuilder.build();
}
@Override
public void translate(GeyserSession session, ClientboundHorseScreenOpenPacket packet) {
public void translate(GeyserSession session, ClientboundMountScreenOpenPacket packet) {
Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId());
if (entity == null) {
return;
@@ -141,10 +150,12 @@ public class JavaHorseScreenOpenTranslator extends PacketTranslator<ClientboundH
inventoryTranslator = new DonkeyInventoryTranslator(slotCount);
slots.add(SADDLE_SLOT);
} else {
inventoryTranslator = new HorseInventoryTranslator(slotCount);
inventoryTranslator = new MountInventoryTranslator(slotCount);
slots.add(SADDLE_SLOT);
if (!(entity instanceof SkeletonHorseEntity || entity instanceof ZombieHorseEntity)) {
slots.add(ARMOR_SLOT);
if (entity instanceof NautilusEntity) {
slots.add(NAUTILUS_ARMOR_SLOT);
} else if (!(entity instanceof SkeletonHorseEntity || entity instanceof ZombieHorseEntity)) {
slots.add(HORSE_ARMOR_SLOT);
}
}

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

@@ -95,6 +95,7 @@ public final class EntityUtils {
case OOZING -> 34;
case INFESTED -> 35;
case RAID_OMEN -> 36;
case BREATH_OF_THE_NAUTILUS -> 37;
default -> effect.ordinal() + 1;
};
}

4
core/src/main/java/org/geysermc/geyser/util/InteractiveTag.java
View File

@@ -80,7 +80,9 @@ public enum InteractiveTag {
SCRAPE,
WAX_ON,
WAX_OFF,
DROP_ITEM;
DROP_ITEM,
EQUIP_NAUTILUS_ARMOR("equipnautilusarmor"),
REMOVE_NAUTILUS_ARMOR("removenautilusarmor");
/**
* The full string that should be passed on to the client.

11
core/src/main/java/org/geysermc/geyser/util/MathUtils.java
View File

@@ -25,6 +25,7 @@
package org.geysermc.geyser.util;
import org.cloudburstmc.math.GenericMath;
import org.cloudburstmc.math.TrigMath;
import org.cloudburstmc.math.vector.Vector3f;
@@ -47,6 +48,16 @@ public class MathUtils {
return Vector3f.from(d1, e, i1);
}
public static Vector3f calculateViewVector(float pitch, float yaw) {
float var3 = pitch * 0.017453292F;
float var4 = -yaw * 0.017453292F;
float var5 = TrigMath.cos(var4);
float var6 = TrigMath.sin(var4);
float var7 = TrigMath.cos(var3);
float var8 = TrigMath.sin(var3);
return Vector3f.from(var6 * var7, -var8, var5 * var7);
}
/**
* Wrap the given float degrees to be between -180.0 and 180.0.
*

BIN
core/src/main/resources/GeyserIntegratedPack.mcpack
View File

Binary file not shown.

BIN
core/src/main/resources/bedrock/block_palette.1_21_100.nbt
View File

Binary file not shown.

BIN
core/src/main/resources/bedrock/block_palette.1_21_90.nbt
View File

Binary file not shown.

9048
core/src/main/resources/bedrock/creative_items.1_21_100.json
View File

File diff suppressed because it is too large Load Diff

9044
core/src/main/resources/bedrock/creative_items.1_21_90.json
View File

File diff suppressed because it is too large Load Diff

9048
core/src/main/resources/bedrock/creative_items.1_21_93.json
View File

File diff suppressed because it is too large Load Diff

BIN
core/src/main/resources/bedrock/item_components.1_21_100.nbt
View File

Binary file not shown.

BIN
core/src/main/resources/bedrock/item_components.1_21_90.nbt
View File

Binary file not shown.

BIN
core/src/main/resources/bedrock/item_components.1_21_93.nbt
View File

Binary file not shown.

850
core/src/main/resources/bedrock/item_tags.1_21_100.json
View File

@@ -1,850 +0,0 @@
{
"minecraft:arrow": [
"minecraft:arrow"
],
"minecraft:banner": [
"minecraft:banner"
],
"minecraft:boat": [
"minecraft:acacia_boat",
"minecraft:acacia_chest_boat",
"minecraft:bamboo_chest_raft",
"minecraft:bamboo_raft",
"minecraft:birch_boat",
"minecraft:birch_chest_boat",
"minecraft:cherry_boat",
"minecraft:cherry_chest_boat",
"minecraft:dark_oak_boat",
"minecraft:dark_oak_chest_boat",
"minecraft:jungle_boat",
"minecraft:jungle_chest_boat",
"minecraft:mangrove_boat",
"minecraft:mangrove_chest_boat",
"minecraft:oak_boat",
"minecraft:oak_chest_boat",
"minecraft:pale_oak_boat",
"minecraft:pale_oak_chest_boat",
"minecraft:spruce_boat",
"minecraft:spruce_chest_boat"
],
"minecraft:boats": [
"minecraft:acacia_boat",
"minecraft:acacia_chest_boat",
"minecraft:bamboo_chest_raft",
"minecraft:bamboo_raft",
"minecraft:birch_boat",
"minecraft:birch_chest_boat",
"minecraft:cherry_boat",
"minecraft:cherry_chest_boat",
"minecraft:dark_oak_boat",
"minecraft:dark_oak_chest_boat",
"minecraft:jungle_boat",
"minecraft:jungle_chest_boat",
"minecraft:mangrove_boat",
"minecraft:mangrove_chest_boat",
"minecraft:oak_boat",
"minecraft:oak_chest_boat",
"minecraft:pale_oak_boat",
"minecraft:pale_oak_chest_boat",
"minecraft:spruce_boat",
"minecraft:spruce_chest_boat"
],
"minecraft:bookshelf_books": [
"minecraft:book",
"minecraft:enchanted_book",
"minecraft:writable_book"
],
"minecraft:chainmail_tier": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings"
],
"minecraft:coals": [
"minecraft:charcoal",
"minecraft:coal"
],
"minecraft:crimson_stems": [
"minecraft:crimson_hyphae",
"minecraft:crimson_stem",
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_crimson_stem"
],
"minecraft:decorated_pot_sherds": [
"minecraft:angler_pottery_sherd",
"minecraft:archer_pottery_sherd",
"minecraft:arms_up_pottery_sherd",
"minecraft:blade_pottery_sherd",
"minecraft:brewer_pottery_sherd",
"minecraft:brick",
"minecraft:burn_pottery_sherd",
"minecraft:danger_pottery_sherd",
"minecraft:explorer_pottery_sherd",
"minecraft:flow_pottery_sherd",
"minecraft:friend_pottery_sherd",
"minecraft:guster_pottery_sherd",
"minecraft:heart_pottery_sherd",
"minecraft:heartbreak_pottery_sherd",
"minecraft:howl_pottery_sherd",
"minecraft:miner_pottery_sherd",
"minecraft:mourner_pottery_sherd",
"minecraft:plenty_pottery_sherd",
"minecraft:prize_pottery_sherd",
"minecraft:scrape_pottery_sherd",
"minecraft:sheaf_pottery_sherd",
"minecraft:shelter_pottery_sherd",
"minecraft:skull_pottery_sherd",
"minecraft:snort_pottery_sherd"
],
"minecraft:diamond_tier": [
"minecraft:diamond_axe",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_hoe",
"minecraft:diamond_leggings",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:diamond_sword",
"minecraft:mace"
],
"minecraft:digger": [
"minecraft:diamond_axe",
"minecraft:diamond_hoe",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:golden_axe",
"minecraft:golden_hoe",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:iron_axe",
"minecraft:iron_hoe",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:netherite_axe",
"minecraft:netherite_hoe",
"minecraft:netherite_pickaxe",
"minecraft:netherite_shovel",
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel",
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel"
],
"minecraft:door": [
"minecraft:acacia_door",
"minecraft:bamboo_door",
"minecraft:birch_door",
"minecraft:cherry_door",
"minecraft:copper_door",
"minecraft:crimson_door",
"minecraft:dark_oak_door",
"minecraft:exposed_copper_door",
"minecraft:iron_door",
"minecraft:jungle_door",
"minecraft:mangrove_door",
"minecraft:oxidized_copper_door",
"minecraft:pale_oak_door",
"minecraft:spruce_door",
"minecraft:warped_door",
"minecraft:waxed_copper_door",
"minecraft:waxed_exposed_copper_door",
"minecraft:waxed_oxidized_copper_door",
"minecraft:waxed_weathered_copper_door",
"minecraft:weathered_copper_door",
"minecraft:wooden_door"
],
"minecraft:egg": [
"minecraft:blue_egg",
"minecraft:brown_egg",
"minecraft:egg"
],
"minecraft:golden_tier": [
"minecraft:golden_axe",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_hoe",
"minecraft:golden_leggings",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:golden_sword"
],
"minecraft:hanging_actor": [
"minecraft:painting"
],
"minecraft:hanging_sign": [
"minecraft:acacia_hanging_sign",
"minecraft:bamboo_hanging_sign",
"minecraft:birch_hanging_sign",
"minecraft:cherry_hanging_sign",
"minecraft:crimson_hanging_sign",
"minecraft:dark_oak_hanging_sign",
"minecraft:jungle_hanging_sign",
"minecraft:mangrove_hanging_sign",
"minecraft:oak_hanging_sign",
"minecraft:pale_oak_hanging_sign",
"minecraft:spruce_hanging_sign",
"minecraft:warped_hanging_sign"
],
"minecraft:harness": [
"minecraft:black_harness",
"minecraft:blue_harness",
"minecraft:brown_harness",
"minecraft:cyan_harness",
"minecraft:gray_harness",
"minecraft:green_harness",
"minecraft:light_blue_harness",
"minecraft:light_gray_harness",
"minecraft:lime_harness",
"minecraft:magenta_harness",
"minecraft:orange_harness",
"minecraft:pink_harness",
"minecraft:purple_harness",
"minecraft:red_harness",
"minecraft:white_harness",
"minecraft:yellow_harness"
],
"minecraft:horse_armor": [
"minecraft:diamond_horse_armor",
"minecraft:golden_horse_armor",
"minecraft:iron_horse_armor",
"minecraft:leather_horse_armor"
],
"minecraft:iron_tier": [
"minecraft:iron_axe",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_hoe",
"minecraft:iron_leggings",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:iron_sword"
],
"minecraft:is_armor": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_leggings",
"minecraft:elytra",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_leggings",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_leggings",
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_leggings",
"minecraft:turtle_helmet"
],
"minecraft:is_axe": [
"minecraft:diamond_axe",
"minecraft:golden_axe",
"minecraft:iron_axe",
"minecraft:netherite_axe",
"minecraft:stone_axe",
"minecraft:wooden_axe"
],
"minecraft:is_cooked": [
"minecraft:cooked_beef",
"minecraft:cooked_chicken",
"minecraft:cooked_cod",
"minecraft:cooked_mutton",
"minecraft:cooked_porkchop",
"minecraft:cooked_rabbit",
"minecraft:cooked_salmon",
"minecraft:rabbit_stew"
],
"minecraft:is_fish": [
"minecraft:cod",
"minecraft:cooked_cod",
"minecraft:cooked_salmon",
"minecraft:pufferfish",
"minecraft:salmon",
"minecraft:tropical_fish"
],
"minecraft:is_food": [
"minecraft:apple",
"minecraft:baked_potato",
"minecraft:beef",
"minecraft:beetroot",
"minecraft:beetroot_soup",
"minecraft:bread",
"minecraft:carrot",
"minecraft:chicken",
"minecraft:cooked_beef",
"minecraft:cooked_chicken",
"minecraft:cooked_mutton",
"minecraft:cooked_porkchop",
"minecraft:cooked_rabbit",
"minecraft:cookie",
"minecraft:dried_kelp",
"minecraft:enchanted_golden_apple",
"minecraft:golden_apple",
"minecraft:golden_carrot",
"minecraft:melon_slice",
"minecraft:mushroom_stew",
"minecraft:mutton",
"minecraft:porkchop",
"minecraft:potato",
"minecraft:pumpkin_pie",
"minecraft:rabbit",
"minecraft:rabbit_stew",
"minecraft:rotten_flesh",
"minecraft:sweet_berries"
],
"minecraft:is_hoe": [
"minecraft:diamond_hoe",
"minecraft:golden_hoe",
"minecraft:iron_hoe",
"minecraft:netherite_hoe",
"minecraft:stone_hoe",
"minecraft:wooden_hoe"
],
"minecraft:is_meat": [
"minecraft:beef",
"minecraft:chicken",
"minecraft:cooked_beef",
"minecraft:cooked_chicken",
"minecraft:cooked_mutton",
"minecraft:cooked_porkchop",
"minecraft:cooked_rabbit",
"minecraft:mutton",
"minecraft:porkchop",
"minecraft:rabbit",
"minecraft:rabbit_stew",
"minecraft:rotten_flesh"
],
"minecraft:is_minecart": [
"minecraft:chest_minecart",
"minecraft:command_block_minecart",
"minecraft:hopper_minecart",
"minecraft:minecart",
"minecraft:tnt_minecart"
],
"minecraft:is_pickaxe": [
"minecraft:diamond_pickaxe",
"minecraft:golden_pickaxe",
"minecraft:iron_pickaxe",
"minecraft:netherite_pickaxe",
"minecraft:stone_pickaxe",
"minecraft:wooden_pickaxe"
],
"minecraft:is_shears": [
"minecraft:shears"
],
"minecraft:is_shovel": [
"minecraft:diamond_shovel",
"minecraft:golden_shovel",
"minecraft:iron_shovel",
"minecraft:netherite_shovel",
"minecraft:stone_shovel",
"minecraft:wooden_shovel"
],
"minecraft:is_sword": [
"minecraft:diamond_sword",
"minecraft:golden_sword",
"minecraft:iron_sword",
"minecraft:mace",
"minecraft:netherite_sword",
"minecraft:stone_sword",
"minecraft:wooden_sword"
],
"minecraft:is_tool": [
"minecraft:diamond_axe",
"minecraft:diamond_hoe",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:diamond_sword",
"minecraft:golden_axe",
"minecraft:golden_hoe",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:golden_sword",
"minecraft:iron_axe",
"minecraft:iron_hoe",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:iron_sword",
"minecraft:mace",
"minecraft:netherite_axe",
"minecraft:netherite_hoe",
"minecraft:netherite_pickaxe",
"minecraft:netherite_shovel",
"minecraft:netherite_sword",
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel",
"minecraft:stone_sword",
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel",
"minecraft:wooden_sword"
],
"minecraft:is_trident": [
"minecraft:trident"
],
"minecraft:leather_tier": [
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings"
],
"minecraft:lectern_books": [
"minecraft:writable_book"
],
"minecraft:logs": [
"minecraft:acacia_log",
"minecraft:acacia_wood",
"minecraft:birch_log",
"minecraft:birch_wood",
"minecraft:cherry_log",
"minecraft:cherry_wood",
"minecraft:crimson_hyphae",
"minecraft:crimson_stem",
"minecraft:dark_oak_log",
"minecraft:dark_oak_wood",
"minecraft:jungle_log",
"minecraft:jungle_wood",
"minecraft:mangrove_log",
"minecraft:mangrove_wood",
"minecraft:oak_log",
"minecraft:oak_wood",
"minecraft:pale_oak_log",
"minecraft:pale_oak_wood",
"minecraft:spruce_log",
"minecraft:spruce_wood",
"minecraft:stripped_acacia_log",
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_log",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_log",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_crimson_stem",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_log",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_log",
"minecraft:stripped_oak_wood",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_log",
"minecraft:stripped_spruce_wood",
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_warped_stem",
"minecraft:warped_hyphae",
"minecraft:warped_stem"
],
"minecraft:logs_that_burn": [
"minecraft:acacia_log",
"minecraft:acacia_wood",
"minecraft:birch_log",
"minecraft:birch_wood",
"minecraft:cherry_log",
"minecraft:cherry_wood",
"minecraft:dark_oak_log",
"minecraft:dark_oak_wood",
"minecraft:jungle_log",
"minecraft:jungle_wood",
"minecraft:mangrove_log",
"minecraft:mangrove_wood",
"minecraft:oak_log",
"minecraft:oak_wood",
"minecraft:pale_oak_log",
"minecraft:pale_oak_wood",
"minecraft:spruce_log",
"minecraft:spruce_wood",
"minecraft:stripped_acacia_log",
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_log",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_log",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_log",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_log",
"minecraft:stripped_oak_wood",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_log",
"minecraft:stripped_spruce_wood"
],
"minecraft:mangrove_logs": [
"minecraft:mangrove_log",
"minecraft:mangrove_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood"
],
"minecraft:music_disc": [
"minecraft:music_disc_11",
"minecraft:music_disc_13",
"minecraft:music_disc_5",
"minecraft:music_disc_blocks",
"minecraft:music_disc_cat",
"minecraft:music_disc_chirp",
"minecraft:music_disc_creator",
"minecraft:music_disc_creator_music_box",
"minecraft:music_disc_far",
"minecraft:music_disc_lava_chicken",
"minecraft:music_disc_mall",
"minecraft:music_disc_mellohi",
"minecraft:music_disc_otherside",
"minecraft:music_disc_pigstep",
"minecraft:music_disc_precipice",
"minecraft:music_disc_relic",
"minecraft:music_disc_stal",
"minecraft:music_disc_strad",
"minecraft:music_disc_tears",
"minecraft:music_disc_wait",
"minecraft:music_disc_ward"
],
"minecraft:netherite_tier": [
"minecraft:netherite_axe",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_hoe",
"minecraft:netherite_leggings",
"minecraft:netherite_pickaxe",
"minecraft:netherite_shovel",
"minecraft:netherite_sword"
],
"minecraft:planks": [
"minecraft:acacia_planks",
"minecraft:bamboo_planks",
"minecraft:birch_planks",
"minecraft:cherry_planks",
"minecraft:crimson_planks",
"minecraft:dark_oak_planks",
"minecraft:jungle_planks",
"minecraft:mangrove_planks",
"minecraft:oak_planks",
"minecraft:pale_oak_planks",
"minecraft:spruce_planks",
"minecraft:warped_planks"
],
"minecraft:sand": [
"minecraft:red_sand",
"minecraft:sand"
],
"minecraft:sign": [
"minecraft:acacia_hanging_sign",
"minecraft:acacia_sign",
"minecraft:bamboo_hanging_sign",
"minecraft:bamboo_sign",
"minecraft:birch_hanging_sign",
"minecraft:birch_sign",
"minecraft:cherry_hanging_sign",
"minecraft:cherry_sign",
"minecraft:crimson_hanging_sign",
"minecraft:crimson_sign",
"minecraft:dark_oak_hanging_sign",
"minecraft:dark_oak_sign",
"minecraft:jungle_hanging_sign",
"minecraft:jungle_sign",
"minecraft:mangrove_hanging_sign",
"minecraft:mangrove_sign",
"minecraft:oak_hanging_sign",
"minecraft:oak_sign",
"minecraft:pale_oak_hanging_sign",
"minecraft:pale_oak_sign",
"minecraft:spruce_hanging_sign",
"minecraft:spruce_sign",
"minecraft:warped_hanging_sign",
"minecraft:warped_sign"
],
"minecraft:soul_fire_base_blocks": [
"minecraft:soul_sand",
"minecraft:soul_soil"
],
"minecraft:spawn_egg": [
"minecraft:allay_spawn_egg",
"minecraft:armadillo_spawn_egg",
"minecraft:axolotl_spawn_egg",
"minecraft:bat_spawn_egg",
"minecraft:bee_spawn_egg",
"minecraft:blaze_spawn_egg",
"minecraft:bogged_spawn_egg",
"minecraft:breeze_spawn_egg",
"minecraft:camel_spawn_egg",
"minecraft:cat_spawn_egg",
"minecraft:cave_spider_spawn_egg",
"minecraft:chicken_spawn_egg",
"minecraft:cod_spawn_egg",
"minecraft:cow_spawn_egg",
"minecraft:creaking_spawn_egg",
"minecraft:creeper_spawn_egg",
"minecraft:dolphin_spawn_egg",
"minecraft:donkey_spawn_egg",
"minecraft:drowned_spawn_egg",
"minecraft:elder_guardian_spawn_egg",
"minecraft:ender_dragon_spawn_egg",
"minecraft:enderman_spawn_egg",
"minecraft:endermite_spawn_egg",
"minecraft:evoker_spawn_egg",
"minecraft:fox_spawn_egg",
"minecraft:frog_spawn_egg",
"minecraft:ghast_spawn_egg",
"minecraft:glow_squid_spawn_egg",
"minecraft:goat_spawn_egg",
"minecraft:guardian_spawn_egg",
"minecraft:happy_ghast_spawn_egg",
"minecraft:hoglin_spawn_egg",
"minecraft:horse_spawn_egg",
"minecraft:husk_spawn_egg",
"minecraft:iron_golem_spawn_egg",
"minecraft:llama_spawn_egg",
"minecraft:magma_cube_spawn_egg",
"minecraft:mooshroom_spawn_egg",
"minecraft:mule_spawn_egg",
"minecraft:ocelot_spawn_egg",
"minecraft:panda_spawn_egg",
"minecraft:parrot_spawn_egg",
"minecraft:phantom_spawn_egg",
"minecraft:pig_spawn_egg",
"minecraft:piglin_brute_spawn_egg",
"minecraft:piglin_spawn_egg",
"minecraft:pillager_spawn_egg",
"minecraft:polar_bear_spawn_egg",
"minecraft:pufferfish_spawn_egg",
"minecraft:rabbit_spawn_egg",
"minecraft:ravager_spawn_egg",
"minecraft:salmon_spawn_egg",
"minecraft:sheep_spawn_egg",
"minecraft:shulker_spawn_egg",
"minecraft:silverfish_spawn_egg",
"minecraft:skeleton_horse_spawn_egg",
"minecraft:skeleton_spawn_egg",
"minecraft:slime_spawn_egg",
"minecraft:sniffer_spawn_egg",
"minecraft:snow_golem_spawn_egg",
"minecraft:spider_spawn_egg",
"minecraft:squid_spawn_egg",
"minecraft:stray_spawn_egg",
"minecraft:strider_spawn_egg",
"minecraft:tadpole_spawn_egg",
"minecraft:trader_llama_spawn_egg",
"minecraft:tropical_fish_spawn_egg",
"minecraft:turtle_spawn_egg",
"minecraft:vex_spawn_egg",
"minecraft:villager_spawn_egg",
"minecraft:vindicator_spawn_egg",
"minecraft:wandering_trader_spawn_egg",
"minecraft:warden_spawn_egg",
"minecraft:witch_spawn_egg",
"minecraft:wither_skeleton_spawn_egg",
"minecraft:wither_spawn_egg",
"minecraft:wolf_spawn_egg",
"minecraft:zoglin_spawn_egg",
"minecraft:zombie_horse_spawn_egg",
"minecraft:zombie_pigman_spawn_egg",
"minecraft:zombie_spawn_egg",
"minecraft:zombie_villager_spawn_egg"
],
"minecraft:stone_bricks": [
"minecraft:chiseled_stone_bricks",
"minecraft:cracked_stone_bricks",
"minecraft:mossy_stone_bricks",
"minecraft:stone_bricks"
],
"minecraft:stone_crafting_materials": [
"minecraft:blackstone",
"minecraft:cobbled_deepslate",
"minecraft:cobblestone"
],
"minecraft:stone_tier": [
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel",
"minecraft:stone_sword"
],
"minecraft:stone_tool_materials": [
"minecraft:blackstone",
"minecraft:cobbled_deepslate",
"minecraft:cobblestone"
],
"minecraft:transform_materials": [
"minecraft:netherite_ingot"
],
"minecraft:transform_templates": [
"minecraft:netherite_upgrade_smithing_template"
],
"minecraft:transformable_items": [
"minecraft:diamond_axe",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_hoe",
"minecraft:diamond_leggings",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:diamond_sword",
"minecraft:golden_boots"
],
"minecraft:trim_materials": [
"minecraft:amethyst_shard",
"minecraft:copper_ingot",
"minecraft:diamond",
"minecraft:emerald",
"minecraft:gold_ingot",
"minecraft:iron_ingot",
"minecraft:lapis_lazuli",
"minecraft:netherite_ingot",
"minecraft:quartz",
"minecraft:redstone",
"minecraft:resin_brick"
],
"minecraft:trim_templates": [
"minecraft:bolt_armor_trim_smithing_template",
"minecraft:coast_armor_trim_smithing_template",
"minecraft:dune_armor_trim_smithing_template",
"minecraft:eye_armor_trim_smithing_template",
"minecraft:flow_armor_trim_smithing_template",
"minecraft:host_armor_trim_smithing_template",
"minecraft:raiser_armor_trim_smithing_template",
"minecraft:rib_armor_trim_smithing_template",
"minecraft:sentry_armor_trim_smithing_template",
"minecraft:shaper_armor_trim_smithing_template",
"minecraft:silence_armor_trim_smithing_template",
"minecraft:snout_armor_trim_smithing_template",
"minecraft:spire_armor_trim_smithing_template",
"minecraft:tide_armor_trim_smithing_template",
"minecraft:vex_armor_trim_smithing_template",
"minecraft:ward_armor_trim_smithing_template",
"minecraft:wayfinder_armor_trim_smithing_template",
"minecraft:wild_armor_trim_smithing_template"
],
"minecraft:trimmable_armors": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_leggings",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_leggings",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_leggings",
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_leggings",
"minecraft:turtle_helmet"
],
"minecraft:vibration_damper": [
"minecraft:black_carpet",
"minecraft:black_wool",
"minecraft:blue_carpet",
"minecraft:blue_wool",
"minecraft:brown_carpet",
"minecraft:brown_wool",
"minecraft:cyan_carpet",
"minecraft:cyan_wool",
"minecraft:gray_carpet",
"minecraft:gray_wool",
"minecraft:green_carpet",
"minecraft:green_wool",
"minecraft:light_blue_carpet",
"minecraft:light_blue_wool",
"minecraft:light_gray_carpet",
"minecraft:light_gray_wool",
"minecraft:lime_carpet",
"minecraft:lime_wool",
"minecraft:magenta_carpet",
"minecraft:magenta_wool",
"minecraft:orange_carpet",
"minecraft:orange_wool",
"minecraft:pink_carpet",
"minecraft:pink_wool",
"minecraft:purple_carpet",
"minecraft:purple_wool",
"minecraft:red_carpet",
"minecraft:red_wool",
"minecraft:white_carpet",
"minecraft:white_wool",
"minecraft:yellow_carpet",
"minecraft:yellow_wool"
],
"minecraft:warped_stems": [
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_warped_stem",
"minecraft:warped_hyphae",
"minecraft:warped_stem"
],
"minecraft:wooden_slabs": [
"minecraft:acacia_slab",
"minecraft:bamboo_slab",
"minecraft:birch_slab",
"minecraft:cherry_slab",
"minecraft:crimson_slab",
"minecraft:dark_oak_slab",
"minecraft:jungle_slab",
"minecraft:mangrove_slab",
"minecraft:oak_slab",
"minecraft:pale_oak_slab",
"minecraft:spruce_slab",
"minecraft:warped_slab"
],
"minecraft:wooden_tier": [
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel",
"minecraft:wooden_sword"
],
"minecraft:wool": [
"minecraft:black_wool",
"minecraft:blue_wool",
"minecraft:brown_wool",
"minecraft:cyan_wool",
"minecraft:gray_wool",
"minecraft:green_wool",
"minecraft:light_blue_wool",
"minecraft:light_gray_wool",
"minecraft:lime_wool",
"minecraft:magenta_wool",
"minecraft:orange_wool",
"minecraft:pink_wool",
"minecraft:purple_wool",
"minecraft:red_wool",
"minecraft:white_wool",
"minecraft:yellow_wool"
]
}

829
core/src/main/resources/bedrock/item_tags.1_21_90.json
View File

@@ -1,829 +0,0 @@
{
"minecraft:arrow": [
"minecraft:arrow"
],
"minecraft:banner": [
"minecraft:banner"
],
"minecraft:boat": [
"minecraft:acacia_boat",
"minecraft:acacia_chest_boat",
"minecraft:bamboo_chest_raft",
"minecraft:bamboo_raft",
"minecraft:birch_boat",
"minecraft:birch_chest_boat",
"minecraft:cherry_boat",
"minecraft:cherry_chest_boat",
"minecraft:dark_oak_boat",
"minecraft:dark_oak_chest_boat",
"minecraft:jungle_boat",
"minecraft:jungle_chest_boat",
"minecraft:mangrove_boat",
"minecraft:mangrove_chest_boat",
"minecraft:oak_boat",
"minecraft:oak_chest_boat",
"minecraft:pale_oak_boat",
"minecraft:pale_oak_chest_boat",
"minecraft:spruce_boat",
"minecraft:spruce_chest_boat"
],
"minecraft:boats": [
"minecraft:acacia_boat",
"minecraft:acacia_chest_boat",
"minecraft:bamboo_chest_raft",
"minecraft:bamboo_raft",
"minecraft:birch_boat",
"minecraft:birch_chest_boat",
"minecraft:cherry_boat",
"minecraft:cherry_chest_boat",
"minecraft:dark_oak_boat",
"minecraft:dark_oak_chest_boat",
"minecraft:jungle_boat",
"minecraft:jungle_chest_boat",
"minecraft:mangrove_boat",
"minecraft:mangrove_chest_boat",
"minecraft:oak_boat",
"minecraft:oak_chest_boat",
"minecraft:pale_oak_boat",
"minecraft:pale_oak_chest_boat",
"minecraft:spruce_boat",
"minecraft:spruce_chest_boat"
],
"minecraft:bookshelf_books": [
"minecraft:book",
"minecraft:enchanted_book",
"minecraft:writable_book"
],
"minecraft:chainmail_tier": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings"
],
"minecraft:coals": [
"minecraft:charcoal",
"minecraft:coal"
],
"minecraft:crimson_stems": [
"minecraft:crimson_hyphae",
"minecraft:crimson_stem",
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_crimson_stem"
],
"minecraft:decorated_pot_sherds": [
"minecraft:angler_pottery_sherd",
"minecraft:archer_pottery_sherd",
"minecraft:arms_up_pottery_sherd",
"minecraft:blade_pottery_sherd",
"minecraft:brewer_pottery_sherd",
"minecraft:brick",
"minecraft:burn_pottery_sherd",
"minecraft:danger_pottery_sherd",
"minecraft:explorer_pottery_sherd",
"minecraft:flow_pottery_sherd",
"minecraft:friend_pottery_sherd",
"minecraft:guster_pottery_sherd",
"minecraft:heart_pottery_sherd",
"minecraft:heartbreak_pottery_sherd",
"minecraft:howl_pottery_sherd",
"minecraft:miner_pottery_sherd",
"minecraft:mourner_pottery_sherd",
"minecraft:plenty_pottery_sherd",
"minecraft:prize_pottery_sherd",
"minecraft:scrape_pottery_sherd",
"minecraft:sheaf_pottery_sherd",
"minecraft:shelter_pottery_sherd",
"minecraft:skull_pottery_sherd",
"minecraft:snort_pottery_sherd"
],
"minecraft:diamond_tier": [
"minecraft:diamond_axe",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_hoe",
"minecraft:diamond_leggings",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:diamond_sword",
"minecraft:mace"
],
"minecraft:digger": [
"minecraft:diamond_axe",
"minecraft:diamond_hoe",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:golden_axe",
"minecraft:golden_hoe",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:iron_axe",
"minecraft:iron_hoe",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:netherite_axe",
"minecraft:netherite_hoe",
"minecraft:netherite_pickaxe",
"minecraft:netherite_shovel",
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel",
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel"
],
"minecraft:door": [
"minecraft:acacia_door",
"minecraft:bamboo_door",
"minecraft:birch_door",
"minecraft:cherry_door",
"minecraft:copper_door",
"minecraft:crimson_door",
"minecraft:dark_oak_door",
"minecraft:exposed_copper_door",
"minecraft:iron_door",
"minecraft:jungle_door",
"minecraft:mangrove_door",
"minecraft:oxidized_copper_door",
"minecraft:pale_oak_door",
"minecraft:spruce_door",
"minecraft:warped_door",
"minecraft:waxed_copper_door",
"minecraft:waxed_exposed_copper_door",
"minecraft:waxed_oxidized_copper_door",
"minecraft:waxed_weathered_copper_door",
"minecraft:weathered_copper_door",
"minecraft:wooden_door"
],
"minecraft:egg": [
"minecraft:blue_egg",
"minecraft:brown_egg",
"minecraft:egg"
],
"minecraft:golden_tier": [
"minecraft:golden_axe",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_hoe",
"minecraft:golden_leggings",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:golden_sword"
],
"minecraft:hanging_actor": [
"minecraft:painting"
],
"minecraft:hanging_sign": [
"minecraft:acacia_hanging_sign",
"minecraft:bamboo_hanging_sign",
"minecraft:birch_hanging_sign",
"minecraft:cherry_hanging_sign",
"minecraft:crimson_hanging_sign",
"minecraft:dark_oak_hanging_sign",
"minecraft:jungle_hanging_sign",
"minecraft:mangrove_hanging_sign",
"minecraft:oak_hanging_sign",
"minecraft:pale_oak_hanging_sign",
"minecraft:spruce_hanging_sign",
"minecraft:warped_hanging_sign"
],
"minecraft:horse_armor": [
"minecraft:diamond_horse_armor",
"minecraft:golden_horse_armor",
"minecraft:iron_horse_armor",
"minecraft:leather_horse_armor"
],
"minecraft:iron_tier": [
"minecraft:iron_axe",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_hoe",
"minecraft:iron_leggings",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:iron_sword"
],
"minecraft:is_armor": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_leggings",
"minecraft:elytra",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_leggings",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_leggings",
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_leggings",
"minecraft:turtle_helmet"
],
"minecraft:is_axe": [
"minecraft:diamond_axe",
"minecraft:golden_axe",
"minecraft:iron_axe",
"minecraft:netherite_axe",
"minecraft:stone_axe",
"minecraft:wooden_axe"
],
"minecraft:is_cooked": [
"minecraft:cooked_beef",
"minecraft:cooked_chicken",
"minecraft:cooked_cod",
"minecraft:cooked_mutton",
"minecraft:cooked_porkchop",
"minecraft:cooked_rabbit",
"minecraft:cooked_salmon",
"minecraft:rabbit_stew"
],
"minecraft:is_fish": [
"minecraft:cod",
"minecraft:cooked_cod",
"minecraft:cooked_salmon",
"minecraft:pufferfish",
"minecraft:salmon",
"minecraft:tropical_fish"
],
"minecraft:is_food": [
"minecraft:apple",
"minecraft:baked_potato",
"minecraft:beef",
"minecraft:beetroot",
"minecraft:beetroot_soup",
"minecraft:bread",
"minecraft:carrot",
"minecraft:chicken",
"minecraft:cooked_beef",
"minecraft:cooked_chicken",
"minecraft:cooked_mutton",
"minecraft:cooked_porkchop",
"minecraft:cooked_rabbit",
"minecraft:cookie",
"minecraft:dried_kelp",
"minecraft:enchanted_golden_apple",
"minecraft:golden_apple",
"minecraft:golden_carrot",
"minecraft:melon_slice",
"minecraft:mushroom_stew",
"minecraft:mutton",
"minecraft:porkchop",
"minecraft:potato",
"minecraft:pumpkin_pie",
"minecraft:rabbit",
"minecraft:rabbit_stew",
"minecraft:rotten_flesh",
"minecraft:sweet_berries"
],
"minecraft:is_hoe": [
"minecraft:diamond_hoe",
"minecraft:golden_hoe",
"minecraft:iron_hoe",
"minecraft:netherite_hoe",
"minecraft:stone_hoe",
"minecraft:wooden_hoe"
],
"minecraft:is_meat": [
"minecraft:beef",
"minecraft:chicken",
"minecraft:cooked_beef",
"minecraft:cooked_chicken",
"minecraft:cooked_mutton",
"minecraft:cooked_porkchop",
"minecraft:cooked_rabbit",
"minecraft:mutton",
"minecraft:porkchop",
"minecraft:rabbit",
"minecraft:rabbit_stew",
"minecraft:rotten_flesh"
],
"minecraft:is_minecart": [
"minecraft:chest_minecart",
"minecraft:command_block_minecart",
"minecraft:hopper_minecart",
"minecraft:minecart",
"minecraft:tnt_minecart"
],
"minecraft:is_pickaxe": [
"minecraft:diamond_pickaxe",
"minecraft:golden_pickaxe",
"minecraft:iron_pickaxe",
"minecraft:netherite_pickaxe",
"minecraft:stone_pickaxe",
"minecraft:wooden_pickaxe"
],
"minecraft:is_shears": [
"minecraft:shears"
],
"minecraft:is_shovel": [
"minecraft:diamond_shovel",
"minecraft:golden_shovel",
"minecraft:iron_shovel",
"minecraft:netherite_shovel",
"minecraft:stone_shovel",
"minecraft:wooden_shovel"
],
"minecraft:is_sword": [
"minecraft:diamond_sword",
"minecraft:golden_sword",
"minecraft:iron_sword",
"minecraft:mace",
"minecraft:netherite_sword",
"minecraft:stone_sword",
"minecraft:wooden_sword"
],
"minecraft:is_tool": [
"minecraft:diamond_axe",
"minecraft:diamond_hoe",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:diamond_sword",
"minecraft:golden_axe",
"minecraft:golden_hoe",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:golden_sword",
"minecraft:iron_axe",
"minecraft:iron_hoe",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:iron_sword",
"minecraft:mace",
"minecraft:netherite_axe",
"minecraft:netherite_hoe",
"minecraft:netherite_pickaxe",
"minecraft:netherite_shovel",
"minecraft:netherite_sword",
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel",
"minecraft:stone_sword",
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel",
"minecraft:wooden_sword"
],
"minecraft:is_trident": [
"minecraft:trident"
],
"minecraft:leather_tier": [
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings"
],
"minecraft:lectern_books": [
"minecraft:writable_book"
],
"minecraft:logs": [
"minecraft:acacia_log",
"minecraft:acacia_wood",
"minecraft:birch_log",
"minecraft:birch_wood",
"minecraft:cherry_log",
"minecraft:cherry_wood",
"minecraft:crimson_hyphae",
"minecraft:crimson_stem",
"minecraft:dark_oak_log",
"minecraft:dark_oak_wood",
"minecraft:jungle_log",
"minecraft:jungle_wood",
"minecraft:mangrove_log",
"minecraft:mangrove_wood",
"minecraft:oak_log",
"minecraft:oak_wood",
"minecraft:pale_oak_log",
"minecraft:pale_oak_wood",
"minecraft:spruce_log",
"minecraft:spruce_wood",
"minecraft:stripped_acacia_log",
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_log",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_log",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_crimson_stem",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_log",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_log",
"minecraft:stripped_oak_wood",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_log",
"minecraft:stripped_spruce_wood",
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_warped_stem",
"minecraft:warped_hyphae",
"minecraft:warped_stem"
],
"minecraft:logs_that_burn": [
"minecraft:acacia_log",
"minecraft:acacia_wood",
"minecraft:birch_log",
"minecraft:birch_wood",
"minecraft:cherry_log",
"minecraft:cherry_wood",
"minecraft:dark_oak_log",
"minecraft:dark_oak_wood",
"minecraft:jungle_log",
"minecraft:jungle_wood",
"minecraft:mangrove_log",
"minecraft:mangrove_wood",
"minecraft:oak_log",
"minecraft:oak_wood",
"minecraft:pale_oak_log",
"minecraft:pale_oak_wood",
"minecraft:spruce_log",
"minecraft:spruce_wood",
"minecraft:stripped_acacia_log",
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_log",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_log",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_log",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_log",
"minecraft:stripped_oak_wood",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_log",
"minecraft:stripped_spruce_wood"
],
"minecraft:mangrove_logs": [
"minecraft:mangrove_log",
"minecraft:mangrove_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood"
],
"minecraft:music_disc": [
"minecraft:music_disc_11",
"minecraft:music_disc_13",
"minecraft:music_disc_5",
"minecraft:music_disc_blocks",
"minecraft:music_disc_cat",
"minecraft:music_disc_chirp",
"minecraft:music_disc_creator",
"minecraft:music_disc_creator_music_box",
"minecraft:music_disc_far",
"minecraft:music_disc_mall",
"minecraft:music_disc_mellohi",
"minecraft:music_disc_otherside",
"minecraft:music_disc_pigstep",
"minecraft:music_disc_precipice",
"minecraft:music_disc_relic",
"minecraft:music_disc_stal",
"minecraft:music_disc_strad",
"minecraft:music_disc_wait",
"minecraft:music_disc_ward"
],
"minecraft:netherite_tier": [
"minecraft:netherite_axe",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_hoe",
"minecraft:netherite_leggings",
"minecraft:netherite_pickaxe",
"minecraft:netherite_shovel",
"minecraft:netherite_sword"
],
"minecraft:planks": [
"minecraft:acacia_planks",
"minecraft:bamboo_planks",
"minecraft:birch_planks",
"minecraft:cherry_planks",
"minecraft:crimson_planks",
"minecraft:dark_oak_planks",
"minecraft:jungle_planks",
"minecraft:mangrove_planks",
"minecraft:oak_planks",
"minecraft:pale_oak_planks",
"minecraft:spruce_planks",
"minecraft:warped_planks"
],
"minecraft:sand": [
"minecraft:red_sand",
"minecraft:sand"
],
"minecraft:sign": [
"minecraft:acacia_hanging_sign",
"minecraft:acacia_sign",
"minecraft:bamboo_hanging_sign",
"minecraft:bamboo_sign",
"minecraft:birch_hanging_sign",
"minecraft:birch_sign",
"minecraft:cherry_hanging_sign",
"minecraft:cherry_sign",
"minecraft:crimson_hanging_sign",
"minecraft:crimson_sign",
"minecraft:dark_oak_hanging_sign",
"minecraft:dark_oak_sign",
"minecraft:jungle_hanging_sign",
"minecraft:jungle_sign",
"minecraft:mangrove_hanging_sign",
"minecraft:mangrove_sign",
"minecraft:oak_hanging_sign",
"minecraft:oak_sign",
"minecraft:pale_oak_hanging_sign",
"minecraft:pale_oak_sign",
"minecraft:spruce_hanging_sign",
"minecraft:spruce_sign",
"minecraft:warped_hanging_sign",
"minecraft:warped_sign"
],
"minecraft:soul_fire_base_blocks": [
"minecraft:soul_sand",
"minecraft:soul_soil"
],
"minecraft:spawn_egg": [
"minecraft:allay_spawn_egg",
"minecraft:armadillo_spawn_egg",
"minecraft:axolotl_spawn_egg",
"minecraft:bat_spawn_egg",
"minecraft:bee_spawn_egg",
"minecraft:blaze_spawn_egg",
"minecraft:bogged_spawn_egg",
"minecraft:breeze_spawn_egg",
"minecraft:camel_spawn_egg",
"minecraft:cat_spawn_egg",
"minecraft:cave_spider_spawn_egg",
"minecraft:chicken_spawn_egg",
"minecraft:cod_spawn_egg",
"minecraft:cow_spawn_egg",
"minecraft:creaking_spawn_egg",
"minecraft:creeper_spawn_egg",
"minecraft:dolphin_spawn_egg",
"minecraft:donkey_spawn_egg",
"minecraft:drowned_spawn_egg",
"minecraft:elder_guardian_spawn_egg",
"minecraft:ender_dragon_spawn_egg",
"minecraft:enderman_spawn_egg",
"minecraft:endermite_spawn_egg",
"minecraft:evoker_spawn_egg",
"minecraft:fox_spawn_egg",
"minecraft:frog_spawn_egg",
"minecraft:ghast_spawn_egg",
"minecraft:glow_squid_spawn_egg",
"minecraft:goat_spawn_egg",
"minecraft:guardian_spawn_egg",
"minecraft:hoglin_spawn_egg",
"minecraft:horse_spawn_egg",
"minecraft:husk_spawn_egg",
"minecraft:iron_golem_spawn_egg",
"minecraft:llama_spawn_egg",
"minecraft:magma_cube_spawn_egg",
"minecraft:mooshroom_spawn_egg",
"minecraft:mule_spawn_egg",
"minecraft:ocelot_spawn_egg",
"minecraft:panda_spawn_egg",
"minecraft:parrot_spawn_egg",
"minecraft:phantom_spawn_egg",
"minecraft:pig_spawn_egg",
"minecraft:piglin_brute_spawn_egg",
"minecraft:piglin_spawn_egg",
"minecraft:pillager_spawn_egg",
"minecraft:polar_bear_spawn_egg",
"minecraft:pufferfish_spawn_egg",
"minecraft:rabbit_spawn_egg",
"minecraft:ravager_spawn_egg",
"minecraft:salmon_spawn_egg",
"minecraft:sheep_spawn_egg",
"minecraft:shulker_spawn_egg",
"minecraft:silverfish_spawn_egg",
"minecraft:skeleton_horse_spawn_egg",
"minecraft:skeleton_spawn_egg",
"minecraft:slime_spawn_egg",
"minecraft:sniffer_spawn_egg",
"minecraft:snow_golem_spawn_egg",
"minecraft:spider_spawn_egg",
"minecraft:squid_spawn_egg",
"minecraft:stray_spawn_egg",
"minecraft:strider_spawn_egg",
"minecraft:tadpole_spawn_egg",
"minecraft:trader_llama_spawn_egg",
"minecraft:tropical_fish_spawn_egg",
"minecraft:turtle_spawn_egg",
"minecraft:vex_spawn_egg",
"minecraft:villager_spawn_egg",
"minecraft:vindicator_spawn_egg",
"minecraft:wandering_trader_spawn_egg",
"minecraft:warden_spawn_egg",
"minecraft:witch_spawn_egg",
"minecraft:wither_skeleton_spawn_egg",
"minecraft:wither_spawn_egg",
"minecraft:wolf_spawn_egg",
"minecraft:zoglin_spawn_egg",
"minecraft:zombie_horse_spawn_egg",
"minecraft:zombie_pigman_spawn_egg",
"minecraft:zombie_spawn_egg",
"minecraft:zombie_villager_spawn_egg"
],
"minecraft:stone_bricks": [
"minecraft:chiseled_stone_bricks",
"minecraft:cracked_stone_bricks",
"minecraft:mossy_stone_bricks",
"minecraft:stone_bricks"
],
"minecraft:stone_crafting_materials": [
"minecraft:blackstone",
"minecraft:cobbled_deepslate",
"minecraft:cobblestone"
],
"minecraft:stone_tier": [
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel",
"minecraft:stone_sword"
],
"minecraft:stone_tool_materials": [
"minecraft:blackstone",
"minecraft:cobbled_deepslate",
"minecraft:cobblestone"
],
"minecraft:transform_materials": [
"minecraft:netherite_ingot"
],
"minecraft:transform_templates": [
"minecraft:netherite_upgrade_smithing_template"
],
"minecraft:transformable_items": [
"minecraft:diamond_axe",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_hoe",
"minecraft:diamond_leggings",
"minecraft:diamond_pickaxe",
"minecraft:diamond_shovel",
"minecraft:diamond_sword",
"minecraft:golden_boots"
],
"minecraft:trim_materials": [
"minecraft:amethyst_shard",
"minecraft:copper_ingot",
"minecraft:diamond",
"minecraft:emerald",
"minecraft:gold_ingot",
"minecraft:iron_ingot",
"minecraft:lapis_lazuli",
"minecraft:netherite_ingot",
"minecraft:quartz",
"minecraft:redstone",
"minecraft:resin_brick"
],
"minecraft:trim_templates": [
"minecraft:bolt_armor_trim_smithing_template",
"minecraft:coast_armor_trim_smithing_template",
"minecraft:dune_armor_trim_smithing_template",
"minecraft:eye_armor_trim_smithing_template",
"minecraft:flow_armor_trim_smithing_template",
"minecraft:host_armor_trim_smithing_template",
"minecraft:raiser_armor_trim_smithing_template",
"minecraft:rib_armor_trim_smithing_template",
"minecraft:sentry_armor_trim_smithing_template",
"minecraft:shaper_armor_trim_smithing_template",
"minecraft:silence_armor_trim_smithing_template",
"minecraft:snout_armor_trim_smithing_template",
"minecraft:spire_armor_trim_smithing_template",
"minecraft:tide_armor_trim_smithing_template",
"minecraft:vex_armor_trim_smithing_template",
"minecraft:ward_armor_trim_smithing_template",
"minecraft:wayfinder_armor_trim_smithing_template",
"minecraft:wild_armor_trim_smithing_template"
],
"minecraft:trimmable_armors": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_leggings",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_leggings",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_leggings",
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_leggings",
"minecraft:turtle_helmet"
],
"minecraft:vibration_damper": [
"minecraft:black_carpet",
"minecraft:black_wool",
"minecraft:blue_carpet",
"minecraft:blue_wool",
"minecraft:brown_carpet",
"minecraft:brown_wool",
"minecraft:cyan_carpet",
"minecraft:cyan_wool",
"minecraft:gray_carpet",
"minecraft:gray_wool",
"minecraft:green_carpet",
"minecraft:green_wool",
"minecraft:light_blue_carpet",
"minecraft:light_blue_wool",
"minecraft:light_gray_carpet",
"minecraft:light_gray_wool",
"minecraft:lime_carpet",
"minecraft:lime_wool",
"minecraft:magenta_carpet",
"minecraft:magenta_wool",
"minecraft:orange_carpet",
"minecraft:orange_wool",
"minecraft:pink_carpet",
"minecraft:pink_wool",
"minecraft:purple_carpet",
"minecraft:purple_wool",
"minecraft:red_carpet",
"minecraft:red_wool",
"minecraft:white_carpet",
"minecraft:white_wool",
"minecraft:yellow_carpet",
"minecraft:yellow_wool"
],
"minecraft:warped_stems": [
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_warped_stem",
"minecraft:warped_hyphae",
"minecraft:warped_stem"
],
"minecraft:wooden_slabs": [
"minecraft:acacia_slab",
"minecraft:bamboo_slab",
"minecraft:birch_slab",
"minecraft:cherry_slab",
"minecraft:crimson_slab",
"minecraft:dark_oak_slab",
"minecraft:jungle_slab",
"minecraft:mangrove_slab",
"minecraft:oak_slab",
"minecraft:pale_oak_slab",
"minecraft:spruce_slab",
"minecraft:warped_slab"
],
"minecraft:wooden_tier": [
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel",
"minecraft:wooden_sword"
],
"minecraft:wool": [
"minecraft:black_wool",
"minecraft:blue_wool",
"minecraft:brown_wool",
"minecraft:cyan_wool",
"minecraft:gray_wool",
"minecraft:green_wool",
"minecraft:light_blue_wool",
"minecraft:light_gray_wool",
"minecraft:lime_wool",
"minecraft:magenta_wool",
"minecraft:orange_wool",
"minecraft:pink_wool",
"minecraft:purple_wool",
"minecraft:red_wool",
"minecraft:white_wool",
"minecraft:yellow_wool"
]
}

11018
core/src/main/resources/bedrock/runtime_item_states.1_21_100.json
View File

File diff suppressed because it is too large Load Diff

10904
core/src/main/resources/bedrock/runtime_item_states.1_21_90.json
View File

File diff suppressed because it is too large Load Diff

10910
core/src/main/resources/bedrock/runtime_item_states.1_21_93.json
View File

File diff suppressed because it is too large Load Diff

7
core/src/main/resources/git.properties
View File

@@ -1,7 +0,0 @@
git.branch=${branch}
git.build.number=${buildNumber}
git.build.version=${projectVersion}
git.commit.id=${commit}
git.commit.id.abbrev=${commitAbbrev}
git.commit.message.full=${commitMessage}
git.remote.origin.url=${repository}

2
core/src/main/resources/mappings

Submodule core/src/main/resources/mappings updated: 15398c1588...f110274a7e

46
gradle/libs.versions.toml
View File

@@ -18,45 +18,48 @@ protocol-common = "3.0.0.Beta11-20251210.195537-14"
protocol-codec = "3.0.0.Beta11-20251210.195537-15"
raknet = "1.0.0.CR3-20251208.214317-23"
minecraftauth = "5.0.0"
mcprotocollib = "1.21.9-20251029.184056-18"
mcprotocollib = "1.21.11-20251210.192611-9"
adventure = "4.25.0"
adventure-platform = "4.4.1"
junit = "5.9.2"
junit = "6.0.0"
checkerframework = "3.19.0"
log4j = "2.20.0"
jline = "3.21.0"
terminalconsoleappender = "1.2.0"
folia = "1.19.4-R0.1-SNAPSHOT"
viaversion = "4.9.2"
adapters = "1.16-SNAPSHOT"
adapters = "1.17-SNAPSHOT"
cloud = "2.0.0-rc.2"
cloud-minecraft = "2.0.0-beta.13"
cloud-minecraft-modded = "2.0.0-beta.13"
cloud-minecraft = "2.0.0-beta.14"
cloud-minecraft-modded = "2.0.0-beta.15"
commodore = "2.2"
bungeecord = "1.21-R0.1-20250215.224541-54"
bungeecord-api = "1.21-R0.1"
velocity = "3.4.0-SNAPSHOT"
viaproxy = "3.3.2-SNAPSHOT"
fabric-loader = "0.17.2"
fabric-api = "0.133.14+1.21.9"
fabric-permissions-api = "0.4.1"
neoforge-minecraft = "21.10.0-beta"
fabric-loader = "0.18.2"
fabric-api = "0.139.4+1.21.11"
fabric-permissions-api = "0.6.1"
neoforge-minecraft = "21.11.0-beta"
mixin = "0.8.5"
mixinextras = "0.3.5"
minecraft = "1.21.10"
minecraft = "1.21.11"
mockito = "5.+"
runtask = "2.3.1"
runpaperversion = "1.21.10"
runvelocityversion = "3.4.0-SNAPSHOT"
# plugin versions
indra = "3.1.3"
shadow = "8.1.1"
architectury-plugin = "3.4-SNAPSHOT"
architectury-loom = "1.11-SNAPSHOT"
minotaur = "2.8.7"
lombok = "8.4"
blossom = "2.1.0"
indra = "4.0.0"
shadow = "9.2.2"
architectury-plugin = "3.4.162"
architectury-loom = "1.13.457"
loom-companion = "1.13.467"
minotaur = "2.8.10"
lombok = "9.1.0"
blossom = "2.2.0"
runtask = "3.0.2"
# run tasks versions
runpaperversion = "1.21.11"
runvelocityversion = "3.4.0-SNAPSHOT"
[libraries]
base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }
@@ -159,10 +162,11 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
# plugins
lombok = { group = "io.freefair.gradle", name = "lombok-plugin", version.ref = "lombok" }
indra = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
shadow = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
architectury-loom = { group = "dev.architectury.loom", name = "dev.architectury.loom.gradle.plugin", version.ref = "architectury-loom" }
minotaur = { group = "com.modrinth.minotaur", name = "Minotaur", version.ref = "minotaur" }
loom-companion = { group = "dev.architectury.loom-companion", name = "dev.architectury.loom-companion.gradle.plugin", version.ref = "loom-companion" }
[plugins]
indra = { id = "net.kyori.indra", version.ref = "indra" }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

12
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -206,15 +203,14 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.

187
gradlew.bat vendored
View File

@@ -1,94 +1,93 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:execute
@rem Setup the command line
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega