From d53715f47a0e290e0343fa8406e2295fd9e2e181 Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Sun, 24 Jan 2021 15:03:44 +0100 Subject: [PATCH] deployment things --- .gitignore | 4 +- KilluaBot.iml | 2 +- pom.xml | 12 +- .../com/github/nilstrieb/cofig/Config.java | 4 +- .../commands/fun/trivia/TriviaCommand.java | 45 ++-- .../java/com/github/nilstrieb/core/Main.java | 3 +- .../github/nilstrieb/util/DepartureSong.java | 251 +++++++++--------- 7 files changed, 161 insertions(+), 160 deletions(-) diff --git a/.gitignore b/.gitignore index ad46e4e..9a34764 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -target\* -.idea/* +target +.idea *.class Secrets.java src\main\java\com\github\nilstrieb\cofig/Secrets.java \ No newline at end of file diff --git a/KilluaBot.iml b/KilluaBot.iml index cb88d6a..b2a132a 100644 --- a/KilluaBot.iml +++ b/KilluaBot.iml @@ -1,6 +1,6 @@ - + diff --git a/pom.xml b/pom.xml index 599eb6c..a4b3456 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 1.0.0 - 15 - 15 + 14 + 14 @@ -36,6 +36,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 14 + + maven-assembly-plugin diff --git a/src/main/java/com/github/nilstrieb/cofig/Config.java b/src/main/java/com/github/nilstrieb/cofig/Config.java index 34e7ac1..cf97fb4 100644 --- a/src/main/java/com/github/nilstrieb/cofig/Config.java +++ b/src/main/java/com/github/nilstrieb/cofig/Config.java @@ -10,7 +10,7 @@ import java.io.File; import java.net.URISyntaxException; public class Config { - public static final String D_PREFIX = "kil "; + public static final String NORMAL_PREFIX = "kil "; public static final String L_PREFIX = "k "; public static final String PREFIX = L_PREFIX; @@ -34,7 +34,7 @@ public class Config { } } private static final String JSON_PATH_INTELLIJ = "trivia_questions.json"; - public static final String JSON_PATH = JSON_PATH_INTELLIJ; + public static final String JSON_PATH = JSON_PATH_JAR; public static EmbedBuilder getDefaultEmbed(Event event) { User killua = event.getJDA().getUserById(THIS_ID); diff --git a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java index 4c74716..b183dcc 100644 --- a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java @@ -12,19 +12,19 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public class TriviaCommand extends Command { public TriviaCommand() { - super("trivia", "Answer random Trivia questions!", "trivia 0", "(maximal arc (inclusive) as a number) or (add)", """ - Answer random trivia questions by the community! - You can choose the last arc the questions will be from to avoid spoilers - Arcs: - 0 Hunter Exam arc - 1 Zoldyck Family arc - 2 Heavens Arena arc - 3 Yorknew City arc - 4 Greed Island arc - 5 Chimera Ant arc - 6 Election arc - - Add questions using `""" + Config.PREFIX + "trivia add`"); + super("trivia", "Answer random Trivia questions!", "trivia 0", "(maximal arc (inclusive) as a number) or (add)", + "Answer random trivia questions by the community!\n" + + "You can choose the last arc the questions will be from to avoid spoilers\n" + + "Arcs:\n" + + "0 Hunter Exam arc\n" + + "1 Zoldyck Family arc\n" + + "2 Heavens Arena arc\n" + + "3 Yorknew City arc\n" + + "4 Greed Island arc\n" + + "5 Chimera Ant arc\n" + + "6 Election arc\n" + + "\n" + + "Add questions using `" + Config.PREFIX + "trivia add`"); } @Override @@ -110,16 +110,15 @@ public class TriviaCommand extends Command { private int status = 0; private static final String[] messages = {"Enter all answers seperated by a ; (Example: \"Ging;Mito;Gon\")", "Enter the correct answer index starting at 0 (Example: \"0\")", - """ - Enter the arc this question belongs to as a number (Example: "0") - EXAM = 0 - ZOLDYCK_FAMILY = 1 - HEAVENS_ARENA = 2 - YORKNEW_CITY = 3 - GREED_ISLAND = 4 - CHIMERA_ANT = 5 - ELECTION = 6 - """}; + "Enter the arc this question belongs to as a number (Example: \"0\")\n" + + "EXAM = 0\n" + + "ZOLDYCK_FAMILY = 1\n" + + "HEAVENS_ARENA = 2\n" + + "YORKNEW_CITY = 3\n" + + "GREED_ISLAND = 4\n" + + "CHIMERA_ANT = 5\n" + + "ELECTION = 6\n" + }; private final String[] answers = new String[4]; private AddSection(long textChannelID, long userID) { diff --git a/src/main/java/com/github/nilstrieb/core/Main.java b/src/main/java/com/github/nilstrieb/core/Main.java index 0dcbbd0..6a1ba00 100644 --- a/src/main/java/com/github/nilstrieb/core/Main.java +++ b/src/main/java/com/github/nilstrieb/core/Main.java @@ -1,6 +1,7 @@ package com.github.nilstrieb.core; import com.github.nilstrieb.cofig.Secrets; +//import com.github.nilstrieb.commands.fun.DepartureCommand; import com.github.nilstrieb.commands.fun.DepartureCommand; import com.github.nilstrieb.commands.fun.QuoteCommand; import com.github.nilstrieb.commands.fun.SayCommand; @@ -13,7 +14,6 @@ import com.github.nilstrieb.listener.ChannelMessageListener; import com.github.nilstrieb.listener.CommandListener; import com.github.nilstrieb.listener.ReactionEventListener; import com.github.nilstrieb.listener.StartUpListener; -import com.github.nilstrieb.util.ConsoleColors; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.Activity; @@ -22,7 +22,6 @@ import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.utils.Compression; import javax.security.auth.login.LoginException; -import java.io.File; import java.util.Scanner; public class Main { diff --git a/src/main/java/com/github/nilstrieb/util/DepartureSong.java b/src/main/java/com/github/nilstrieb/util/DepartureSong.java index 8b1f2e2..db660bd 100644 --- a/src/main/java/com/github/nilstrieb/util/DepartureSong.java +++ b/src/main/java/com/github/nilstrieb/util/DepartureSong.java @@ -5,138 +5,133 @@ public class DepartureSong { public static final String DEPARTURE_YOUTUBE_LINK = "https://www.youtube.com/watch?v=VxFUs1pcWzU"; public static final String DEPARTURE_SPOTIFY_LINK = "https://open.spotify.com/track/5sjoJa0YmBCCPMrBPsBMge?si=Qb-eIMuBRD6Ms62cFf3yaw"; - public static final String[] LYRICS_JAPANESE = - {""" - 大地を踏みしめて - 君は目覚めていく - 天使の微笑みで 連れ出して! - """, + public static final String[] LYRICS_JAPANESE = { + " 大地を踏みしめて\n" + + "君は目覚めていく\n" + + "天使の微笑みで 連れ出して!" + , - """ - 孤独でも 一人じゃないさ - 生まれてきたことに - 必ず意味がある - 優しさに 満ち溢れてる - 青い地球(ほし)にありがとう - You can smile again - 太陽浴びて - You can fly away - 世界は君の 輝きを待ってる - 大地を踏みしめて - 君は目覚めていく - 天使の微笑みで 連れ出して! - (you can smile!) - "始まり"はいつでも遅くないさ - 何度でも立ち上がれ! - """, + "孤独でも 一人じゃないさ\n" + + "生まれてきたことに\n" + + "必ず意味がある\n" + + "優しさに 満ち溢れてる\n" + + "青い地球(ほし)にありがとう\n" + + "You can smile again\n" + + "太陽浴びて\n" + + "You can fly away\n" + + "世界は君の 輝きを待ってる\n" + + "大地を踏みしめて\n" + + "君は目覚めていく\n" + + "天使の微笑みで 連れ出して!\n" + + "(you can smile!)\n" + + "\"始まり\"はいつでも遅くないさ\n" + + "何度でも立ち上がれ!" + , - """ - 最後まで あきらめないさ - やり続けることに 必ず意味がある - You just try again - 闇を抜けて - You just go away - 未来はいつも 僕たちを待ってる - 大空駆けぬけて 海原越えて行け - 天使の投げキッス 捕まえて! - (you can try!) - まだ誰も見たことない世界へ - 飛び出そう明日 - 大地を踏みしめて - 君は目覚めていく - 天使の微笑みで 連れ出して! - (you can smile!) - 終わらない冒険に出掛けよう - いつまでも どこまでも - """, + "最後まで あきらめないさ\n" + + "やり続けることに 必ず意味がある\n" + + "You just try again\n" + + "闇を抜けて\n" + + "You just go away\n" + + "未来はいつも 僕たちを待ってる\n" + + "大空駆けぬけて 海原越えて行け\n" + + "天使の投げキッス 捕まえて!\n" + + "(you can try!)\n" + + "まだ誰も見たことない世界へ\n" + + "飛び出そう明日\n" + + "大地を踏みしめて\n" + + "君は目覚めていく\n" + + "天使の微笑みで 連れ出して!\n" + + "(you can smile!)\n" + + "終わらない冒険に出掛けよう\n" + + "いつまでも どこまでも" + , - """ - 流れ落ちる涙 勇気に変えていく - 天使の羽広げ 舞い上がれ! - (you can fly!) - 悲しみも痛みも包みこんで - 強くなれ明日 - 大地を踏みしめて - 君は目覚めていく - 天使の微笑みで 連れ出して! - (you can smile!) - "始まり"はいつでも遅くないさ - 何度でも! (you can try!) - 何度でも! (you can try!) - 何度でも立ち上がれ! - """}; + "勇気に変えていく\n" + + "天使の羽広げ 舞い上がれ!\n" + + "(you can fly!)\n" + + "悲しみも痛みも包みこんで\n" + + "強くなれ明日\n" + + "大地を踏みしめて\n" + + "君は目覚めていく\n" + + "天使の微笑みで 連れ出して!\n" + + "(you can smile!)\n" + + "\"始まり\"はいつでも遅くないさ\n" + + "何度でも! (you can try!)\n" + + "何度でも! (you can try!)\n" + + "何度でも立ち上がれ!" + }; public static final String[] LYRICS_LATIN = - {""" - Daichi wo fumishimete - Kimi wa mezameteiku - Tenshi no hohoemi de - Tsuredashite!""", + { + "Daichi wo fumishimete\n" + + "Kimi wa mezameteiku\n" + + "Tenshi no hohoemi de\n" + + "Tsuredashite!", - """ - Kodoku demo - Hitori janai sa - Umaretekita koto ni - Kanarazu ima ga aru""", - """ - Yasashisa ni michiafureteru - Aoi hoshi ni arigatou""", - """ - You can smile again - Taiyou abite - You can fly away - Sekai wa kimi no kagayaki - Wo matteru""", - """ - Daichi wo fumishimete - Kimi wa mezameteiku - Tenshi no hohoemi de - Tsuredashite! (You can smile!) - "Hajimari" wa itsudemo - Osokunai sa - Nandodemo tachiagare!""", - """ - Saigo made akiramenai sa - Yaritsuzukeru koto ni - Kanarazu imi ga aru""", - """ - You just try again - Yami wo nukete - You just go away - Mirai wa itsumo bokutachi wo - Matteru""", - """ - Oozora nukenukete kaihara - Koeteyuke - Tenshi no nage kissu - Tsukamaete! (You can try!) - Mada daremo mita koto nai - Sekai he - Tobidasou ashita""", - """ - Daichi wo fumishimete - Kimi wa mezameteiku - Tenshi no hohoemi de - Tsuredashite! (YOU CAN SMILE!) - Owaranai bouken ni dekakeyou - Itsumademo dokomademo""", - """ - Nagareochiru namida yuuki ni - Kaeteiku - Tenshi no hani hiroge maiagare! (YOU CAN FLY!) - Kanashimi mo itami mo - Tsutsumikonde - Tsuyoku nare ashita""", - """ - Daichi wo fumishimete - Kimi wa mezameteiku - Tenshi no hohoemi de - Tsuredashite! (You can smile!)""", - """ - "Hajimari" wa itsudemo - Osokunai sa - Nandodemo! (you can try!) - Nandodemo! (you can try!) - Nandodemo tachiagare! - """}; + "Kodoku demo\n" + + "Hitori janai sa\n" + + "Umaretekita koto ni\n" + + "Kanarazu ima ga aru\n", + + "Yasashisa ni michiafureteru\n" + + "Aoi hoshi ni arigatou", + + "You can smile again\n" + + "Taiyou abite\n" + + "You can fly away\n" + + "Sekai wa kimi no kagayaki\n" + + "Wo matteru", + + "Daichi wo fumishimete\n" + + "Kimi wa mezameteiku\n" + + "Tenshi no hohoemi de\n" + + "Tsuredashite! (You can smile!)\n" + + "\"Hajimari\" wa itsudemo\n" + + "Osokunai sa\n" + + "Nandodemo tachiagare!", + + "Saigo made akiramenai sa\n" + + "Yaritsuzukeru koto ni\n" + + "Kanarazu imi ga aru", + + "You just try again\n" + + "Yami wo nukete\n" + + "You just go away\n" + + "Mirai wa itsumo bokutachi wo\n" + + "Matteru", + + "Oozora nukenukete kaihara\n" + + "Koeteyuke\n" + + "Tenshi no nage kissu\n" + + "Tsukamaete! (You can try!)\n" + + "Mada daremo mita koto nai\n" + + "Sekai he\n" + + "Tobidasou ashita", + + "Daichi wo fumishimete\n" + + "Kimi wa mezameteiku\n" + + "Tenshi no hohoemi de\n" + + "Tsuredashite! (YOU CAN SMILE!)\n" + + "Owaranai bouken ni dekakeyou\n" + + "Itsumademo dokomademo", + + "Nagareochiru namida yuuki ni\n" + + "Kaeteiku\n" + + "Tenshi no hani hiroge maiagare! (YOU CAN FLY!)\n" + + "Kanashimi mo itami mo\n" + + "Tsutsumikonde\n" + + "Tsuyoku nare ashita", + + "Daichi wo fumishimete\n" + + "Kimi wa mezameteiku\n" + + "Tenshi no hohoemi de\n" + + "Tsuredashite! (You can smile!)", + + "\"Hajimari\" wa itsudemo\n" + + "Osokunai sa\n" + + "Nandodemo! (you can try!)\n" + + "Nandodemo! (you can try!)\n" + + "Nandodemo tachiagare!" + }; } \ No newline at end of file