diff --git a/.project b/.project index 602cd30..a3cb20e 100644 --- a/.project +++ b/.project @@ -5,11 +5,6 @@ - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.m2e.core.maven2Builder @@ -18,6 +13,5 @@ org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.travis.yml b/.travis.yml index 9bcf999..dfd0224 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,26 @@ +cache: + directories: + - $HOME/.m2/repository/org/ +before_install: | # Wget BuildTools and run if cached folder not found + if [ ! -d "$HOME/.m2/repository/org/spigotmc/spigot/1.12.1-R0.1-SNAPSHOT" ]; then + wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar + # grep so that download counts don't appear in log files + java -jar BuildTools.jar --rev 1.12.1 | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$" + fi language: java jdk: - oraclejdk8 +sudo: true +deploy: + # deploy develop to the staging environment + - provider: script + script: chmod +x deploy.sh && sh deploy.sh staging + on: + branch: dev + skip_cleanup: true + # deploy master to production + - provider: script + script: chmod +x deploy.sh && sh deploy.sh production + on: + branch: master + skip_cleanup: true diff --git a/.factorypath b/ButtonCore/.factorypath similarity index 100% rename from .factorypath rename to ButtonCore/.factorypath diff --git a/.gitignore b/ButtonCore/.gitignore similarity index 100% rename from .gitignore rename to ButtonCore/.gitignore diff --git a/ButtonCore/.project b/ButtonCore/.project new file mode 100644 index 0000000..602cd30 --- /dev/null +++ b/ButtonCore/.project @@ -0,0 +1,23 @@ + + + ButtonCore + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/ButtonCore/.settings/org.eclipse.core.resources.prefs b/ButtonCore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..ed7df2b --- /dev/null +++ b/ButtonCore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs b/ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..7d52ece --- /dev/null +++ b/ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=.apt_generated +org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/.settings/org.eclipse.jdt.core.prefs b/ButtonCore/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from .settings/org.eclipse.jdt.core.prefs rename to ButtonCore/.settings/org.eclipse.jdt.core.prefs diff --git a/ButtonCore/.settings/org.eclipse.m2e.core.prefs b/ButtonCore/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..14b697b --- /dev/null +++ b/ButtonCore/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/License.md b/ButtonCore/License.md similarity index 100% rename from License.md rename to ButtonCore/License.md diff --git a/README.md b/ButtonCore/README.md similarity index 97% rename from README.md rename to ButtonCore/README.md index a338d88..cae677a 100644 --- a/README.md +++ b/ButtonCore/README.md @@ -1,2 +1,2 @@ -# ButtonCore -A plugin that serves as a container for things common to many of our plugins +# ButtonCore +A plugin that serves as a container for things common to many of our plugins diff --git a/ButtonCore/pom.xml b/ButtonCore/pom.xml new file mode 100644 index 0000000..2504963 --- /dev/null +++ b/ButtonCore/pom.xml @@ -0,0 +1,175 @@ + + 4.0.0 + + com.github.TBMCPlugins + ButtonCore + master-SNAPSHOT + + com.github.TBMCPlugins.ButtonCore + ButtonCore + ButtonCore + ButtonCore + + src/main/java + + + src/main/resources + + *.properties + *.yml + *.csv + *.txt + + true + + + ButtonCore + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.2 + + + package + + shade + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.1 + + + copy + compile + + copy-resources + + + target + + + src/main/resources + + + + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io/ + + + vault-repo + http://nexus.hc.to/content/repositories/pub_releases + + + + + org.reflections + reflections + 0.9.10 + compile + + + org.spigotmc + spigot-api + 1.9.2-R0.1-SNAPSHOT + provided + + + + commons-io + commons-io + 1.3.2 + provided + + + + com.github.TBMCPlugins.ButtonCore + Towny + master-SNAPSHOT + provided + + + com.github.milkbowl + VaultAPI + master-SNAPSHOT + provided + + + + org.javassist + javassist + 3.20.0-GA + + + org.mockito + mockito-core + 2.7.20 + + + + org.projectlombok + lombok + 1.16.16 + provided + + + com.github.TBMCPlugins.ButtonCore + ButtonProcessor + master-SNAPSHOT + provided + + + + TBMCPlugins + https://github.com/TBMCPlugins + + + + internal.repo + Temporary Staging Repository + file://${project.build.directory}/mvn-repo/${project.name} + + + + + github + UTF-8 + + + https://github.com/TBMCPlugins/mvn-repo + scm:git:https://github.com/TBMCPlugins/mvn-repo.git + scm:git:https://github.com/TBMCPlugins/mvn-repo.git + + \ No newline at end of file diff --git a/src/main/java/buttondevteam/core/CommandCaller.java b/ButtonCore/src/main/java/buttondevteam/core/CommandCaller.java similarity index 100% rename from src/main/java/buttondevteam/core/CommandCaller.java rename to ButtonCore/src/main/java/buttondevteam/core/CommandCaller.java diff --git a/src/main/java/buttondevteam/core/MainPlugin.java b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java similarity index 84% rename from src/main/java/buttondevteam/core/MainPlugin.java rename to ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java index ac4a4ad..2762a48 100644 --- a/src/main/java/buttondevteam/core/MainPlugin.java +++ b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java @@ -7,6 +7,7 @@ import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.chat.Channel; +import buttondevteam.lib.chat.ChatRoom; import buttondevteam.lib.chat.Color; import buttondevteam.lib.chat.TBMCChatAPI; import buttondevteam.lib.player.TBMCPlayerBase; @@ -35,11 +36,11 @@ public class MainPlugin extends JavaPlugin { TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class); TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fg§f", Color.White, "g", null)); TBMCChatAPI.RegisterChatChannel( - Channel.AdminChat = new Channel("§cADMIN§f", Color.Red, "a", Channel.filteranderrormsg(null))); + Channel.AdminChat = new Channel("§cADMIN§f", Color.Red, "a", Channel.inGroupFilter(null))); TBMCChatAPI.RegisterChatChannel( - Channel.ModChat = new Channel("§9MOD§f", Color.Blue, "mod", Channel.filteranderrormsg("mod"))); - TBMCChatAPI - .RegisterChatChannel(new Channel("§6DEV§", Color.Gold, "dev", Channel.filteranderrormsg("developer"))); + Channel.ModChat = new Channel("§9MOD§f", Color.Blue, "mod", Channel.inGroupFilter("mod"))); + TBMCChatAPI.RegisterChatChannel(new Channel("§6DEV§", Color.Gold, "dev", Channel.inGroupFilter("developer"))); + TBMCChatAPI.RegisterChatChannel(new ChatRoom("§cRED", Color.DarkRed, "red")); logger.info(pdfFile.getName() + " has been Enabled (V." + pdfFile.getVersion() + ") Test: " + Test + "."); } diff --git a/src/main/java/buttondevteam/core/PlayerListener.java b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java similarity index 58% rename from src/main/java/buttondevteam/core/PlayerListener.java rename to ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java index 0a2ecb3..b8bd6e7 100644 --- a/src/main/java/buttondevteam/core/PlayerListener.java +++ b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java @@ -1,16 +1,18 @@ package buttondevteam.core; +import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; +import buttondevteam.lib.TBMCSystemChatEvent; import buttondevteam.lib.player.TBMCPlayerBase; public class PlayerListener implements Listener { - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.LOWEST) public void OnPlayerJoin(PlayerJoinEvent event) { TBMCPlayerBase.joinPlayer(event.getPlayer()); } @@ -19,4 +21,12 @@ public class PlayerListener implements Listener { public void OnPlayerLeave(PlayerQuitEvent event) { TBMCPlayerBase.quitPlayer(event.getPlayer()); } + + @EventHandler(priority = EventPriority.HIGHEST) + public void onSystemChat(TBMCSystemChatEvent event) { + if (event.isHandled()) + return; // Only handle here if ButtonChat couldn't + Bukkit.getOnlinePlayers().stream().filter(p -> event.shouldSendTo(p)) + .forEach(p -> p.sendMessage(event.getChannel().DisplayName.substring(0, 2) + event.getMessage())); + } } diff --git a/src/main/java/buttondevteam/core/ScheduledRestartCommand.java b/ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java similarity index 97% rename from src/main/java/buttondevteam/core/ScheduledRestartCommand.java rename to ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java index b80c2de..7f9c4fe 100644 --- a/src/main/java/buttondevteam/core/ScheduledRestartCommand.java +++ b/ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java @@ -47,7 +47,7 @@ public class ScheduledRestartCommand extends TBMCCommandBase { if (restartcounter % 200 == 0) Bukkit.broadcastMessage("§c-- The server is restarting in " + restartcounter / 20 + " seconds!"); restartbar.setProgress(restartcounter / (double) restarttime); - restartbar.setTitle(String.format("Server restart in %f.2", restartcounter / 20f)); + restartbar.setTitle(String.format("Server restart in %.2f", restartcounter / 20f)); restartcounter--; }, 1, 1); return true; diff --git a/src/main/java/buttondevteam/core/TestPrepare.java b/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java similarity index 100% rename from src/main/java/buttondevteam/core/TestPrepare.java rename to ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java diff --git a/src/main/java/buttondevteam/core/UpdatePluginCommand.java b/ButtonCore/src/main/java/buttondevteam/core/UpdatePluginCommand.java similarity index 100% rename from src/main/java/buttondevteam/core/UpdatePluginCommand.java rename to ButtonCore/src/main/java/buttondevteam/core/UpdatePluginCommand.java diff --git a/src/main/java/buttondevteam/lib/EventExceptionCoreHandler.java b/ButtonCore/src/main/java/buttondevteam/lib/EventExceptionCoreHandler.java similarity index 100% rename from src/main/java/buttondevteam/lib/EventExceptionCoreHandler.java rename to ButtonCore/src/main/java/buttondevteam/lib/EventExceptionCoreHandler.java diff --git a/src/main/java/buttondevteam/lib/EventExceptionHandler.java b/ButtonCore/src/main/java/buttondevteam/lib/EventExceptionHandler.java similarity index 100% rename from src/main/java/buttondevteam/lib/EventExceptionHandler.java rename to ButtonCore/src/main/java/buttondevteam/lib/EventExceptionHandler.java diff --git a/src/main/java/buttondevteam/lib/PluginUpdater.java b/ButtonCore/src/main/java/buttondevteam/lib/PluginUpdater.java similarity index 100% rename from src/main/java/buttondevteam/lib/PluginUpdater.java rename to ButtonCore/src/main/java/buttondevteam/lib/PluginUpdater.java diff --git a/src/main/java/buttondevteam/lib/ScheduledServerRestartEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/ScheduledServerRestartEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/ScheduledServerRestartEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/ScheduledServerRestartEvent.java diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java new file mode 100644 index 0000000..9b292df --- /dev/null +++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java @@ -0,0 +1,35 @@ +package buttondevteam.lib; + +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; + +import buttondevteam.lib.chat.Channel; +import lombok.Getter; + +/** + * Make sure to only send the message to users who {@link #shouldSendTo(CommandSender)} returns true. + * + * @author NorbiPeti + * + */ +@Getter +public class TBMCChatEvent extends TBMCChatEventBase { + public TBMCChatEvent(CommandSender sender, Channel channel, String message, int score) { + super(channel, message, score); + this.sender = sender; + } + + private static final HandlerList handlers = new HandlerList(); + + private CommandSender sender; + // TODO: Message object with data? + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java new file mode 100644 index 0000000..627f7c6 --- /dev/null +++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java @@ -0,0 +1,40 @@ +package buttondevteam.lib; + +import org.bukkit.command.CommandSender; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import buttondevteam.lib.chat.Channel; +import buttondevteam.lib.chat.Channel.RecipientTestResult; +import lombok.Getter; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.Setter; + +@Getter +@RequiredArgsConstructor +public abstract class TBMCChatEventBase extends Event implements Cancellable { + private final Channel channel; + private @NonNull String message; + private @Setter boolean cancelled; + private final int score; + + /** + * Note: Errors are sent to the sender automatically + */ + public boolean shouldSendTo(CommandSender sender) { + if (channel.filteranderrormsg == null) + return true; + RecipientTestResult result = channel.filteranderrormsg.apply(sender); + return result.errormessage == null && score == result.score; + } + + /** + * Note: Errors are sent to the sender automatically + */ + public int getMCScore(CommandSender sender) { + if (channel.filteranderrormsg == null) + return 0; + RecipientTestResult result = channel.filteranderrormsg.apply(sender); + return result.errormessage == null ? result.score : -1; + } +} diff --git a/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java diff --git a/src/main/java/buttondevteam/lib/TBMCCoreAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java similarity index 100% rename from src/main/java/buttondevteam/lib/TBMCCoreAPI.java rename to ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java diff --git a/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java new file mode 100644 index 0000000..7bb0e05 --- /dev/null +++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java @@ -0,0 +1,38 @@ +package buttondevteam.lib; + +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + *

