Added MossyCarpet to MaterialSides #2808
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,174 +1,139 @@ | ||
| 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.denizen.utilities.Utilities; | ||
| import com.denizenscript.denizencore.objects.Mechanism; | ||
| import com.denizenscript.denizencore.objects.core.ElementTag; | ||
| import com.denizenscript.denizencore.objects.core.ListTag; | ||
| import com.denizenscript.denizencore.utilities.debugging.DebugInternals; | ||
| import org.bukkit.block.BlockFace; | ||
| import org.bukkit.block.data.BlockData; | ||
| import org.bukkit.block.data.type.MossyCarpet; | ||
| import org.bukkit.block.data.type.RedstoneWire; | ||
| import org.bukkit.block.data.type.Wall; | ||
|
|
||
| import java.util.function.BiConsumer; | ||
|
|
||
| public class MaterialSides extends MaterialProperty<ListTag> { | ||
|
|
||
| // <--[property] | ||
| // @object MaterialTag | ||
| // @name sides | ||
| // @input ListTag | ||
| // @description | ||
| // Controls the heights for a wall block or mossy carpet, or connections for a redstone wire, in order North|East|South|West|Vertical. | ||
| // For wall blocks: For n/e/s/w, can be "tall", "low", or "none". For vertical, can be "tall" or "none". | ||
| // For redstone wires: For n/e/s/w, can be "none", "side", or "up". No vertical. | ||
| // For mossy carpets: For n/e/s/w, can be "tall", "low", or "none". Vertical controls the bottom, and can either be "bottom" or "none". | ||
| // --> | ||
|
|
||
| public static boolean describes(MaterialTag material) { | ||
| BlockData data = material.getModernData(); | ||
| return data instanceof Wall | ||
| || data instanceof RedstoneWire | ||
| || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && data instanceof MossyCarpet); | ||
| } | ||
|
|
||
| @Override | ||
| public ListTag getPropertyValue() { | ||
| ListTag list = new ListTag(5); | ||
| if (getBlockData() instanceof Wall wall) { | ||
| list.add(wall.getHeight(BlockFace.NORTH).name()); | ||
| list.add(wall.getHeight(BlockFace.EAST).name()); | ||
| list.add(wall.getHeight(BlockFace.SOUTH).name()); | ||
| list.add(wall.getHeight(BlockFace.WEST).name()); | ||
| list.add(wall.isUp() ? "TALL" : "NONE"); | ||
| } | ||
| else if (getBlockData() instanceof RedstoneWire wire) { | ||
| list.add(wire.getFace(BlockFace.NORTH).name()); | ||
| list.add(wire.getFace(BlockFace.EAST).name()); | ||
| list.add(wire.getFace(BlockFace.SOUTH).name()); | ||
| list.add(wire.getFace(BlockFace.WEST).name()); | ||
| } | ||
| else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getBlockData() instanceof MossyCarpet carpet) { | ||
| list.add(carpet.getHeight(BlockFace.NORTH).name()); | ||
| list.add(carpet.getHeight(BlockFace.EAST).name()); | ||
| list.add(carpet.getHeight(BlockFace.SOUTH).name()); | ||
| list.add(carpet.getHeight(BlockFace.WEST).name()); | ||
| list.add(carpet.isBottom() ? "BOTTOM" : "NONE"); | ||
| } | ||
| return list; | ||
| } | ||
|
|
||
| @Override | ||
| public void setPropertyValue(ListTag list, Mechanism mechanism) { | ||
| if (getBlockData() instanceof Wall wall) { | ||
| if (list.size() != 5) { | ||
| mechanism.echoError("Invalid sides list, size must be 5."); | ||
| return; | ||
| } | ||
| setSide(wall::setHeight, Wall.Height.class, BlockFace.NORTH, list, 0, mechanism); | ||
| setSide(wall::setHeight, Wall.Height.class, BlockFace.EAST, list, 1, mechanism); | ||
| setSide(wall::setHeight, Wall.Height.class, BlockFace.SOUTH, list, 2, mechanism); | ||
| setSide(wall::setHeight, Wall.Height.class, BlockFace.WEST, list, 3, mechanism); | ||
| wall.setUp(list.get(4).equalsIgnoreCase("tall")); | ||
| } | ||
| else if (getBlockData() instanceof RedstoneWire wire) { | ||
| if (list.size() != 4) { | ||
| mechanism.echoError("Invalid sides list, size must be 4."); | ||
| return; | ||
| } | ||
| setSide(wire::setFace, RedstoneWire.Connection.class, BlockFace.NORTH, list, 0, mechanism); | ||
| setSide(wire::setFace, RedstoneWire.Connection.class, BlockFace.EAST, list, 1, mechanism); | ||
| setSide(wire::setFace, RedstoneWire.Connection.class, BlockFace.SOUTH, list, 2, mechanism); | ||
| setSide(wire::setFace, RedstoneWire.Connection.class, BlockFace.WEST, list, 3, mechanism); | ||
| } | ||
| else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && getBlockData() instanceof MossyCarpet carpet) { | ||
| if (list.size() != 5) { | ||
| mechanism.echoError("Invalid sides list, size must be 5."); | ||
| return; | ||
| } | ||
| setSide(carpet::setHeight, MossyCarpet.Height.class, BlockFace.NORTH, list, 0, mechanism); | ||
| setSide(carpet::setHeight, MossyCarpet.Height.class, BlockFace.EAST, list, 1, mechanism); | ||
| setSide(carpet::setHeight, MossyCarpet.Height.class, BlockFace.SOUTH, list, 2, mechanism); | ||
| setSide(carpet::setHeight, MossyCarpet.Height.class, BlockFace.WEST, list, 3, mechanism); | ||
| carpet.setBottom(list.get(4).equalsIgnoreCase("bottom")); | ||
| } | ||
| } | ||
|
|
||
| public static <T> void setSide(BiConsumer<BlockFace, T> consumer, Class<T> type, BlockFace face, ListTag list, int index, Mechanism mechanism) { | ||
| T value = Utilities.elementToEnumlike(new ElementTag(list.get(index)), type); | ||
|
Member
There was a problem hiding this comment. Looks good overall, but you'd want |
||
| if (value == null) { | ||
| mechanism.echoError("'"+ list.get(index) + "' is not a valid " + DebugInternals.getClassNameOpti(type) + "."); | ||
|
|
||
| return; | ||
| } | ||
| consumer.accept(face, value); | ||
| } | ||
|
|
||
| @Override | ||
| public String getPropertyId() { | ||
| return "sides"; | ||
| } | ||
|
|
||
| // <--[tag] | ||
| // @attribute <MaterialTag.heights> | ||
| // @returns ListTag | ||
| // @mechanism MaterialTag.heights | ||
| // @group properties | ||
| // @deprecated Use 'sides' | ||
|
|
||
| // @description | ||
| // Deprecated in favor of <@link property MaterialTag.sides> | ||
| // --> | ||
|
|
||
| // <--[mechanism] | ||
| // @object MaterialTag | ||
| // @name heights | ||
| // @input ElementTag | ||
| // @deprecated Use 'sides' | ||
| // @description | ||
| // Deprecated in favor of <@link property MaterialTag.sides> | ||
| // @tags | ||
| // <MaterialTag.heights> | ||
| // --> | ||
|
|
||
| public static void register() { | ||
| autoRegister("sides", MaterialSides.class, ListTag.class, false, "heights"); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick, but these can be
CoreUtilities#equalsIgnoreCase/#toLowerCaseon the list value + a normal equals