format codes

khjxiaogu · Aug 8, 2020 · 190a734 · 190a734
1 parent 88f8956
commit 190a734
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 29 deletions.
diff --git a/src/main/java/com/khjxiaogu/MCMidi/MCMidi.java b/src/main/java/com/khjxiaogu/MCMidi/MCMidi.java
@@ -26,10 +26,12 @@
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
-import com.khjxiaogu.MCMidi.Midi.NoteBlockPlayers;
+
+import com.khjxiaogu.MCMidi.Midi.MidiSheet;
 import com.khjxiaogu.MCMidi.Midi.NoteInfo;
-import com.khjxiaogu.MCMidi.Midi.NotePlayers;
 import com.khjxiaogu.MCMidi.Midi.NoteTrack;
+import com.khjxiaogu.MCMidi.Midi.Players.NoteBlockPlayers;
+import com.khjxiaogu.MCMidi.Midi.Players.NotePlayers;
 import com.khjxiaogu.MCMidi.api.MidiAPI;
 
 public class MCMidi extends JavaPlugin {
@@ -55,6 +57,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			sender.sendMessage(Messages.getString("MCMidi.help5")); //$NON-NLS-1$
 			sender.sendMessage(Messages.getString("MCMidi.help6")); //$NON-NLS-1$
 			sender.sendMessage(Messages.getString("MCMidi.help7")); //$NON-NLS-1$
+			sender.sendMessage(Messages.getString("MCMidi.help7_1"));
+			sender.sendMessage(Messages.getString("MCMidi.help7_2"));
+			sender.sendMessage(Messages.getString("MCMidi.help8"));
 			return true;
 		}
 		if (args.length >= 2) {

diff --git a/.../java/com/khjxiaogu/MCMidi/MidiSheet.java → .../com/khjxiaogu/MCMidi/Midi/MidiSheet.java b/.../java/com/khjxiaogu/MCMidi/MidiSheet.java → .../com/khjxiaogu/MCMidi/Midi/MidiSheet.java
@@ -1,4 +1,4 @@
-package com.khjxiaogu.MCMidi;
+package com.khjxiaogu.MCMidi.Midi;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,9 +24,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import com.khjxiaogu.MCMidi.Midi.NoteBlockPlayers;
-import com.khjxiaogu.MCMidi.Midi.NotePlayers;
-import com.khjxiaogu.MCMidi.Midi.NoteTrack;
+import com.khjxiaogu.MCMidi.Midi.Players.NoteBlockPlayers;
+import com.khjxiaogu.MCMidi.Midi.Players.NotePlayers;
 
 public class MidiSheet implements ConfigurationSerializable {
 	public List<NoteTrack> tracks = new ArrayList<>();

diff --git a/src/main/java/com/khjxiaogu/MCMidi/Midi/NoteInfo.java b/src/main/java/com/khjxiaogu/MCMidi/Midi/NoteInfo.java
@@ -21,22 +21,20 @@ interface Initializer {
 		public void init(NoteInfo n, int key);
 	}
 
-	long ticks;
-	Note n;
-	Instrument ins;
-	int volume = 64;
+	public long ticks;
+	public Note n;
+	public Instrument ins;
+	public int volume = 64;
 	private final static Instrument[] inss = new Instrument[25];
 	private final static Note[] notes = new Note[25];
 	private static Initializer init;
 	private final int key;
 
 	public static void initNotes() {
 		if (MCMidi.plugin.getConfig().getBoolean("universal", false)) {
-			for (int i = 24; i >= 10; i--) {
+			for (int i = 24; i >= 8; i--) {
 				NoteInfo.inss[i] = Instrument.SNARE_DRUM;
 			}
-			NoteInfo.inss[9] = Instrument.SNARE_DRUM;
-			NoteInfo.inss[8] = Instrument.SNARE_DRUM;
 			Instrument Bell;
 			try {
 				Bell = Instrument.valueOf("BELL");// attempt to use 1.12 bell to provide better performation

diff --git a/src/main/java/com/khjxiaogu/MCMidi/Midi/NoteTrack.java b/src/main/java/com/khjxiaogu/MCMidi/Midi/NoteTrack.java
@@ -17,10 +17,16 @@
 import org.bukkit.util.Vector;
 
 import com.khjxiaogu.MCMidi.Messages;
+import com.khjxiaogu.MCMidi.Midi.Players.NoteBlockPlayer;
+import com.khjxiaogu.MCMidi.Midi.Players.TrackPlayer;
 
 public class NoteTrack implements ConfigurationSerializable {
 	List<NoteInfo> notes = new ArrayList<>();
 
+	public List<NoteInfo> getNotes() {
+		return notes;
+	}
+
 	public NoteTrack() {
 	}
 

diff --git a/...hjxiaogu/MCMidi/Midi/NoteBlockPlayer.java → .../MCMidi/Midi/Players/NoteBlockPlayer.java b/...hjxiaogu/MCMidi/Midi/NoteBlockPlayer.java → .../MCMidi/Midi/Players/NoteBlockPlayer.java
@@ -1,7 +1,10 @@
-package com.khjxiaogu.MCMidi.Midi;
+package com.khjxiaogu.MCMidi.Midi.Players;
 
 import org.bukkit.block.NoteBlock;
 
+import com.khjxiaogu.MCMidi.Midi.NoteInfo;
+import com.khjxiaogu.MCMidi.Midi.NoteTrack;
+
 public class NoteBlockPlayer extends TrackPlayer {
 	NoteBlock nb;
 

diff --git a/...jxiaogu/MCMidi/Midi/NoteBlockPlayers.java → ...MCMidi/Midi/Players/NoteBlockPlayers.java b/...jxiaogu/MCMidi/Midi/NoteBlockPlayers.java → ...MCMidi/Midi/Players/NoteBlockPlayers.java
@@ -1,4 +1,4 @@
-package com.khjxiaogu.MCMidi.Midi;
+package com.khjxiaogu.MCMidi.Midi.Players;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,8 @@
 import org.bukkit.scheduler.BukkitRunnable;
 
 import com.khjxiaogu.MCMidi.MCMidi;
-import com.khjxiaogu.MCMidi.MidiSheet;
+import com.khjxiaogu.MCMidi.Midi.MidiSheet;
+import com.khjxiaogu.MCMidi.Midi.NoteTrack;
 
 public class NoteBlockPlayers {
 	List<TrackPlayer> players = new ArrayList<>();

diff --git a/...om/khjxiaogu/MCMidi/Midi/NotePlayers.java → ...aogu/MCMidi/Midi/Players/NotePlayers.java b/...om/khjxiaogu/MCMidi/Midi/NotePlayers.java → ...aogu/MCMidi/Midi/Players/NotePlayers.java
@@ -1,4 +1,4 @@
-package com.khjxiaogu.MCMidi.Midi;
+package com.khjxiaogu.MCMidi.Midi.Players;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,8 @@
 import org.bukkit.scheduler.BukkitRunnable;
 
 import com.khjxiaogu.MCMidi.MCMidi;
-import com.khjxiaogu.MCMidi.MidiSheet;
+import com.khjxiaogu.MCMidi.Midi.MidiSheet;
+import com.khjxiaogu.MCMidi.Midi.NoteTrack;
 
 public class NotePlayers {
 	List<TrackPlayer> players = new ArrayList<>();

diff --git a/...om/khjxiaogu/MCMidi/Midi/TrackPlayer.java → ...aogu/MCMidi/Midi/Players/TrackPlayer.java b/...om/khjxiaogu/MCMidi/Midi/TrackPlayer.java → ...aogu/MCMidi/Midi/Players/TrackPlayer.java
@@ -1,9 +1,13 @@
-package com.khjxiaogu.MCMidi.Midi;
+package com.khjxiaogu.MCMidi.Midi.Players;
+
+import java.util.List;
 
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import com.khjxiaogu.MCMidi.MCMidi;
+import com.khjxiaogu.MCMidi.Midi.NoteInfo;
+import com.khjxiaogu.MCMidi.Midi.NoteTrack;
 
 public class TrackPlayer {
 	private Player p;
@@ -47,37 +51,38 @@ public boolean canPlay() {
 	}
 
 	public void play() {
+		List<NoteInfo> notes=nc.getNotes();
 		if (canceled)
 			return;
-		if (nc.notes.size() == 0) {
+		if (notes.size() == 0) {
 			synchronized (finished) {
 				finished = true;
 			}
 			return;
 		}
-		if (index >= nc.notes.size()) {
+		if (index >= notes.size()) {
 			synchronized (finished) {
 				finished = true;
 			}
 			return;
 		}
 		if (index > 0) {
-			play(nc.notes.get(index));
+			play(nc.getNotes().get(index));
 		}
 		index++;
-		while (index < nc.notes.size() && nc.notes.get(index).ticks == curticks) {
-			play(nc.notes.get(index));
+		while (index < notes.size() && notes.get(index).ticks == curticks) {
+			play(notes.get(index));
 			index++;
 		}
-		if (index >= nc.notes.size()) {
+		if (index >= notes.size()) {
 			synchronized (finished) {
 				finished = true;
 			}
 			return;
 		}
 
-		long wait = nc.notes.get(index).ticks - curticks;
-		curticks = nc.notes.get(index).ticks;
+		long wait = notes.get(index).ticks - curticks;
+		curticks = notes.get(index).ticks;
 		new BukkitRunnable() {
 			@Override
 			public void run() {

diff --git a/src/main/java/com/khjxiaogu/MCMidi/api/MidiAPI.java b/src/main/java/com/khjxiaogu/MCMidi/api/MidiAPI.java
@@ -11,8 +11,8 @@
 import org.bukkit.util.Vector;
 
 import com.khjxiaogu.MCMidi.MCMidi;
-import com.khjxiaogu.MCMidi.MidiSheet;
-import com.khjxiaogu.MCMidi.Midi.NotePlayers;
+import com.khjxiaogu.MCMidi.Midi.MidiSheet;
+import com.khjxiaogu.MCMidi.Midi.Players.NotePlayers;
 
 public class MidiAPI {
 	public static boolean generateStucture(String name, Location l, int width, Material baseBlock) {