Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
entity script cleanup
Browse files Browse the repository at this point in the history 
- Share FORCE_TO_STATIC ref
- De-stupid the ai tasks handling
- Clean docs
- Fix an issue in item+entity scripts with casing
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jun 15, 2018
1 parent f8983b8 commit 05c6a28
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 39 deletions.
10 changes: 10 additions & 0 deletions src/main/java/com/denizenscript/denizen2sponge/Denizen2Sponge.java
View file
@@ -1,8 +1,10 @@
package com.denizenscript.denizen2sponge;

import com.denizenscript.denizen2core.Denizen2Core;
import com.denizenscript.denizen2core.commands.CommandQueue;
import com.denizenscript.denizen2core.tags.objects.MapTag;
import com.denizenscript.denizen2core.utilities.CoreUtilities;
import com.denizenscript.denizen2core.utilities.ErrorInducedException;
import com.denizenscript.denizen2core.utilities.debugging.ColorSet;
import com.denizenscript.denizen2core.utilities.debugging.Debug;
import com.denizenscript.denizen2core.utilities.yaml.YAMLConfiguration;
Expand Down Expand Up @@ -74,6 +76,14 @@ public class Denizen2Sponge {

public static char colorChar = '\u00A7';

public static final CommandQueue FORCE_TO_STATIC; // Special case recursive static generation helper

static {
(FORCE_TO_STATIC = new CommandQueue()).error = (es) -> {
throw new ErrorInducedException(es);
};
}

public static Cause getGenericCause() {
// TODO: Decipher new cause system, make a nice generic cause
return Cause.builder().append(plugin).build(EventContext.empty());
Expand Down
48 changes: 22 additions & 26 deletions src/main/java/com/denizenscript/denizen2sponge/spongescripts/EntityScript.java
View file
Expand Up @@ -34,17 +34,15 @@
public class EntityScript extends CommandScript {

// <--[explanation]
// @Since 0.5.0
// @Since 0.5.5
// @Name Entity Scripts
// @Group Script Types
// @Description
// An entity script is a type of script that fully defines specific entity template, which can
// be used to spawn entities afterwards. Keys in an entity script define which properties the
// final entity will have.
//
// An entity script can be used in place of any normal entity type, by putting the name of the
// entity script where a script expects an entity type. A script may block this from user input by
// requiring a valid EntityTypeTag input, which will not recognize an item script.
// An entity script can be used in place of an entity type in certain spawning related commands or inputs.
//
// The entity script name may not be the same as an existing entity type name.
//
Expand All @@ -68,11 +66,12 @@ public class EntityScript extends CommandScript {
// Set key "flags" as a section and within it put all flags keyed by name and with the value that each flag should hold.
// If you wish to dynamically structure the mapping, see the "keys" option for specifying that.
//
// To specify other values, create a section labeled "keys" and within it put any valid item keys.
// To specify other values, create a section labeled "keys" and within it put any valid entity keys.
// TODO: Create and reference an explanation of basic entity keys.
//
// You can also specify AI Tasks that will be applied to the entity on spawn. Valid task types can be found at
// <@link explanation AI Task Types>AI task types<@/link>, and the properties they accept are explained at <@link command addaitask>addaitask<@/link>.
// Set key "ai tasks" to specify AI Tasks that will be applied to the entity on spawn. Valid task types can be found in the
// <@link explanation AI Task Types>AI task types explanation<@/link>, and the properties they accept
// are explained in the <@link command addaitask>addaitask command<@/link> documentation.
// On top of that, each task accepts a goal (see <@link explanation AI Goal Types>AI goal types<@/link>) and a priority value.
// -->

Expand All @@ -83,21 +82,13 @@ public EntityScript(String name, YAMLConfiguration section) {

public final String entityScriptName;

private static final CommandQueue FORCE_TO_STATIC; // Special case recursive static generation helper

static {
(FORCE_TO_STATIC = new CommandQueue()).error = (es) -> {
throw new ErrorInducedException(es);
};
}

@Override
public boolean init() {
if (super.init()) {
try {
prepValues();
if (contents.contains("static") && BooleanTag.getFor(FORCE_TO_STATIC.error, contents.getString("static")).getInternal()) {
staticEntity = getEntityCopy(FORCE_TO_STATIC);
if (contents.contains("static") && BooleanTag.getFor(Denizen2Sponge.FORCE_TO_STATIC.error, contents.getString("static")).getInternal()) {
staticEntity = getEntityCopy(Denizen2Sponge.FORCE_TO_STATIC);
}
}
catch (ErrorInducedException ex) {
Expand All @@ -123,7 +114,7 @@ public EntityTemplate getEntityCopy(CommandQueue queue) {

public List<Tuple<String, Argument>> otherValues, flags;

public List<Tuple<String, YAMLConfiguration>> taskData;
public List<Tuple<String, List<Tuple<String, Argument>>>> taskData;

public void prepValues() {
Action<String> error = (es) -> {
Expand All @@ -149,22 +140,28 @@ public void prepValues() {
YAMLConfiguration sec = contents.getConfigurationSection("flags");
for (StringHolder key : sec.getKeys(false)) {
Argument arg = Denizen2Core.splitToArgument(sec.getString(key.str), true, true, error);
flags.add(new Tuple<>(CoreUtilities.toUpperCase(key.low), arg));
flags.add(new Tuple<>(key.low, arg));
}
}
if (contents.contains("keys")) {
otherValues = new ArrayList<>();
YAMLConfiguration sec = contents.getConfigurationSection("keys");
for (StringHolder key : sec.getKeys(false)) {
Argument arg = Denizen2Core.splitToArgument(sec.getString(key.str), true, true, error);
otherValues.add(new Tuple<>(CoreUtilities.toUpperCase(key.low), arg));
otherValues.add(new Tuple<>(key.low, arg));
}
}
if (contents.contains("ai tasks")) {
taskData = new ArrayList<>();
YAMLConfiguration sec = contents.getConfigurationSection("ai tasks");
for (StringHolder key : sec.getKeys(false)) {
taskData.add( new Tuple<>(key.low, sec.getConfigurationSection(key.str)));
YAMLConfiguration subsec = sec.getConfigurationSection(key.str);
List<Tuple<String, Argument>> subList = new ArrayList<>();
for (StringHolder subKey : subsec.getKeys(false)) {
Argument arg = Denizen2Core.splitToArgument(subsec.getString(subKey.str), true, true, error);
subList.add(new Tuple<>(subKey.low, arg));
}
taskData.add(new Tuple<>(key.low, subList));
}
}
}
Expand Down Expand Up @@ -234,21 +231,20 @@ public EntityTemplate generateEntity(CommandQueue queue) {
}
ent.properties.putAll(prop);
if (taskData != null) {
for (Tuple<String, YAMLConfiguration> task : taskData) {
for (Tuple<String, List<Tuple<String, Argument>>> task : taskData) {
if (AITaskHelper.handlers.get(task.one) == null) {
queue.error.run("Error handling entity script '" + ColorSet.emphasis + title + ColorSet.warning
+ "': task type '" + ColorSet.emphasis + task.one + ColorSet.warning + "' does not seem to exist.");
return null;
}
HashMap<String, AbstractTagObject> map = new HashMap<>();
for (StringHolder subkey : task.two.getKeys(false)) {
Argument arg = Denizen2Core.splitToArgument(task.two.getString(subkey.str), true, true, queue.error);
map.put(subkey.low, parseVal(queue, arg, varBack));
for (Tuple<String, Argument> opt : task.two) {
map.put(opt.one, parseVal(queue, opt.two, varBack));
}
ent.tasks.put(task.one, map);
}
}
if (queue == FORCE_TO_STATIC && contents.contains("static")
if (queue == Denizen2Sponge.FORCE_TO_STATIC && contents.contains("static")
&& BooleanTag.getFor(queue.error, contents.getString("static")).getInternal()) {
staticEntity = ent;
}
Expand Down
18 changes: 5 additions & 13 deletions src/main/java/com/denizenscript/denizen2sponge/spongescripts/ItemScript.java
View file
Expand Up @@ -83,21 +83,13 @@ public ItemScript(String name, YAMLConfiguration section) {

public final String itemScriptName;

private static final CommandQueue FORCE_TO_STATIC; // Special case recursive static generation helper

static {
(FORCE_TO_STATIC = new CommandQueue()).error = (es) -> {
throw new ErrorInducedException(es);
};
}

@Override
public boolean init() {
if (super.init()) {
try {
prepValues();
if (contents.contains("static") && BooleanTag.getFor(FORCE_TO_STATIC.error, contents.getString("static")).getInternal()) {
staticItem = getItemCopy(FORCE_TO_STATIC);
if (contents.contains("static") && BooleanTag.getFor(Denizen2Sponge.FORCE_TO_STATIC.error, contents.getString("static")).getInternal()) {
staticItem = getItemCopy(Denizen2Sponge.FORCE_TO_STATIC);
}
}
catch (ErrorInducedException ex) {
Expand Down Expand Up @@ -156,15 +148,15 @@ public void prepValues() {
YAMLConfiguration sec = contents.getConfigurationSection("flags");
for (StringHolder key : sec.getKeys(false)) {
Argument arg = Denizen2Core.splitToArgument(sec.getString(key.str), true, true, error);
flags.add(new Tuple<>(CoreUtilities.toUpperCase(key.low), arg));
flags.add(new Tuple<>(key.low, arg));
}
}
if (contents.contains("keys")) {
otherValues = new ArrayList<>();
YAMLConfiguration sec = contents.getConfigurationSection("keys");
for (StringHolder key : sec.getKeys(false)) {
Argument arg = Denizen2Core.splitToArgument(sec.getString(key.str), true, true, error);
otherValues.add(new Tuple<>(CoreUtilities.toUpperCase(key.low), arg));
otherValues.add(new Tuple<>(key.low, arg));
}
}
}
Expand Down Expand Up @@ -231,7 +223,7 @@ public ItemStack generateItem(CommandQueue queue) {
if (!flagsMap.getInternal().isEmpty()) {
toRet.offer(new FlagMapDataImpl(new FlagMap(flagsMap)));
}
if (queue == FORCE_TO_STATIC && contents.contains("static")
if (queue == Denizen2Sponge.FORCE_TO_STATIC && contents.contains("static")
&& BooleanTag.getFor(queue.error, contents.getString("static")).getInternal()) {
staticItem = toRet;
}
Expand Down

0 comments on commit 05c6a28

Please sign in to comment.