From 6fe71351673c7d393988ad3911add346bd99a7dc Mon Sep 17 00:00:00 2001 From: KrLite <68179735+KrLite@users.noreply.github.com> Date: Thu, 4 Jan 2024 19:06:03 +0800 Subject: [PATCH] update --- README.md | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../{ive_spoken => ivespoken}/IveSpoken.java | 6 +++--- .../{ive_spoken => ivespoken}/StampedMessage.java | 2 +- .../config/IveSpokenConfig.java | 5 +++-- .../config/modmenu/IveSpokenConfigScreen.java | 4 ++-- .../config/modmenu/IveSpokenModMenuImpl.java | 2 +- .../mixin/ChatTracker.java | 4 ++-- .../mixin/DialogRenderer.java | 4 ++-- .../resources/assets/ive_spoken/lang/en_us.json | 6 ------ .../resources/assets/ive_spoken/lang/zh_cn.json | 6 ------ .../assets/{ive_spoken => ivespoken}/icon.png | Bin .../resources/assets/ivespoken/lang/en_us.json | 6 ++++++ .../resources/assets/ivespoken/lang/zh_cn.json | 6 ++++++ src/main/resources/fabric.mod.json | 14 +++++++------- ...e_spoken.mixins.json => ivespoken.mixins.json} | 2 +- 17 files changed, 37 insertions(+), 36 deletions(-) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/IveSpoken.java (96%) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/StampedMessage.java (87%) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/config/IveSpokenConfig.java (82%) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/config/modmenu/IveSpokenConfigScreen.java (94%) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/config/modmenu/IveSpokenModMenuImpl.java (87%) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/mixin/ChatTracker.java (94%) rename src/main/java/net/krlite/{ive_spoken => ivespoken}/mixin/DialogRenderer.java (94%) delete mode 100644 src/main/resources/assets/ive_spoken/lang/en_us.json delete mode 100644 src/main/resources/assets/ive_spoken/lang/zh_cn.json rename src/main/resources/assets/{ive_spoken => ivespoken}/icon.png (100%) create mode 100644 src/main/resources/assets/ivespoken/lang/en_us.json create mode 100644 src/main/resources/assets/ivespoken/lang/zh_cn.json rename src/main/resources/{ive_spoken.mixins.json => ivespoken.mixins.json} (81%) diff --git a/README.md b/README.md index 588dcb7..f42eab7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The content will be truncated if too long (configurable). ## Configuration -You can now configure **I've Spoken** by editing the configuration file at `/config/ive_spoken.toml`. You shall restart the game in order to reload the configurations. +You can now configure **I've Spoken** by editing the configuration file at `/config/ivespoken.toml`. You shall restart the game in order to reload the configurations. ## License diff --git a/gradle.properties b/gradle.properties index f69e131..762ccec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version = 0.14.22 mod_version = 2.0.0 maven_group = net.krlite -archives_base_name = ive_spoken +archives_base_name = ivespoken # Dependencies fabric_version = 0.83.0+1.20 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..c30b486 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/net/krlite/ive_spoken/IveSpoken.java b/src/main/java/net/krlite/ivespoken/IveSpoken.java similarity index 96% rename from src/main/java/net/krlite/ive_spoken/IveSpoken.java rename to src/main/java/net/krlite/ivespoken/IveSpoken.java index 068a827..2e3896c 100644 --- a/src/main/java/net/krlite/ive_spoken/IveSpoken.java +++ b/src/main/java/net/krlite/ivespoken/IveSpoken.java @@ -1,9 +1,9 @@ -package net.krlite.ive_spoken; +package net.krlite.ivespoken; import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.api.ModInitializer; -import net.krlite.ive_spoken.config.IveSpokenConfig; +import net.krlite.ivespoken.config.IveSpokenConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.network.AbstractClientPlayerEntity; @@ -24,7 +24,7 @@ import java.util.UUID; public class IveSpoken implements ModInitializer { - public static final String NAME = "I've Spoken", ID = "ive_spoken"; + public static final String NAME = "I've Spoken", ID = "ivespoken"; public static final Logger LOGGER = LoggerFactory.getLogger(ID); public static final IveSpokenConfig CONFIG = new IveSpokenConfig(); diff --git a/src/main/java/net/krlite/ive_spoken/StampedMessage.java b/src/main/java/net/krlite/ivespoken/StampedMessage.java similarity index 87% rename from src/main/java/net/krlite/ive_spoken/StampedMessage.java rename to src/main/java/net/krlite/ivespoken/StampedMessage.java index 5f72047..32a5113 100644 --- a/src/main/java/net/krlite/ive_spoken/StampedMessage.java +++ b/src/main/java/net/krlite/ivespoken/StampedMessage.java @@ -1,4 +1,4 @@ -package net.krlite.ive_spoken; +package net.krlite.ivespoken; import net.minecraft.text.Text; diff --git a/src/main/java/net/krlite/ive_spoken/config/IveSpokenConfig.java b/src/main/java/net/krlite/ivespoken/config/IveSpokenConfig.java similarity index 82% rename from src/main/java/net/krlite/ive_spoken/config/IveSpokenConfig.java rename to src/main/java/net/krlite/ivespoken/config/IveSpokenConfig.java index ff032ff..62bd6f7 100644 --- a/src/main/java/net/krlite/ive_spoken/config/IveSpokenConfig.java +++ b/src/main/java/net/krlite/ivespoken/config/IveSpokenConfig.java @@ -1,13 +1,14 @@ -package net.krlite.ive_spoken.config; +package net.krlite.ivespoken.config; import net.fabricmc.loader.api.FabricLoader; +import net.krlite.ivespoken.IveSpoken; import net.krlite.pierced.annotation.Silent; import net.krlite.pierced.config.Pierced; import java.io.File; public class IveSpokenConfig extends Pierced { - private static final @Silent File file = FabricLoader.getInstance().getConfigDir().resolve("ive_spoken.toml").toFile(); + private static final @Silent File file = FabricLoader.getInstance().getConfigDir().resolve(IveSpoken.ID + ".toml").toFile(); public IveSpokenConfig() { super(IveSpokenConfig.class, file); diff --git a/src/main/java/net/krlite/ive_spoken/config/modmenu/IveSpokenConfigScreen.java b/src/main/java/net/krlite/ivespoken/config/modmenu/IveSpokenConfigScreen.java similarity index 94% rename from src/main/java/net/krlite/ive_spoken/config/modmenu/IveSpokenConfigScreen.java rename to src/main/java/net/krlite/ivespoken/config/modmenu/IveSpokenConfigScreen.java index e7b3fca..a61aedf 100644 --- a/src/main/java/net/krlite/ive_spoken/config/modmenu/IveSpokenConfigScreen.java +++ b/src/main/java/net/krlite/ivespoken/config/modmenu/IveSpokenConfigScreen.java @@ -1,9 +1,9 @@ -package net.krlite.ive_spoken.config.modmenu; +package net.krlite.ivespoken.config.modmenu; import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; -import net.krlite.ive_spoken.IveSpoken; +import net.krlite.ivespoken.IveSpoken; import net.minecraft.client.gui.screen.Screen; public class IveSpokenConfigScreen { diff --git a/src/main/java/net/krlite/ive_spoken/config/modmenu/IveSpokenModMenuImpl.java b/src/main/java/net/krlite/ivespoken/config/modmenu/IveSpokenModMenuImpl.java similarity index 87% rename from src/main/java/net/krlite/ive_spoken/config/modmenu/IveSpokenModMenuImpl.java rename to src/main/java/net/krlite/ivespoken/config/modmenu/IveSpokenModMenuImpl.java index 2ec147d..5e7189f 100644 --- a/src/main/java/net/krlite/ive_spoken/config/modmenu/IveSpokenModMenuImpl.java +++ b/src/main/java/net/krlite/ivespoken/config/modmenu/IveSpokenModMenuImpl.java @@ -1,4 +1,4 @@ -package net.krlite.ive_spoken.config.modmenu; +package net.krlite.ivespoken.config.modmenu; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; diff --git a/src/main/java/net/krlite/ive_spoken/mixin/ChatTracker.java b/src/main/java/net/krlite/ivespoken/mixin/ChatTracker.java similarity index 94% rename from src/main/java/net/krlite/ive_spoken/mixin/ChatTracker.java rename to src/main/java/net/krlite/ivespoken/mixin/ChatTracker.java index cc8779b..a641fb4 100644 --- a/src/main/java/net/krlite/ive_spoken/mixin/ChatTracker.java +++ b/src/main/java/net/krlite/ivespoken/mixin/ChatTracker.java @@ -1,6 +1,6 @@ -package net.krlite.ive_spoken.mixin; +package net.krlite.ivespoken.mixin; -import net.krlite.ive_spoken.IveSpoken; +import net.krlite.ivespoken.IveSpoken; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.gui.hud.MessageIndicator; import net.minecraft.network.message.MessageSignatureData; diff --git a/src/main/java/net/krlite/ive_spoken/mixin/DialogRenderer.java b/src/main/java/net/krlite/ivespoken/mixin/DialogRenderer.java similarity index 94% rename from src/main/java/net/krlite/ive_spoken/mixin/DialogRenderer.java rename to src/main/java/net/krlite/ivespoken/mixin/DialogRenderer.java index 6eb3820..ea5719e 100644 --- a/src/main/java/net/krlite/ive_spoken/mixin/DialogRenderer.java +++ b/src/main/java/net/krlite/ivespoken/mixin/DialogRenderer.java @@ -1,6 +1,6 @@ -package net.krlite.ive_spoken.mixin; +package net.krlite.ivespoken.mixin; -import net.krlite.ive_spoken.IveSpoken; +import net.krlite.ivespoken.IveSpoken; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.EntityRenderer; diff --git a/src/main/resources/assets/ive_spoken/lang/en_us.json b/src/main/resources/assets/ive_spoken/lang/en_us.json deleted file mode 100644 index ca53488..0000000 --- a/src/main/resources/assets/ive_spoken/lang/en_us.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "screen.ive_spoken.config": "I've Spoken", - - "config.ive_spoken.general.lasting_time": "Dialog Lasting Time (ms)", - "config.ive_spoken.general.max_width": "Max Dialog Width (pixels)" -} \ No newline at end of file diff --git a/src/main/resources/assets/ive_spoken/lang/zh_cn.json b/src/main/resources/assets/ive_spoken/lang/zh_cn.json deleted file mode 100644 index 7f3bedf..0000000 --- a/src/main/resources/assets/ive_spoken/lang/zh_cn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "screen.ive_spoken.config": "I've Spoken", - - "config.ive_spoken.general.lasting_time": "对话框显示时间（毫秒）", - "config.ive_spoken.general.max_width": "对话框最大宽度（像素）" -} \ No newline at end of file diff --git a/src/main/resources/assets/ive_spoken/icon.png b/src/main/resources/assets/ivespoken/icon.png similarity index 100% rename from src/main/resources/assets/ive_spoken/icon.png rename to src/main/resources/assets/ivespoken/icon.png diff --git a/src/main/resources/assets/ivespoken/lang/en_us.json b/src/main/resources/assets/ivespoken/lang/en_us.json new file mode 100644 index 0000000..6676478 --- /dev/null +++ b/src/main/resources/assets/ivespoken/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "screen.ivespoken.config": "I've Spoken", + + "config.ivespoken.general.lasting_time": "Dialog Lasting Time (ms)", + "config.ivespoken.general.max_width": "Max Dialog Width (pixels)" +} \ No newline at end of file diff --git a/src/main/resources/assets/ivespoken/lang/zh_cn.json b/src/main/resources/assets/ivespoken/lang/zh_cn.json new file mode 100644 index 0000000..fa99791 --- /dev/null +++ b/src/main/resources/assets/ivespoken/lang/zh_cn.json @@ -0,0 +1,6 @@ +{ + "screen.ivespoken.config": "I've Spoken", + + "config.ivespoken.general.lasting_time": "对话框显示时间（毫秒）", + "config.ivespoken.general.max_width": "对话框最大宽度（像素）" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b18187b..bfcd27f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,32 +1,32 @@ { "schemaVersion": 1, - "id": "ive_spoken", + "id": "ivespoken", "version": "${version}", "name": "I've Spoken", - "description": "Displays RPG-Like Dialogs Beyond Players' Names. I've Spoken.", + "description": "Displays RPG-like dialogs above players' names. I've spoken.", "authors": [ "KrLite" ], "contact": { "homepage": "https://github.com/KrLite", - "sources": "https://github.com/KrLite/Ive-Spoken" + "sources": "https://github.com/KrLite/Mod.Ive-Spoken" }, "license": "GPL-3.0", - "icon": "assets/ive_spoken/icon.png", + "icon": "assets/ivespoken/icon.png", "environment": "client", "entrypoints": { "main": [ - "net.krlite.ive_spoken.IveSpoken" + "net.krlite.ivespoken.IveSpoken" ], "modmenu": [ - "net.krlite.ive_spoken.config.modmenu.IveSpokenModMenuImpl" + "net.krlite.ivespoken.config.modmenu.IveSpokenModMenuImpl" ] }, "mixins": [ - "ive_spoken.mixins.json" + "ivespoken.mixins.json" ], "depends": { diff --git a/src/main/resources/ive_spoken.mixins.json b/src/main/resources/ivespoken.mixins.json similarity index 81% rename from src/main/resources/ive_spoken.mixins.json rename to src/main/resources/ivespoken.mixins.json index 1bb1b11..9874a23 100644 --- a/src/main/resources/ive_spoken.mixins.json +++ b/src/main/resources/ivespoken.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "net.krlite.ive_spoken.mixin", + "package": "net.krlite.ivespoken.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ],