yey

Author: CaptainBern

src/main/java/me/captainbern/animationlib/AnimationLib.java

@@ -1,26 +1,94 @@
 package me.captainbern.animationlib;
 
+import me.captainbern.animationlib.command.CommandInfo;
+import me.captainbern.animationlib.command.CommandSource;
+import me.captainbern.animationlib.command.ICommand;
+import me.captainbern.animationlib.command.User;
+import org.bukkit.ChatColor;
+import org.bukkit.block.Block;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.logging.Level;
+
 public class AnimationLib extends JavaPlugin {
 
     private static AnimationLib instance;
-    public static final String LOG_PREFIX = "[AnimationLib] ";
+
+    public static final ModuleLogger LOGGER = new ModuleLogger("AnimationLib");
 
     public void onEnable(){
         instance = this;
 
         getLogger().info("Enabled");
     }
 
-    /**
-     * Used when players would activate this through console or something
-     */
-    public static void main(String[] args){
-        System.out.print("This is a library for Bukkit, place it in your plugins folder!");
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args){
+        String permissionPrefix = "animationlib.debug.";
+        String commandPath = "me.captainbern.animationlib.command.commands.Command";
+        ICommand cmd = null;
+
+        User user = null;
+        Block sBlock = null;
+
+        if(sender instanceof Player){
+
+            user = new User((Player) sender);
+
+        }else if(sender instanceof BlockCommandSender){
+
+            BlockCommandSender bCmdSender = (BlockCommandSender) sender;
+            sBlock = bCmdSender.getBlock();
+
+            LOGGER.log(Level.INFO, "CommandBlock at {0}, {1}, {2} issued BackPacks++ command: /{3}", new Object[]
+                    {
+                            sBlock.getX(), sBlock.getY(), sBlock.getZ(), command.getName()
+                    });
+
+        }
+
+        CommandSource source = new CommandSource(sender);
+
+        try {
+
+            cmd = (ICommand) this.getClassLoader().loadClass(commandPath + command.getName()).newInstance();
+
+        } catch (Exception e) {
+            LOGGER.log(Level.WARNING, "Failed to execute {0} command!", command.getName());
+            return true;
+        }
+
+        if(user != null && !user.isAuthorized(cmd, permissionPrefix)){
+            user.sendMessage(ChatColor.RED + "You don't have permission to execute this command.");
+            LOGGER.log(Level.INFO, "Player {0} issued AnimationLib (debug) command: /{1}", new Object[]{user.getBase().getName(), command.getName()});
+            return true;
+        }
+
+        //run the command
+        try{
+            if(user != null){
+                cmd.run(getServer(), user, new CommandInfo(command, args));
+                return true;
+            }else{
+                cmd.run(getServer(), source, new CommandInfo(command, args));
+                return true;
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+
+        return true;
     }
 
     public static AnimationLib getInstance(){
+        if(instance == null) {
+            LOGGER.warning("Instance is null!");
+            return null;
+        }
         return instance;
     }
 }

src/main/java/me/captainbern/animationlib/ModuleLogger.java

@@ -0,0 +1,41 @@
+package me.captainbern.animationlib;
+
+import me.captainbern.animationlib.utils.LogicUtil;
+import me.captainbern.animationlib.utils.StringUtil;
+import org.bukkit.Bukkit;
+
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+public class ModuleLogger extends Logger{
+
+    private final String[] modulePath;
+    private final String prefix;
+
+    public ModuleLogger(String... modulePath) {
+        this(Bukkit.getLogger(), modulePath);
+    }
+
+    public ModuleLogger(Logger parent, String... modulePath) {
+        super(StringUtil.join(modulePath, "."), null);
+        this.setParent(parent);
+        this.setLevel(Level.ALL);
+        this.modulePath = modulePath;
+        StringBuilder builder = new StringBuilder();
+        for (String module : modulePath) {
+            builder.append("[").append(module).append("] ");
+        }
+        this.prefix = builder.toString();
+    }
+
+    public ModuleLogger getModule(String... path) {
+        return new ModuleLogger(this.getParent(), LogicUtil.appendArray(this.modulePath, path));
+    }
+
+    @Override
+    public void log(LogRecord logRecord) {
+        logRecord.setMessage(this.prefix + logRecord.getMessage());
+        super.log(logRecord);
+    }
+}

src/main/java/me/captainbern/animationlib/animations/BlockAnimation.java

@@ -27,7 +27,7 @@ protected void broadcastAnimation(Block block, short damage) {
                     throw new NumberFormatException("Damage needs to be between 0 and 9!");
                 }
 
-                Packet packet = new Packet(PacketType.BLOCK_BREAK_ANIMATION);
+                Packet packet = new Packet(PacketType.PLAY.Server.BLOCK_BREAK_ANIMATION);
                 packet.write("a", RandGen.nextInt());
                 packet.write("b", block.getX());
                 packet.write("c", block.getY());
@@ -37,7 +37,7 @@ protected void broadcastAnimation(Block block, short damage) {
                 sendPacketNearby(block.getLocation(), Arrays.asList(packet), this, block);
 
             }catch(Exception e){
-                Bukkit.getLogger().warning(AnimationLib.LOG_PREFIX + "Something went wrong while crafting the Packet55BlockBreakAnimation packet! (BLOCK_BREAK)");
+                AnimationLib.LOGGER.warning("Something went wrong while crafting the Packet55BlockBreakAnimation packet! (BLOCK_BREAK)");
                 e.printStackTrace();
             }
         }
@@ -66,6 +66,6 @@ private static void sendPacketNearby(Location loc, Collection<Packet> packets, B
     }
 
     protected void broadcastAnimation(Block block, short damage){
-        throw new UnsupportedOperationException(AnimationLib.LOG_PREFIX + "Unimplemented animation");
+        throw new UnsupportedOperationException("Unimplemented animation");
     }
 }