diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 483739e..a150120 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,10 +33,10 @@ jobs: - name: Bundle run: ./gradlew createMojmapBundlerJar --info - name: Rename Artifact - run: mv build/libs/cheetah-1.21-bundler-1.21-R0.1-SNAPSHOT-mojmap.jar build/libs/cheetah-1.21.jar + run: mv build/libs/cheetah-1.21.1-bundler-1.21.1-R0.1-SNAPSHOT-mojmap.jar build/libs/cheetah-1.21.1.jar - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: Cheetah-1.21 - path: build/libs/cheetah-1.21.jar + name: Cheetah-1.21.1 + path: build/libs/cheetah-1.21.1.jar if-no-files-found: error diff --git a/README.md b/README.md index afab6cf..8c22715 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GommeHD.net Cheetah 1.21 +# GommeHD.net Cheetah 1.21.1 [![Patch and Build](https://github.com/gommehdnet/cheetah/actions/workflows/build.yml/badge.svg)](https://github.com/gommehdnet/cheetah/actions/workflows/build.yml) @@ -10,7 +10,7 @@ This is a fork of Paper tailored for the use at GommeHD.net - On Windows, make sure that `git config core.longpaths true` is set for this project - Run `./gradlew applyPatches` to apply the patches - Run `./gradlew createMojmapBundlerJar` to create the final jar file -- The final jar file can be found in `build/libs/cheetah-1.21-bundler-1.21-R0.1-SNAPSHOT-reobf.jar` +- The final jar file can be found in `build/libs/cheetah-1.21.1-bundler-1.21.1-R0.1-SNAPSHOT-reobf.jar` ## How to use the API with Maven? Currently, it is not possible to add a dependency containing NMS code, the API, and dependencies to the classpath. The current solution is to use the cheetah API combined with the normal Spigot NMS. @@ -21,7 +21,7 @@ Thus, changes to the NMS code will not be reflected to plugins using it. net.gommehd.cheetah cheetah-api - 1.21-R0.1-SNAPSHOT + 1.21.1-R0.1-SNAPSHOT ``` diff --git a/build.gradle.kts b/build.gradle.kts index 81e2e52..81a952e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java `maven-publish` - id("io.papermc.paperweight.patcher") version "1.7.1" + id("io.papermc.paperweight.patcher") version "1.7.2" } val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" diff --git a/gradle.properties b/gradle.properties index 098e333..68a0ab2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=net.gommehd.cheetah -version=1.21-R0.1-SNAPSHOT +version=1.21.1-R0.1-SNAPSHOT -mcVersion=1.21 -paperRef=042f15ffbd7598c5b7beaf87d4ede45f8efc0aa3 +mcVersion=1.21.1 +paperRef=70dfa467e796a0dfaf74147fe3560e07a5816054 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch index 7233cf9..e20f5b3 100644 --- a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch +++ b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] added ProjectileAllowCollideWithPlayerEvent diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index a01c0d9ae53d1b748c5da914069bd672cb1215c7..8e3038d63b978523ae78f0530d23413b7ebff4c5 100644 +index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..3b0cd13ac6837e58ab1eec800b4a1523c6b11a2e 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -316,7 +316,10 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -322,7 +322,10 @@ public abstract class Projectile extends Entity implements TraceableEntity { if (entity1 instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer) { org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity(); org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity(); @@ -21,7 +21,7 @@ index a01c0d9ae53d1b748c5da914069bd672cb1215c7..8e3038d63b978523ae78f0530d23413b } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0ab53d46f0b8f3f3791dd01766738522c86932e8..bb414100a6ca5919bfe022f9b60c9851e654a8c4 100644 +index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8a27915a57780554d9ae877e4e0e3c0e17b9068a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -15,6 +15,7 @@ import java.util.Map; @@ -32,7 +32,7 @@ index 0ab53d46f0b8f3f3791dd01766738522c86932e8..bb414100a6ca5919bfe022f9b60c9851 import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.protocol.game.ServerboundContainerClosePacket; -@@ -1460,7 +1461,10 @@ public class CraftEventFactory { +@@ -1473,7 +1474,10 @@ public class CraftEventFactory { com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); if (projectile.getShooter() instanceof Player && collided instanceof Player) { @@ -44,7 +44,7 @@ index 0ab53d46f0b8f3f3791dd01766738522c86932e8..bb414100a6ca5919bfe022f9b60c9851 event.setCancelled(true); return event; } -@@ -1471,6 +1475,15 @@ public class CraftEventFactory { +@@ -1484,6 +1488,15 @@ public class CraftEventFactory { } // Paper end diff --git a/settings.gradle.kts b/settings.gradle.kts index 3373b37..22eb6f4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,6 @@ pluginManagement { } } -rootProject.name = "cheetah-1.21" +rootProject.name = "cheetah-1.21.1" include("cheetah-api", "cheetah-server")