Skip to content

Commit

Permalink
update for core tab complete format change
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jan 19, 2022
1 parent 7ea6850 commit 4ef5985
Show file tree
Hide file tree
Showing 40 changed files with 109 additions and 310 deletions.
16 changes: 3 additions & 13 deletions ...c/main/java/com/denizenscript/denizen/events/player/PlayerChangesMainHandScriptEvent.java
View file
@@ -1,23 +1,15 @@
package com.denizenscript.denizen.events.player;

import com.denizenscript.denizen.objects.*;
import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
import com.denizenscript.denizen.events.BukkitScriptEvent;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.core.ListTag;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.scripts.ScriptEntryData;
import com.denizenscript.denizencore.utilities.CoreUtilities;
import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.event.player.PlayerChangedMainHandEvent;
import org.bukkit.inventory.MainHand;

import java.util.Arrays;

public class PlayerChangesMainHandScriptEvent extends BukkitScriptEvent implements Listener {

// <--[event]
Expand Down Expand Up @@ -57,11 +49,9 @@ public ScriptEntryData getScriptEntryData() {
@Override
public ObjectTag getContext(String name) {
switch (name) {
case "old_hand":
return new ElementTag(event.getMainHand().toString());
// workaround for spigot bug
case "new_hand":
return new ElementTag(event.getMainHand() == MainHand.LEFT ? "RIGHT" : "LEFT");
// workaround for spigot bug: getMainHand returns the old value, despite being documented as returning the new value
case "old_hand": return new ElementTag(event.getMainHand().toString());
case "new_hand": return new ElementTag(event.getMainHand() == MainHand.LEFT ? "RIGHT" : "LEFT");
}
return super.getContext(name);
}
Expand Down
12 changes: 2 additions & 10 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java
View file
Expand Up @@ -11,11 +11,7 @@
import com.denizenscript.denizencore.objects.core.ScriptTag;
import com.denizenscript.denizencore.objects.core.TimeTag;
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.ScriptRegistry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
import com.denizenscript.denizencore.scripts.containers.ScriptContainer;

import java.util.function.Consumer;

public class CooldownCommand extends AbstractCommand {

Expand Down Expand Up @@ -65,12 +61,8 @@ public CooldownCommand() {
private enum Type {GLOBAL, PLAYER}

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (ScriptContainer script : ScriptRegistry.scriptContainers.values()) {
if (script instanceof InteractScriptContainer) {
addOne.accept(script.getName());
}
}
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.addScriptsOfType(InteractScriptContainer.class);
}

@Override
Expand Down
12 changes: 2 additions & 10 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java
View file
Expand Up @@ -15,14 +15,10 @@
import com.denizenscript.denizencore.objects.core.ScriptTag;
import com.denizenscript.denizencore.objects.core.TimeTag;
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.ScriptRegistry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
import com.denizenscript.denizencore.utilities.Deprecations;
import org.bukkit.event.Listener;

import java.util.function.Consumer;

public class ZapCommand extends AbstractCommand implements Listener {

public ZapCommand() {
Expand Down Expand Up @@ -78,12 +74,8 @@ public ZapCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (ScriptContainer script : ScriptRegistry.scriptContainers.values()) {
if (script instanceof InteractScriptContainer) {
addOne.accept(script.getName());
}
}
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.addScriptsOfType(InteractScriptContainer.class);
}

@Override
Expand Down
17 changes: 4 additions & 13 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java
View file
Expand Up @@ -16,7 +16,6 @@
import org.bukkit.entity.Player;

import java.util.List;
import java.util.function.Consumer;

public class AnimateCommand extends AbstractCommand {

Expand Down Expand Up @@ -69,18 +68,10 @@ public AnimateCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
if (arg.startsWith("animation:")) {
for (EntityEffect effect : EntityEffect.values()) {
addOne.accept("animation:" + effect.name());
}
for (PlayerAnimation anim : PlayerAnimation.values()) {
addOne.accept("animation:" + anim.name());
}
for (String nmsAnim : AnimationHelper.entityAnimations.keySet()) {
addOne.accept("animation:" + nmsAnim);
}
}
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.addWithPrefix("animation:", EntityEffect.values());
tab.addWithPrefix("animation:", PlayerAnimation.values());
tab.addWithPrefix("animation:", AnimationHelper.entityAnimations.keySet());
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java
View file
Expand Up @@ -14,7 +14,6 @@
import org.bukkit.potion.PotionEffectType;

import java.util.List;
import java.util.function.Consumer;

public class CastCommand extends AbstractCommand {

Expand Down Expand Up @@ -77,9 +76,9 @@ public CastCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (PotionEffectType effect : PotionEffectType.values()) {
addOne.accept(effect.getName());
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
for (PotionEffectType effect : PotionEffectType.values()) { // Not an enum for some reason
tab.add(effect.getName());
}
}

Expand Down
11 changes: 3 additions & 8 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java
View file
Expand Up @@ -16,7 +16,6 @@
import org.bukkit.entity.EntityType;

import java.util.List;
import java.util.function.Consumer;

public class SpawnCommand extends AbstractCommand {

Expand Down Expand Up @@ -64,13 +63,9 @@ public SpawnCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (EntityType entity : EntityType.values()) {
addOne.accept(entity.name());
}
for (String scriptName : EntityScriptHelper.scripts.keySet()) {
addOne.accept(scriptName);
}
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.add(EntityType.values());
tab.add(EntityScriptHelper.scripts.keySet());
}

@Override
Expand Down
9 changes: 2 additions & 7 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/TeleportCommand.java
View file
Expand Up @@ -9,15 +9,12 @@
import com.denizenscript.denizencore.objects.Argument;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.core.ListTag;
import com.denizenscript.denizencore.objects.notable.Notable;
import com.denizenscript.denizencore.objects.notable.NoteManager;
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
import org.bukkit.event.player.PlayerTeleportEvent;

import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;

public class TeleportCommand extends AbstractCommand {

Expand Down Expand Up @@ -71,10 +68,8 @@ public TeleportCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (Notable note : NoteManager.notesByType.get(LocationTag.class)) {
addOne.accept(NoteManager.getSavedId(note));
}
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.addNotesOfType(LocationTag.class);
}

@Override
Expand Down
9 changes: 2 additions & 7 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java
View file
Expand Up @@ -12,16 +12,13 @@
import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.core.ListTag;
import com.denizenscript.denizencore.objects.notable.Notable;
import com.denizenscript.denizencore.objects.notable.NoteManager;
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
import com.denizenscript.denizencore.scripts.commands.Holdable;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;

public class WalkCommand extends AbstractCommand implements Holdable {

Expand Down Expand Up @@ -95,10 +92,8 @@ public WalkCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (Notable note : NoteManager.notesByType.get(LocationTag.class)) {
addOne.accept(NoteManager.getSavedId(note));
}
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.addNotesOfType(LocationTag.class);
}

@Override
Expand Down
9 changes: 3 additions & 6 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java
View file
Expand Up @@ -25,7 +25,6 @@

import java.util.HashSet;
import java.util.UUID;
import java.util.function.Consumer;

public class DisplayItemCommand extends AbstractCommand implements Listener {

Expand Down Expand Up @@ -74,15 +73,13 @@ public DisplayItemCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
for (Material material : Material.values()) {
if (material.isItem()) {
addOne.accept(material.name());
tab.add(material.name());
}
}
for (String itemScript : ItemScriptHelper.item_scripts.keySet()) {
addOne.accept(itemScript);
}
tab.add(ItemScriptHelper.item_scripts.keySet());
}

@Override
Expand Down
9 changes: 3 additions & 6 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java
View file
Expand Up @@ -24,7 +24,6 @@

import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;

public class FakeItemCommand extends AbstractCommand {

Expand Down Expand Up @@ -62,15 +61,13 @@ public FakeItemCommand() {
// -->

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
for (Material material : Material.values()) {
if (material.isItem()) {
addOne.accept(material.name());
tab.add(material.name());
}
}
for (String itemScript : ItemScriptHelper.item_scripts.keySet()) {
addOne.accept(itemScript);
}
tab.add(ItemScriptHelper.item_scripts.keySet());
}

@Override
Expand Down
9 changes: 3 additions & 6 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java
View file
Expand Up @@ -18,7 +18,6 @@
import org.bukkit.inventory.ItemStack;

import java.util.List;
import java.util.function.Consumer;

public class GiveCommand extends AbstractCommand {

Expand Down Expand Up @@ -76,15 +75,13 @@ public GiveCommand() {
enum Type {ITEM, MONEY, EXP}

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
for (Material material : Material.values()) {
if (material.isItem()) {
addOne.accept(material.name());
tab.add(material.name());
}
}
for (String itemScript : ItemScriptHelper.item_scripts.keySet()) {
addOne.accept(itemScript);
}
tab.add(ItemScriptHelper.item_scripts.keySet());
}

@Override
Expand Down
18 changes: 8 additions & 10 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
View file
Expand Up @@ -152,17 +152,15 @@ public InventoryCommand() {
private enum Action {OPEN, CLOSE, COPY, MOVE, SWAP, ADD, REMOVE, SET, KEEP, EXCLUDE, FILL, CLEAR, UPDATE, ADJUST, FLAG}

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
for (String mech : PropertyParser.propertiesByClass.get(ItemTag.class).propertiesByMechanism.keySet()) {
addOne.accept(mech);
}
if (arg.contains(":")) {
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.add(PropertyParser.propertiesByClass.get(ItemTag.class).propertiesByMechanism.keySet());
if (tab.arg.contains(":")) {
Consumer<String> addAll = (s) -> {
addOne.accept("o:" + s);
addOne.accept("origin:" + s);
addOne.accept("d:" + s);
addOne.accept("dest:" + s);
addOne.accept("destination:" + s);
tab.add("o:" + s);
tab.add("origin:" + s);
tab.add("d:" + s);
tab.add("dest:" + s);
tab.add("destination:" + s);
};
for (InventoryTag inventory : (HashSet<InventoryTag>) ((HashSet) NoteManager.notesByType.get(InventoryTag.class))) {
addAll.accept(inventory.noteName);
Expand Down
21 changes: 7 additions & 14 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java
View file
Expand Up @@ -28,7 +28,6 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;

public class TakeCommand extends AbstractCommand {
Expand Down Expand Up @@ -104,28 +103,22 @@ private enum Type {MONEY, XP, ITEMINHAND, CURSORITEM, ITEM, INVENTORY, BYDISPLAY
public static HashSet<Type> requiresPlayerTypes = new HashSet<>(Arrays.asList(Type.XP, Type.MONEY, Type.ITEMINHAND, Type.CURSORITEM));

@Override
public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
if (arg.startsWith("material:")) {
public void addCustomTabCompletions(TabCompletionsBuilder tab) {
tab.addWithPrefix("scriptname:", ItemScriptHelper.item_scripts.keySet());
if (tab.arg.startsWith("material:")) {
for (Material material : Material.values()) {
if (material.isItem()) {
addOne.accept("material:" + material.name());
tab.add("material:" + material.name());
}
}
}
else if (arg.startsWith("scriptname:")) {
for (String itemScript : ItemScriptHelper.item_scripts.keySet()) {
addOne.accept("scriptname:" + itemScript);
}
}
else if (arg.startsWith("item:")) {
else if (tab.arg.startsWith("item:")) {
for (Material material : Material.values()) {
if (material.isItem()) {
addOne.accept("item:" + material.name());
tab.add("item:" + material.name());
}
}
for (String itemScript : ItemScriptHelper.item_scripts.keySet()) {
addOne.accept("item:" + itemScript);
}
tab.addWithPrefix("item:", ItemScriptHelper.item_scripts.keySet());
}
}

Expand Down

0 comments on commit 4ef5985

Please sign in to comment.