+ * This event gets called (ideally) each time an exception occurs in a TBMC plugin. To call it, use {@link TBMCCoreAPI#SendException(String, Exception)}. + *

+ * + * @author Norbi + * + */ +@Getter +@RequiredArgsConstructor +public class TBMCExceptionEvent extends Event { + private static final HandlerList handlers = new HandlerList(); + + private final String sourceMessage; + private final Throwable exception; + private boolean handled; + + public void setHandled() { + handled = true; + } + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java new file mode 100644 index 0000000..c0fce47 --- /dev/null +++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java @@ -0,0 +1,37 @@ +package buttondevteam.lib; + +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; + +import buttondevteam.lib.chat.Channel; +import lombok.Getter; + +/** + * Make sure to only send the message to users who {@link #shouldSendTo(CommandSender)} returns true. + * + * @author NorbiPeti + * + */ +@Getter +public class TBMCSystemChatEvent extends TBMCChatEventBase { + private boolean handled; + + public void setHandled() { + handled = true; + } + + public TBMCSystemChatEvent(Channel channel, String message, int score) { // TODO: RIch message + super(channel, message, score); + } + + private static final HandlerList handlers = new HandlerList(); + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/src/main/java/buttondevteam/lib/chat/Channel.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java similarity index 62% rename from src/main/java/buttondevteam/lib/chat/Channel.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java index a8d84dd..43e00ea 100644 --- a/src/main/java/buttondevteam/lib/chat/Channel.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java @@ -2,7 +2,10 @@ package buttondevteam.lib.chat; import java.util.ArrayList; import java.util.List; +import java.util.function.BiFunction; +import java.util.function.BiPredicate; import java.util.function.Function; +import java.util.function.Predicate; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -25,7 +28,7 @@ public class Channel { * Creates a channel. * * @param displayname - * The name that should appear at the start of the message + * The name that should appear at the start of the message. A chat color is expected at the beginning (§9). * @param color * The default color of the messages sent in the channel * @param command @@ -42,6 +45,20 @@ public class Channel { this.filteranderrormsg = filteranderrormsg; } + /** + * Must be only called from a subclass - otherwise it'll throw an exception. + * + * @see Channel#Channel(String, Color, String, Function) + */ + @SuppressWarnings("unchecked") + protected Channel(String displayname, Color color, String command, + BiFunction filteranderrormsg) { + DisplayName = displayname; + this.color = color; + ID = command; + this.filteranderrormsg = s -> filteranderrormsg.apply((T) this, s); + } + public static List getChannels() { return channels; } @@ -54,12 +71,21 @@ public class Channel { * The group that can access the channel or null to only allow OPs. * @return */ - public static Function filteranderrormsg(String permgroup) { - return s -> s.isOp() || (permgroup != null - ? s instanceof Player && MainPlugin.permission.playerInGroup((Player) s, permgroup) : false) - ? new RecipientTestResult(0) // - : new RecipientTestResult("You need to be a(n) " + (permgroup != null ? permgroup : "OP") - + " to use this channel."); + public static Function inGroupFilter(String permgroup) { + return noScoreResult( + s -> s.isOp() || (permgroup != null + ? s instanceof Player && MainPlugin.permission.playerInGroup((Player) s, permgroup) : false), + "You need to be a(n) " + (permgroup != null ? permgroup : "OP") + " to use this channel."); + } + + public static Function noScoreResult(Predicate filter, + String errormsg) { + return s -> filter.test(s) ? new RecipientTestResult(0) : new RecipientTestResult(errormsg); + } + + public static BiFunction noScoreResult( + BiPredicate filter, String errormsg) { + return (this_, s) -> filter.test(this_, s) ? new RecipientTestResult(0) : new RecipientTestResult(errormsg); } public static Channel GlobalChat; diff --git a/src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatRoom.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatRoom.java new file mode 100644 index 0000000..6a735e7 --- /dev/null +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatRoom.java @@ -0,0 +1,24 @@ +package buttondevteam.lib.chat; + +import java.util.ArrayList; +import java.util.List; +import org.bukkit.command.CommandSender; + +public class ChatRoom extends Channel { + private List usersInRoom = new ArrayList<>(); + + public ChatRoom(String displayname, Color color, String command) { + super(displayname, color, command, noScoreResult((this_, s) -> this_.usersInRoom.contains(s), + "Not implemented yet. Please report it to the devs along with which platform you're trying to talk from.")); + } + + public void joinRoom(CommandSender sender) { + usersInRoom.add(sender); + TBMCChatAPI.SendSystemMessage(this, 0, sender.getName() + " joined the room"); + } + + public void leaveRoom(CommandSender sender) { + usersInRoom.remove(sender); + TBMCChatAPI.SendSystemMessage(this, 0, sender.getName() + " left the room"); + } +} diff --git a/src/main/java/buttondevteam/lib/chat/Color.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Color.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/Color.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/Color.java diff --git a/src/main/java/buttondevteam/lib/chat/CommandClass.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/CommandClass.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/CommandClass.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/CommandClass.java diff --git a/src/main/java/buttondevteam/lib/chat/IDiscordSender.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/IDiscordSender.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/IDiscordSender.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/IDiscordSender.java diff --git a/src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandBase.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandBase.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandBase.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandBase.java diff --git a/src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandClass.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandClass.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandClass.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/OptionallyPlayerCommandClass.java diff --git a/src/main/java/buttondevteam/lib/chat/PlayerCommandBase.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/PlayerCommandBase.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/PlayerCommandBase.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/PlayerCommandBase.java diff --git a/src/main/java/buttondevteam/lib/chat/Priority.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Priority.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/Priority.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/Priority.java diff --git a/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java similarity index 87% rename from src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java index 359e7e7..c537b63 100644 --- a/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java @@ -22,6 +22,7 @@ import buttondevteam.core.MainPlugin; import buttondevteam.lib.TBMCChatEvent; import buttondevteam.lib.TBMCChatPreprocessEvent; import buttondevteam.lib.TBMCCoreAPI; +import buttondevteam.lib.TBMCSystemChatEvent; import buttondevteam.lib.chat.Channel.RecipientTestResult; public class TBMCChatAPI { @@ -223,20 +224,46 @@ public class TBMCChatAPI { Bukkit.getPluginManager().callEvent(eventPre); if (eventPre.isCancelled()) return true; + int score = getScoreOrSendError(channel, sender); + if (score == -1) + return true; + TBMCChatEvent event = new TBMCChatEvent(sender, channel, eventPre.getMessage(), score); + Bukkit.getPluginManager().callEvent(event); + return event.isCancelled(); + } + + /** + * Sends a regular message to Minecraft. Make sure that the channel is registered with {@link #RegisterChatChannel(Channel)}. + * + * @param channel + * The channel to send to + * @param score + * The score to use to find the group - use 0 if the channel doesn't have scores + * @param message + * The message to send + * @return The event cancelled state + */ + public static boolean SendSystemMessage(Channel channel, int score, String message) { + if (!Channel.getChannels().contains(channel)) + throw new RuntimeException("Channel " + channel.DisplayName + " not registered!"); + TBMCSystemChatEvent event = new TBMCSystemChatEvent(channel, message, score); + Bukkit.getPluginManager().callEvent(event); + return event.isCancelled(); + } + + private static int getScoreOrSendError(Channel channel, CommandSender sender) { int score; if (channel.filteranderrormsg == null) - score = -1; + score = 0; else { RecipientTestResult result = channel.filteranderrormsg.apply(sender); if (result.errormessage != null) { sender.sendMessage("§c" + result.errormessage); - return true; + return -1; } score = result.score; } - TBMCChatEvent event = new TBMCChatEvent(sender, channel, eventPre.getMessage(), score); - Bukkit.getPluginManager().callEvent(event); - return event.isCancelled(); + return score; } /** diff --git a/src/main/java/buttondevteam/lib/chat/TBMCCommandBase.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCCommandBase.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/TBMCCommandBase.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCCommandBase.java diff --git a/src/main/java/buttondevteam/lib/chat/TellrawSerializableEnum.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TellrawSerializableEnum.java similarity index 100% rename from src/main/java/buttondevteam/lib/chat/TellrawSerializableEnum.java rename to ButtonCore/src/main/java/buttondevteam/lib/chat/TellrawSerializableEnum.java diff --git a/src/main/java/buttondevteam/lib/player/AbstractUserClass.java b/ButtonCore/src/main/java/buttondevteam/lib/player/AbstractUserClass.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/AbstractUserClass.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/AbstractUserClass.java diff --git a/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java b/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java similarity index 97% rename from src/main/java/buttondevteam/lib/player/ChromaGamerBase.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java index 0424c41..c533fa8 100644 --- a/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java @@ -2,7 +2,6 @@ package buttondevteam.lib.player; import java.io.File; import java.util.HashMap; -import java.util.Map.Entry; import java.util.function.Consumer; import org.bukkit.Bukkit; @@ -11,6 +10,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import com.google.common.collect.HashBiMap; import buttondevteam.lib.TBMCCoreAPI; +import lombok.val; @ChromaGamerEnforcer public abstract class ChromaGamerBase implements AutoCloseable { @@ -131,7 +131,7 @@ public abstract class ChromaGamerBase implements AutoCloseable { Consumer sync = sourcedata -> { final String sourcefolder = sourcedata == plugindata ? ownFolder : userFolder; final String id = sourcedata.getString(sourcefolder + "_id"); - for (Entry, String> entry : playerTypes.entrySet()) { // Set our ID in all files we can find, both from our connections and the new ones + for (val entry : playerTypes.entrySet()) { // Set our ID in all files we can find, both from our connections and the new ones if (entry.getKey() == getClass() || entry.getKey() == user.getClass()) continue; final String otherid = sourcedata.getString(entry.getValue() + "_id"); @@ -139,7 +139,7 @@ public abstract class ChromaGamerBase implements AutoCloseable { continue; try (ChromaGamerBase cg = getUser(otherid, entry.getKey())) { cg.plugindata.set(sourcefolder + "_id", id); // Set new IDs - for (Entry, String> item : playerTypes.entrySet()) + for (val item : playerTypes.entrySet()) if (sourcedata.contains(item.getValue() + "_id")) cg.plugindata.set(item.getValue() + "_id", sourcedata.getString(item.getValue() + "_id")); // Set all existing IDs } catch (Exception e) { diff --git a/src/main/java/buttondevteam/lib/player/ChromaGamerEnforcer.java b/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerEnforcer.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/ChromaGamerEnforcer.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerEnforcer.java diff --git a/src/main/java/buttondevteam/lib/player/EnumPlayerData.java b/ButtonCore/src/main/java/buttondevteam/lib/player/EnumPlayerData.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/EnumPlayerData.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/EnumPlayerData.java diff --git a/src/main/java/buttondevteam/lib/player/PlayerClass.java b/ButtonCore/src/main/java/buttondevteam/lib/player/PlayerClass.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/PlayerClass.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/PlayerClass.java diff --git a/src/main/java/buttondevteam/lib/player/PlayerData.java b/ButtonCore/src/main/java/buttondevteam/lib/player/PlayerData.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/PlayerData.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/PlayerData.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayer.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayer.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayer.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayer.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayerQuitEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerQuitEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayerQuitEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerQuitEvent.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCPlayerSaveEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerSaveEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCPlayerSaveEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerSaveEvent.java diff --git a/src/main/java/buttondevteam/lib/player/TBMCYEEHAWEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/player/TBMCYEEHAWEvent.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/TBMCYEEHAWEvent.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/TBMCYEEHAWEvent.java diff --git a/src/main/java/buttondevteam/lib/player/UserClass.java b/ButtonCore/src/main/java/buttondevteam/lib/player/UserClass.java similarity index 100% rename from src/main/java/buttondevteam/lib/player/UserClass.java rename to ButtonCore/src/main/java/buttondevteam/lib/player/UserClass.java diff --git a/src/main/java/buttondevteam/lib/potato/DebugPotato.java b/ButtonCore/src/main/java/buttondevteam/lib/potato/DebugPotato.java similarity index 100% rename from src/main/java/buttondevteam/lib/potato/DebugPotato.java rename to ButtonCore/src/main/java/buttondevteam/lib/potato/DebugPotato.java diff --git a/src/main/java/buttondevteam/lib/potato/Gary.java b/ButtonCore/src/main/java/buttondevteam/lib/potato/Gary.java similarity index 100% rename from src/main/java/buttondevteam/lib/potato/Gary.java rename to ButtonCore/src/main/java/buttondevteam/lib/potato/Gary.java diff --git a/src/main/resources/plugin.yml b/ButtonCore/src/main/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to ButtonCore/src/main/resources/plugin.yml diff --git a/src/test/java/buttondevteam/core/PlayerDataTest.java b/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java similarity index 100% rename from src/test/java/buttondevteam/core/PlayerDataTest.java rename to ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java diff --git a/src/test/java/buttondevteam/core/TestPlayerClass.java b/ButtonCore/src/test/java/buttondevteam/core/TestPlayerClass.java similarity index 100% rename from src/test/java/buttondevteam/core/TestPlayerClass.java rename to ButtonCore/src/test/java/buttondevteam/core/TestPlayerClass.java diff --git a/ButtonProcessor/.classpath b/ButtonProcessor/.classpath new file mode 100644 index 0000000..af1430b --- /dev/null +++ b/ButtonProcessor/.classpath @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ButtonProcessor/.gitignore b/ButtonProcessor/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/ButtonProcessor/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/ButtonProcessor/.project b/ButtonProcessor/.project new file mode 100644 index 0000000..208ad72 --- /dev/null +++ b/ButtonProcessor/.project @@ -0,0 +1,23 @@ + + + ButtonProcessor + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/ButtonProcessor/.settings/org.eclipse.core.resources.prefs b/ButtonProcessor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/ButtonProcessor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/ButtonProcessor/.settings/org.eclipse.jdt.core.prefs b/ButtonProcessor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..714351a --- /dev/null +++ b/ButtonProcessor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/ButtonProcessor/.settings/org.eclipse.m2e.core.prefs b/ButtonProcessor/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/ButtonProcessor/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/ButtonProcessor/License.md b/ButtonProcessor/License.md new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/ButtonProcessor/License.md @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ButtonProcessor/pom.xml b/ButtonProcessor/pom.xml new file mode 100644 index 0000000..6a14248 --- /dev/null +++ b/ButtonProcessor/pom.xml @@ -0,0 +1,41 @@ + + 4.0.0 + + com.github.TBMCPlugins + ButtonCore + master-SNAPSHOT + + com.github.TBMCPlugins.ButtonCore + ButtonProcessor + jar + + ButtonProcessor + http://maven.apache.org + + + + + maven-compiler-plugin + + 1.8 + 1.8 + -proc:none + + + + + + + UTF-8 + + + + + junit + junit + 3.8.1 + test + + + diff --git a/src/main/java/buttondevteam/lib/AnnotationProcessor.java b/ButtonProcessor/src/main/java/buttondevteam/buttonproc/ButtonProcessor.java similarity index 54% rename from src/main/java/buttondevteam/lib/AnnotationProcessor.java rename to ButtonProcessor/src/main/java/buttondevteam/buttonproc/ButtonProcessor.java index 8e763ec..8f71daf 100644 --- a/src/main/java/buttondevteam/lib/AnnotationProcessor.java +++ b/ButtonProcessor/src/main/java/buttondevteam/buttonproc/ButtonProcessor.java @@ -1,31 +1,33 @@ -package buttondevteam.lib; +package buttondevteam.buttonproc; import java.util.List; import java.util.Set; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; -import buttondevteam.lib.player.ChromaGamerEnforcer; - /** * A simple session bean type annotation processor. The implementation * is based on the standard annotation processing API in Java 6. */ @SupportedSourceVersion(SourceVersion.RELEASE_8) -public class AnnotationProcessor extends AbstractProcessor { +@SupportedAnnotationTypes("buttondevteam.*") +public class ButtonProcessor extends AbstractProcessor { /** * Check if both @Stateful and @Stateless are present in an * session bean. If so, emits a warning message. */ @Override public boolean process(Set typeElements, RoundEnvironment roundEnv) { // TODO: SEparate JAR - Set elements = roundEnv.getElementsAnnotatedWith(ChromaGamerEnforcer.class); - for (Element element : elements) { - System.out.println("Processing " + element); - List annotationMirrors = element.getAnnotationMirrors(); - System.out.println("Annotations: " + annotationMirrors); - for (AnnotationMirror annotation : annotationMirrors) { - String type = annotation.getAnnotationType().toString(); - System.out.println("Type: " + type); + for (TypeElement te : typeElements) { + Set elements = roundEnv.getElementsAnnotatedWith(te); + for (Element element : elements) { + System.out.println("Processing " + element); + List annotationMirrors = element.getAnnotationMirrors(); + System.out.println("Annotations: " + annotationMirrors); + for (AnnotationMirror annotation : annotationMirrors) { + String type = annotation.getAnnotationType().toString(); + System.out.println("Type: " + type); + } } } return true; // claim the annotations diff --git a/ButtonProcessor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/ButtonProcessor/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000..2869804 --- /dev/null +++ b/ButtonProcessor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +buttondevteam.buttonproc.ButtonProcessor \ No newline at end of file diff --git a/ButtonProcessor/src/test/java/buttondevteam/ButtonProcessor/AppTest.java b/ButtonProcessor/src/test/java/buttondevteam/ButtonProcessor/AppTest.java new file mode 100644 index 0000000..0b65143 --- /dev/null +++ b/ButtonProcessor/src/test/java/buttondevteam/ButtonProcessor/AppTest.java @@ -0,0 +1,38 @@ +package buttondevteam.ButtonProcessor; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/META-INF/services/javax.annotation.processing.Processor b/META-INF/services/javax.annotation.processing.Processor deleted file mode 100644 index c52a464..0000000 --- a/META-INF/services/javax.annotation.processing.Processor +++ /dev/null @@ -1 +0,0 @@ -buttondevteam.lib.AnnotationProcessor \ No newline at end of file diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..606423b --- /dev/null +++ b/deploy.sh @@ -0,0 +1,10 @@ +#!/bin/sh +FILENAME=$(find target/ -maxdepth 1 ! -name '*original*' -name '*.jar') +echo Found file: $FILENAME + +if [ $1 = 'production' ]; then +echo Production mode +echo $UPLOAD_KEY > upload_key +chmod 400 upload_key +yes | scp -B -i upload_key -o StrictHostKeyChecking=no $FILENAME travis@server.figytuna.com:/minecraft/main/plugins +fi diff --git a/jitpack.yml b/jitpack.yml index 219eab8..5d9bcff 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,10 +1,10 @@ -jdk: - - oraclejdk8 -#before_install: -# - ./prepareEnvironment.sh -install: - - echo "Downloading Towny JAR..." - - 'wget -O "Towny.jar" --header="Accept-Language: en-us,en;q=0.5" http://palmergames.com/file-repo/Towny%20Advanced/Development/0.91.1.5/Towny.jar' - - mvn install:install-file -Dfile=Towny.jar -DgroupId=com.github.TBMCPlugins.ButtonCore -DartifactId=Towny -Dversion=master-SNAPSHOT -Dpackaging=jar - - mvn clean install -DskipTests +jdk: + - oraclejdk8 +#before_install: +# - ./prepareEnvironment.sh +install: + - echo "Downloading Towny JAR..." + - 'wget -O "Towny.jar" --header="Accept-Language: en-us,en;q=0.5" http://palmergames.com/file-repo/Towny%20Advanced/Development/0.91.1.5/Towny.jar' + - mvn install:install-file -Dfile=Towny.jar -DgroupId=com.github.TBMCPlugins.ButtonCore -DartifactId=Towny -Dversion=master-SNAPSHOT -Dpackaging=jar + - mvn clean install -DskipTests # - rm -r ~/.m2/repository/com/palmergames/Towny/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index ba1b5fd..672f423 100644 --- a/pom.xml +++ b/pom.xml @@ -1,163 +1,42 @@ - - 4.0.0 - com.github.TBMCPlugins.ButtonCore - ButtonCore - master-SNAPSHOT - ButtonCore - ButtonCore - - src/main/java - - - src/main/resources - - *.properties - *.yml - *.csv - *.txt - - true - - - ButtonCore - - - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - -proc:none - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.2 - - - package - - shade - - - - - org.reflections:reflections - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.0.1 - - - copy - compile - - copy-resources - - - target - - - src/main/resources - - - - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jitpack.io - https://jitpack.io/ - - - vault-repo - http://nexus.hc.to/content/repositories/pub_releases - - - - - org.reflections - reflections - 0.9.10 - compile - - - org.spigotmc - spigot-api - 1.9.2-R0.1-SNAPSHOT - provided - - - - commons-io - commons-io - 1.3.2 - provided - - - - com.github.TBMCPlugins.ButtonCore - Towny - master-SNAPSHOT - provided - - - com.github.milkbowl - VaultAPI - master-SNAPSHOT - provided - - - - org.javassist - javassist - 3.20.0-GA - - - org.mockito - mockito-core - 2.7.20 - - - - TBMCPlugins - https://github.com/TBMCPlugins - - - - internal.repo - Temporary Staging Repository - file://${project.build.directory}/mvn-repo/${project.name} - - - - - github - UTF-8 - - - https://github.com/TBMCPlugins/mvn-repo - scm:git:https://github.com/TBMCPlugins/mvn-repo.git - scm:git:https://github.com/TBMCPlugins/mvn-repo.git - + + 4.0.0 + + com.github.TBMCPlugins + ButtonCore + pom + master-SNAPSHOT + ButtonCore Parent + + + ButtonCore + ButtonProcessor + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + + + + + + + + + junit + junit + 3.8.1 + test + + \ No newline at end of file diff --git a/src/main/java/buttondevteam/lib/TBMCChatEvent.java b/src/main/java/buttondevteam/lib/TBMCChatEvent.java deleted file mode 100644 index 192b7c1..0000000 --- a/src/main/java/buttondevteam/lib/TBMCChatEvent.java +++ /dev/null @@ -1,87 +0,0 @@ -package buttondevteam.lib; - -import org.bukkit.command.CommandSender; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -import buttondevteam.lib.chat.Channel; -import buttondevteam.lib.chat.Channel.RecipientTestResult; - -/** - * Make sure to only send the message to users who {@link #shouldSendTo(CommandSender)} returns true. - * - * @author NorbiPeti - * - */ -public class TBMCChatEvent extends Event implements Cancellable { - private static final HandlerList handlers = new HandlerList(); - - private Channel channel; - private CommandSender sender; - private String message; - private boolean cancelled; - private int score; - - public TBMCChatEvent(CommandSender sender, Channel channel, String message, int score) { - this.sender = sender; - this.channel = channel; - this.message = message; // TODO: Message object with data? - this.score = score; - } - - /* - * public TBMCPlayer getPlayer() { return TBMCPlayer.getPlayer(sender); // TODO: Get Chroma user } - */ - - public Channel getChannel() { - return channel; - } - - public CommandSender getSender() { - return sender; - } - - public String getMessage() { - return message; - } - - @Override - public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - @Override - public boolean isCancelled() { - return cancelled; - } - - @Override - public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } - - /** - * Note: Errors are sent to the sender automatically - */ - public boolean shouldSendTo(CommandSender sender) { - if (channel.filteranderrormsg == null) - return true; - RecipientTestResult result = channel.filteranderrormsg.apply(sender); - return result.errormessage == null && score == result.score; - } - - /** - * Note: Errors are sent to the sender automatically - */ - public int getMCScore(CommandSender sender) { - if (channel.filteranderrormsg == null) - return 0; - RecipientTestResult result = channel.filteranderrormsg.apply(sender); - return result.errormessage == null ? result.score : -1; - } -} diff --git a/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java b/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java deleted file mode 100644 index 8526248..0000000 --- a/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java +++ /dev/null @@ -1,68 +0,0 @@ -package buttondevteam.lib; - -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -/** - *

- * This event gets called (ideally) each time an exception occurs in a TBMC plugin. To call it, use {@link TBMCCoreAPI#SendException(String, Exception)}. - *

- * - * @author Norbi - * - */ -public class TBMCExceptionEvent extends Event { - private static final HandlerList handlers = new HandlerList(); - - private String sourcemsg; - private Throwable exception; - private boolean handled; - - TBMCExceptionEvent(String sourcemsg, Throwable exception) { - this.sourcemsg = sourcemsg; - this.exception = exception; - } - - /** - * Gets the source message (where did this exception occur, etc.) - * - * @return The message - */ - public String getSourceMessage() { - return sourcemsg; - } - - /** - * Gets the exception - * - * @return The exception - */ - public Throwable getException() { - return exception; - } - - /** - * Gets if this event was handled - * - * @return True if it was handled - */ - public boolean isHandled() { - return handled; - } - - /** - * Flags the event as handled - */ - public void setHandled() { - this.handled = true; - } - - @Override - public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } -}