From 11da4d0d37055ef262dcf5238c597ceb2db4a578 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 20 Apr 2022 17:41:58 +0200 Subject: [PATCH 1/3] 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 0000000..083047e --- /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 0000000..d992d9c --- /dev/null +++ b/CommonCore @@ -0,0 +1 @@ +Subproject commit d992d9cae7b5e00eb369e7e2135e37ea6a1210e6 From bcfc8aaf49566a785a5cce57e554979c995316f2 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Wed, 20 Apr 2022 18:07:11 +0200 Subject: [PATCH 2/3] Implement CommonCore --- CommonCore | 2 +- build.gradle | 2 ++ settings.gradle | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index d992d9c..e83103d 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit d992d9cae7b5e00eb369e7e2135e37ea6a1210e6 +Subproject commit e83103d8afce8161a12d008d6ad99ba439243b27 diff --git a/build.gradle b/build.gradle index 52eae83..5610cf2 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,8 @@ dependencies { implementation project(":SpigotCore_14") implementation project(":SpigotCore_15") implementation project(":SpigotCore_18") + + implementation project(":CommonCore") } task buildProject { diff --git a/settings.gradle b/settings.gradle index 0bd9de2..ffc0d4b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,3 +27,5 @@ include 'SpigotCore_12' include 'SpigotCore_10' include 'SpigotCore_9' include 'SpigotCore_8' + +include 'CommonCore' From afdb690a450ce606b216d5792453ab9f31c489c8 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 22 Apr 2022 12:41:43 +0200 Subject: [PATCH 3/3] Test build --- SpigotCore_Main/src/de/steamwar/core/Core.java | 1 - 1 file changed, 1 deletion(-) diff --git a/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore_Main/src/de/steamwar/core/Core.java index cc4270d..1ef9272 100644 --- a/SpigotCore_Main/src/de/steamwar/core/Core.java +++ b/SpigotCore_Main/src/de/steamwar/core/Core.java @@ -39,7 +39,6 @@ import java.util.logging.Level; public class Core extends JavaPlugin{ - public static final Message MESSAGE = new Message("SpigotCore", Core.class.getClassLoader()); private static final int VERSION;