Theaninova/HMCore
1
0
Fork 0
mirror of https://github.com/HMCore/Core.git synced 2025-12-12 13:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged old changes

Browse Source
This commit is contained in:
UnrealValentin
2021-04-29 18:16:46 +02:00
parent 3d804a0de1 e9dc0c1e7f
commit 6303983029
14 changed files with 106 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/hmcore/registration/config/ModuleInfo.java
View File

@@ -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;
}
}

10
src/main/java/org/hmcore/registration/config/ObjectInfoConfig.java
View File

@@ -1,10 +0,0 @@
package org.hmcore.registration.config;
public class ObjectInfoConfig {
public final ModuleInfo[] modules;
public ObjectInfoConfig(ModuleInfo[] modules) {
this.modules = modules;
}
}

6
src/main/java/org/hmcore/registration/config/ObjectInfoConfigHandler.java
View File

@@ -43,10 +43,10 @@ public class ObjectInfoConfigHandler {
RegistryModule<?, ?> registryModule = (RegistryModule<?, ?>) module;
for (ObjectInfoData data:
moduleInfo.objects) {
if(registryModule.objectAndInfoExist(data.objectName, data.objectInfoChoosen)) {
registryModule.forceObjectInfoForObject(data.objectName, data.objectInfoChoosen);
if(registryModule.objectAndInfoExist(data.objectInfoName, data.objectInfoChosen)) {
registryModule.forceObjectInfoForObject(data.objectInfoName, data.objectInfoChosen);
} else {
System.out.println("[!] Either Object Info " + data.objectInfoChoosen + " doesn't exist for " + data.objectName + " or " + data.objectName + " doesn't exist!\n" +
System.out.println("[!] Either Object Info " + data.objectInfoChosen + " doesn't exist for " + data.objectInfoName + " or " + data.objectInfoName + " doesn't exist!\n" +
"Please stop the Server, delete objetc-infos.json and let the server regenertate a new config [!]");
}
}

16
src/main/java/org/hmcore/registration/config/ObjectInfoData.java
View File

@@ -1,16 +0,0 @@
package org.hmcore.registration.config;
import org.jetbrains.annotations.Nullable;
public class ObjectInfoData {
public final String objectName;
public final String objectInfoChoosen;
public final String _availableOptions;
public ObjectInfoData(String objectName, @Nullable String objectInfoChoosen, String availableOptions) {
this.objectName = objectName;
this.objectInfoChoosen = objectInfoChoosen == null ? "default" : objectInfoChoosen;
_availableOptions = availableOptions;
}
}

7
src/main/kotlin/extensions/Array.kt Normal file
View File

@@ -0,0 +1,7 @@
package extensions
/**
* Map a Java array to another Java array
*/
inline fun <T, reified I> Array<T>.map(crossinline transform: (T) -> I) =
Array(size) { transform(this[it]) }

6
src/main/kotlin/org/hmcore/registration/config/ModuleInfo.kt Normal file
View File

@@ -0,0 +1,6 @@
package org.hmcore.registration.config
internal class ModuleInfo(
@JvmField val moduleName: String,
@JvmField val objects: Array<ObjectInfoData>,
)

5
src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfig.kt Normal file
View File

@@ -0,0 +1,5 @@
package org.hmcore.registration.config
internal class ObjectInfoConfig(
@JvmField val modules: Array<ModuleInfo>,
)

12
src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt Normal file
View File

@@ -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()
internal fun Array<Module<*, *>>.generateFreshJSON(): String =
GSON.toJson(ObjectInfoConfig(map { ModuleInfo(it.name, it.objectInfoArray) }))

7
src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt Normal file
View File

@@ -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",
)

1
src/test/java/org/hmcore/tests/JavaTests.java
View File

@@ -12,6 +12,7 @@ import java.io.FileNotFoundException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@SuppressWarnings("KotlinInternalInJava")
public class JavaTests {
@Test

1
src/test/java/org/hmcore/tests/modules/impl/JavaTestRegistryModule.java
View File

@@ -8,6 +8,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@SuppressWarnings("KotlinInternalInJava")
public class JavaTestRegistryModule extends RegistryModule<Integer, JavaCustomObjectInfo> {
public HashMap<String, Integer> objectMap = new HashMap<>();