deployment things

This commit is contained in:
nora 2021-01-24 15:03:44 +01:00
parent ab90751c21
commit d53715f47a
7 changed files with 161 additions and 160 deletions

4
.gitignore vendored
View file

@ -1,5 +1,5 @@
target\* target
.idea/* .idea
*.class *.class
Secrets.java Secrets.java
src\main\java\com\github\nilstrieb\cofig/Secrets.java src\main\java\com\github\nilstrieb\cofig/Secrets.java

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">

12
pom.xml
View file

@ -9,8 +9,8 @@
<version>1.0.0</version> <version>1.0.0</version>
<properties> <properties>
<maven.compiler.source>15</maven.compiler.source> <maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target> <maven.compiler.target>14</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
@ -36,6 +36,14 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>14</release>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>

View file

@ -10,7 +10,7 @@ import java.io.File;
import java.net.URISyntaxException; import java.net.URISyntaxException;
public class Config { 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 L_PREFIX = "k ";
public static final String PREFIX = L_PREFIX; public static final String PREFIX = L_PREFIX;
@ -34,7 +34,7 @@ public class Config {
} }
} }
private static final String JSON_PATH_INTELLIJ = "trivia_questions.json"; 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) { public static EmbedBuilder getDefaultEmbed(Event event) {
User killua = event.getJDA().getUserById(THIS_ID); User killua = event.getJDA().getUserById(THIS_ID);

View file

@ -12,19 +12,19 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class TriviaCommand extends Command { public class TriviaCommand extends Command {
public TriviaCommand() { public TriviaCommand() {
super("trivia", "Answer random Trivia questions!", "trivia 0", "(maximal arc (inclusive) as a number) or (add)", """ super("trivia", "Answer random Trivia questions!", "trivia 0", "(maximal arc (inclusive) as a number) or (add)",
Answer random trivia questions by the community! "Answer random trivia questions by the community!\n" +
You can choose the last arc the questions will be from to avoid spoilers "You can choose the last arc the questions will be from to avoid spoilers\n" +
Arcs: "Arcs:\n" +
0 Hunter Exam arc "0 Hunter Exam arc\n" +
1 Zoldyck Family arc "1 Zoldyck Family arc\n" +
2 Heavens Arena arc "2 Heavens Arena arc\n" +
3 Yorknew City arc "3 Yorknew City arc\n" +
4 Greed Island arc "4 Greed Island arc\n" +
5 Chimera Ant arc "5 Chimera Ant arc\n" +
6 Election arc "6 Election arc\n" +
"\n" +
Add questions using `""" + Config.PREFIX + "trivia add`"); "Add questions using `" + Config.PREFIX + "trivia add`");
} }
@Override @Override
@ -110,16 +110,15 @@ public class TriviaCommand extends Command {
private int status = 0; private int status = 0;
private static final String[] messages = {"Enter all answers seperated by a ; (Example: \"Ging;Mito;Gon\")", 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 correct answer index starting at 0 (Example: \"0\")",
""" "Enter the arc this question belongs to as a number (Example: \"0\")\n" +
Enter the arc this question belongs to as a number (Example: "0") "EXAM = 0\n" +
EXAM = 0 "ZOLDYCK_FAMILY = 1\n" +
ZOLDYCK_FAMILY = 1 "HEAVENS_ARENA = 2\n" +
HEAVENS_ARENA = 2 "YORKNEW_CITY = 3\n" +
YORKNEW_CITY = 3 "GREED_ISLAND = 4\n" +
GREED_ISLAND = 4 "CHIMERA_ANT = 5\n" +
CHIMERA_ANT = 5 "ELECTION = 6\n"
ELECTION = 6 };
"""};
private final String[] answers = new String[4]; private final String[] answers = new String[4];
private AddSection(long textChannelID, long userID) { private AddSection(long textChannelID, long userID) {

View file

@ -1,6 +1,7 @@
package com.github.nilstrieb.core; package com.github.nilstrieb.core;
import com.github.nilstrieb.cofig.Secrets; 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.DepartureCommand;
import com.github.nilstrieb.commands.fun.QuoteCommand; import com.github.nilstrieb.commands.fun.QuoteCommand;
import com.github.nilstrieb.commands.fun.SayCommand; 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.CommandListener;
import com.github.nilstrieb.listener.ReactionEventListener; import com.github.nilstrieb.listener.ReactionEventListener;
import com.github.nilstrieb.listener.StartUpListener; import com.github.nilstrieb.listener.StartUpListener;
import com.github.nilstrieb.util.ConsoleColors;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.entities.Activity; 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 net.dv8tion.jda.api.utils.Compression;
import javax.security.auth.login.LoginException; import javax.security.auth.login.LoginException;
import java.io.File;
import java.util.Scanner; import java.util.Scanner;
public class Main { public class Main {

View file

@ -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_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 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" +
君は目覚めていく "天使の微笑みで 連れ出して!"
天使の微笑みで 連れ出して! ,
""",
""" "孤独でも 一人じゃないさ\n" +
孤独でも 一人じゃないさ "生まれてきたことに\n" +
生まれてきたことに "必ず意味がある\n" +
必ず意味がある "優しさに 満ち溢れてる\n" +
優しさに 満ち溢れてる "青い地球(ほし)にありがとう\n" +
青い地球(ほし)にありがとう "You can smile again\n" +
You can smile again "太陽浴びて\n" +
太陽浴びて "You can fly away\n" +
You can fly away "世界は君の 輝きを待ってる\n" +
世界は君の 輝きを待ってる "大地を踏みしめて\n" +
大地を踏みしめて "君は目覚めていく\n" +
君は目覚めていく "天使の微笑みで 連れ出して!\n" +
天使の微笑みで 連れ出して! "(you can smile!)\n" +
(you can smile!) "\"始まり\"はいつでも遅くないさ\n" +
"始まり"はいつでも遅くないさ "何度でも立ち上がれ!"
何度でも立ち上がれ! ,
""",
""" "最後まで あきらめないさ\n" +
最後まで あきらめないさ "やり続けることに 必ず意味がある\n" +
やり続けることに 必ず意味がある "You just try again\n" +
You just try again "闇を抜けて\n" +
闇を抜けて "You just go away\n" +
You just go away "未来はいつも 僕たちを待ってる\n" +
未来はいつも 僕たちを待ってる "大空駆けぬけて 海原越えて行け\n" +
大空駆けぬけて 海原越えて行け "天使の投げキッス 捕まえて!\n" +
天使の投げキッス 捕まえて! "(you can try!)\n" +
(you can try!) "まだ誰も見たことない世界へ\n" +
まだ誰も見たことない世界へ "飛び出そう明日\n" +
飛び出そう明日 "大地を踏みしめて\n" +
大地を踏みしめて "君は目覚めていく\n" +
君は目覚めていく "天使の微笑みで 連れ出して!\n" +
天使の微笑みで 連れ出して! "(you can smile!)\n" +
(you can smile!) "終わらない冒険に出掛けよう\n" +
終わらない冒険に出掛けよう "いつまでも どこまでも"
いつまでも どこまでも ,
""",
""" "勇気に変えていく\n" +
流れ落ちる涙 勇気に変えていく "天使の羽広げ 舞い上がれ!\n" +
天使の羽広げ 舞い上がれ! "(you can fly!)\n" +
(you can fly!) "悲しみも痛みも包みこんで\n" +
悲しみも痛みも包みこんで "強くなれ明日\n" +
強くなれ明日 "大地を踏みしめて\n" +
大地を踏みしめて "君は目覚めていく\n" +
君は目覚めていく "天使の微笑みで 連れ出して!\n" +
天使の微笑みで 連れ出して! "(you can smile!)\n" +
(you can smile!) "\"始まり\"はいつでも遅くないさ\n" +
"始まり"はいつでも遅くないさ "何度でも! (you can try!)\n" +
何度でも! (you can try!) "何度でも! (you can try!)\n" +
何度でも! (you can try!) "何度でも立ち上がれ!"
何度でも立ち上がれ! };
"""};
public static final String[] LYRICS_LATIN = public static final String[] LYRICS_LATIN =
{""" {
Daichi wo fumishimete "Daichi wo fumishimete\n" +
Kimi wa mezameteiku "Kimi wa mezameteiku\n" +
Tenshi no hohoemi de "Tenshi no hohoemi de\n" +
Tsuredashite!""", "Tsuredashite!",
""" "Kodoku demo\n" +
Kodoku demo "Hitori janai sa\n" +
Hitori janai sa "Umaretekita koto ni\n" +
Umaretekita koto ni "Kanarazu ima ga aru\n",
Kanarazu ima ga aru""",
""" "Yasashisa ni michiafureteru\n" +
Yasashisa ni michiafureteru "Aoi hoshi ni arigatou",
Aoi hoshi ni arigatou""",
""" "You can smile again\n" +
You can smile again "Taiyou abite\n" +
Taiyou abite "You can fly away\n" +
You can fly away "Sekai wa kimi no kagayaki\n" +
Sekai wa kimi no kagayaki "Wo matteru",
Wo matteru""",
""" "Daichi wo fumishimete\n" +
Daichi wo fumishimete "Kimi wa mezameteiku\n" +
Kimi wa mezameteiku "Tenshi no hohoemi de\n" +
Tenshi no hohoemi de "Tsuredashite! (You can smile!)\n" +
Tsuredashite! (You can smile!) "\"Hajimari\" wa itsudemo\n" +
"Hajimari" wa itsudemo "Osokunai sa\n" +
Osokunai sa "Nandodemo tachiagare!",
Nandodemo tachiagare!""",
""" "Saigo made akiramenai sa\n" +
Saigo made akiramenai sa "Yaritsuzukeru koto ni\n" +
Yaritsuzukeru koto ni "Kanarazu imi ga aru",
Kanarazu imi ga aru""",
""" "You just try again\n" +
You just try again "Yami wo nukete\n" +
Yami wo nukete "You just go away\n" +
You just go away "Mirai wa itsumo bokutachi wo\n" +
Mirai wa itsumo bokutachi wo "Matteru",
Matteru""",
""" "Oozora nukenukete kaihara\n" +
Oozora nukenukete kaihara "Koeteyuke\n" +
Koeteyuke "Tenshi no nage kissu\n" +
Tenshi no nage kissu "Tsukamaete! (You can try!)\n" +
Tsukamaete! (You can try!) "Mada daremo mita koto nai\n" +
Mada daremo mita koto nai "Sekai he\n" +
Sekai he "Tobidasou ashita",
Tobidasou ashita""",
""" "Daichi wo fumishimete\n" +
Daichi wo fumishimete "Kimi wa mezameteiku\n" +
Kimi wa mezameteiku "Tenshi no hohoemi de\n" +
Tenshi no hohoemi de "Tsuredashite! (YOU CAN SMILE!)\n" +
Tsuredashite! (YOU CAN SMILE!) "Owaranai bouken ni dekakeyou\n" +
Owaranai bouken ni dekakeyou "Itsumademo dokomademo",
Itsumademo dokomademo""",
""" "Nagareochiru namida yuuki ni\n" +
Nagareochiru namida yuuki ni "Kaeteiku\n" +
Kaeteiku "Tenshi no hani hiroge maiagare! (YOU CAN FLY!)\n" +
Tenshi no hani hiroge maiagare! (YOU CAN FLY!) "Kanashimi mo itami mo\n" +
Kanashimi mo itami mo "Tsutsumikonde\n" +
Tsutsumikonde "Tsuyoku nare ashita",
Tsuyoku nare ashita""",
""" "Daichi wo fumishimete\n" +
Daichi wo fumishimete "Kimi wa mezameteiku\n" +
Kimi wa mezameteiku "Tenshi no hohoemi de\n" +
Tenshi no hohoemi de "Tsuredashite! (You can smile!)",
Tsuredashite! (You can smile!)""",
""" "\"Hajimari\" wa itsudemo\n" +
"Hajimari" wa itsudemo "Osokunai sa\n" +
Osokunai sa "Nandodemo! (you can try!)\n" +
Nandodemo! (you can try!) "Nandodemo! (you can try!)\n" +
Nandodemo! (you can try!) "Nandodemo tachiagare!"
Nandodemo tachiagare! };
"""};
} }