diff --git a/build.gradle b/build.gradle index bf0a404..d3ba76a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name version = project.mod_version @@ -30,9 +30,9 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } - include "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}" + // include "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}" - modImplementation "com.terraformersmc:modmenu:9.0.0-pre.1" + modImplementation "com.terraformersmc:modmenu:10.0.0-beta.1" } processResources { diff --git a/gradle.properties b/gradle.properties index 67970a0..6f9ef1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties -mod_version = 1.0.0-fabric-1.20.4 +mod_version = 1.0.1-fabric-1.20.5 maven_group = troy.autofish archives_base_name = xplus-autofish # Fabric Properties # check these on https://modmuss50.me/fabric.html or https://fabricmc.net/use -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.1 -loader_version=0.15.1 +minecraft_version=1.20.5 +yarn_mappings=1.20.5+build.1 +loader_version=0.15.10 #Fabric api -fabric_version=0.91.2+1.20.4 +fabric_version=0.97.6+1.20.5 #Cloth Config API -cloth_config_version=13.0.114 +cloth_config_version=14.0.126 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b8..48c0a02 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-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/assets/autofish/lang/en_gb.json b/src/main/resources/assets/autofish/lang/en_gb.json index 3539a24..3d884ef 100644 --- a/src/main/resources/assets/autofish/lang/en_gb.json +++ b/src/main/resources/assets/autofish/lang/en_gb.json @@ -1,6 +1,6 @@ { - "key.autofish.open_gui": "Open Autofish GUI", - "options.autofish.title": "Autofish Settings", + "key.autofish.open_gui": "Open XPlus Autofish GUI", + "options.autofish.title": "XPlus Autofish Settings", "options.autofish.toggle.on": "\u00A7aOn", "options.autofish.toggle.off": "\u00A7eOff", @@ -24,7 +24,7 @@ "options.autofish.persistent.tooltip_3": "if needed.", "options.autofish.persistent.tooltip_4": "This is useful for lag issues or when", "options.autofish.persistent.tooltip_5": "fishing for long periods of time.", - + "options.autofish.sound.title": "Use Sound Detection", "options.autofish.sound.tooltip_0": "\u00A76Newer, more accurate detection based", "options.autofish.sound.tooltip_1": "\u00A76on bobber sounds rather than the", @@ -53,5 +53,17 @@ "options.autofish.clear_regex.tooltip_2": "\u00A76This pattern is a \u00A7aRegular Expression\u00A76.", "options.autofish.basic.title": "Basic Options", - "options.autofish.advanced.title": "Advanced Options" + "options.autofish.advanced.title": "Advanced Options", + "options.autofish.open_water_detection.title": "Enable Open Water detection", + "options.autofish.open_water_detection.tooltip_0": "In game versions above 20w12a(1.16),", + "options.autofish.open_water_detection.tooltip_1": "You can only get treasure loot at open water.", + "options.autofish.open_water_detection.tooltip_2": "This will alert you when you are not fishing at open water.", + "options.autofish.random_delay.title": "Random Recast Delay Field", + "options.autofish.random_delay.value": "%d percent", + "options.autofish.random_delay.tooltip_0": "Add ±% randomness to the Recast Delay", + "options.autofish.random_delay.tooltip_1": "For example: Set this to 20% will make", + "options.autofish.random_delay.tooltip_2": "a 1500ms delay fall in 1200-1800ms (1500ms ±20%).", + "options.autofish.random_delay.tooltip_3": "Set this to 0 to disable this function.", + "info.autofish.open_water_detection.fail": "§c[Autofish] The area you're fishing in is not open water!§0", + "info.autofish.open_water_detection.success": "§2[Autofish] You're fishing in open water!§0" } diff --git a/src/main/resources/assets/autofish/lang/en_ud.json b/src/main/resources/assets/autofish/lang/en_ud.json index 21db3a4..e90e3e7 100644 --- a/src/main/resources/assets/autofish/lang/en_ud.json +++ b/src/main/resources/assets/autofish/lang/en_ud.json @@ -53,5 +53,17 @@ "options.autofish.clear_regex.tooltip_2": "uǝɥʍ poɹ ƃuᴉɥsᴉɟ ǝɥʇ ʇsɐɔǝᴚ", "options.autofish.basic.title": "suoᴉʇdO ɔᴉsɐq", - "options.autofish.advanced.title": "suoᴉʇdO pǝɔuɐʌp∀" + "options.autofish.advanced.title": "suoᴉʇdO pǝɔuɐʌp∀", + "options.autofish.open_water_detection.title": "Enable Open Water detection", + "options.autofish.open_water_detection.tooltip_0": "In game versions above 20w12a(1.16),", + "options.autofish.open_water_detection.tooltip_1": "You can only get treasure loot at open water.", + "options.autofish.open_water_detection.tooltip_2": "This will alert you when you are not fishing at open water.", + "options.autofish.random_delay.title": "Random Recast Delay Field", + "options.autofish.random_delay.value": "%d percent", + "options.autofish.random_delay.tooltip_0": "Add ±% randomness to the Recast Delay", + "options.autofish.random_delay.tooltip_1": "For example: Set this to 20% will make", + "options.autofish.random_delay.tooltip_2": "a 1500ms delay fall in 1200-1800ms (1500ms ±20%).", + "options.autofish.random_delay.tooltip_3": "Set this to 0 to disable this function.", + "info.autofish.open_water_detection.fail": "§c[Autofish] The area you're fishing in is not open water!§0", + "info.autofish.open_water_detection.success": "§2[Autofish] You're fishing in open water!§0" } diff --git a/src/main/resources/assets/autofish/lang/ko_kr.json b/src/main/resources/assets/autofish/lang/ko_kr.json index 47c42c8..a0389b7 100644 --- a/src/main/resources/assets/autofish/lang/ko_kr.json +++ b/src/main/resources/assets/autofish/lang/ko_kr.json @@ -53,5 +53,17 @@ "options.autofish.clear_regex.tooltip_2": "\u00A7a정규 표현식\u00A76의 형식으로 기입하여 주십시오.", "options.autofish.basic.title": "기본 옵션", - "options.autofish.advanced.title": "고급 옵션" + "options.autofish.advanced.title": "고급 옵션", + "options.autofish.open_water_detection.title": "Enable Open Water detection", + "options.autofish.open_water_detection.tooltip_0": "In game versions above 20w12a(1.16),", + "options.autofish.open_water_detection.tooltip_1": "You can only get treasure loot at open water.", + "options.autofish.open_water_detection.tooltip_2": "This will alert you when you are not fishing at open water.", + "options.autofish.random_delay.title": "Random Recast Delay Field", + "options.autofish.random_delay.value": "%d percent", + "options.autofish.random_delay.tooltip_0": "Add ±% randomness to the Recast Delay", + "options.autofish.random_delay.tooltip_1": "For example: Set this to 20% will make", + "options.autofish.random_delay.tooltip_2": "a 1500ms delay fall in 1200-1800ms (1500ms ±20%).", + "options.autofish.random_delay.tooltip_3": "Set this to 0 to disable this function.", + "info.autofish.open_water_detection.fail": "§c[Autofish] The area you're fishing in is not open water!§0", + "info.autofish.open_water_detection.success": "§2[Autofish] You're fishing in open water!§0" } diff --git a/src/main/resources/assets/autofish/lang/zh_cn.json b/src/main/resources/assets/autofish/lang/zh_cn.json index c527c1b..3862907 100644 --- a/src/main/resources/assets/autofish/lang/zh_cn.json +++ b/src/main/resources/assets/autofish/lang/zh_cn.json @@ -1,6 +1,6 @@ { "key.autofish.open_gui": "打开Autofish界面", - "options.autofish.title": "Autofish设置", + "options.autofish.title": "XPlus Autofish设置", "options.autofish.toggle.on": "\u00A7a开", "options.autofish.toggle.off": "\u00A7e关", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index de96d2c..8502bcb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -40,6 +40,7 @@ ], "depends": { - "fabric": "*" + "fabric": "*", + "cloth-config": "*" } }