diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c0d678..44d5d8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,6 +81,7 @@ jobs: done echo "tag=${{ env.tag }}-${counter}" >> $GITHUB_ENV echo "release_count= - ${counter}" >> $GITHUB_ENV + release_exists=false fi echo "release_exists=${release_exists}" >> $GITHUB_ENV diff --git a/gradle.properties b/gradle.properties index 86a74ee..078f39e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ group=fun.bm.lophine -version=26.1.2-R0.1-SNAPSHOT mcVersion=26.1.2 apiVersion=26.1.2 channel=BETA @@ -8,7 +7,7 @@ weightVersion=2.0.12 # 0 for skip release, 1 for pre-release, 2 for release release=0 -luminolRef=c85c062a3b0679ae4ad2fdf86dd51719a6d42be5 +luminolRef=1aa9272ba1b75dc69ae812067db0b2fe36550daa org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0003-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0003-Purpur-Barrels-and-enderchests-6-rows.patch index a1221bf..f9a43db 100644 --- a/lophine-server/minecraft-patches/features/0003-Purpur-Barrels-and-enderchests-6-rows.patch +++ b/lophine-server/minecraft-patches/features/0003-Purpur-Barrels-and-enderchests-6-rows.patch @@ -23,7 +23,7 @@ index 63b81f30b8d813a7986ae72842fdc2d3097fa103..527c495bb4f6007aee760b99cc0e9aa5 // Paper start - whitelist verify event / login event diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index 57be1c239209414c6a9d9f96dd16d8fc109833f9..1b9fca50508a77f2b835edcdce153935b566d143 100644 +index c157aa170d5879206810f4852a96120396b69db7..b9cc33198efceb75dfef333c018b1296944451cb 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -174,6 +174,7 @@ public abstract class Player extends Avatar implements ContainerUser { diff --git a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-cross-region-damage-trace.patch index 1242466..db19648 100644 --- a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-cross-region-damage-trace.patch +++ b/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-cross-region-damage-trace.patch @@ -48,7 +48,7 @@ index 6cedc129f31289eaf4e3580219fc1988c0f3c5a1..5f1fad59a26e3fe29f9000a92be5d6c4 AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0); this.level() diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 9dc9e87e6aed1330501a7f10e062a0e5d36d17f3..c43d0a47a511b0c1612eec038bb35d75f8372a00 100644 +index 17483ffff6cb2a9e86db7079e7c3a9a800654c62..fde9fad11e130cf93205d23da09ad369b35db160 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1961,6 +1961,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -84,7 +84,7 @@ index 9dc9e87e6aed1330501a7f10e062a0e5d36d17f3..c43d0a47a511b0c1612eec038bb35d75 protected void dropEquipment(final ServerLevel level) { } protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled -@@ -2642,6 +2661,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -2629,6 +2648,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } } diff --git a/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch index ef49ace..f380964 100644 --- a/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch +++ b/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch @@ -92,7 +92,7 @@ index cb0a52dc3795e1cf54069bcbe82abf7877a658b8..1440946665f41ebf534d701515f982bb public EntityType( final EntityType.EntityFactory factory, diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index 1b9fca50508a77f2b835edcdce153935b566d143..9061d9f980bec5cc362fa3aadd603c0c5193ad90 100644 +index b9cc33198efceb75dfef333c018b1296944451cb..f6f6d21f3393a3ab79a84212b0d66d83d0e817f1 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -185,6 +185,25 @@ public abstract class Player extends Avatar implements ContainerUser { diff --git a/lophine-server/minecraft-patches/features/0013-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0013-Leaves-Item-overstack-util.patch index 8a1b6e0..62366f6 100644 --- a/lophine-server/minecraft-patches/features/0013-Leaves-Item-overstack-util.patch +++ b/lophine-server/minecraft-patches/features/0013-Leaves-Item-overstack-util.patch @@ -145,7 +145,7 @@ index 44b06b1585e7630fa17d8dfb01f737b14efebcbc..679a941a2af886697fbfcbc7f21e5f4e ItemStack otherItemStack = other.getItem(); if (Objects.equals(this.target, other.target) && areMergable(thisItemStack, otherItemStack)) { diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java -index da8bab81e135a9b240fbeac0e9e1d2aa12c6212d..4711bfe454dbb9925531f61554fbf110dfe596fd 100644 +index f004911c438e6f89d6e079437e3f4104d6cbacbd..a248b1d11303237ebdf7cac4fa63865287d91a10 100644 --- a/net/minecraft/world/entity/player/Inventory.java +++ b/net/minecraft/world/entity/player/Inventory.java @@ -166,10 +166,12 @@ public class Inventory implements Container, Nameable { @@ -200,10 +200,10 @@ index da8bab81e135a9b240fbeac0e9e1d2aa12c6212d..4711bfe454dbb9925531f61554fbf110 serverPlayer.connection.send(this.createInventoryUpdatePacket(slot)); } diff --git a/net/minecraft/world/entity/player/StackedItemContents.java b/net/minecraft/world/entity/player/StackedItemContents.java -index ffaa8e450a11a01060b6847d1b66a76323f9d8ba..4419eb2996639c7d60b96204b4ded9d8883c8016 100644 +index 1ace17d8fc7e7b8b4722a1889d49233c0ec55e20..d146f02338852810679a45bff932d9d68ee86d60 100644 --- a/net/minecraft/world/entity/player/StackedItemContents.java +++ b/net/minecraft/world/entity/player/StackedItemContents.java -@@ -18,7 +18,7 @@ public class StackedItemContents { +@@ -36,7 +36,7 @@ public class StackedItemContents { } public void accountStack(final ItemStack itemStack) { diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index b44ae6b..322a794 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -7,7 +7,6 @@ project_id_b="Lophine" commitid=$(git log --pretty='%h' -1) mcversion=$(prop mcVersion) -grdversion=$(prop version) release=$(prop release) release_tag="$mcversion-$commitid" jarName="$project_id-$mcversion-paperclip.jar" @@ -25,7 +24,12 @@ elif [ "$release" = "2" ]; then make_latest=true fi -mv lophine-server/build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir +actual_jar=$(ls lophine-server/build/libs/$project_id-paperclip-*.jar 2>/dev/null | head -n 1) +if [ -n "$actual_jar" ]; then + mv "$actual_jar" "$jarName_dir" +else + echo "Warning: No paperclip jar found to rename" +fi echo "project_id=$project_id" >> $GITHUB_ENV echo "project_id_b=$project_id_b" >> $GITHUB_ENV