-
-
Notifications
You must be signed in to change notification settings - Fork 407
EffOpenInventory Update #8075
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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Absolutionism
wants to merge
6
commits into
SkriptLang:dev/feature
Choose a base branch
from
Absolutionism:dev/EffOpenInventoryUpdate
base: dev/feature
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
EffOpenInventory Update #8075
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c018ca2
Update EffOpenInventory.java
Absolutionism 3654335
Update EffOpenInventory.java
Absolutionism 6b1926a
Update EffOpenInventory.java
Absolutionism 7fd3757
Merge branch 'dev/feature' into dev/EffOpenInventoryUpdate
Efnilite af64905
Update EffOpenInventory.java
Absolutionism aa37ac8
Merge branch 'dev/EffOpenInventoryUpdate' of https://github.com/Absol…
Absolutionism File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
262 changes: 152 additions & 110 deletions
262
src/main/java/ch/njol/skript/effects/EffOpenInventory.java
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,146 +1,188 @@ | ||
package ch.njol.skript.effects; | ||
|
||
import java.util.Locale; | ||
|
||
import ch.njol.skript.Skript; | ||
import ch.njol.skript.doc.Description; | ||
import ch.njol.skript.doc.Example; | ||
import ch.njol.skript.doc.Name; | ||
import ch.njol.skript.doc.Since; | ||
import ch.njol.skript.lang.Effect; | ||
import ch.njol.skript.lang.Expression; | ||
import ch.njol.skript.lang.Literal; | ||
import ch.njol.skript.lang.SkriptParser.ParseResult; | ||
import ch.njol.skript.lang.SyntaxStringBuilder; | ||
import ch.njol.skript.registrations.Classes; | ||
import ch.njol.util.Kleenean; | ||
import org.bukkit.Bukkit; | ||
import org.bukkit.entity.Player; | ||
import org.bukkit.event.Event; | ||
import org.bukkit.event.inventory.InventoryType; | ||
import org.bukkit.inventory.Inventory; | ||
import org.jetbrains.annotations.Nullable; | ||
|
||
import ch.njol.skript.Skript; | ||
import ch.njol.skript.doc.Description; | ||
import ch.njol.skript.doc.Examples; | ||
import ch.njol.skript.doc.Name; | ||
import ch.njol.skript.doc.Since; | ||
import ch.njol.skript.lang.Effect; | ||
import ch.njol.skript.lang.Expression; | ||
import ch.njol.skript.lang.SkriptParser.ParseResult; | ||
import ch.njol.util.Kleenean; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
import java.util.function.Consumer; | ||
|
||
@Name("Open/Close Inventory") | ||
@Description({"Opens an inventory to a player. The player can then access and modify the inventory as if it was a chest that he just opened.", | ||
"Please note that currently 'show' and 'open' have the same effect, but 'show' will eventually show an unmodifiable view of the inventory in the future."}) | ||
@Examples({"show the victim's inventory to the player", | ||
"open the player's inventory for the player"}) | ||
@Since("2.0, 2.1.1 (closing), 2.2-Fixes-V10 (anvil), 2.4 (hopper, dropper, dispenser") | ||
@Description(""" | ||
Opens an inventory to a player. The player can then access and modify the inventory as if it was a chest that they opened. | ||
Please note that currently 'show' and 'open' have the same effect,\ | ||
but 'show' will eventually show an unmodifiable view of the inventory in the future. | ||
""") | ||
@Example("open the player's inventory for the player") | ||
@Example("open an anvil window for all players") | ||
@Example("show grindstone view to {_player}") | ||
@Example("open a dropper inventory for player") | ||
@Example("close the inventory for all players") | ||
@Since("2.0, 2.1.1 (closing), 2.2-Fixes-V10 (anvil), 2.4 (hopper, dropper, dispenser)") | ||
public class EffOpenInventory extends Effect { | ||
|
||
private final static int WORKBENCH = 0, CHEST = 1, ANVIL = 2, HOPPER = 3, DROPPER = 4, DISPENSER = 5; | ||
|
||
// TODO: Add support for Paper's MenuType (1.21.3+) | ||
|
||
private enum OpenableType { | ||
ANVIL("[an] anvil", "anvil", InventoryType.ANVIL), | ||
CARTOGRAPHY("[a] cartography [table]", "cartography table", InventoryType.CARTOGRAPHY), | ||
CRAFTING("[a] (crafting [table]|workbench)", "crafting table", InventoryType.CRAFTING), | ||
DISPENSER("dispenser", InventoryType.DISPENSER), | ||
DROPPER("dropper", InventoryType.DROPPER), | ||
ENCHANTING("[an] enchant(ing|ment) [table]", "enchantment table", InventoryType.ENCHANTING), | ||
GRINDSTONE("grindstone", InventoryType.GRINDSTONE), | ||
HOPPER("hopper", InventoryType.HOPPER), | ||
LOOM("loom", InventoryType.LOOM), | ||
SMITHING("[a] smithing [table]", "smithing table", InventoryType.SMITHING), | ||
STONECUTTER("stonecutter", InventoryType.STONECUTTER) | ||
; | ||
|
||
private final String pattern; | ||
private final String toString; | ||
private final InventoryType inventoryType; | ||
|
||
OpenableType(String pattern, InventoryType inventoryType) { | ||
this(pattern, "[a] " + pattern, inventoryType); | ||
} | ||
|
||
OpenableType(String pattern, String toString, InventoryType inventoryType) { | ||
this.pattern = "(open|show) " + pattern + "[view|window|inventory] (to|for) %players%"; | ||
this.toString = toString; | ||
this.inventoryType = inventoryType; | ||
} | ||
|
||
} | ||
|
||
private static final OpenableType[] TYPES = OpenableType.values(); | ||
|
||
static { | ||
Skript.registerEffect(EffOpenInventory.class, | ||
"(open|show) ((0¦(crafting [table]|workbench)|1¦chest|2¦anvil|3¦hopper|4¦dropper|5¦dispenser) (view|window|inventory|)|%-inventory/inventorytype%) (to|for) %players%", | ||
"close [the] inventory [view] (to|of|for) %players%", "close %players%'[s] inventory [view]"); | ||
List<String> patterns = new ArrayList<>(); | ||
for (OpenableType type : TYPES) { | ||
patterns.add(type.pattern); | ||
} | ||
patterns.add("(open|show) %inventory/inventorytype% (to|for) %players%"); | ||
patterns.add("close [the] inventory [view] (to|of|for) %players%"); | ||
patterns.add("close %players%'[s] inventory [view]"); | ||
Skript.registerEffect(EffOpenInventory.class, patterns.toArray(String[]::new)); | ||
} | ||
|
||
@Nullable | ||
private Expression<?> invi; | ||
|
||
boolean open; | ||
private int invType; | ||
|
||
@SuppressWarnings("null") | ||
|
||
private @Nullable OpenableType openableType = null; | ||
private @Nullable Expression<?> invObject = null; | ||
private Expression<Player> players; | ||
|
||
@SuppressWarnings({"unchecked", "null"}) | ||
private boolean open = true; | ||
|
||
@Override | ||
public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) { | ||
int openFlag = 0; | ||
if(parseResult.mark >= 5) { | ||
openFlag = parseResult.mark ^ 5; | ||
invType = DISPENSER; | ||
} else if(parseResult.mark >= 4) { | ||
openFlag = parseResult.mark ^ 4; | ||
invType = DROPPER; | ||
} else if(parseResult.mark >= 3) { | ||
openFlag = parseResult.mark ^ 3; | ||
invType = HOPPER; | ||
} else if (parseResult.mark >= 2) { | ||
openFlag = parseResult.mark ^ 2; | ||
invType = ANVIL; | ||
} else if (parseResult.mark >= 1) { | ||
openFlag = parseResult.mark ^ 1; | ||
invType = CHEST; | ||
} else if (parseResult.mark >= 0) { | ||
invType = WORKBENCH; | ||
openFlag = parseResult.mark ^ 0; | ||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { | ||
if (matchedPattern <= TYPES.length) { | ||
if (matchedPattern < TYPES.length) { | ||
openableType = TYPES[matchedPattern]; | ||
//noinspection unchecked | ||
players = (Expression<Player>) exprs[0]; | ||
} else { | ||
invObject = exprs[0]; | ||
//noinspection unchecked | ||
players = (Expression<Player>) exprs[1]; | ||
if (invObject instanceof Literal<?> literal && literal.getSingle() instanceof InventoryType inventoryType && !inventoryType.isCreatable()) { | ||
Skript.error("Cannot create an inventory of type " + Classes.toString(inventoryType)); | ||
return false; | ||
} | ||
} | ||
} else { | ||
openFlag = parseResult.mark; | ||
} | ||
|
||
open = matchedPattern == 0; | ||
invi = open ? exprs[0] : null; | ||
players = (Expression<Player>) exprs[exprs.length - 1]; | ||
if (openFlag == 1 && invi != null) { | ||
Skript.warning("Using 'show' inventory instead of 'open' is not recommended as it will eventually show an unmodifiable view of the inventory in the future."); | ||
} | ||
if (exprs[0] instanceof Literal<?> lit && lit.getSingle() instanceof InventoryType inventoryType && !inventoryType.isCreatable()) { | ||
Skript.error("Cannot create an inventory of type " + Classes.toString(inventoryType)); | ||
return false; | ||
open = false; | ||
//noinspection unchecked | ||
players = (Expression<Player>) exprs[0]; | ||
} | ||
return true; | ||
} | ||
|
||
@Override | ||
protected void execute(final Event e) { | ||
if (invi != null) { | ||
Inventory i; | ||
|
||
assert invi != null; | ||
Object o = invi.getSingle(e); | ||
if (o instanceof Inventory) { | ||
i = (Inventory) o; | ||
} else if (o instanceof InventoryType inventoryType && inventoryType.isCreatable()) { | ||
i = Bukkit.createInventory(null, inventoryType); | ||
protected void execute(Event event) { | ||
Consumer<Player> consumer = null; | ||
if (open) { | ||
if (openableType != null) { | ||
consumer = getPlayerConsumer(openableType.inventoryType); | ||
} else { | ||
return; | ||
} | ||
|
||
if (i == null) | ||
return; | ||
for (final Player p : players.getArray(e)) { | ||
try { | ||
p.openInventory(i); | ||
} catch (IllegalArgumentException ex){ | ||
Skript.error("You can't open a " + i.getType().name().toLowerCase(Locale.ENGLISH).replaceAll("_", "") + " inventory to a player."); | ||
assert invObject != null; | ||
Object object = invObject.getSingle(event); | ||
if (object == null) | ||
return; | ||
if (object instanceof Inventory inventory) { | ||
consumer = player -> player.openInventory(inventory); | ||
} else if (object instanceof InventoryType inventoryType) { | ||
consumer = getPlayerConsumer(inventoryType); | ||
if (consumer == null) { | ||
error("Cannot create an inventory of type " + Classes.toString(inventoryType)); | ||
return; | ||
} | ||
} | ||
} | ||
} else { | ||
for (final Player p : players.getArray(e)) { | ||
if (open) { | ||
switch (invType) { | ||
case WORKBENCH: | ||
p.openWorkbench(null, true); | ||
break; | ||
case CHEST: | ||
p.openInventory(Bukkit.createInventory(p, InventoryType.CHEST)); | ||
break; | ||
case ANVIL: | ||
p.openInventory(Bukkit.createInventory(p, InventoryType.ANVIL)); | ||
break; | ||
case HOPPER: | ||
p.openInventory(Bukkit.createInventory(p, InventoryType.HOPPER)); | ||
break; | ||
case DROPPER: | ||
p.openInventory(Bukkit.createInventory(p, InventoryType.DROPPER)); | ||
break; | ||
case DISPENSER: | ||
p.openInventory(Bukkit.createInventory(p, InventoryType.DISPENSER)); | ||
|
||
} | ||
} else | ||
p.closeInventory(); | ||
} | ||
consumer = Player::closeInventory; | ||
} | ||
assert consumer != null; | ||
|
||
for (Player player : players.getArray(event)) { | ||
consumer.accept(player); | ||
} | ||
} | ||
|
||
/** | ||
* Handles how to open {@code inventoryType} for a {@link Player}. | ||
* | ||
* @param inventoryType The {@link InventoryType} to open for a {@link Player}. | ||
* @return {@link Consumer} for a {@link Player} or {@code null} if {@code inventoryType} is not creatable. | ||
*/ | ||
@SuppressWarnings("deprecation") | ||
private @Nullable Consumer<Player> getPlayerConsumer(InventoryType inventoryType) { | ||
if (!inventoryType.isCreatable()) | ||
return null; | ||
|
||
// Having 'switch' outside rather than inside the consumer reduces any re-iterating | ||
return switch (inventoryType) { | ||
case ANVIL -> player -> player.openAnvil(null, true); | ||
case CARTOGRAPHY -> player -> player.openCartographyTable(null, true); | ||
case CRAFTING -> player -> player.openWorkbench(null, true); | ||
case ENCHANTING -> player -> player.openEnchanting(null, true); | ||
case GRINDSTONE -> player -> player.openGrindstone(null, true); | ||
case LOOM -> player -> player.openLoom(null, true); | ||
case SMITHING -> player -> player.openSmithingTable(null, true); | ||
case STONECUTTER -> player -> player.openStonecutter(null, true); | ||
default -> player -> player.openInventory(Bukkit.createInventory(player, inventoryType)); | ||
}; | ||
} | ||
|
||
@Override | ||
public String toString(final @Nullable Event e, final boolean debug) { | ||
return (open ? "open " + (invi != null ? invi.toString(e, debug) : "crafting table") + " to " : "close inventory view of ") + players.toString(e, debug); | ||
public String toString(@Nullable Event event, boolean debug) { | ||
SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug); | ||
if (open) { | ||
builder.append("open"); | ||
if (openableType != null) { | ||
builder.append(openableType.toString, "inventory"); | ||
} else { | ||
assert invObject != null; | ||
builder.append(invObject); | ||
} | ||
} else { | ||
builder.append("close the inventory"); | ||
} | ||
builder.append("for", players); | ||
return builder.toString(); | ||
} | ||
|
||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.