Add handling for 'string-list' and fix 'material-list'

3 files changed, 86 insertions, 12 deletions

diff --git a/src/components/Editor/Quest/Task/TaskConfiguration.vue b/src/components/Editor/Quest/Task/TaskConfiguration.vue
index 5c6613a..c31a87d 100644
--- a/src/components/Editor/Quest/Task/TaskConfiguration.vue
+++ b/src/components/Editor/Quest/Task/TaskConfiguration.vue
@@ -101,7 +101,7 @@ const deleteValue = (fieldName: string) => {
       <div v-if="taskDefintion">
         <TaskConfigurationRow 
           v-for="fieldName in [...givenRequiredFields, ...missingFields, ...remainingGivenFields]" 
-          :key="fieldName" 
+          :key="`${quest.id}-${props.taskId}-${fieldName}`" 
           :required="requiredFields.includes(fieldName)" 
           :configKey="fieldName" 
           :initialValue="taskConfig[fieldName]" 
diff --git a/src/components/Editor/Quest/Task/TaskConfigurationRow.vue b/src/components/Editor/Quest/Task/TaskConfigurationRow.vue
index fb872a8..d77e450 100644
--- a/src/components/Editor/Quest/Task/TaskConfigurationRow.vue
+++ b/src/components/Editor/Quest/Task/TaskConfigurationRow.vue
@@ -28,17 +28,31 @@ const definition = computed(() => {
 
 const { description, note } = toRefs(definition.value);
 const showDescription = ref(false);
-const currentValue = ref(props.initialValue);
+const currentValue = ref(props.initialValue ||
+  (props.type === 'boolean'
+    ? false
+    : (props.type === 'material-list' || props.type === 'string-list'
+      ? []
+      : ''
+    )));
 
-const error = computed(() => currentValue.value === undefined || currentValue.value === null || currentValue.value === '');
+if (props.initialValue !== currentValue.value) {
+  emit('update', currentValue.value);
+}
+
+const error = computed(() => currentValue.value === undefined || currentValue.value === null || currentValue.value === '' || (Array.isArray(currentValue.value) && currentValue.value.length === 0));
 const updateValue = (value: any) => {
   currentValue.value = value;
 };
 
 watch(currentValue, () => {
-  emit('update', currentValue.value); 
+  emit('update', currentValue.value);
 });
 
+const addValue = (searchQuery: any) => {
+  currentValue.value.push(searchQuery);
+};
+
 </script>
 
 <template>
@@ -51,15 +65,27 @@ watch(currentValue, () => {
     </div>
     <div id="value">
       <div id="value-container">
+        <!-- Data type 'string' -->
         <input v-if="props.type === 'string'" v-model="currentValue" />
+
+        <!-- Data type 'number' -->
         <input v-else-if="props.type === 'number'" type="number" v-model="currentValue" />
+
+        <!-- Data type 'boolean' -->
         <TrueFalseSwitch v-else-if="props.type === 'boolean'" :value="!!currentValue" @update="updateValue" />
-        <multiselect v-else-if="props.type === 'material-list'" :value="currentValue" :options="materials"
-          :multiple="true" :taggable="true" :searchable="true" placeholder="Enter material name"></multiselect>
-      </div>
-      <div v-if="showDescription || error" id="task-configuration-row-info">
-        <p v-if="error" class="error">A value is required.</p>
-        <p>{{ description }} <i>{{ note }}</i></p>
+
+        <!-- Data type 'material-list' -->
+        <multiselect v-else-if="props.type === 'material-list'" v-model="currentValue" 
+          :options="materials" :multiple="true" :taggable="true" :searchable="true" placeholder="Enter material name" />
+        
+        <!-- Data type 'string-list' -->
+        <multiselect v-else-if="props.type === 'string-list'" v-model="currentValue" :options="[]" @tag="addValue"
+          :multiple="true" :taggable="true" :searchable="true" placeholder="Enter string" />
+
+        <div v-if="showDescription || error" id="task-configuration-row-info">
+          <p v-if="error" class="error">A value is required.</p>
+          <p>{{ description }} <i>{{ note }}</i></p>
+        </div>
       </div>
     </div>
   </div>
@@ -91,11 +117,12 @@ watch(currentValue, () => {
       border-right: 1px solid var(--color-border);
       background-color: var(--color-background-soft);
       transition: color 0.3s;
-      
+
       &:hover {
         color: var(--color-false);
       }
     }
+
     #name {
       display: flex;
       align-items: center;
@@ -106,7 +133,7 @@ watch(currentValue, () => {
       font-family: monospace;
       cursor: pointer;
       transition: background-color 0.3s;
-      
+
       &:hover {
         background-color: var(--color-hover);
       }
@@ -117,6 +144,12 @@ watch(currentValue, () => {
     width: 75%;
     background-color: var(--color-background);
     border-left: 1px solid var(--color-border);
+    
+    #value-container {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+    }
   }
 }
 
diff --git a/src/data/taskDefinitions.json b/src/data/taskDefinitions.json
index 5a5143e..8aba912 100644
--- a/src/data/taskDefinitions.json
+++ b/src/data/taskDefinitions.json
@@ -25,6 +25,16 @@
           "description": "Whether placing blocks should decrement from the quest progress.",
           "default": false
         },
+        "allow-negative-progress": {
+          "type": "boolean",
+          "description": "Whether the quest progress can go into the negatives.",
+          "default": false
+        },
+        "allow-silk-touch": {
+          "type": "boolean",
+          "description": "Whether blocks broken with a silk touch pickaxe should count towards the quest progress.",
+          "default": false
+        },
         "check-coreprotect": {
           "type": "boolean",
           "description": "Whether the plugin should query CoreProtect if a block has been recently placed.",
@@ -48,6 +58,37 @@
           "description": "The worlds in which the blocks should be broken."
         }
       }
+    },
+    "blockplace": {
+      "description": "Place a set amount of blocks.",
+      "configuration": {
+        "amount": {
+          "type": "number",
+          "description": "The amount of blocks to place.",
+          "default": 1,
+          "required": true
+        },
+        "block": {
+          "type": "material-list",
+          "description": "The specific block to place.",
+          "note": "Omitting this value will allow any block to be place."
+        },
+        "data": {
+          "type": "number",
+          "description": "The data value of the block to place.",
+          "default": 0,
+          "note": "Not required for Minecraft versions 1.13 and above."
+        },
+        "reverse-if-broken": {
+          "type": "boolean",
+          "description": "Whether breaking blocks should decrement from the quest progress.",
+          "default": false
+        },
+        "worlds": {
+          "type": "string-list",
+          "description": "The worlds in which the blocks should be broken."
+        }
+      }
     }
   }
 }
\ No newline at end of file