diff --git a/gradle.properties b/gradle.properties index 7feea64..f7037f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,16 @@ org.gradle.jvmargs=-Xmx2G -# Fabric (https://fabricmc.net/versions.html) +# Fabric Properties (https://fabricmc.net/versions.html) minecraft_version=1.19 -yarn_mappings=1.19+build.1 -loader_version=0.14.7 +yarn_mappings=1.19+build.4 +loader_version=0.14.8 # Mod Properties -mod_version=0.1 -maven_group=dummy.package +mod_version=0.1.0 +maven_group=com.example archives_base_name=addon-template -# Dependency Versions +# Dependencies # Meteor (https://maven.meteordev.org/) meteor_version=0.5.0-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 5b60df3..b02216b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { repositories { - jcenter() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + mavenCentral() gradlePluginPortal() } } diff --git a/src/main/java/com/example/addon/Addon.java b/src/main/java/com/example/addon/Addon.java new file mode 100644 index 0000000..3db31c7 --- /dev/null +++ b/src/main/java/com/example/addon/Addon.java @@ -0,0 +1,43 @@ +package com.example.addon; + +import com.example.addon.commands.CommandExample; +import com.example.addon.hud.HudExample; +import com.example.addon.modules.ModuleExample; +import meteordevelopment.meteorclient.addons.MeteorAddon; +import meteordevelopment.meteorclient.systems.commands.Commands; +import meteordevelopment.meteorclient.systems.hud.Hud; +import meteordevelopment.meteorclient.systems.hud.HudGroup; +import meteordevelopment.meteorclient.systems.modules.Category; +import meteordevelopment.meteorclient.systems.modules.Modules; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Addon extends MeteorAddon { + public static final Logger LOG = LoggerFactory.getLogger(Addon.class); + public static final Category CATEGORY = new Category("Example"); + public static final HudGroup HUD_GROUP = new HudGroup("Example"); + + @Override + public void onInitialize() { + LOG.info("Initializing Meteor Addon Template"); + + // Modules + Modules.get().add(new ModuleExample()); + + // Commands + Commands.get().add(new CommandExample()); + + // HUD + Hud.get().register(HudExample.INFO); + } + + @Override + public void onRegisterCategories() { + Modules.registerCategory(CATEGORY); + } + + @Override + public String getPackage() { + return "com.example.addon"; + } +} diff --git a/src/main/java/dummy/addon/template/commands/ExampleCommand.java b/src/main/java/com/example/addon/commands/CommandExample.java similarity index 68% rename from src/main/java/dummy/addon/template/commands/ExampleCommand.java rename to src/main/java/com/example/addon/commands/CommandExample.java index a8023ac..9c1c3b7 100644 --- a/src/main/java/dummy/addon/template/commands/ExampleCommand.java +++ b/src/main/java/com/example/addon/commands/CommandExample.java @@ -1,21 +1,20 @@ -package dummy.addon.template.commands; +package com.example.addon.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import meteordevelopment.meteorclient.systems.commands.Command; -import meteordevelopment.meteorclient.utils.player.ChatUtils; import net.minecraft.command.CommandSource; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; -public class ExampleCommand extends Command { - public ExampleCommand() { +public class CommandExample extends Command { + public CommandExample() { super("example", "Sends a message."); } @Override public void build(LiteralArgumentBuilder builder) { builder.executes(context -> { - ChatUtils.info("hi"); + info("hi"); return SINGLE_SUCCESS; }); } diff --git a/src/main/java/dummy/addon/template/modules/hud/HudExample.java b/src/main/java/com/example/addon/hud/HudExample.java similarity index 78% rename from src/main/java/dummy/addon/template/modules/hud/HudExample.java rename to src/main/java/com/example/addon/hud/HudExample.java index 873ec4a..9b2622d 100644 --- a/src/main/java/dummy/addon/template/modules/hud/HudExample.java +++ b/src/main/java/com/example/addon/hud/HudExample.java @@ -1,13 +1,13 @@ -package dummy.addon.template.modules.hud; +package com.example.addon.hud; -import dummy.addon.template.TemplateAddon; +import com.example.addon.Addon; import meteordevelopment.meteorclient.systems.hud.HudElement; import meteordevelopment.meteorclient.systems.hud.HudElementInfo; import meteordevelopment.meteorclient.systems.hud.HudRenderer; import meteordevelopment.meteorclient.utils.render.color.Color; public class HudExample extends HudElement { - public static final HudElementInfo INFO = new HudElementInfo<>(TemplateAddon.HUD_GROUP, "example", "HUD element example.", HudExample::new); + public static final HudElementInfo INFO = new HudElementInfo<>(Addon.HUD_GROUP, "example", "HUD element example.", HudExample::new); public HudExample() { super(INFO); diff --git a/src/main/java/com/example/addon/modules/ModuleExample.java b/src/main/java/com/example/addon/modules/ModuleExample.java new file mode 100644 index 0000000..2563056 --- /dev/null +++ b/src/main/java/com/example/addon/modules/ModuleExample.java @@ -0,0 +1,10 @@ +package com.example.addon.modules; + +import com.example.addon.Addon; +import meteordevelopment.meteorclient.systems.modules.Module; + +public class ModuleExample extends Module { + public ModuleExample() { + super(Addon.CATEGORY, "example", "An example module in a custom category."); + } +} diff --git a/src/main/java/dummy/addon/template/TemplateAddon.java b/src/main/java/dummy/addon/template/TemplateAddon.java deleted file mode 100644 index f4b7cca..0000000 --- a/src/main/java/dummy/addon/template/TemplateAddon.java +++ /dev/null @@ -1,46 +0,0 @@ -package dummy.addon.template; - -import dummy.addon.template.commands.ExampleCommand; -import dummy.addon.template.modules.AnotherExample; -import dummy.addon.template.modules.Example; -import dummy.addon.template.modules.hud.HudExample; -import meteordevelopment.meteorclient.MeteorClient; -import meteordevelopment.meteorclient.addons.MeteorAddon; -import meteordevelopment.meteorclient.systems.commands.Commands; -import meteordevelopment.meteorclient.systems.hud.Hud; -import meteordevelopment.meteorclient.systems.hud.HudGroup; -import meteordevelopment.meteorclient.systems.modules.Category; -import meteordevelopment.meteorclient.systems.modules.Modules; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.invoke.MethodHandles; - -public class TemplateAddon extends MeteorAddon { - public static final Logger LOG = LoggerFactory.getLogger(TemplateAddon.class); - public static final Category CATEGORY = new Category("Example"); - public static final HudGroup HUD_GROUP = new HudGroup("Template"); - - @Override - public void onInitialize() { - LOG.info("Initializing Meteor Addon Template"); - - // Required when using @EventHandler - MeteorClient.EVENT_BUS.registerLambdaFactory("meteordevelopment.addons.template", (lookupInMethod, klass) -> (MethodHandles.Lookup) lookupInMethod.invoke(null, klass, MethodHandles.lookup())); - - // Modules - Modules.get().add(new Example()); - Modules.get().add(new AnotherExample()); - - // Commands - Commands.get().add(new ExampleCommand()); - - // HUD - Hud.get().register(HudExample.INFO); - } - - @Override - public void onRegisterCategories() { - Modules.registerCategory(CATEGORY); - } -} diff --git a/src/main/java/dummy/addon/template/modules/AnotherExample.java b/src/main/java/dummy/addon/template/modules/AnotherExample.java deleted file mode 100644 index adf511e..0000000 --- a/src/main/java/dummy/addon/template/modules/AnotherExample.java +++ /dev/null @@ -1,10 +0,0 @@ -package dummy.addon.template.modules; - -import meteordevelopment.meteorclient.systems.modules.Categories; -import meteordevelopment.meteorclient.systems.modules.Module; - -public class AnotherExample extends Module { - public AnotherExample() { - super(Categories.Player, "example-2", "An example module in an existing category."); - } -} diff --git a/src/main/java/dummy/addon/template/modules/Example.java b/src/main/java/dummy/addon/template/modules/Example.java deleted file mode 100644 index ef96bb3..0000000 --- a/src/main/java/dummy/addon/template/modules/Example.java +++ /dev/null @@ -1,10 +0,0 @@ -package dummy.addon.template.modules; - -import dummy.addon.template.TemplateAddon; -import meteordevelopment.meteorclient.systems.modules.Module; - -public class Example extends Module { - public Example() { - super(TemplateAddon.CATEGORY, "example", "An example module in a custom category."); - } -} diff --git a/src/main/resources/template.mixins.json b/src/main/resources/addon.mixins.json similarity index 57% rename from src/main/resources/template.mixins.json rename to src/main/resources/addon.mixins.json index 2e0cc2b..93b5dde 100644 --- a/src/main/resources/template.mixins.json +++ b/src/main/resources/addon.mixins.json @@ -1,10 +1,8 @@ { "required": true, - "package": "meteordevelopment.addons.template.mixins", + "package": "com.example.addon.mixin", "compatibilityLevel": "JAVA_17", - "client": [ - - ], + "client": [], "injectors": { "defaultRequire": 1 } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e62e5c1..c20b761 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Addon Template", "description": "An addon template for the Meteor addons.", "authors": [ - "seasnail8169" + "seasnail" ], "contact": { "repo": "https://github.com/MeteorDevelopment/meteor-addon-template" @@ -14,11 +14,11 @@ "environment": "client", "entrypoints": { "meteor": [ - "dummy.addon.template.TemplateAddon" + "com.example.addon.Addon" ] }, "mixins": [ - "template.mixins.json" + "addon.mixins.json" ], "custom": { "meteor-client:color": "225,25,25"