Skip to content

Commit

Permalink
Merge branch 'pull/1'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
its-c10 committed Mar 15, 2022
2 parents ea1a5b3 + 4047479 commit 9b498af
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Third number I will change whenever I add a new feature.
Fourth number I will change for bug fixes/small changes.
-->
<version>1.2.0.0</version>
<version>1.2.0.1</version>
<packaging>jar</packaging>

<name>Dialogue</name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/Dialogue.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Object that represents dialogue between the plugin and a player.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class Dialogue {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/DialogueAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* An API that completely eliminates your need for the ConversationsAPI
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class DialogueAPI {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/DialogueEndCause.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Reasons that the dialogue ended.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public enum DialogueEndCause {

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/nthbyte/dialogue/DialogueListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.plugin.java.JavaPlugin;

import java.util.Set;
import java.util.UUID;
Expand All @@ -17,7 +18,7 @@
* The listener for all input and dialogue.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class DialogueListener implements Listener {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/DialogueManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* The manager for all dialogue.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class DialogueManager {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Validates the format of input.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class InputFormatValidator {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/Prompt.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Represents a question or a request.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class Prompt {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/PromptInputType.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* The different types of input for prompts.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public enum PromptInputType {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nthbyte/dialogue/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Utility class.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class Utils {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Event fired when you receive input from a player post-validation.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class ReceiveInputEvent extends Event {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* The event that fires just before the prompt uses its own validation check (If there is any). Use this if you wish to do your own validation.
*
* @author <a href="linktr.ee/c10_">Caleb Owens</a>
* @version 1.1.1.1
* @version 1.2.0.1
*/
public class ValidateInputEvent extends Event {

Expand All @@ -20,6 +20,7 @@ public class ValidateInputEvent extends Event {
private String promptId, input;

public ValidateInputEvent(Player responder, String promptId, String input){
super(true);
this.responder = responder;
this.promptId = promptId;
this.input = input;
Expand Down

0 comments on commit 9b498af

Please sign in to comment.