From 24d2c8f0d01b251fce909f1ae60058813e6b81fa Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 20 Apr 2022 11:32:30 +0200 Subject: [PATCH 1/6] Initial CommonCore --- .gitmodules | 3 +++ CommonCore | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 CommonCore diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..083047ed --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "CommonCore"] + path = CommonCore + url = gitea@steamwar.de:SteamWar/CommonCore.git diff --git a/CommonCore b/CommonCore new file mode 160000 index 00000000..d93d8026 --- /dev/null +++ b/CommonCore @@ -0,0 +1 @@ +Subproject commit d93d8026812f4956a4f8b3b0a958d88b215c6cbf From 29d0e056ab0c6967ae84ea3b1d2e331ca613d663 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Wed, 20 Apr 2022 17:57:27 +0200 Subject: [PATCH 2/6] Make git submodule buildable --- CommonCore | 2 +- build.gradle | 2 ++ settings.gradle | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index d93d8026..e83103d8 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit d93d8026812f4956a4f8b3b0a958d88b215c6cbf +Subproject commit e83103d8afce8161a12d008d6ad99ba439243b27 diff --git a/build.gradle b/build.gradle index 2bfd99de..7b1f7967 100644 --- a/build.gradle +++ b/build.gradle @@ -98,6 +98,8 @@ dependencies { implementation("net.dv8tion:JDA:4.3.0_299") { exclude module: 'opus-java' } + + implementation project(":CommonCore") } task buildProject { diff --git a/settings.gradle b/settings.gradle index 973f0c60..4c2a7456 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,3 +18,5 @@ */ rootProject.name = 'BungeeCore' + +include 'CommonCore' \ No newline at end of file From 62279b7baa794f105f039ffa902bad87b4a8380b Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 22 Apr 2022 10:40:42 +0200 Subject: [PATCH 3/6] Test build Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/BungeeCore.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index be531351..10497e2b 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -49,6 +49,7 @@ import java.util.logging.Level; public class BungeeCore extends Plugin { + public static String CHAT_PREFIX; public static String WORLD_FOLDER; public static String BAUWELT_PROTOTYP; From b1113eed6c6fe27fdaadd81c319f0f0836b2ace4 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 22 Apr 2022 12:35:44 +0200 Subject: [PATCH 4/6] Test build Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/BungeeCore.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index 10497e2b..be531351 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -49,7 +49,6 @@ import java.util.logging.Level; public class BungeeCore extends Plugin { - public static String CHAT_PREFIX; public static String WORLD_FOLDER; public static String BAUWELT_PROTOTYP; From c32445187197bd5f21a77ea518cf4611b75df266 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 22 Apr 2022 12:38:07 +0200 Subject: [PATCH 5/6] Test build Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/BungeeCore.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index be531351..10497e2b 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -49,6 +49,7 @@ import java.util.logging.Level; public class BungeeCore extends Plugin { + public static String CHAT_PREFIX; public static String WORLD_FOLDER; public static String BAUWELT_PROTOTYP; From 5de2bbd87653fae297fbc03210f03839e6f94aa1 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 22 Apr 2022 12:40:12 +0200 Subject: [PATCH 6/6] Test build Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/BungeeCore.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index 10497e2b..be531351 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -49,7 +49,6 @@ import java.util.logging.Level; public class BungeeCore extends Plugin { - public static String CHAT_PREFIX; public static String WORLD_FOLDER; public static String BAUWELT_PROTOTYP;