From f2d2d623a0ece86ce9b80b59cfcfdd78519a45bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 10:36:52 +0000 Subject: [PATCH 01/11] Bump junit-jupiter-api from 5.6.0 to 5.7.1 Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.6.0 to 5.7.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.6.0...r5.7.1) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4dced80..2318de4 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation 'com.google.code.gson:gson:2.8.6' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } From 100cc538fa347ab079e55f8ae5a09283846a8813 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 11:55:14 +0000 Subject: [PATCH 02/11] docs: update README.md [skip ci] --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index e544038..23089cd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,27 @@ # Core + +[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) + ## The Core Mod of HMCore which powers the whole system. ### TODO + +## Contributors ✨ + +Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): + + + + + + + + +

Wieland Schöbl
⚠️ 💻 📖
+ + + + + + +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! \ No newline at end of file From 766acb02a67eaf9949c18c0ac4001f2ca02d047e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 11:55:15 +0000 Subject: [PATCH 03/11] docs: create .all-contributorsrc [skip ci] --- .all-contributorsrc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .all-contributorsrc diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 0000000..0f5b468 --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,26 @@ +{ + "files": [ + "README.md" + ], + "imageSize": 100, + "commit": false, + "contributors": [ + { + "login": "wulkanat", + "name": "Wieland Schöbl", + "avatar_url": "https://avatars.githubusercontent.com/u/19289296?v=4", + "profile": "https://github.com/wulkanat", + "contributions": [ + "test", + "code", + "doc" + ] + } + ], + "contributorsPerLine": 7, + "projectName": "Core", + "projectOwner": "HMCore", + "repoType": "github", + "repoHost": "https://github.com", + "skipCi": true +} From 18b38e4b1de7af6cc20f0a7ff2bc3bc6fde35768 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 12:01:08 +0000 Subject: [PATCH 04/11] docs: update README.md [skip ci] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 23089cd..337f163 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Core -[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-) ## The Core Mod of HMCore which powers the whole system. @@ -16,6 +16,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d +

