Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/assets/carpetamsaddition/lang/zh_cn.yml

Author: wendavid552

.github/workflows/release.yml

@@ -104,19 +104,18 @@ jobs:
           echo 'EOF' >> $GITHUB_OUTPUT
 
       - name: Publish Minecraft Mods
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: q4fx1eTg
           modrinth-token: ${{ secrets.MODRINTH_API_TOKEN }}
 
-          curseforge-id: _INSERT_CURSEFORGE_MOD_ID_HERE_
-          curseforge-token: ${{ secrets.CF_API_TOKEN }}
+          # curseforge-id: _INSERT_CURSEFORGE_MOD_ID_HERE_
+          # curseforge-token: ${{ secrets.CF_API_TOKEN }}
 
           github-tag: ${{ steps.release_info.outputs.tag_name }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-          files-primary: ${{ format('build-artifacts/{0}/build/libs/!(*-@(dev|sources)).jar', matrix.subproject_dir) }}
-          files-secondary: ''
+          files: ${{ format('build-artifacts/{0}/build/libs/!(*-@(dev|sources)).jar', matrix.subproject_dir) }}
 
           name: ${{ format('{0} v{1} for mc{2}', steps.properties_g.outputs.mod_name, steps.properties_g.outputs.mod_version, steps.properties_v.outputs.minecraft_version) }}
           version: ${{ format('mc{0}-v{1}', steps.properties_v.outputs.minecraft_version, steps.properties_g.outputs.mod_version) }}
@@ -125,7 +124,7 @@ jobs:
 
           loaders: fabric
           game-versions: ${{ steps.game_versions.outputs.value }}
-          version-resolver: exact
+          game-version-filter: any
 
           retry-attempts: 3
           retry-delay: 10000

README.md

@@ -21,20 +21,28 @@
 
 
 ## 前置
+
 |      前置       |                    链接                    |
 |:-------------:|:----------------------------------------:|
 |  Fabric API   |    https://github.com/FabricMC/fabric    |
 | Fabric-Carpet | https://github.com/gnembon/fabric-carpet |
 
 ## 文档
+
 访问网页查看所有关于Carpet-AMS-Addition的相关信息：<br>
 https://minecraft-ams.github.io/carpetamsaddition/
 
 ## 补充说明
+
 - 前置模组尽可能使用高的版本。
 - Carpet-AMS-Addition中的功能，虽然存在但不代表我们在AMS服务器内使用它。
 - 由于英文水平有限，目前所有翻译均来自 [Chat-GPT](https://openai.com/blog/chatgpt) （除了很久很久以前
   [nirvanaxiao6](https://github.com/nirvanaxiao6)撰写的第一篇英文文档）。
 
 ## 许可
 此项目在 [ LGPL-v3.0 ](https://choosealicense.com/licenses/lgpl-3.0/) 许可证下可用,您可以随意从中学习并将其纳入您自己的项目中。
+
+## 特别鸣谢
+感谢 [JetBrains](https://www.jetbrains.com/) 所提供的免费开源开发许可证。
+
+[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" height="96"/>](https://www.jetbrains.com/)[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/IntelliJ_IDEA.png" height="96"/>](https://www.jetbrains.com/idea/)

README_en.md

@@ -41,3 +41,9 @@ https://minecraft-ams.github.io/carpetamsaddition/
 ## License
 
 This project is available under the [ LGPL-v3.0 ](https://choosealicense.com/licenses/lgpl-3.0/) license. Feel free to learn from it and incorporate it in your own projects.
+
+## Thanks
+
+Thanks for the free open-source development license provided by [JetBrains](https://www.jetbrains.com/).
+
+[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" height="96"/>](https://www.jetbrains.com/)[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/IntelliJ_IDEA.png" height="96"/>](https://www.jetbrains.com/idea/)

common.gradle

@@ -12,14 +12,11 @@ preprocess {
 
 repositories {
 	maven {
-		url 'https://masa.dy.fi/maven'
+		url 'https://www.cursemaven.com'
 	}
 	maven {
 		url 'https://jitpack.io'
 	}
-	maven {
-		url 'https://www.cursemaven.com'
-	}
 }
 
 // https://github.com/FabricMC/fabric-loader/issues/783
@@ -34,11 +31,12 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// mods
-    modImplementation "carpet:fabric-carpet:${project.carpet_core_version}"
+    //modImplementation "carpet:fabric-carpet:${project.carpet_core_version}" //masa
+	modImplementation("curse.maven:carpet-349239:${project.carpet_core_version}") //cursemaven
 
 	// Dependencies
-	implementation "org.yaml:snakeyaml:${project.snakeyaml_version}"
-	include "org.yaml:snakeyaml:${project.snakeyaml_version}"
+	implementation "com.esotericsoftware.yamlbeans:yamlbeans:${project.yamlbeans_version}"
+	include "com.esotericsoftware.yamlbeans:yamlbeans:${project.yamlbeans_version}"
 	include(annotationProcessor(implementation("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
 }
 
@@ -109,13 +107,6 @@ processResources {
 	}
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile).configureEach {
-	options.encoding = "UTF-8"
-}
-
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
@@ -169,7 +160,6 @@ publishing {
 	publications {
 		mavenJava(MavenPublication) {
 			artifactId archivesBaseName
-
 			from components.java
 		}
 	}

gradle.properties

@@ -8,13 +8,13 @@ loader_version = 0.14.25
 # Mod Properties
 mod_id = carpet-ams-addition
 mod_name = Carpet AMS Addition
-mod_version = 2.22.0
+mod_version = 2.28.0
 maven_group = carpetamsaddition
 archives_base_name = Carpet-AMS-Addition
 
 # Dependencies
-# https://mvnrepository.com/artifact/org.yaml/snakeyaml
-snakeyaml_version = 2.2
+# https://mvnrepository.com/artifact/com.esotericsoftware.yamlbeans/yamlbeans
+yamlbeans_version = 1.17
 
 # https://github.com/LlamaLad7/MixinExtras
-mixinextras_version = 0.3.2
+mixinextras_version = 0.3.5

run/options.txt

@@ -1,6 +1,5 @@
-version:3700
+version:2586
 autoJump:false
-operatorItemsTab:false
 autoSuggestions:true
 chatColors:true
 chatLinks:true
@@ -12,43 +11,32 @@ discrete_mouse_scroll:false
 invertYMouse:false
 realmsNotifications:false
 reducedDebugInfo:false
+snooperEnabled:false
 showSubtitles:false
-directionalAudio:false
 touchscreen:false
 fullscreen:false
 bobView:false
 toggleCrouch:false
 toggleSprint:false
-darkMojangStudiosBackground:false
-hideLightningFlashes:false
-hideSplashTexts:false
 mouseSensitivity:0.40316900610923767
 fov:0.0
 screenEffectScale:0.5
 fovEffectScale:1.0
-darknessEffectScale:1.0
-glintSpeed:0.5
-glintStrength:0.75
-damageTiltStrength:1.0
-highContrast:false
-narratorHotkey:true
 gamma:1.0
 renderDistance:12
-simulationDistance:12
 entityDistanceScaling:1.0
 guiScale:4
 particles:1
 maxFps:260
+difficulty:2
 graphicsMode:0
-ao:true
-prioritizeChunkUpdates:0
+ao:2
 biomeBlendRadius:4
-renderClouds:"true"
-resourcePacks:["vanilla","programmer_art"]
+renderClouds:true
+resourcePacks:["vanilla","programer_art"]
 incompatibleResourcePacks:[]
 lastServer:124.227.80.185:25227
 lang:zh_cn
-soundDevice:""
 chatVisibility:0
 chatOpacity:1.0
 chatLineSpacing:0.019366197288036346
@@ -59,33 +47,25 @@ advancedItemTooltips:true
 pauseOnLostFocus:true
 overrideWidth:0
 overrideHeight:0
+heldItemTooltips:true
 chatHeightFocused:1.0
-chatDelay:0.0
+chatDelay: 0.0
 chatHeightUnfocused:0.44366195797920227
-chatScale:0.6214788732394366
+chatScale:0.6214788556098938
 chatWidth:1.0
-notificationDisplayTime:1.0
 mipmapLevels:4
 useNativeTransport:true
-mainHand:"right"
+mainHand:right
 attackIndicator:1
 narrator:0
 tutorialStep:none
 mouseWheelSensitivity:1.0
 rawMouseInput:true
 glDebugVerbosity:1
 skipMultiplayerWarning:true
-skipRealms32bitWarning:false
 hideMatchedNames:true
 joinedFirstServer:true
-hideBundleTutorial:false
 syncChunkWrites:true
-showAutosaveIndicator:true
-allowServerListing:true
-onlyShowSecureChat:false
-panoramaScrollSpeed:1.0
-telemetryOptInExtra:false
-onboardAccessibility:false
 key_key.attack:key.mouse.left
 key_key.use:key.mouse.right
 key_key.forward:key.keyboard.w