diff --git a/build.gradle b/build.gradle index 73d832c..d0edfa3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,20 +9,11 @@ base { archivesName = project.archives_base_name } -repositories { - maven { - name = "Terraformers" - url = "https://maven.terraformersmc.com/" - } -} - dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - modImplementation("com.terraformersmc:modmenu:16.0.0-rc.1") } processResources { diff --git a/gradle.properties b/gradle.properties index cee5964..864a48c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ loom_version=1.13-SNAPSHOT library_version=1.0 maven_group=com.kasetoatz -archives_base_name=DumbassConfigLib +archives_base_name=DACL fabric_version=0.138.0+1.21.10 diff --git a/settings.gradle b/settings.gradle index f2ec2fb..f5d1956 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,4 @@ pluginManagement { } } -rootProject.name = "dumbassconfiglib" \ No newline at end of file +rootProject.name = "dacl" \ No newline at end of file diff --git a/src/main/java/com/kasetoatz/dumbassconfig/DumbassConfig.java b/src/main/java/com/kasetoatz/dacl/DumbassConfig.java similarity index 94% rename from src/main/java/com/kasetoatz/dumbassconfig/DumbassConfig.java rename to src/main/java/com/kasetoatz/dacl/DumbassConfig.java index 2d7dc39..e6142ba 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/DumbassConfig.java +++ b/src/main/java/com/kasetoatz/dacl/DumbassConfig.java @@ -1,12 +1,12 @@ -package com.kasetoatz.dumbassconfig; +package com.kasetoatz.dacl; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.kasetoatz.dumbassconfig.options.AbstractInputOption; -import com.kasetoatz.dumbassconfig.options.AbstractOption; -import com.kasetoatz.dumbassconfig.ui.ConfigScreen; +import com.kasetoatz.dacl.options.AbstractInputOption; +import com.kasetoatz.dacl.options.AbstractOption; +import com.kasetoatz.dacl.ui.ConfigScreen; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/AbstractButtonOption.java b/src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java similarity index 89% rename from src/main/java/com/kasetoatz/dumbassconfig/options/AbstractButtonOption.java rename to src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java index 428b27f..5e727a1 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/AbstractButtonOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java @@ -1,4 +1,4 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/AbstractInputOption.java b/src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java similarity index 84% rename from src/main/java/com/kasetoatz/dumbassconfig/options/AbstractInputOption.java rename to src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java index a2d99a2..d073e9d 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/AbstractInputOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java @@ -1,13 +1,13 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; -import com.kasetoatz.dumbassconfig.ui.InputField; -import com.kasetoatz.dumbassconfig.options.validators.AbstractValidator; +import com.kasetoatz.dacl.ui.InputField; +import com.kasetoatz.dacl.options.validators.AbstractValidator; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.text.Text; -import static com.kasetoatz.dumbassconfig.DumbassConfig.INVALID_INPUT_COLOR; -import static com.kasetoatz.dumbassconfig.DumbassConfig.VALID_INPUT_COLOR; +import static com.kasetoatz.dacl.DumbassConfig.INVALID_INPUT_COLOR; +import static com.kasetoatz.dacl.DumbassConfig.VALID_INPUT_COLOR; public abstract class AbstractInputOption extends AbstractOption { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/AbstractOption.java b/src/main/java/com/kasetoatz/dacl/options/AbstractOption.java similarity index 95% rename from src/main/java/com/kasetoatz/dumbassconfig/options/AbstractOption.java rename to src/main/java/com/kasetoatz/dacl/options/AbstractOption.java index 23b6de8..c9b5ee4 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/AbstractOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/AbstractOption.java @@ -1,4 +1,4 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; import net.minecraft.text.Text; diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/BoolOption.java b/src/main/java/com/kasetoatz/dacl/options/BoolOption.java similarity index 80% rename from src/main/java/com/kasetoatz/dumbassconfig/options/BoolOption.java rename to src/main/java/com/kasetoatz/dacl/options/BoolOption.java index c6d2eb4..2b074ca 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/BoolOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/BoolOption.java @@ -1,11 +1,11 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; -import static com.kasetoatz.dumbassconfig.DumbassConfig.BOOLEAN_FALSE_COLOR; -import static com.kasetoatz.dumbassconfig.DumbassConfig.BOOLEAN_TRUE_COLOR; +import static com.kasetoatz.dacl.DumbassConfig.BOOLEAN_FALSE_COLOR; +import static com.kasetoatz.dacl.DumbassConfig.BOOLEAN_TRUE_COLOR; public class BoolOption extends AbstractButtonOption { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/FloatOption.java b/src/main/java/com/kasetoatz/dacl/options/FloatOption.java similarity index 89% rename from src/main/java/com/kasetoatz/dumbassconfig/options/FloatOption.java rename to src/main/java/com/kasetoatz/dacl/options/FloatOption.java index f68c97e..121bd80 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/FloatOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/FloatOption.java @@ -1,7 +1,7 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; -import com.kasetoatz.dumbassconfig.options.validators.AbstractValidator; +import com.kasetoatz.dacl.options.validators.AbstractValidator; public class FloatOption extends AbstractInputOption { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/IntOption.java b/src/main/java/com/kasetoatz/dacl/options/IntOption.java similarity index 89% rename from src/main/java/com/kasetoatz/dumbassconfig/options/IntOption.java rename to src/main/java/com/kasetoatz/dacl/options/IntOption.java index ef96104..7e13eb6 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/IntOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/IntOption.java @@ -1,7 +1,7 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; -import com.kasetoatz.dumbassconfig.options.validators.AbstractValidator; +import com.kasetoatz.dacl.options.validators.AbstractValidator; public class IntOption extends AbstractInputOption { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/SubOption.java b/src/main/java/com/kasetoatz/dacl/options/SubOption.java similarity index 95% rename from src/main/java/com/kasetoatz/dumbassconfig/options/SubOption.java rename to src/main/java/com/kasetoatz/dacl/options/SubOption.java index 8ed0104..6d2fa21 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/SubOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/SubOption.java @@ -1,10 +1,10 @@ -package com.kasetoatz.dumbassconfig.options; +package com.kasetoatz.dacl.options; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.kasetoatz.dumbassconfig.ui.ConfigScreen; +import com.kasetoatz.dacl.ui.ConfigScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/validators/AbstractValidator.java b/src/main/java/com/kasetoatz/dacl/options/validators/AbstractValidator.java similarity index 71% rename from src/main/java/com/kasetoatz/dumbassconfig/options/validators/AbstractValidator.java rename to src/main/java/com/kasetoatz/dacl/options/validators/AbstractValidator.java index 7387177..19cc2bb 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/validators/AbstractValidator.java +++ b/src/main/java/com/kasetoatz/dacl/options/validators/AbstractValidator.java @@ -1,4 +1,4 @@ -package com.kasetoatz.dumbassconfig.options.validators; +package com.kasetoatz.dacl.options.validators; public abstract class AbstractValidator { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/options/validators/RangeValidator.java b/src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java similarity index 95% rename from src/main/java/com/kasetoatz/dumbassconfig/options/validators/RangeValidator.java rename to src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java index 07e2b3b..58f3ff0 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/options/validators/RangeValidator.java +++ b/src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java @@ -1,4 +1,4 @@ -package com.kasetoatz.dumbassconfig.options.validators; +package com.kasetoatz.dacl.options.validators; public class RangeValidator> extends AbstractValidator { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigEntry.java b/src/main/java/com/kasetoatz/dacl/ui/ConfigEntry.java similarity index 94% rename from src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigEntry.java rename to src/main/java/com/kasetoatz/dacl/ui/ConfigEntry.java index bee3a85..4abb95b 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigEntry.java +++ b/src/main/java/com/kasetoatz/dacl/ui/ConfigEntry.java @@ -1,4 +1,4 @@ -package com.kasetoatz.dumbassconfig.ui; +package com.kasetoatz.dacl.ui; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Element; @@ -11,7 +11,7 @@ import net.minecraft.client.gui.widget.TextWidget; import java.util.ArrayList; import java.util.List; -import static com.kasetoatz.dumbassconfig.DumbassConfig.*; +import static com.kasetoatz.dacl.DumbassConfig.*; public class ConfigEntry extends ElementListWidget.Entry { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigEntryList.java b/src/main/java/com/kasetoatz/dacl/ui/ConfigEntryList.java similarity index 85% rename from src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigEntryList.java rename to src/main/java/com/kasetoatz/dacl/ui/ConfigEntryList.java index f8d7ca6..cf4b281 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigEntryList.java +++ b/src/main/java/com/kasetoatz/dacl/ui/ConfigEntryList.java @@ -1,16 +1,16 @@ -package com.kasetoatz.dumbassconfig.ui; +package com.kasetoatz.dacl.ui; -import com.kasetoatz.dumbassconfig.options.AbstractButtonOption; -import com.kasetoatz.dumbassconfig.options.AbstractInputOption; -import com.kasetoatz.dumbassconfig.options.AbstractOption; +import com.kasetoatz.dacl.options.AbstractButtonOption; +import com.kasetoatz.dacl.options.AbstractInputOption; +import com.kasetoatz.dacl.options.AbstractOption; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.*; import java.util.List; -import static com.kasetoatz.dumbassconfig.DumbassConfig.BACKGROUND_COLOR_1; -import static com.kasetoatz.dumbassconfig.DumbassConfig.BACKGROUND_COLOR_2; +import static com.kasetoatz.dacl.DumbassConfig.BACKGROUND_COLOR_1; +import static com.kasetoatz.dacl.DumbassConfig.BACKGROUND_COLOR_2; public class ConfigEntryList extends ElementListWidget { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigScreen.java b/src/main/java/com/kasetoatz/dacl/ui/ConfigScreen.java similarity index 88% rename from src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigScreen.java rename to src/main/java/com/kasetoatz/dacl/ui/ConfigScreen.java index 57f9cb7..31b426d 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/ui/ConfigScreen.java +++ b/src/main/java/com/kasetoatz/dacl/ui/ConfigScreen.java @@ -1,6 +1,6 @@ -package com.kasetoatz.dumbassconfig.ui; +package com.kasetoatz.dacl.ui; -import com.kasetoatz.dumbassconfig.options.AbstractOption; +import com.kasetoatz.dacl.options.AbstractOption; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ThreePartsLayoutWidget; @@ -9,8 +9,8 @@ import net.minecraft.text.Text; import java.util.List; -import static com.kasetoatz.dumbassconfig.DumbassConfig.DONE_BUTTON_WIDTH; -import static com.kasetoatz.dumbassconfig.DumbassConfig.ENTRY_HEIGHT; +import static com.kasetoatz.dacl.DumbassConfig.DONE_BUTTON_WIDTH; +import static com.kasetoatz.dacl.DumbassConfig.ENTRY_HEIGHT; public class ConfigScreen extends Screen { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/ui/InputField.java b/src/main/java/com/kasetoatz/dacl/ui/InputField.java similarity index 94% rename from src/main/java/com/kasetoatz/dumbassconfig/ui/InputField.java rename to src/main/java/com/kasetoatz/dacl/ui/InputField.java index b697b81..4519123 100644 --- a/src/main/java/com/kasetoatz/dumbassconfig/ui/InputField.java +++ b/src/main/java/com/kasetoatz/dacl/ui/InputField.java @@ -1,4 +1,4 @@ -package com.kasetoatz.dumbassconfig.ui; +package com.kasetoatz.dacl.ui; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gl.RenderPipelines; @@ -10,7 +10,7 @@ import net.minecraft.util.Identifier; import java.lang.reflect.Field; -import static com.kasetoatz.dumbassconfig.DumbassConfig.INVALID_INPUT_COLOR; +import static com.kasetoatz.dacl.DumbassConfig.INVALID_INPUT_COLOR; public class InputField extends TextFieldWidget { diff --git a/src/main/java/com/kasetoatz/dumbassconfig/Test.java b/src/main/java/com/kasetoatz/dumbassconfig/Test.java deleted file mode 100644 index 8aca484..0000000 --- a/src/main/java/com/kasetoatz/dumbassconfig/Test.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.kasetoatz.dumbassconfig; - -import com.kasetoatz.dumbassconfig.options.BoolOption; -import com.kasetoatz.dumbassconfig.options.FloatOption; -import com.kasetoatz.dumbassconfig.options.IntOption; -import com.kasetoatz.dumbassconfig.options.SubOption; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import net.minecraft.text.Text; - -public class Test implements ModMenuApi -{ - public static final BoolOption TEST_BOOL_OPT = new BoolOption("TEST", "test_bool_opt", false); - public static final FloatOption TEST_FLOAT_OPT = new FloatOption("TEST", "test_float_opt", 1.F); - public static final IntOption TEST_INT_OPT = new IntOption("TEST", "test_int_opt", 1); - - public static final IntOption SUB_SUB_INT_OPT = new IntOption("SUB SUB", "sub_sub_int_opt", 1); - public static final SubOption SUB_SUB_OPT = SubOption.builder("SUB SUB SCREEN", "sub_sub_opt") - .withOption(SUB_SUB_INT_OPT) - .build(); - - public static final IntOption SUB_INT_OPT = new IntOption("SUB", "sub_int_opt", 0); - public static final SubOption TEST_SUB_OPT = SubOption.builder("SUB SCREEN", "sub_opt") - .withOption(SUB_INT_OPT) - .withOption(SUB_SUB_OPT) - .build(); - - DumbassConfig config = DumbassConfig.builder(Text.literal("Test Screen"), "test.json") - .withOption(TEST_BOOL_OPT) - .withOption(TEST_FLOAT_OPT) - .withOption(TEST_INT_OPT) - .withOption(TEST_SUB_OPT) - .build(); - - @Override - public ConfigScreenFactory getModConfigScreenFactory() - { - return config::getUI; - } -} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 37f3703..7b1a4d1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,17 +3,17 @@ "id": "dumbassconfiglib", "version": "${version}", "name": "DumbassConfigLib", - "description": "", - "authors": [], - "contact": {}, + "description": "DumbassConfigLib is a config library used for my mods", + "authors": ["KaseToatz"], + "contact": { + "email": "kasetoatz@kasetoatz.com", + "homepage": "https://modrinth.com/mod/dacl", + "issues": "https://git.kasetoatz.com/KaseToatz/DACL/issues", + "sources": "https://git.kasetoatz.com/KaseToatz/DACL" + }, "license": "MIT", "icon": "icon.png", "environment": "client", - "entrypoints": { - "modmenu": [ - "com.kasetoatz.dumbassconfig.Test" - ] - }, "depends": { "fabricloader": ">=${loader_version}", "fabric": "*", diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png new file mode 100644 index 0000000..e6dad80 Binary files /dev/null and b/src/main/resources/icon.png differ