ViaRewind 4.1.0

Signed-off-by: Florian Reuth <git@florianreuth.de>

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 6.1.0
       - name: Set up JDK 17
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
         with:
@@ -24,7 +24,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload Artifacts to GitHub
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # 7.0.1
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 6.1.0
       - name: Set up JDK 17
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
         with:

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/VirtualHologramEntity.java

@@ -24,6 +24,7 @@ import com.viaversion.viarewind.api.type.RewindTypes;
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter.EntityPacketRewriter1_8;
+import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
@@ -46,6 +47,8 @@ public class VirtualHologramEntity {
     private String name = null;
     private float yaw, pitch;
     private float headYaw;
+    private byte flags = 0;
+    private byte armorStandFlags = 0;
     private boolean small = false;
     private boolean marker = false;
     private boolean sneaking = false;
@@ -99,8 +102,6 @@ public class VirtualHologramEntity {
         }
 
         // Filter armor stand data to calculate emulation
-        byte flags = 0;
-        byte armorStandFlags = 0;
         for (EntityData entityData : entityDataTracker) {
             if (entityData.id() == 0 && entityData.dataType() == EntityDataTypes1_8.BYTE) {
                 flags = ((Number) entityData.getValue()).byteValue();
@@ -167,6 +168,18 @@ public class VirtualHologramEntity {
             } else {
                 return baseOffset + (0.9875 * 2);
             }
+        } else if (currentState == State.ZOMBIE_NO_GRAVITY) {
+            // 1.7 ride stack offset sum: Squid (0.95 * 0.75) + Zombie (1.8 * 0.75) = 2.0625
+            // By starting at -2.0625, we zero out the 1.7 passenger height so we can apply 1.8's offsets.
+            double baseOffset = -2.0625;
+
+            if (marker) {
+                // 1.8 Marker ArmorStand height is 0.0 -> mounted offset 0.0
+                return baseOffset;
+            } else {
+                // 1.8 Normal ArmorStand height is 1.975 -> mounted offset 1.975 * 0.75 = 1.48125
+                return baseOffset + 1.48125;
+            }
         } else {
             return -0.4;
         }
@@ -291,6 +304,13 @@ public class VirtualHologramEntity {
             this.entityIds = entityIds;
         }
 
+        for (int extraId : entityIds) {
+            if (extraId != entityId) {
+                ((EntityTracker1_8) user.getEntityTracker(Protocol1_8To1_7_6_10.class)).setExtraHologramId(entityId, extraId);
+            }
+        }
+
+
         sendEntityDataUpdate(entityRewriter);
         if (entityIds == null) {
             return;
@@ -326,6 +346,13 @@ public class VirtualHologramEntity {
         if (entityIds == null) {
             return;
         }
+
+        for (int extraId : entityIds) {
+            if (extraId != entityId) {
+                ((EntityTracker1_8) user.getEntityTracker(Protocol1_8To1_7_6_10.class)).removeExtraHologramId(extraId);
+            }
+        }
+
         final PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.REMOVE_ENTITIES, user);
         despawn.write(Types.BYTE, (byte) entityIds.length);
         for (int id : entityIds) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/EntityPacketRewriter1_8.java

@@ -337,6 +337,11 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets
                 map(Types.ENTITY_DATA_LIST1_8, RewindTypes.ENTITY_DATA_LIST1_7); // Entity data
 
                 handler(getTrackerAndDataHandler(RewindTypes.ENTITY_DATA_LIST1_7, EntityTypes1_8.EntityType.PLAYER));
+                handler(wrapper -> {
+                    final int entityId = wrapper.get(Types.VAR_INT, 0);
+                    final EntityTracker1_8 tracker = tracker(wrapper.user());
+                    tracker.checkNametagVisibility(entityId);
+                });
             }
         });
         protocol.registerClientbound(ClientboundPackets1_8.SET_EQUIPPED_ITEM, new PacketHandlers() {

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/PlayerPacketRewriter1_8.java

@@ -532,13 +532,15 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                     if (mode != 0) {
                         return;
                     }
-                    final int entityId = wrapper.get(Types.VAR_INT, 0);
                     final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
+                    final int entityId = tracker.getHologramIdWithExtra(wrapper.get(Types.VAR_INT, 0));
                     final PlayerSessionStorage position = wrapper.user().get(PlayerSessionStorage.class);
 
-                    if (!tracker.getHolograms().containsKey(entityId)) {
+                    if (entityId == -1) {
                         return;
                     }
+
+                    wrapper.set(Types.VAR_INT, 0, entityId);
                     final AABB boundingBox = tracker.getHolograms().get(entityId).getBoundingBox();
 
                     Vector3d pos = new Vector3d(position.getPosX(), position.getPosY() + 1.8, position.getPosZ());

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/ScoreboardPacketRewriter1_8.java

@@ -19,6 +19,7 @@ package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
 
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
+import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.ScoreboardTracker;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -173,6 +174,7 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
             }
 
             final ScoreboardTracker scoreboard = wrapper.user().get(ScoreboardTracker.class);
+            final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
 
             final byte mode = wrapper.passthrough(Types.BYTE);
             if (mode != 0 && !scoreboard.teamExists(team)) {
@@ -190,6 +192,10 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
             if (mode == 0) {
                 scoreboard.addTeam(team);
             } else if (mode == 1) {
+                // Team removed, nametag visibility might have changed
+                for (final String member : scoreboard.getTeamMembers(team)) {
+                    tracker.checkNametagVisbility(member);
+                }
                 scoreboard.removeTeam(team);
             }
 
@@ -198,7 +204,9 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                 wrapper.passthrough(Types.STRING); // Prefix
                 wrapper.passthrough(Types.STRING); // Suffix
                 wrapper.passthrough(Types.BYTE); // Friendly fire
-                wrapper.read(Types.STRING); // Name tag visibility
+                final String nameTagVisibility = wrapper.read(Types.STRING);
+                final String previousVisibility = scoreboard.getTeamNameTagVisibility(team);
+                scoreboard.setTeamNameTagVisibility(team, nameTagVisibility);
                 byte color = wrapper.read(Types.BYTE);
                 if (mode == 2 && scoreboard.getTeamColor(team).get() != color) {
                     final String sidebar = scoreboard.getColorDependentSidebar().get(color);
@@ -209,6 +217,13 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                     sidebarPacket.scheduleSend(Protocol1_8To1_7_6_10.class);
                 }
                 scoreboard.setTeamColor(team, color);
+
+                // Re-evaluate nametag visibility for all team members when visibility changes
+                if (mode == 2 && !nameTagVisibility.equals(previousVisibility)) {
+                    for (final String member : scoreboard.getTeamMembers(team)) {
+                        tracker.checkNametagVisbility(member);
+                    }
+                }
             }
             if (mode == 0 || mode == 3 || mode == 4) {
                 byte color = scoreboard.getTeamColor(team).get();
@@ -223,6 +238,8 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                             continue;
                         }
                         scoreboard.removePlayerFromTeam(entry, team);
+                        // Player left team, nametag visibility may change
+                        tracker.checkNametagVisbility(entry);
                         if (entry.equals(username)) {
                             final PacketWrapper sidebarPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
                             sidebarPacket.write(Types.BYTE, (byte) 1);
@@ -231,6 +248,8 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                         }
                     } else {
                         scoreboard.addPlayerToTeam(entry, team);
+                        // Player joined team, nametag visibility may change
+                        tracker.checkNametagVisbility(entry);
                         if (entry.equals(username) && scoreboard.getColorDependentSidebar().containsKey(color)) {
                             final PacketWrapper displayObjective = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
                             displayObjective.write(Types.BYTE, (byte) 1);

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/EntityTracker1_8.java

@@ -37,18 +37,26 @@ import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Level;
 
+import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
+import com.viaversion.viarewind.api.type.RewindTypes;
+import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
+
 public class EntityTracker1_8 extends EntityTrackerBase {
 
     private final Int2ObjectMap<VirtualHologramEntity> holograms = new Int2ObjectArrayMap<>();
+    private final Int2IntMap extraHologramIds = new Int2IntArrayMap();
     private final Int2IntMap vehicles = new Int2IntArrayMap();
     private final Int2ObjectMap<UUID> entityIdToUUID = new Int2ObjectArrayMap<>();
     private final Object2IntMap<UUID> entityUUIDToId = new Object2IntOpenHashMap<>();
+    private final Int2IntMap playerNametagHiderEntities = new Int2IntArrayMap();
 
     private final List<EntityData> entityData = new ArrayList<>();
 
@@ -77,6 +85,10 @@ public class EntityTracker1_8 extends EntityTrackerBase {
             holograms.remove(entityId);
         }
 
+        if (playerNametagHiderEntities.containsKey(entityId)) {
+            despawnNametagHiderEntity(entityId);
+        }
+
         if (entityIdToUUID.containsKey(entityId)) {
             final UUID playerId = entityIdToUUID.remove(entityId);
 
@@ -88,7 +100,10 @@ public class EntityTracker1_8 extends EntityTrackerBase {
     @Override
     public void clearEntities() {
         super.clearEntities();
+        holograms.clear();
+        extraHologramIds.clear();
         vehicles.clear();
+        playerNametagHiderEntities.clear();
     }
 
     @Override
@@ -155,6 +170,11 @@ public class EntityTracker1_8 extends EntityTrackerBase {
         } else {
             vehicles.put(vehicleId, passengerId);
         }
+
+        // Re-evaluate nametag visibility when a player entity's passenger changes
+        if (vehicleId != -1 && entityIdToUUID.containsKey(vehicleId)) {
+            checkNametagVisibility(vehicleId);
+        }
     }
 
     protected void attachEntity(final int target) {
@@ -185,10 +205,112 @@ public class EntityTracker1_8 extends EntityTrackerBase {
         }
     }
 
+    public void checkNametagVisibility(final int entityId) {
+        if (!entityIdToUUID.containsKey(entityId)) {
+            return;
+        }
+        final boolean shouldHide = isPlayerNametagHidden(entityId);
+        final boolean hasServerPassenger = getPassenger(entityId) != -1;
+        final boolean hasSkull = playerNametagHiderEntities.containsKey(entityId);
+
+        if (shouldHide && !hasServerPassenger && !hasSkull) {
+            spawnNametagHiderEntity(entityId);
+        } else if ((!shouldHide || hasServerPassenger) && hasSkull) {
+            despawnNametagHiderEntity(entityId);
+        }
+    }
+
+    public void checkNametagVisbility(final String username) {
+        final GameProfileStorage profileStorage = user().get(GameProfileStorage.class);
+        final GameProfileStorage.GameProfile profile = profileStorage.get(username, false);
+        if (profile == null) {
+            return;
+        }
+
+        final int entityId = getPlayerEntityId(profile.uuid);
+        if (entityId == -1) {
+            return;
+        }
+
+        checkNametagVisibility(entityId);
+    }
+
+    private boolean isPlayerNametagHidden(final int entityId) {
+        final UUID uuid = entityIdToUUID.get(entityId);
+        if (uuid == null) {
+            return false;
+        }
+        final GameProfileStorage profileStorage = user().get(GameProfileStorage.class);
+        final GameProfileStorage.GameProfile profile = profileStorage.get(uuid);
+        if (profile == null) {
+            return false;
+        }
+        return user().get(ScoreboardTracker.class).isNametagHidden(profile.name);
+    }
+
+    private int getNametagHiderEntityId(final int playerEntityId) {
+        return Integer.MAX_VALUE - 32000 - playerEntityId;
+    }
+
+    private void spawnNametagHiderEntity(final int playerEntityId) {
+        final int entityId = getNametagHiderEntityId(playerEntityId);
+        playerNametagHiderEntities.put(playerEntityId, entityId);
+
+        final List<EntityData> mobData = new ArrayList<>();
+        mobData.add(new EntityData(0, EntityDataTypes1_7_6_10.BYTE, (byte) 0x20));
+        mobData.add(new EntityData(16, EntityDataTypes1_7_6_10.BYTE, (byte) 0));
+
+        final PacketWrapper spawnMob = PacketWrapper.create(ClientboundPackets1_7_2_5.ADD_MOB, user());
+        spawnMob.write(Types.VAR_INT, entityId);
+        spawnMob.write(Types.UNSIGNED_BYTE, (short) EntityTypes1_8.EntityType.MAGMA_CUBE.getId());
+        spawnMob.write(Types.INT, 0); // X
+        spawnMob.write(Types.INT, 0); // Y
+        spawnMob.write(Types.INT, 0); // Z
+        spawnMob.write(Types.BYTE, (byte) 0); // Yaw
+        spawnMob.write(Types.BYTE, (byte) 0); // Pitch
+        spawnMob.write(Types.BYTE, (byte) 0); // Head yaw
+        spawnMob.write(Types.SHORT, (short) 0); // Velocity x
+        spawnMob.write(Types.SHORT, (short) 0); // Velocity y
+        spawnMob.write(Types.SHORT, (short) 0); // Velocity z
+        spawnMob.write(RewindTypes.ENTITY_DATA_LIST1_7, mobData);
+        spawnMob.scheduleSend(Protocol1_8To1_7_6_10.class);
+
+        final PacketWrapper attach = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_ENTITY_LINK, user());
+        attach.write(Types.INT, entityId);
+        attach.write(Types.INT, playerEntityId);
+        attach.write(Types.BOOLEAN, false);
+        attach.scheduleSend(Protocol1_8To1_7_6_10.class);
+    }
+
+    private void despawnNametagHiderEntity(final int playerEntityId) {
+        if (!playerNametagHiderEntities.containsKey(playerEntityId)) return;
+        final int mobId = playerNametagHiderEntities.remove(playerEntityId);
+
+        final PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.REMOVE_ENTITIES, user());
+        despawn.write(Types.BYTE, (byte) 1);
+        despawn.write(Types.INT, mobId);
+        despawn.scheduleSend(Protocol1_8To1_7_6_10.class);
+    }
+
     public Int2ObjectMap<VirtualHologramEntity> getHolograms() {
         return holograms;
     }
 
+    public void setExtraHologramId(final int entityId, final int extraId) {
+        extraHologramIds.put(extraId, entityId);
+    }
+
+    public void removeExtraHologramId(int extraId) {
+        extraHologramIds.remove(extraId);
+    }
+
+    public int getHologramIdWithExtra(final int id) {
+        if (holograms.containsKey(id)) {
+            return id;
+        }
+        return extraHologramIds.getOrDefault(id, -1);
+    }
+
     public boolean isSpectator() {
         return clientEntityGameMode == 3;
     }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/ScoreboardTracker.java

@@ -37,6 +37,7 @@ public class ScoreboardTracker extends StoredObject {
     private final HashMap<String, Byte> teamColors = new HashMap<>();
     private final HashSet<String> scoreTeamNames = new HashSet<>();
     private final HashMap<Byte, String> colorDependentSidebar = new HashMap<>();
+    private final HashMap<String, String> teamNameTagVisibilities = new HashMap<>();
     private String colorIndependentSidebar;
 
     public ScoreboardTracker(UserConnection user) {
@@ -63,6 +64,7 @@ public class ScoreboardTracker extends StoredObject {
         teams.remove(team);
         scoreTeams.remove(team);
         teamColors.remove(team);
+        teamNameTagVisibilities.remove(team);
     }
 
     public boolean teamExists(String team) {
@@ -98,6 +100,27 @@ public class ScoreboardTracker extends StoredObject {
         return Optional.empty();
     }
 
+    public void setTeamNameTagVisibility(String team, String visibility) {
+        teamNameTagVisibilities.put(team, visibility);
+    }
+
+    public String getTeamNameTagVisibility(String team) {
+        return teamNameTagVisibilities.getOrDefault(team, "always");
+    }
+
+    public boolean isNametagHidden(String username) {
+        for (Map.Entry<String, List<String>> entry : teams.entrySet()) {
+            if (entry.getValue().contains(username)) {
+                return "never".equalsIgnoreCase(teamNameTagVisibilities.getOrDefault(entry.getKey(), "always"));
+            }
+        }
+        return false;
+    }
+
+    public List<String> getTeamMembers(String team) {
+        return teams.getOrDefault(team, new ArrayList<>());
+    }
+
     public void addObjective(String name) {
         objectives.add(name);
     }

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
 project_jvm_version=17
 
 project_group=com.viaversion
-project_version=4.0.15
+project_version=4.1.0
 project_description=ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions.
 
 publishing_dev_id=florianreuth
@@ -15,6 +15,6 @@ publishing_dev_name=Florian Reuth
 publishing_dev_mail=git@florianreuth.de
 
 # Modrinth/Hangar Publishing
-minecraft_versions=1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
-minecraft_version_range=1.8-1.21.11
-velocity_version=3.3-3.5
+minecraft_versions=26.1.2, 26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
+minecraft_version_range=1.8-26.1.2
+velocity_version=3.4-3.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle.kts

@@ -6,7 +6,7 @@ pluginManagement {
     }
 
     plugins {
-        id("de.florianreuth.baseproject") version "2.0.0"
+        id("de.florianreuth.baseproject") version "2.0.2"
         id("io.papermc.hangar-publish-plugin") version "0.1.4"
         id("net.raphimc.class-token-replacer") version "1.1.7"
         id("com.modrinth.minotaur") version "2.+"