Skip to content

Commit

Permalink
MaterialTag.age sniffer egg support (#2613)
Browse files Browse the repository at this point in the history
* Egg

* Version checks

* Update MaterialAge.java

* Update parenthesis location
  • Loading branch information
heypr committed Apr 15, 2024
1 parent 29bb0fa commit 19060dc
Showing 1 changed file with 16 additions and 1 deletion.
@@ -1,12 +1,15 @@
package com.denizenscript.denizen.objects.properties.material;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.nms.NMSVersion;
import com.denizenscript.denizen.objects.MaterialTag;
import com.denizenscript.denizencore.exceptions.Unreachable;
import com.denizenscript.denizencore.objects.Mechanism;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.properties.PropertyParser;
import org.bukkit.block.data.Ageable;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Hatchable;
import org.bukkit.block.data.type.Sapling;
import org.bukkit.block.data.type.TurtleEgg;

Expand All @@ -23,7 +26,10 @@ public class MaterialAge extends MaterialProperty<ElementTag> {

public static boolean describes(MaterialTag material) {
BlockData data = material.getModernData();
return data instanceof Ageable || data instanceof TurtleEgg || data instanceof Sapling;
return data instanceof Ageable
|| data instanceof TurtleEgg
|| data instanceof Sapling
|| (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20) && data instanceof Hatchable);
}

public MaterialAge(MaterialTag material) { // NOTE: BlockGrowsScriptEvent needs this available
Expand Down Expand Up @@ -55,6 +61,9 @@ else if (data instanceof Sapling sapling) {
else if (data instanceof Ageable ageable) {
ageable.setAge(age);
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20) && data instanceof Hatchable hatchable) {
hatchable.setHatch(age);
}
}

@Override
Expand Down Expand Up @@ -89,6 +98,9 @@ else if (data instanceof Sapling sapling) {
else if (data instanceof Ageable age) {
return age.getAge();
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20) && data instanceof Hatchable hatchable) {
return hatchable.getHatch();
}
throw new Unreachable();
}

Expand All @@ -103,6 +115,9 @@ else if (data instanceof Sapling sapling) {
else if (data instanceof Ageable age) {
return age.getMaximumAge();
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20) && data instanceof Hatchable hatchable) {
return hatchable.getMaximumHatch();
}
throw new Unreachable();
}
}

0 comments on commit 19060dc

Please sign in to comment.