Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4

This reverts commit e1afa32f90.

.github/workflows/build_1_20_4.yml

@@ -61,10 +61,3 @@ jobs:
        file: "build/libs/luminol-1.20.4-paperclip.jar"
        file_glob: true
        prerelease: true
-    - name: Push to API
-      continue-on-error: true
-      if: "!contains(github.event.commits[0].message, '[release-skip]')"
-      env:
-        secret_v2: ${{ secrets.API_V2_PUSH_TOKEN }}
-        tag: ${{ env.tag }}
-      run: sh scripts/PushToAPI.sh

README.md

@@ -52,6 +52,11 @@ dependencies {
 
 QQ群：`368632360`  |  QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j)  |  Telegram：[点击加入](https://t.me/LuminolMC)
 
+> [!WARNING]
+> **此项目与Leaves无关。不要向Leaves报告任何有关协议支持的错误，因为协议支持已经重构**
+
+## 关于 Issue
+当您遇到任何问题时，请向我们提问，我们将尽力解决，但请记得清楚地描述您的问题并提供足够的日志等信息。
 
 ## 贡献代码
 可[查看 Contributing](./docs/CONTRIBUTING.md)
@@ -69,7 +74,3 @@ QQ群：`368632360`  |  QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j)
     <img alt="Star历史表" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date" />
   </picture>
 </a>
-
-> [!WARNING]
-> **此项目与Leaves无关。不要向Leaves报告任何有关协议支持的错误，因为协议支持已经重构**
-> 

patches/server/0014-Add-config-for-incorrect-tripwire-updating-fixing.patch

@@ -31,15 +31,21 @@ index 0000000000000000000000000000000000000000..79ce93a1e97f176c7b0e5b00d7f0880f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..a286d6cd2c371c135cb708f2bee9c5afa7532a92 100644
+index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..25e069bd660720232737031fe1630765cce9a1b1 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-@@ -201,7 +201,7 @@ public class TripWireHookBlock extends Block {
+@@ -201,8 +201,13 @@ public class TripWireHookBlock extends Block {
                      BlockState iblockdata4 = aiblockdata[l];
  
                      if (iblockdata4 != null) {
 -                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended
-+                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE) || me.earthme.luminol.config.modules.fixes.IncorrectTripwireFixConfig.enabled) { // Paper - Fix tripwire disarming not working as intended //Luminol - Add config for this
++                        if (me.earthme.luminol.config.modules.fixes.IncorrectTripwireFixConfig.enabled || world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended //Luminol - Add config for this
                          world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
++                        //Luminol start - Add config for incorrect tripwire updating
++                        if (me.earthme.luminol.config.modules.fixes.IncorrectTripwireFixConfig.enabled){
++                            world.getBlockState(blockposition2).isAir();
++                        }
++                        //Luminol end
                          }
                      }
+                 }

scripts/PushToAPI.sh

@@ -1,32 +0,0 @@
-sha256() {
-  sha256sum $1 | awk '{print $1}'
-}
-
-prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
-}
-echo "$tag"
-project_id="leaves"
-project_name="leaves"
-mcversion=$(prop mcVersion)
-ctime=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-pre=$(prop preVersion)
-if [ $pre = "true" ]; then
-  channel="experimental"
-else
-  channel="default"
-fi
-promoted=false
-
-# shellcheck disable=SC2046
-number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l)
-changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g')
-jar_name="leaves-$mcversion.jar"
-jar_sha256=`sha256 $jar_name`
-
-# v1
-#curl --location --request POST "https://api.leavesmc.org/new_release" --header "Content-Type: application/json" --data-raw "{\"project_id\":\"$project_id\",\"project_name\":\"$project_name\",\"version\":\"$mcversion\",\"time\":\"$ctime\",\"channel\":\"$channel\",\"promoted\":$promoted,\"changes\":\"$changes\",\"downloads\":{\"application\":{\"name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"url\":\"https://github.com/LeavesMC/Leaves/releases/download/$tag/$jar_name\"}},\"secret\":\"$secret\"}"
-#curl --location --request POST "https://api.leavesmc.org/upload_file" -F "file=@$jar_name" -F "filename=$jar_name" -F "filehash=$jar_sha256" -F "secret=$secret"
-
-# v2
-curl --location --request POST "https://api.luminolmc.com/v2/commit/build" --header "Content-Type: application/json" --header "Authentication: Bearer $secret_v2" --data-raw "{\"project_id\":\"$project_id\",\"version\":\"$mcversion\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"tag\":\"$tag\"}"