diff --git a/build.gradle b/build.gradle index 5f76489..c5d2e8f 100644 --- a/build.gradle +++ b/build.gradle @@ -25,63 +25,79 @@ archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group -sourceSets { - testmod { - compileClasspath += main.compileClasspath - runtimeClasspath += main.runtimeClasspath - } +subprojects { + apply plugin: 'fabric-loom' + apply plugin: 'maven-publish' + + archivesBaseName = project.name } -repositories { - maven { url = "https://maven.terraformersmc.com/releases/"} +allprojects { + apply plugin: 'fabric-loom' + + repositories { + maven { url = "https://maven.terraformersmc.com/releases/"} + } + + dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modImplementation "com.terraformersmc:modmenu:1.16.8" + + afterEvaluate { + testmodImplementation sourceSets.main.output + } + } + + processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } + + doLast { + def jsonMinifyStart = System.currentTimeMillis() + def jsonMinified = 0 + def jsonBytesSaved = 0 + + fileTree(dir: outputs.files.asPath, include: '**/*.json').each { + + File file = it + jsonMinified++ + def oldLength = file.length() + file.text = JsonOutput.toJson(new JsonSlurper().parse(file)) + jsonBytesSaved += oldLength - file.length() + + println(it) + } + + println('Minified ' + jsonMinified + ' json files. Saved ' + jsonBytesSaved + ' bytes. Took ' + (System.currentTimeMillis() - jsonMinifyStart) + 'ms.') + } + } + + sourceSets { + testmod { + compileClasspath += main.compileClasspath + runtimeClasspath += main.runtimeClasspath + } + } } dependencies { - //to change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - modImplementation "com.terraformersmc:modmenu:1.16.8" - - afterEvaluate { - testmodImplementation sourceSets.main.output - } -} - -processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.version - } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } - - doLast { - def jsonMinifyStart = System.currentTimeMillis() - def jsonMinified = 0 - def jsonBytesSaved = 0 - - fileTree(dir: outputs.files.asPath, include: '**/*.json').each { - - File file = it - jsonMinified++ - def oldLength = file.length() - file.text = JsonOutput.toJson(new JsonSlurper().parse(file)) - jsonBytesSaved += oldLength - file.length() - - println(it) - } - - println('Minified ' + jsonMinified + ' json files. Saved ' + jsonBytesSaved + ' bytes. Took ' + (System.currentTimeMillis() - jsonMinifyStart) + 'ms.') - } + compile project(":omega-config-base") + compile project(":omega-config-gui") } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/src/main/java/draylar/omegaconfig/OmegaConfig.java b/omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java similarity index 100% rename from src/main/java/draylar/omegaconfig/OmegaConfig.java rename to omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java diff --git a/src/main/java/draylar/omegaconfig/api/Comment.java b/omega-config-base/src/main/java/draylar/omegaconfig/api/Comment.java similarity index 100% rename from src/main/java/draylar/omegaconfig/api/Comment.java rename to omega-config-base/src/main/java/draylar/omegaconfig/api/Comment.java diff --git a/src/main/java/draylar/omegaconfig/api/Config.java b/omega-config-base/src/main/java/draylar/omegaconfig/api/Config.java similarity index 100% rename from src/main/java/draylar/omegaconfig/api/Config.java rename to omega-config-base/src/main/java/draylar/omegaconfig/api/Config.java diff --git a/src/main/java/draylar/omegaconfig/api/SyncableExclusionStrategy.java b/omega-config-base/src/main/java/draylar/omegaconfig/api/SyncableExclusionStrategy.java similarity index 100% rename from src/main/java/draylar/omegaconfig/api/SyncableExclusionStrategy.java rename to omega-config-base/src/main/java/draylar/omegaconfig/api/SyncableExclusionStrategy.java diff --git a/src/main/java/draylar/omegaconfig/api/Syncing.java b/omega-config-base/src/main/java/draylar/omegaconfig/api/Syncing.java similarity index 100% rename from src/main/java/draylar/omegaconfig/api/Syncing.java rename to omega-config-base/src/main/java/draylar/omegaconfig/api/Syncing.java diff --git a/src/main/java/draylar/omegaconfig/exception/NoValidConstructorException.java b/omega-config-base/src/main/java/draylar/omegaconfig/exception/NoValidConstructorException.java similarity index 100% rename from src/main/java/draylar/omegaconfig/exception/NoValidConstructorException.java rename to omega-config-base/src/main/java/draylar/omegaconfig/exception/NoValidConstructorException.java diff --git a/src/main/java/draylar/omegaconfig/mixin/ClientMixin.java b/omega-config-base/src/main/java/draylar/omegaconfig/mixin/ClientMixin.java similarity index 100% rename from src/main/java/draylar/omegaconfig/mixin/ClientMixin.java rename to omega-config-base/src/main/java/draylar/omegaconfig/mixin/ClientMixin.java diff --git a/src/main/resources/fabric.mod.json b/omega-config-base/src/main/resources/fabric.mod.json similarity index 100% rename from src/main/resources/fabric.mod.json rename to omega-config-base/src/main/resources/fabric.mod.json diff --git a/src/main/resources/omega-config.mixins.json b/omega-config-base/src/main/resources/omega-config.mixins.json similarity index 91% rename from src/main/resources/omega-config.mixins.json rename to omega-config-base/src/main/resources/omega-config.mixins.json index 03b467f..74ce8f9 100644 --- a/src/main/resources/omega-config.mixins.json +++ b/omega-config-base/src/main/resources/omega-config.mixins.json @@ -4,7 +4,7 @@ "package": "draylar.omegaconfig.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - "ModMenuAccessor" + ], "client": [ "ClientMixin" diff --git a/omega-config-gui/build.gradle b/omega-config-gui/build.gradle new file mode 100644 index 0000000..d2bd486 --- /dev/null +++ b/omega-config-gui/build.gradle @@ -0,0 +1,3 @@ +dependencies { + compile project(":omega-config-base") +} \ No newline at end of file diff --git a/src/main/java/draylar/omegaconfig/OmegaConfigClient.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/OmegaConfigGui.java similarity index 72% rename from src/main/java/draylar/omegaconfig/OmegaConfigClient.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/OmegaConfigGui.java index 1f3c475..7b32893 100644 --- a/src/main/java/draylar/omegaconfig/OmegaConfigClient.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/OmegaConfigGui.java @@ -1,16 +1,16 @@ -package draylar.omegaconfig; +package draylar.omegaconfiggui; import draylar.omegaconfig.api.Config; -import draylar.omegaconfig.api.screen.ModMenuHelper; -import draylar.omegaconfig.api.screen.OmegaConfigScreen; -import draylar.omegaconfig.api.screen.OmegaConfigScreenSupplier; +import draylar.omegaconfiggui.api.screen.ModMenuHelper; +import draylar.omegaconfiggui.api.screen.OmegaConfigScreen; +import draylar.omegaconfiggui.api.screen.OmegaConfigScreenSupplier; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; @Environment(EnvType.CLIENT) -public class OmegaConfigClient implements ClientModInitializer { +public class OmegaConfigGui implements ClientModInitializer { @Override public void onInitializeClient() { diff --git a/src/main/java/draylar/omegaconfig/api/screen/ModMenuHelper.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/ModMenuHelper.java similarity index 90% rename from src/main/java/draylar/omegaconfig/api/screen/ModMenuHelper.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/ModMenuHelper.java index ab804e6..a4b75c3 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/ModMenuHelper.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/ModMenuHelper.java @@ -1,9 +1,9 @@ -package draylar.omegaconfig.api.screen; +package draylar.omegaconfiggui.api.screen; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import draylar.omegaconfig.api.Config; -import draylar.omegaconfig.mixin.ModMenuAccessor; +import draylar.omegaconfiggui.mixin.ModMenuAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/draylar/omegaconfig/api/screen/OmegaConfigScreen.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java similarity index 92% rename from src/main/java/draylar/omegaconfig/api/screen/OmegaConfigScreen.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java index e2957d5..4813d77 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/OmegaConfigScreen.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java @@ -1,9 +1,9 @@ -package draylar.omegaconfig.api.screen; +package draylar.omegaconfiggui.api.screen; import draylar.omegaconfig.api.Config; -import draylar.omegaconfig.api.screen.widget.LabelWidget; -import draylar.omegaconfig.api.screen.widget.TypeWidgets; -import draylar.omegaconfig.api.screen.widget.WidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.LabelWidget; +import draylar.omegaconfiggui.api.screen.widget.TypeWidgets; +import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; @@ -17,7 +17,10 @@ import net.minecraft.util.Identifier; import net.minecraft.util.Pair; import java.lang.reflect.Field; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; public class OmegaConfigScreen extends Screen { diff --git a/src/main/java/draylar/omegaconfig/api/screen/OmegaConfigScreenSupplier.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreenSupplier.java similarity index 82% rename from src/main/java/draylar/omegaconfig/api/screen/OmegaConfigScreenSupplier.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreenSupplier.java index 06a1980..22dd905 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/OmegaConfigScreenSupplier.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreenSupplier.java @@ -1,4 +1,4 @@ -package draylar.omegaconfig.api.screen; +package draylar.omegaconfiggui.api.screen; import draylar.omegaconfig.api.Config; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/draylar/omegaconfig/api/screen/widget/LabelWidget.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/LabelWidget.java similarity index 93% rename from src/main/java/draylar/omegaconfig/api/screen/widget/LabelWidget.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/LabelWidget.java index 6a34379..ce4dc41 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/widget/LabelWidget.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/LabelWidget.java @@ -1,4 +1,4 @@ -package draylar.omegaconfig.api.screen.widget; +package draylar.omegaconfiggui.api.screen.widget; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Drawable; diff --git a/src/main/java/draylar/omegaconfig/api/screen/widget/TypeWidgets.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/TypeWidgets.java similarity index 83% rename from src/main/java/draylar/omegaconfig/api/screen/widget/TypeWidgets.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/TypeWidgets.java index b5755ca..58c8155 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/widget/TypeWidgets.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/TypeWidgets.java @@ -1,8 +1,8 @@ -package draylar.omegaconfig.api.screen.widget; +package draylar.omegaconfiggui.api.screen.widget; -import draylar.omegaconfig.api.screen.widget.supplier.BooleanWidgetSupplier; -import draylar.omegaconfig.api.screen.widget.supplier.DoubleWidgetSupplier; -import draylar.omegaconfig.api.screen.widget.supplier.StringWidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.supplier.BooleanWidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.supplier.DoubleWidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.supplier.StringWidgetSupplier; import org.jetbrains.annotations.Nullable; import java.util.HashMap; diff --git a/src/main/java/draylar/omegaconfig/api/screen/widget/WidgetSupplier.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/WidgetSupplier.java similarity index 85% rename from src/main/java/draylar/omegaconfig/api/screen/widget/WidgetSupplier.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/WidgetSupplier.java index 55693b4..b2c2b4c 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/widget/WidgetSupplier.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/WidgetSupplier.java @@ -1,4 +1,4 @@ -package draylar.omegaconfig.api.screen.widget; +package draylar.omegaconfiggui.api.screen.widget; import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.text.LiteralText; diff --git a/src/main/java/draylar/omegaconfig/api/screen/widget/supplier/BooleanWidgetSupplier.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/BooleanWidgetSupplier.java similarity index 80% rename from src/main/java/draylar/omegaconfig/api/screen/widget/supplier/BooleanWidgetSupplier.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/BooleanWidgetSupplier.java index 5ef8d17..47ed37b 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/widget/supplier/BooleanWidgetSupplier.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/BooleanWidgetSupplier.java @@ -1,6 +1,6 @@ -package draylar.omegaconfig.api.screen.widget.supplier; +package draylar.omegaconfiggui.api.screen.widget.supplier; -import draylar.omegaconfig.api.screen.widget.WidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier; import net.minecraft.client.gui.widget.CheckboxWidget; import net.minecraft.text.LiteralText; diff --git a/src/main/java/draylar/omegaconfig/api/screen/widget/supplier/DoubleWidgetSupplier.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/DoubleWidgetSupplier.java similarity index 85% rename from src/main/java/draylar/omegaconfig/api/screen/widget/supplier/DoubleWidgetSupplier.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/DoubleWidgetSupplier.java index 498204b..8846a53 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/widget/supplier/DoubleWidgetSupplier.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/DoubleWidgetSupplier.java @@ -1,6 +1,6 @@ -package draylar.omegaconfig.api.screen.widget.supplier; +package draylar.omegaconfiggui.api.screen.widget.supplier; -import draylar.omegaconfig.api.screen.widget.WidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; diff --git a/src/main/java/draylar/omegaconfig/api/screen/widget/supplier/StringWidgetSupplier.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/StringWidgetSupplier.java similarity index 84% rename from src/main/java/draylar/omegaconfig/api/screen/widget/supplier/StringWidgetSupplier.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/StringWidgetSupplier.java index 834c0e2..98d4f65 100644 --- a/src/main/java/draylar/omegaconfig/api/screen/widget/supplier/StringWidgetSupplier.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/StringWidgetSupplier.java @@ -1,6 +1,6 @@ -package draylar.omegaconfig.api.screen.widget.supplier; +package draylar.omegaconfiggui.api.screen.widget.supplier; -import draylar.omegaconfig.api.screen.widget.WidgetSupplier; +import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; diff --git a/src/main/java/draylar/omegaconfig/mixin/ModMenuAccessor.java b/omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/ModMenuAccessor.java similarity index 94% rename from src/main/java/draylar/omegaconfig/mixin/ModMenuAccessor.java rename to omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/ModMenuAccessor.java index 0a745f0..9d85431 100644 --- a/src/main/java/draylar/omegaconfig/mixin/ModMenuAccessor.java +++ b/omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/ModMenuAccessor.java @@ -1,4 +1,4 @@ -package draylar.omegaconfig.mixin; +package draylar.omegaconfiggui.mixin; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.ModMenu; diff --git a/omega-config-gui/src/main/resources/fabric.mod.json b/omega-config-gui/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..a4c73f1 --- /dev/null +++ b/omega-config-gui/src/main/resources/fabric.mod.json @@ -0,0 +1,27 @@ +{ + "schemaVersion": 1, + "id": "omega-config-gui", + "version": "${version}", + "name": "OmegaConfigGui", + "description": "GUI support for Omega Config.", + "authors": [ + "Draylar" + ], + "contact": {}, + "license": "MIT", + "icon": "assets/omega-config/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + "draylar.omegaconfiggui.OmegaConfigGui" + ] + }, + "mixins": [ + "omega-config-gui.mixins.json" + ], + "depends": { + "fabricloader": ">=0.11.2", + "fabric": "*", + "minecraft": "1.16.5" + } +} diff --git a/omega-config-gui/src/main/resources/omega-config-gui.mixins.json b/omega-config-gui/src/main/resources/omega-config-gui.mixins.json new file mode 100644 index 0000000..6eb0f88 --- /dev/null +++ b/omega-config-gui/src/main/resources/omega-config-gui.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "draylar.omegaconfiggui.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "ModMenuAccessor" + ], + "client": [ + + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/settings.gradle b/settings.gradle index 5b60df3..3b3d207 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,3 +8,8 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = 'omega-config' + +include 'omega-config-base' +include 'omega-config-gui' \ No newline at end of file diff --git a/src/testmod/java/draylar/omegaconfig/OmegaConfigClientTest.java b/src/testmod/java/draylar/omegatest/OmegaTestClient.java similarity index 55% rename from src/testmod/java/draylar/omegaconfig/OmegaConfigClientTest.java rename to src/testmod/java/draylar/omegatest/OmegaTestClient.java index ef8f172..9a6c743 100644 --- a/src/testmod/java/draylar/omegaconfig/OmegaConfigClientTest.java +++ b/src/testmod/java/draylar/omegatest/OmegaTestClient.java @@ -1,19 +1,20 @@ -package draylar.omegaconfig; +package draylar.omegatest; +import draylar.omegaconfiggui.OmegaConfigGui; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.text.LiteralText; -public class OmegaConfigClientTest implements ClientModInitializer { +public class OmegaTestClient implements ClientModInitializer { @Override public void onInitializeClient() { - OmegaConfigClient.registerConfigScreen(OmegaConfigTest.CONFIG); + OmegaConfigGui.registerConfigScreen(OmegaTestMain.CONFIG); HudRenderCallback.EVENT.register((stack, delta) -> { - MinecraftClient.getInstance().textRenderer.draw(stack, new LiteralText(String.valueOf(OmegaConfigTest.CONFIG.v)), 15, 15, 0xffffff); - MinecraftClient.getInstance().textRenderer.draw(stack, new LiteralText(String.valueOf(OmegaConfigTest.CONFIG.doubleTest)), 15, 30, 0xffffff); + MinecraftClient.getInstance().textRenderer.draw(stack, new LiteralText(String.valueOf(OmegaTestMain.CONFIG.v)), 15, 15, 0xffffff); + MinecraftClient.getInstance().textRenderer.draw(stack, new LiteralText(String.valueOf(OmegaTestMain.CONFIG.doubleTest)), 15, 30, 0xffffff); }); } } diff --git a/src/testmod/java/draylar/omegaconfig/OmegaConfigTest.java b/src/testmod/java/draylar/omegatest/OmegaTestMain.java similarity index 72% rename from src/testmod/java/draylar/omegaconfig/OmegaConfigTest.java rename to src/testmod/java/draylar/omegatest/OmegaTestMain.java index 3151b63..8f00971 100644 --- a/src/testmod/java/draylar/omegaconfig/OmegaConfigTest.java +++ b/src/testmod/java/draylar/omegatest/OmegaTestMain.java @@ -1,8 +1,9 @@ -package draylar.omegaconfig; +package draylar.omegatest; +import draylar.omegaconfig.OmegaConfig; import net.fabricmc.api.ModInitializer; -public class OmegaConfigTest implements ModInitializer { +public class OmegaTestMain implements ModInitializer { public static final TestConfig CONFIG = OmegaConfig.register(TestConfig.class); diff --git a/src/testmod/java/draylar/omegaconfig/TestConfig.java b/src/testmod/java/draylar/omegatest/TestConfig.java similarity index 96% rename from src/testmod/java/draylar/omegaconfig/TestConfig.java rename to src/testmod/java/draylar/omegatest/TestConfig.java index 8fe1029..73aad04 100644 --- a/src/testmod/java/draylar/omegaconfig/TestConfig.java +++ b/src/testmod/java/draylar/omegatest/TestConfig.java @@ -1,4 +1,4 @@ -package draylar.omegaconfig; +package draylar.omegatest; import draylar.omegaconfig.api.Comment; import draylar.omegaconfig.api.Config; diff --git a/src/testmod/resources/fabric.mod.json b/src/testmod/resources/fabric.mod.json index ef4f20e..316f17b 100644 --- a/src/testmod/resources/fabric.mod.json +++ b/src/testmod/resources/fabric.mod.json @@ -13,10 +13,10 @@ "environment": "*", "entrypoints": { "main": [ - "draylar.omegaconfig.OmegaConfigTest" + "draylar.omegatest.OmegaTestMain" ], "client": [ - "draylar.omegaconfig.OmegaConfigClientTest" + "draylar.omegatest.OmegaTestClient" ] }, "depends": {