Wieland Schöbl
⚠️ 💻 📖
UnrealValentin
📖 ⚠️ 💻 🤔
From acb7b728ca734b0a7e95210b87a526b0d48fff5e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 12:01:09 +0000 Subject: [PATCH 05/11] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0f5b468..7c14c55 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -15,6 +15,18 @@ "code", "doc" ] + }, + { + "login": "UnrealValentin", + "name": "UnrealValentin", + "avatar_url": "https://avatars.githubusercontent.com/u/30842467?v=4", + "profile": "https://github.com/UnrealValentin", + "contributions": [ + "doc", + "test", + "code", + "ideas" + ] } ], "contributorsPerLine": 7, From 266913301e09614f343a1ceab967c0e843eabaef Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 12:02:18 +0000 Subject: [PATCH 06/11] docs: update README.md [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23089cd..d361f41 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - +

Wieland Schöbl
⚠️ 💻 📖
Wieland Schöbl
⚠️ 💻 📖 🤔
From 855408a1ad7a8a428fec137179bc25384788c02d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 12:02:19 +0000 Subject: [PATCH 07/11] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0f5b468..4760079 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -13,7 +13,8 @@ "contributions": [ "test", "code", - "doc" + "doc", + "ideas" ] } ], From 2304261a62ee43891baba6f320695f777272c323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= Date: Mon, 12 Apr 2021 15:22:43 +0200 Subject: [PATCH 08/11] Refactor Gson saving to Kotlin --- .../config/ObjectInfoConfigHandler.java | 30 ------------------- .../registration/config/ObjectInfoData.java | 6 ++-- src/main/kotlin/extensions/Array.kt | 7 +++++ .../config/ObjectInfoConfigHandler.kt | 12 ++++++++ 4 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 src/main/java/org/hmcore/registration/config/ObjectInfoConfigHandler.java create mode 100644 src/main/kotlin/extensions/Array.kt create mode 100644 src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt diff --git a/src/main/java/org/hmcore/registration/config/ObjectInfoConfigHandler.java b/src/main/java/org/hmcore/registration/config/ObjectInfoConfigHandler.java deleted file mode 100644 index 97c4ed8..0000000 --- a/src/main/java/org/hmcore/registration/config/ObjectInfoConfigHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.hmcore.registration.config; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import org.hmcore.modules.Module; - -public class ObjectInfoConfigHandler { - - public static String generateFreshJSON(Module[] modules) { - - ModuleInfo[] moduleInfos = new ModuleInfo[modules.length]; - - for (int i = 0; i < modules.length; i++) { - - Module module = modules[i]; - moduleInfos[i] = new ModuleInfo(module.getName(), - module.getObjectInfoArray()); - - } - - ObjectInfoConfig objectInfoConfig = new ObjectInfoConfig(moduleInfos); - - GsonBuilder builder = new GsonBuilder().setPrettyPrinting(); - Gson gson = builder.create(); - - return gson.toJson(objectInfoConfig); - - } - -} diff --git a/src/main/java/org/hmcore/registration/config/ObjectInfoData.java b/src/main/java/org/hmcore/registration/config/ObjectInfoData.java index 7602584..616f17e 100644 --- a/src/main/java/org/hmcore/registration/config/ObjectInfoData.java +++ b/src/main/java/org/hmcore/registration/config/ObjectInfoData.java @@ -5,12 +5,12 @@ import org.jetbrains.annotations.Nullable; public class ObjectInfoData { public final String objectName; - public final String objectInfoChoosen; + public final String objectInfoChosen; public final String _availableOptions; - public ObjectInfoData(String objectName, @Nullable String objectInfoChoosen, String availableOptions) { + public ObjectInfoData(String objectName, @Nullable String objectInfoChosen, String availableOptions) { this.objectName = objectName; - this.objectInfoChoosen = objectInfoChoosen == null ? "default" : objectInfoChoosen; + this.objectInfoChosen = objectInfoChosen == null ? "default" : objectInfoChosen; _availableOptions = availableOptions; } } diff --git a/src/main/kotlin/extensions/Array.kt b/src/main/kotlin/extensions/Array.kt new file mode 100644 index 0000000..ce9b3f4 --- /dev/null +++ b/src/main/kotlin/extensions/Array.kt @@ -0,0 +1,7 @@ +package extensions + +/** + * Map a Java array to another Java array + */ +inline fun Array.map(crossinline transform: (T) -> I) = + Array(size) { transform(this[it]) } \ No newline at end of file diff --git a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt new file mode 100644 index 0000000..9e3cc1e --- /dev/null +++ b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt @@ -0,0 +1,12 @@ +@file:JvmName("ObjectInfoConfigHandler") + +package org.hmcore.registration.config + +import com.google.gson.GsonBuilder +import org.hmcore.modules.Module +import extensions.map + +private val GSON = GsonBuilder().setPrettyPrinting().create() + +fun Array>.generateFreshJSON(): String = + GSON.toJson(ObjectInfoConfig(map { ModuleInfo(it.name, it.objectInfoArray) })) \ No newline at end of file From c8c1d2ebbb87cf550f4df9bd9ab8a35153aef21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= Date: Mon, 12 Apr 2021 15:38:56 +0200 Subject: [PATCH 09/11] Refactor ObjectInfoData to Kotlin --- .../registration/config/ObjectInfoData.java | 16 ---------------- .../config/ObjectInfoConfigHandler.kt | 2 +- .../hmcore/registration/config/ObjectInfoData.kt | 7 +++++++ 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 src/main/java/org/hmcore/registration/config/ObjectInfoData.java create mode 100644 src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt diff --git a/src/main/java/org/hmcore/registration/config/ObjectInfoData.java b/src/main/java/org/hmcore/registration/config/ObjectInfoData.java deleted file mode 100644 index 616f17e..0000000 --- a/src/main/java/org/hmcore/registration/config/ObjectInfoData.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.hmcore.registration.config; - -import org.jetbrains.annotations.Nullable; - -public class ObjectInfoData { - - public final String objectName; - public final String objectInfoChosen; - public final String _availableOptions; - - public ObjectInfoData(String objectName, @Nullable String objectInfoChosen, String availableOptions) { - this.objectName = objectName; - this.objectInfoChosen = objectInfoChosen == null ? "default" : objectInfoChosen; - _availableOptions = availableOptions; - } -} diff --git a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt index 9e3cc1e..4446164 100644 --- a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt +++ b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt @@ -8,5 +8,5 @@ import extensions.map private val GSON = GsonBuilder().setPrettyPrinting().create() -fun Array>.generateFreshJSON(): String = +internal fun Array>.generateFreshJSON(): String = GSON.toJson(ObjectInfoConfig(map { ModuleInfo(it.name, it.objectInfoArray) })) \ No newline at end of file diff --git a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt new file mode 100644 index 0000000..0d89f2c --- /dev/null +++ b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt @@ -0,0 +1,7 @@ +package org.hmcore.registration.config + +internal class ObjectInfoData @JvmOverloads constructor( + @JvmField val objectInfoName: String, + @JvmField val availableOptions: String, + @JvmField val objectInfoChosen: String = "default", +) \ No newline at end of file From d1fa7b77ad2e7d5540ec43673c1b8e546355b4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= Date: Mon, 12 Apr 2021 15:44:20 +0200 Subject: [PATCH 10/11] Refactor ModuleInfo, ObjectInfoConfig to Kotlin --- .../org/hmcore/registration/config/ModuleInfo.java | 12 ------------ .../hmcore/registration/config/ObjectInfoConfig.java | 10 ---------- .../org/hmcore/registration/config/ModuleInfo.kt | 6 ++++++ .../hmcore/registration/config/ObjectInfoConfig.kt | 5 +++++ 4 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/org/hmcore/registration/config/ModuleInfo.java delete mode 100644 src/main/java/org/hmcore/registration/config/ObjectInfoConfig.java create mode 100644 src/main/kotlin/org/hmcore/registration/config/ModuleInfo.kt create mode 100644 src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfig.kt diff --git a/src/main/java/org/hmcore/registration/config/ModuleInfo.java b/src/main/java/org/hmcore/registration/config/ModuleInfo.java deleted file mode 100644 index 26b94dd..0000000 --- a/src/main/java/org/hmcore/registration/config/ModuleInfo.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.hmcore.registration.config; - -public class ModuleInfo { - - public final String moduleName; - public final ObjectInfoData[] objects; - - public ModuleInfo(String moduleName, ObjectInfoData[] objects) { - this.moduleName = moduleName; - this.objects = objects; - } -} diff --git a/src/main/java/org/hmcore/registration/config/ObjectInfoConfig.java b/src/main/java/org/hmcore/registration/config/ObjectInfoConfig.java deleted file mode 100644 index 8bcd2df..0000000 --- a/src/main/java/org/hmcore/registration/config/ObjectInfoConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.hmcore.registration.config; - -public class ObjectInfoConfig { - - public final ModuleInfo[] modules; - - public ObjectInfoConfig(ModuleInfo[] modules) { - this.modules = modules; - } -} diff --git a/src/main/kotlin/org/hmcore/registration/config/ModuleInfo.kt b/src/main/kotlin/org/hmcore/registration/config/ModuleInfo.kt new file mode 100644 index 0000000..ebe41fc --- /dev/null +++ b/src/main/kotlin/org/hmcore/registration/config/ModuleInfo.kt @@ -0,0 +1,6 @@ +package org.hmcore.registration.config + +internal class ModuleInfo( + @JvmField val moduleName: String, + @JvmField val objects: Array, +) \ No newline at end of file diff --git a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfig.kt b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfig.kt new file mode 100644 index 0000000..b236bef --- /dev/null +++ b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfig.kt @@ -0,0 +1,5 @@ +package org.hmcore.registration.config + +internal class ObjectInfoConfig( + @JvmField val modules: Array, +) \ No newline at end of file From e9dc0c1e7f81745842e2106328a7d7054f49caa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= Date: Mon, 12 Apr 2021 17:00:09 +0200 Subject: [PATCH 11/11] Suppress Internal Warning in tests --- src/test/java/org/hmcore/tests/JavaTests.java | 1 + .../org/hmcore/tests/modules/impl/JavaTestModule.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/hmcore/tests/JavaTests.java b/src/test/java/org/hmcore/tests/JavaTests.java index 08e5ffb..b9ac5ef 100644 --- a/src/test/java/org/hmcore/tests/JavaTests.java +++ b/src/test/java/org/hmcore/tests/JavaTests.java @@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +@SuppressWarnings("KotlinInternalInJava") public class JavaTests { @Test diff --git a/src/test/java/org/hmcore/tests/modules/impl/JavaTestModule.java b/src/test/java/org/hmcore/tests/modules/impl/JavaTestModule.java index 7a313ff..0e868c9 100644 --- a/src/test/java/org/hmcore/tests/modules/impl/JavaTestModule.java +++ b/src/test/java/org/hmcore/tests/modules/impl/JavaTestModule.java @@ -1,13 +1,13 @@ package org.hmcore.tests.modules.impl; import org.hmcore.modules.Module; -import org.hmcore.registration.config.ObjectInfoData; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +@SuppressWarnings("KotlinInternalInJava") public class JavaTestModule extends Module { public HashMap objectMap = new HashMap<>(); @@ -69,9 +69,10 @@ public class JavaTestModule extends Module { } @Override - public ObjectInfoData[] getObjectInfoArray() { + public org.hmcore.registration.config.ObjectInfoData[] getObjectInfoArray() { - ObjectInfoData[] objectInfoData = new ObjectInfoData[objectMap.values().size()]; + org.hmcore.registration.config.ObjectInfoData[] objectInfoData = + new org.hmcore.registration.config.ObjectInfoData[objectMap.values().size()]; int i = 0; @@ -91,7 +92,7 @@ public class JavaTestModule extends Module { } - objectInfoData[i] = new ObjectInfoData(entry.getKey(), null, options); + objectInfoData[i] = new org.hmcore.registration.config.ObjectInfoData(entry.getKey(), options); i++;