diff --git a/.classpath b/.classpath index c03bc1b..15cb4a3 100644 --- a/.classpath +++ b/.classpath @@ -6,7 +6,7 @@ - + diff --git a/plugin.yml b/plugin.yml index 74e0f5d..1b55cad 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,4 +1,4 @@ name: AudioSpectrum -main: tk.sznp.audiospectrum.PluginMain -version: 1.0 +main: io.github.norbipeti.audiospectrum.PluginMain +version: 4.0 commands: diff --git a/pom.xml b/pom.xml index b5d38ff..8deb1d5 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,14 @@ + + + . + + *.yml + + + diff --git a/src/io/github/norbipeti/audiospectrum/BarsRenderer.java b/src/io/github/norbipeti/audiospectrum/BarsRenderer.java index 86034ac..1b01869 100644 --- a/src/io/github/norbipeti/audiospectrum/BarsRenderer.java +++ b/src/io/github/norbipeti/audiospectrum/BarsRenderer.java @@ -1,9 +1,7 @@ package io.github.norbipeti.audiospectrum; import org.bukkit.entity.Player; -import org.bukkit.map.MapCanvas; -import org.bukkit.map.MapRenderer; -import org.bukkit.map.MapView; +import org.bukkit.map.*; public class BarsRenderer extends MapRenderer { @@ -14,9 +12,15 @@ public class BarsRenderer extends MapRenderer this.bars = bars; } + @SuppressWarnings("deprecation") @Override - public void render(MapView arg0, MapCanvas arg1, Player arg2) - { - + public void render(MapView mv, MapCanvas mc, Player pl) + { //Width: 16, empty space: 16, count per map: 8 + int offsetx = mv.getId() % 2 * 8, offsety = mv.getId() < 2 ? -128 : 0; + //System.out.println("OX: " + offsetx + " OY: " + offsety + " ID: " + mv.getId()); + for (int i = offsetx; i < offsetx + 8; i++) + for (int j = 0; j < bars[i] + offsety; j++) + for (int k = 0; k < 16; k++) + mc.setPixel(i * 32 + k, 128 - j, MapPalette.matchColor(255 - j + offsety, j - offsety, 0)); //TODO: Fix } } diff --git a/src/io/github/norbipeti/audiospectrum/PluginMain.java b/src/io/github/norbipeti/audiospectrum/PluginMain.java index 4af8fbe..008493f 100644 --- a/src/io/github/norbipeti/audiospectrum/PluginMain.java +++ b/src/io/github/norbipeti/audiospectrum/PluginMain.java @@ -4,6 +4,8 @@ import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; +import java.util.Arrays; + import org.bukkit.Bukkit; import org.bukkit.map.MapView; import org.bukkit.plugin.java.JavaPlugin; @@ -61,7 +63,10 @@ public class PluginMain extends JavaPlugin while (running) { serverSocket.receive(receivePacket); - bars[Byte.toUnsignedInt(packet[0])] = Byte.toUnsignedInt(packet[1]); + //bars[Byte.toUnsignedInt(packet[0])] = Byte.toUnsignedInt(packet[1]); + //System.out.println("Index: " + Byte.toUnsignedInt(packet[0]) + " Value: " + bars[Byte.toUnsignedInt(packet[0])]); + for (int i = 0; i < packet.length && i < bars.length; i++) + bars[i] = Byte.toUnsignedInt(packet[i]); } } catch (IOException e) {