Add note_play event

PseudoKnight · PseudoKnight · commit 53481b4e3140 · 2015-12-16T15:49:39.000-08:00
diff --git a/src/main/java/com/laytonsmith/abstraction/MCNote.java b/src/main/java/com/laytonsmith/abstraction/MCNote.java
@@ -1,10 +1,18 @@
 
 package com.laytonsmith.abstraction;
 
+import com.laytonsmith.abstraction.enums.MCTone;
+
 /**
  *
  * 
  */
 public interface MCNote extends AbstractionObject {
 
+	public MCTone getTone();
+
+	public int getOctave();
+
+	public boolean isSharped();
+
 }
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCNote.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCNote.java
@@ -16,6 +16,25 @@ public BukkitMCNote(int octave, MCTone tone, boolean sharp) throws IllegalArgume
 		n = new Note(octave, Note.Tone.valueOf(tone.name()), sharp);
 	}
 
+	public BukkitMCNote(Note n) {
+		this.n = n;
+	}
+
+	@Override
+	public MCTone getTone() {
+		return MCTone.valueOf(n.getTone().toString());
+	}
+
+	@Override
+	public int getOctave() {
+		return n.getOctave();
+	}
+
+	@Override
+	public boolean isSharped() {
+		return n.isSharped();
+	}
+
 	@Override
 	public Object getHandle() {
 		return n;
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitBlockEvents.java b/src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitBlockEvents.java
@@ -7,19 +7,23 @@
 import com.laytonsmith.abstraction.MCEntity;
 import com.laytonsmith.abstraction.MCItemStack;
 import com.laytonsmith.abstraction.MCLocation;
+import com.laytonsmith.abstraction.MCNote;
 import com.laytonsmith.abstraction.MCPlayer;
 import com.laytonsmith.abstraction.blocks.MCBlock;
 import com.laytonsmith.abstraction.blocks.MCBlockFace;
 import com.laytonsmith.abstraction.blocks.MCBlockState;
 import com.laytonsmith.abstraction.bukkit.BukkitMCItemStack;
 import com.laytonsmith.abstraction.bukkit.BukkitMCLocation;
+import com.laytonsmith.abstraction.bukkit.BukkitMCNote;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlock;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlockState;
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCEntity;
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCPlayer;
 import com.laytonsmith.abstraction.enums.MCIgniteCause;
+import com.laytonsmith.abstraction.enums.MCInstrument;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCBlockFace;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCIgniteCause;
+import com.laytonsmith.abstraction.enums.bukkit.BukkitMCInstrument;
 import com.laytonsmith.abstraction.events.MCBlockBreakEvent;
 import com.laytonsmith.abstraction.events.MCBlockBurnEvent;
 import com.laytonsmith.abstraction.events.MCBlockDispenseEvent;
@@ -30,25 +34,17 @@
 import com.laytonsmith.abstraction.events.MCBlockPistonExtendEvent;
 import com.laytonsmith.abstraction.events.MCBlockPistonRetractEvent;
 import com.laytonsmith.abstraction.events.MCBlockPlaceEvent;
+import com.laytonsmith.abstraction.events.MCNotePlayEvent;
 import com.laytonsmith.abstraction.events.MCSignChangeEvent;
 import com.laytonsmith.annotations.abstraction;
 import com.laytonsmith.core.constructs.CArray;
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.exceptions.ConfigRuntimeException;
 import com.laytonsmith.core.functions.Exceptions.ExceptionType;
+import org.bukkit.Note;
 import org.bukkit.block.Block;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockDispenseEvent;
-import org.bukkit.event.block.BlockEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPistonEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.block.*;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -435,4 +431,44 @@ public MCBlockState getNewState() {
 			return new BukkitMCBlockState(bge.getNewState());
 		}
 	}
