diff --git a/build.gradle b/build.gradle index 2b5bd6d..70965c3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.7-SNAPSHOT' + id 'fabric-loom' version '0.9-SNAPSHOT' id 'maven-publish' //id 'maven' id 'idea' @@ -23,11 +23,9 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. - implementation group: 'org.yaml', name: 'snakeyaml', version: '1.28' + implementation group: 'org.yaml', name: 'snakeyaml', version: '1.29' } repositories { - maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } - maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' } maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' @@ -37,15 +35,9 @@ repositories { processResources { inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - include "title.yml" + filesMatching("fabric.mod.json") { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/gradle.properties b/gradle.properties index 5c57cc0..849bd65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.5 - yarn_mappings=1.16.5+build.9 - loader_version=0.11.3 + minecraft_version=1.17.1 + yarn_mappings=1.17.1+build.46 + loader_version=0.11.6 # Mod Properties - mod_version = 1.8 - maven_group = net.fabricmc + mod_version = 1.0.7 + maven_group = me.percydan archives_base_name = RandomTitle-Fabric # 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.34.2+1.16 + fabric_version=0.39.2+1.17 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1..7a3265e 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 0dfb5f5..ffed3a2 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\://lss233.littleservice.cn/repositories/gradle-dist/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/me/PercyDan/RandomTitle/ConfigManager.java b/src/main/java/me/PercyDan/RandomTitle/ConfigManager.java index e544053..88b6f96 100644 --- a/src/main/java/me/PercyDan/RandomTitle/ConfigManager.java +++ b/src/main/java/me/PercyDan/RandomTitle/ConfigManager.java @@ -1,4 +1,4 @@ -package me.percydan.randomtitle; +package me.percydan.RandomTitle; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/src/main/java/me/PercyDan/RandomTitle/Mixins/MixinMinecraft.java b/src/main/java/me/PercyDan/RandomTitle/Mixins/MixinMinecraft.java index b0a1c51..54c5ad9 100644 --- a/src/main/java/me/PercyDan/RandomTitle/Mixins/MixinMinecraft.java +++ b/src/main/java/me/PercyDan/RandomTitle/Mixins/MixinMinecraft.java @@ -1,6 +1,6 @@ -package me.percydan.randomtitle.Mixins; +package me.percydan.RandomTitle.mixins; -import me.percydan.randomtitle.ConfigManager; +import me.percydan.RandomTitle.ConfigManager; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.SharedConstants; import net.minecraft.client.MinecraftClient; @@ -20,7 +20,8 @@ @Mixin(MinecraftClient.class) public abstract class MixinMinecraft { ConfigManager config = new ConfigManager(); - public String RandTitle = config.getTitle(); + private final String randomTitle = config.getTitle(); + @Shadow private IntegratedServer server; @Shadow @@ -57,7 +58,7 @@ private void getWindowTitle(CallbackInfoReturnable ci) { } String date = new SimpleDateFormat(config.Get("dateformat")).format((System.currentTimeMillis())); title = title.replace("%date%", date); - title = title.replace("%title%", RandTitle); + title = title.replace("%title%", randomTitle); title = title.replace("%version%", stringBuilder.toString()); title = title.replace("%mod%", String.valueOf(FabricLoader.getInstance().getAllMods().size())); ci.setReturnValue(title); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7d61b8f..5d95cc6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, "id": "randomtitle", - "version": "1.8", + "version": "1.0.7", - "name": "RandomTitle", + "name": "Random Title", "description": "Pick random sentences as window title", "authors": [ "PercyDan" diff --git a/src/main/resources/mixins.json b/src/main/resources/mixins.json index b5308b0..84e7153 100644 --- a/src/main/resources/mixins.json +++ b/src/main/resources/mixins.json @@ -1,7 +1,6 @@ { - "required": true, "minVersion": "0.8", - "package": "me.percydan.randomtitle.Mixins", + "package": "me.percydan.RandomTitle.mixins", "compatibilityLevel": "JAVA_8", "mixins": [], "client": ["MixinMinecraft"], diff --git a/src/main/resources/title.yml b/src/main/resources/title.yml index 9f5ef56..6ef319f 100644 --- a/src/main/resources/title.yml +++ b/src/main/resources/title.yml @@ -31,10 +31,10 @@ title: - "如果温柔是罪，那就只能用拳头来洗清我们犯下的罪孽 ——《镇魂街》" #Variables: -#%prefix% as defined above -#%title% - random title +#%title% - Random title #%date% - Date formatted as dateformat below -#%mod% - loaded mod count +#%mod% - Loaded mod count +#%version% - Minecraft version format: "Minecraft %version% | %title%" dateformat: "yyyy-MM-dd HH:mm:ss" \ No newline at end of file