Skip to content

Fix for Cow -> AbstractCow bytecode remap #2727

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
mcmonkey4eva merged 3 commits into from
May 22, 2025
Merged

Fix for Cow -> AbstractCow bytecode remap #2727

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf2b196
Fix for `Cow` -> `AbstractCow` bytecode remap
tal5 May 22, 2025
0ecfd87
Add TODO
tal5 May 22, 2025
cd7e3f9
Make TODO clearer
tal5 May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVariant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,32 @@
import com.denizenscript.denizen.utilities.Utilities;
import com.denizenscript.denizencore.objects.Mechanism;
import com.denizenscript.denizencore.objects.core.ElementTag;
import org.bukkit.entity.*;
import com.denizenscript.denizencore.utilities.ReflectionHelper;
import com.denizenscript.denizencore.utilities.debugging.Debug;
import org.bukkit.entity.Chicken;
import org.bukkit.entity.Cow;
import org.bukkit.entity.Pig;
import org.bukkit.entity.Wolf;

import java.lang.invoke.MethodHandle;

public class EntityVariant extends EntityProperty<ElementTag> {

// TODO: once the plugin.yml API version is 1.21, replace with direct method calls (see https://github.com/DenizenScript/Denizen/pull/2727)
public static final MethodHandle COW_GET_VARIANT, COW_SET_VARIANT;

static {
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
Class<?> cowClass = ReflectionHelper.getClassOrThrow("org.bukkit.entity.Cow");
COW_GET_VARIANT = ReflectionHelper.getMethodHandle(cowClass, "getVariant");
COW_SET_VARIANT = ReflectionHelper.getMethodHandle(cowClass, "setVariant", Cow.Variant.class);
}
else {
COW_GET_VARIANT = null;
COW_SET_VARIANT = null;
}
}

// <--[property]
// @object EntityTag
// @name variant
Expand Down Expand Up @@ -37,8 +59,14 @@ public ElementTag getPropertyValue() {
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getEntity() instanceof Chicken chicken) {
return new ElementTag(Utilities.namespacedKeyToString(chicken.getVariant().getKey()), true);
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getEntity() instanceof Cow cow) {
return new ElementTag(Utilities.namespacedKeyToString(cow.getVariant().getKey()), true);
else if (COW_GET_VARIANT != null && getEntity() instanceof Cow cow) {
try {
return new ElementTag(Utilities.namespacedKeyToString(((Cow.Variant) COW_GET_VARIANT.invoke(cow)).getKey()), true);
}
catch (Throwable e) {
Debug.echoError(e);
return null;
}
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getEntity() instanceof Pig pig) {
return new ElementTag(Utilities.namespacedKeyToString(pig.getVariant().getKey()), true);
Expand All @@ -60,10 +88,15 @@ else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getEntity() inst
chicken.setVariant(chickenVariant);
}
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getEntity() instanceof Cow cow) {
else if (COW_SET_VARIANT != null && getEntity() instanceof Cow cow) {
Cow.Variant cowVariant = Utilities.elementToRequiredEnumLike(variant, Cow.Variant.class, mechanism);
if (cowVariant != null) {
cow.setVariant(cowVariant);
try {
COW_SET_VARIANT.invoke(cow, cowVariant);
}
catch (Throwable e) {
Debug.echoError(e);
}
}
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getEntity() instanceof Pig pig) {
Expand Down