Fix build & Update Gradle

Winds-Studio · Jul 15, 2024 · 6f04116 · 6f04116
1 parent 1c7d3ed
commit 6f04116
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/patches/server/0013-Remove-Timings.patch b/patches/server/0013-Remove-Timings.patch
@@ -1219,7 +1219,7 @@ index 54586bbe25911dbdc5144fe71d6219c759234140..04bcc3bfda7669dc446e85b724039dcf
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9283242e8cb1831a2867b2dc119b72f4d6f11696..f876e03058c6ceb0a5660768e6905b368d355b0e 100644
+index 9283242e8cb1831a2867b2dc119b72f4d6f11696..2bb56f0e45187d09dfd9cf2222b6300afeba8050 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -1326,7 +1326,15 @@ index 9283242e8cb1831a2867b2dc119b72f4d6f11696..f876e03058c6ceb0a5660768e6905b36
          Iterator iterator = entity.getPassengers().iterator();
 
          while (iterator.hasNext()) {
-@@ -1347,9 +1321,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1332,7 +1306,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+
+             this.tickPassenger(entity, entity1);
+         }
+-        // } finally { timer.stopTiming(); } // Paper - timings - move up
+         // Paper start - log detailed entity tick information
+         } finally {
+             if (currentlyTickingEntity.get() == entity) {
+@@ -1347,9 +1320,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
                  // Paper - EAR 2
                  final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
@@ -1336,7 +1344,7 @@ index 9283242e8cb1831a2867b2dc119b72f4d6f11696..f876e03058c6ceb0a5660768e6905b36
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
 
-@@ -1371,8 +1342,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1371,8 +1341,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
 
                      this.tickPassenger(passenger, entity2);
                  }
@@ -1345,15 +1353,31 @@ index 9283242e8cb1831a2867b2dc119b72f4d6f11696..f876e03058c6ceb0a5660768e6905b36
              }
          } else {
              passenger.stopRiding();
-@@ -1423,7 +1392,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1392,7 +1360,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+             org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
+         }
+
+-        try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
+             if (doFull) {
+                 this.saveLevelData(true);
+             }
+@@ -1409,7 +1376,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+                 this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
+             }
+             // CraftBukkit end
+-        }
+     }
+     // Paper end - Incremental chunk and player saving
+
+@@ -1423,7 +1389,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
 
          if (!savingDisabled) {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit
 -            try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper
              if (progressListener != null) {
                  progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
              }
-@@ -1433,10 +1401,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1433,10 +1398,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                  progressListener.progressStage(Component.translatable("menu.savingChunks"));
              }