diff --git a/build.gradle b/build.gradle index 98bbf74..dd57daa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id "fabric-loom" version "0.10-SNAPSHOT" + id "fabric-loom" version "0.12-SNAPSHOT" id "maven-publish" id "com.matthewprenger.cursegradle" version "1.4.0" - id "com.modrinth.minotaur" version "1.2.1" + id "com.modrinth.minotaur" version "2.+" } sourceCompatibility = JavaVersion.VERSION_17 @@ -93,7 +93,7 @@ curseforge { changelogType = "text" changelog = file("changelog.txt") - addGameVersion "1.18" + addGameVersion "1.19" addGameVersion "Java 17" addGameVersion "Fabric" @@ -112,14 +112,14 @@ curseforge { } } -import com.modrinth.minotaur.TaskModrinthUpload +import com.modrinth.minotaur.dependencies.ModDependency -task publishModrinth (type: TaskModrinthUpload) { +modrinth { token = project.hasProperty("modrinthApiKey") ? project.property("modrinthApiKey") : System.getenv("modrinthApiKey") projectId = "2i7tg1Wv" - versionName = "v${project.mod_version} (Minecraft 1.18)" + versionName = "v${project.mod_version} (Minecraft 1.19)" versionNumber = version uploadFile = remapJar - addGameVersion "1.18" - addLoader "fabric" + gameVersions = ["1.19"] + loaders = ["fabric"] } diff --git a/changelog.txt b/changelog.txt index 7a44731..79844dc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1 @@ -* Added config option to toggle Auto-Jump automatically when Auto-Run is active -* Added german localization -* Changed localization from AutoRun to Auto-Run in parity with Auto-Jump - Name of the mod is still: AutoRun - Name of the action: Auto-Run - Confusing, I know \ No newline at end of file +* Ported to 1.19 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6313e5d..381ff67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.18 -yarn_mappings=1.18+build.1 -loader_version=0.12.8 +minecraft_version=1.19 +yarn_mappings=1.19+build.2 +loader_version=0.14.7 # Mod Properties -mod_version=0.4.0 -supported_versions=1.18.X +mod_version=0.5.0 +supported_versions=1.19.X maven_group=com.emonadeo archives_base_name=autorun # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.44.0+1.18 -modmenu_version=3.0.0 -cloth_version=6.0.45 +fabric_version=0.55.3+1.19 +modmenu_version=4.0.0 +cloth_version=7.0.69 # CurseGradle project_id=279429 diff --git a/src/main/java/com/emonadeo/autorun/AutoRun.java b/src/main/java/com/emonadeo/autorun/AutoRun.java index 46deb5c..e2c41a0 100644 --- a/src/main/java/com/emonadeo/autorun/AutoRun.java +++ b/src/main/java/com/emonadeo/autorun/AutoRun.java @@ -104,9 +104,9 @@ public static void enableAutoJump(MinecraftClient client) { if (!toggleAutoJump) return; - originalAutoJumpSetting = client.options.autoJump; + originalAutoJumpSetting = client.options.getAutoJump().getValue(); - client.options.autoJump = true; + client.options.getAutoJump().setValue(true); client.options.sendClientSettings(); } @@ -114,7 +114,7 @@ public static void restoreAutoJump(MinecraftClient client) { if (!toggleAutoJump) return; - client.options.autoJump = originalAutoJumpSetting; + client.options.getAutoJump().setValue(originalAutoJumpSetting); client.options.sendClientSettings(); } diff --git a/src/main/java/com/emonadeo/autorun/AutoRunModMenu.java b/src/main/java/com/emonadeo/autorun/AutoRunModMenu.java index cc24c6e..7cb6fca 100644 --- a/src/main/java/com/emonadeo/autorun/AutoRunModMenu.java +++ b/src/main/java/com/emonadeo/autorun/AutoRunModMenu.java @@ -6,7 +6,7 @@ import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; public class AutoRunModMenu implements ModMenuApi, ConfigScreenFactory { @Override @@ -18,22 +18,22 @@ public ConfigScreenFactory getModConfigScreenFactory() { public Screen create(Screen screen) { ConfigBuilder builder = ConfigBuilder.create() .setParentScreen(screen) - .setTitle(new TranslatableText("title." + AutoRun.MODID + ".config")); + .setTitle(Text.translatable("title." + AutoRun.MODID + ".config")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - ConfigCategory general = builder.getOrCreateCategory(new TranslatableText("config." + AutoRun.MODID + ".general")); + ConfigCategory general = builder.getOrCreateCategory(Text.translatable("config." + AutoRun.MODID + ".general")); // Toogle Auto-Jump - general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("config." + AutoRun.MODID + ".toggleAutoJump"), AutoRun.isToggleAutoJump()) + general.addEntry(entryBuilder.startBooleanToggle(Text.translatable("config." + AutoRun.MODID + ".toggleAutoJump"), AutoRun.isToggleAutoJump()) .setDefaultValue(true) - .setTooltip(new TranslatableText("config." + AutoRun.MODID + ".toggleAutoJump.description")) + .setTooltip(Text.translatable("config." + AutoRun.MODID + ".toggleAutoJump.description")) .setSaveConsumer(AutoRun::setToggleAutoJump) .build()); // Delay Buffer - general.addEntry(entryBuilder.startIntField(new TranslatableText("config." + AutoRun.MODID + ".delayBuffer"), AutoRun.getDelayBuffer()) + general.addEntry(entryBuilder.startIntField(Text.translatable("config." + AutoRun.MODID + ".delayBuffer"), AutoRun.getDelayBuffer()) .setDefaultValue(20) - .setTooltip(new TranslatableText("config." + AutoRun.MODID + ".delayBuffer.description")) + .setTooltip(Text.translatable("config." + AutoRun.MODID + ".delayBuffer.description")) .setSaveConsumer(AutoRun::setDelayBuffer) .build()); diff --git a/src/main/java/com/emonadeo/autorun/MovementDirection.java b/src/main/java/com/emonadeo/autorun/MovementDirection.java index f06dc35..5e9d895 100644 --- a/src/main/java/com/emonadeo/autorun/MovementDirection.java +++ b/src/main/java/com/emonadeo/autorun/MovementDirection.java @@ -16,13 +16,13 @@ public enum MovementDirection { public KeyBinding getKeyBinding(MinecraftClient client) { switch (this) { default: - return client.options.keyForward; + return client.options.forwardKey; case BACK: - return client.options.keyBack; + return client.options.backKey; case LEFT: - return client.options.keyLeft; + return client.options.leftKey; case RIGHT: - return client.options.keyRight; + return client.options.rightKey; } } @@ -30,14 +30,14 @@ public Set getTerminators(MinecraftClient client) { switch (this) { default: return Stream.of( - client.options.keyForward, - client.options.keyBack) + client.options.forwardKey, + client.options.backKey) .collect(Collectors.toSet()); case LEFT: case RIGHT: return Stream.of( - client.options.keyLeft, - client.options.keyRight) + client.options.leftKey, + client.options.rightKey) .collect(Collectors.toSet()); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5146b17..c853727 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "license": "CC0-1.0", "icon": "assets/autorun/icon.png", - "environment": "*", + "environment": "client", "entrypoints": { "client": [ "com.emonadeo.autorun.AutoRun" ], "modmenu": [ "com.emonadeo.autorun.AutoRunModMenu" ] @@ -26,11 +26,8 @@ ], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.14.7", "fabric": "*", - "minecraft": "1.18.x" - }, - "custom": { - "modmenu:clientsideOnly": true + "minecraft": "1.19.x" } }