+
+	@abstraction(type = Implementation.Type.BUKKIT)
+	public static class BukkitMCNotePlayEvent implements MCNotePlayEvent {
+
+		NotePlayEvent npe;
+
+		public BukkitMCNotePlayEvent(NotePlayEvent event) {
+			npe = event;
+		}
+
+		@Override
+		public Object _GetObject() {
+			return npe;
+		}
+
+		@Override
+		public MCBlock getBlock() {
+			return new BukkitMCBlock(npe.getBlock());
+		}
+
+		@Override
+		public MCNote getNote() {
+			return new BukkitMCNote(npe.getNote());
+		}
+
+		@Override
+		public void setNote(MCNote note) {
+			npe.setNote((Note) note.getHandle());
+		}
+
+		@Override
+		public MCInstrument getInstrument() {
+			return BukkitMCInstrument.getConvertor().getAbstractedEnum(npe.getInstrument());
+		}
+
+		@Override
+		public void setInstrument(MCInstrument i) {
+			npe.setInstrument(BukkitMCInstrument.getConvertor().getConcreteEnum(i));
+		}
+	}
 }
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitBlockListener.java b/src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitBlockListener.java
@@ -11,15 +11,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockDispenseEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.block.*;
 
 /**
  *
@@ -112,4 +104,10 @@ public void onBlockGrow(BlockGrowEvent e) {
 		BukkitBlockEvents.BukkitMCBlockGrowEvent bge = new BukkitBlockEvents.BukkitMCBlockGrowEvent(e);
 		EventUtils.TriggerListener(Driver.BLOCK_GROW, "block_grow", bge);
 	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onNotePlay(NotePlayEvent e) {
+		BukkitBlockEvents.BukkitMCNotePlayEvent npe = new BukkitBlockEvents.BukkitMCNotePlayEvent(e);
+		EventUtils.TriggerListener(Driver.NOTE_PLAY, "note_play", npe);
+	}
 }
diff --git a/src/main/java/com/laytonsmith/abstraction/events/MCNotePlayEvent.java b/src/main/java/com/laytonsmith/abstraction/events/MCNotePlayEvent.java
@@ -0,0 +1,15 @@
+package com.laytonsmith.abstraction.events;
+
+import com.laytonsmith.abstraction.MCNote;
+import com.laytonsmith.abstraction.enums.MCInstrument;
+
+public interface MCNotePlayEvent extends MCBlockEvent {
+
+	public MCNote getNote();
+
+	public void setNote(MCNote note);
+
+	public MCInstrument getInstrument();
+
+	public void setInstrument(MCInstrument i);
+}
diff --git a/src/main/java/com/laytonsmith/core/events/Driver.java b/src/main/java/com/laytonsmith/core/events/Driver.java
@@ -23,6 +23,7 @@ public enum Driver {
 	BLOCK_PLACE,
 	SIGN_CHANGED,
 	REDSTONE_CHANGED,
+	NOTE_PLAY,
 
 	/**
 	 * Entity events
diff --git a/src/main/java/com/laytonsmith/core/events/drivers/BlockEvents.java b/src/main/java/com/laytonsmith/core/events/drivers/BlockEvents.java
@@ -8,6 +8,8 @@
 import com.laytonsmith.abstraction.blocks.MCBlockState;
 import com.laytonsmith.abstraction.bukkit.BukkitMCItemStack;
 import com.laytonsmith.abstraction.enums.MCIgniteCause;
+import com.laytonsmith.abstraction.enums.MCInstrument;
+import com.laytonsmith.abstraction.enums.MCTone;
 import com.laytonsmith.abstraction.events.MCBlockBreakEvent;
 import com.laytonsmith.abstraction.events.MCBlockBurnEvent;
 import com.laytonsmith.abstraction.events.MCBlockDispenseEvent;
@@ -17,6 +19,7 @@
 import com.laytonsmith.abstraction.events.MCBlockPistonExtendEvent;
 import com.laytonsmith.abstraction.events.MCBlockPistonRetractEvent;
 import com.laytonsmith.abstraction.events.MCBlockPlaceEvent;
+import com.laytonsmith.abstraction.events.MCNotePlayEvent;
 import com.laytonsmith.abstraction.events.MCSignChangeEvent;
 import com.laytonsmith.annotations.api;
 import com.laytonsmith.core.CHVersion;
@@ -36,10 +39,13 @@
 import com.laytonsmith.core.events.EventBuilder;
 import com.laytonsmith.core.events.Prefilters;
 import com.laytonsmith.core.events.Prefilters.PrefilterType;
+import com.laytonsmith.core.exceptions.ConfigRuntimeException;
 import com.laytonsmith.core.exceptions.EventException;
 import com.laytonsmith.core.exceptions.PrefilterNonMatchException;
+import com.laytonsmith.core.functions.Exceptions;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -1045,4 +1051,94 @@ public boolean modifyEvent(String key, Construct value, BindableEvent e) {
 			return false;
 		}
 	}
+
+	@api
+	public static class note_play extends AbstractEvent {
+
+		@Override
+		public String getName() {
+			return "note_play";
+		}
+
+		@Override
+		public Driver driver() {
+			return Driver.NOTE_PLAY;
+		}
+
+		@Override
+		public String docs() {
+			return "{}"
+					+ " This event is called when a noteblock is activated via player interaction or redstone."
+					+ " The instrument may be one of: " + StringUtils.Join(MCInstrument.values(), ", ", ", or ") + "."
+					+ " {location: The location of the noteblock | instrument: The name of the sound"
+					+ " | tone: The note played (eg. F#) | octave: The octave the tone was played (0 - 2)}"
+					+ " {instrument|tone|octave}"
+					+ " {}";
+		}
+
+		@Override
+		public CHVersion since() {
+			return CHVersion.V3_3_1;
+		}
+
+		@Override
+		public boolean matches(Map<String, Construct> prefilter, BindableEvent event) throws PrefilterNonMatchException {
+			return event instanceof MCNotePlayEvent;
+		}
+
+		@Override
+		public BindableEvent convert(CArray manualObject, Target t) {
+			return null;
+		}
+
+		@Override
+		public Map<String, Construct> evaluate(BindableEvent event) throws EventException {
+			if (event instanceof MCNotePlayEvent) {
+				MCNotePlayEvent e = (MCNotePlayEvent) event;
+				Map<String, Construct> map = new HashMap<>();
+				Target t = Target.UNKNOWN;
+				map.put("location", ObjectGenerator.GetGenerator().location(e.getBlock().getLocation(), false));
+				map.put("instrument", new CString(e.getInstrument().name(), t));
+				map.put("tone", new CString(e.getNote().getTone().name() + (e.getNote().isSharped() ? "#" : ""), t));
+				map.put("octave", new CInt(e.getNote().getOctave(), t));
+				return map;
+			} else {
+				throw new EventException("Cannot convert event to NotePlayEvent");
+			}
+		}
+
+		@Override
+		public boolean modifyEvent(String key, Construct value, BindableEvent e) {
+			if (e instanceof MCNotePlayEvent) {
+				MCNotePlayEvent event = (MCNotePlayEvent) e;
+				try {
+					if("instrument".equals(key)){
+						event.setInstrument(MCInstrument.valueOf(value.val()));
+						return true;
+					}
+					if("tone".equals(key)){
+						if(value.val().length() == 0){
+							return false;
+						}
+						int octave = event.getNote().getOctave();
+						MCTone tone = MCTone.valueOf(value.val().substring(0, 1));
+						boolean sharp = value.val().endsWith("#");
+						event.setNote(StaticLayer.GetConvertor().GetNote(octave, tone, sharp));
+						return true;
+					}
+					if("octave".equals(key)){
+						int octave = Static.getInt32(value, Target.UNKNOWN);
+						MCTone tone = event.getNote().getTone();
+						boolean sharp = event.getNote().isSharped();
+						event.setNote(StaticLayer.GetConvertor().GetNote(octave, tone, sharp));
+						return true;
+					}
+				} catch(IllegalArgumentException ex){
+					throw new ConfigRuntimeException("No " + key + " with the value " + value + " exists",
+							Exceptions.ExceptionType.IllegalArgumentException, Target.UNKNOWN, ex);
+				}
+			}
+			return false;
+		}
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,18 @@`
`1`	`1`
`2`	`2`	`package com.laytonsmith.abstraction;`
`3`	`3`
	`4`	`+import com.laytonsmith.abstraction.enums.MCTone;`
	`5`	`+`
`4`	`6`	`/**`
`5`	`7`	`*`
`6`	`8`	`*`
`7`	`9`	`*/`
`8`	`10`	`public interface MCNote extends AbstractionObject {`
`9`	`11`
	`12`	`+ public MCTone getTone();`
	`13`	`+`
	`14`	`+ public int getOctave();`
	`15`	`+`
	`16`	`+ public boolean isSharped();`
	`17`	`+`
`10`	`18`	`}`