ViaRewind 4.1.1

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

.github/workflows/build.yml

@@ -10,13 +10,16 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 6.1.0
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
+        with:
+          cache-disabled: false
+          cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: 17
@@ -24,7 +27,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload Artifacts to GitHub
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # 7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/publish.yml

@@ -15,13 +15,16 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 6.1.0
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
+        with:
+          cache-disabled: false
+          cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: 17

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

@@ -511,7 +511,13 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                 String username = message.split(" ")[1];
                 final GameProfileStorage storage = wrapper.user().get(GameProfileStorage.class);
 
-                final GameProfileStorage.GameProfile profile = storage.get(username, true);
+                // Multiple players with the same name may exist. This will only represent
+                // fake players so it's fine to just pick the first one.
+                List<GameProfileStorage.GameProfile> profiles = storage.get(username, true);
+                if (profiles.isEmpty()) {
+                    return;
+                }
+                final GameProfileStorage.GameProfile profile = profiles.get(0);
                 if (profile != null && profile.uuid != null) {
                     wrapper.cancel();
 
@@ -529,9 +535,6 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                 map(Types.BYTE, Types.VAR_INT); // Mode
                 handler(wrapper -> {
                     final int mode = wrapper.get(Types.VAR_INT, 1);
-                    if (mode != 0) {
-                        return;
-                    }
                     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);
@@ -541,6 +544,11 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                     }
 
                     wrapper.set(Types.VAR_INT, 0, entityId);
+
+                    if (mode != 0) {
+                        return;
+                    }
+
                     final AABB boundingBox = tracker.getHolograms().get(entityId).getBoundingBox();
 
                     Vector3d pos = new Vector3d(position.getPosX(), position.getPosY() + 1.8, position.getPosZ());
@@ -608,6 +616,16 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
             protected void register() {
                 map(Types.VAR_INT); // Status
                 map(RewindTypes.U_BYTE_POSITION, Types.BLOCK_POSITION1_8); // Position
+                handler(wrapper -> {
+                    // 1.7 uses 255 as "no face"
+                    // 1.8 changed this to only be in the range EnumFacing range (0-5) and uses DOWN when no face is used
+                    // This properly rewrites invalid values to the 1.8 equivalent
+                    int face = wrapper.read(Types.UNSIGNED_BYTE);
+                    if (face > 5) {
+                        face = 0;
+                    }
+                    wrapper.write(Types.UNSIGNED_BYTE, (short) face);
+                });
             }
         });
 

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

@@ -222,17 +222,16 @@ public class EntityTracker1_8 extends EntityTrackerBase {
 
     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 List<GameProfileStorage.GameProfile> profiles = profileStorage.get(username, false);
 
-        final int entityId = getPlayerEntityId(profile.uuid);
-        if (entityId == -1) {
-            return;
-        }
+        for (GameProfileStorage.GameProfile profile : profiles) {
+            final int entityId = getPlayerEntityId(profile.uuid);
+            if (entityId == -1) {
+                return;
+            }
 
-        checkNametagVisibility(entityId);
+            checkNametagVisibility(entityId);
+        }
     }
 
     private boolean isPlayerNametagHidden(final int entityId) {

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

@@ -17,6 +17,10 @@
  */
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimap;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
@@ -34,6 +38,7 @@ import java.util.UUID;
 
 public class GameProfileStorage extends StoredObject {
     private final Map<UUID, GameProfile> properties = new HashMap<>();
+    private final ListMultimap<String, GameProfile> nameToProfile = ArrayListMultimap.create();
 
     public GameProfileStorage(UserConnection user) {
         super(user);
@@ -42,6 +47,7 @@ public class GameProfileStorage extends StoredObject {
     public GameProfile put(UUID uuid, String name, String displayName, int ping, int gamemode) {
         GameProfile gameProfile = new GameProfile(uuid, name, displayName, ping, gamemode);
         properties.put(uuid, gameProfile);
+        nameToProfile.put(name, gameProfile);
         return gameProfile;
     }
 
@@ -49,19 +55,9 @@ public class GameProfileStorage extends StoredObject {
         return properties.get(uuid);
     }
 
-    public GameProfile get(String name, boolean ignoreCase) {
+    public List<GameProfile> get(String name, boolean ignoreCase) {
         if (ignoreCase) name = name.toLowerCase();
-
-        for (GameProfile profile : properties.values()) {
-            if (profile.name == null) continue;
-
-            String n = ignoreCase ? profile.name.toLowerCase() : profile.name;
-
-            if (n.equals(name)) {
-                return profile;
-            }
-        }
-        return null;
+        return nameToProfile.get(name);
     }
 
     public List<GameProfile> getAllWithPrefix(String prefix, boolean ignoreCase) {
@@ -81,7 +77,11 @@ public class GameProfileStorage extends StoredObject {
     }
 
     public GameProfile remove(UUID uuid) {
-        return properties.remove(uuid);
+        GameProfile removedProfile = properties.remove(uuid);
+        if (removedProfile != null) {
+            nameToProfile.get(removedProfile.name).remove(removedProfile);
+        }
+        return removedProfile;
     }
 
 

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

@@ -140,37 +140,43 @@ public class ScoreboardTracker extends StoredObject {
     public String sendTeamForScore(String score) {
         if (score.length() <= 16) return score;
         if (scoreTeams.containsKey(score)) return scoreTeams.get(score).name;
-        int l = 16;
-        int i = Math.min(16, score.length() - 16);
-        String name = score.substring(i, i + l);
-        while (scoreTeamNames.contains(name) || teams.containsKey(name)) {
-            i--;
-            while (score.length() - l - i > 16) {
-                l--;
-                if (l < 1) return score;
-                i = Math.min(16, score.length() - l);
+
+        // Find the longest window score[i, i+l) that:
+        // - is not already claimed as a team name
+        // - keeps prefix (score[0,i)) at most 16 chars i <= 16
+        // - keeps suffix (score[i+l, end)) at most 16 chars score.length()-l-i <= 16
+        for (int l = 16; l >= 1; l--) {
+            final int iMax = Math.min(16, score.length() - l);
+            final int iMin = Math.max(0, score.length() - l - 16);
+            for (int i = iMax; i >= iMin; i--) {
+                final String name = score.substring(i, i + l);
+                if (scoreTeamNames.contains(name) || teams.containsKey(name)) {
+                    continue;
+                }
+
+                final String prefix = score.substring(0, i);
+                final String suffix = i + l >= score.length() ? "" : score.substring(i + l);
+
+                final ScoreTeam scoreTeam = new ScoreTeam(name, prefix, suffix);
+                scoreTeams.put(score, scoreTeam);
+                scoreTeamNames.add(name);
+
+                final PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
+                teamPacket.write(Types.STRING, name);
+                teamPacket.write(Types.BYTE, (byte) 0);
+                teamPacket.write(Types.STRING, "ViaRewind");
+                teamPacket.write(Types.STRING, prefix);
+                teamPacket.write(Types.STRING, suffix);
+                teamPacket.write(Types.BYTE, (byte) 0);
+                teamPacket.write(Types.SHORT, (short) 1);
+                teamPacket.write(Types.STRING, name);
+                teamPacket.send(Protocol1_8To1_7_6_10.class);
+
+                return name;
             }
-            name = score.substring(i, i + l);
         }
-        String prefix = score.substring(0, i);
-        String suffix = i + l >= score.length() ? "" : score.substring(i + l);
 
-        ScoreTeam scoreTeam = new ScoreTeam(name, prefix, suffix);
-        scoreTeams.put(score, scoreTeam);
-        scoreTeamNames.add(name);
-
-        PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
-        teamPacket.write(Types.STRING, name);
-        teamPacket.write(Types.BYTE, (byte) 0);
-        teamPacket.write(Types.STRING, "ViaRewind");
-        teamPacket.write(Types.STRING, prefix);
-        teamPacket.write(Types.STRING, suffix);
-        teamPacket.write(Types.BYTE, (byte) 0);
-        teamPacket.write(Types.SHORT, (short) 1);
-        teamPacket.write(Types.STRING, name);
-        teamPacket.send(Protocol1_8To1_7_6_10.class);
-
-        return name;
+        return score;
     }
 
     public String removeTeamForScore(String score) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/storage/WindowTracker.java

@@ -52,11 +52,11 @@ public class WindowTracker extends StoredObject {
         openWindow.write(Types.UNSIGNED_BYTE, windowId);
         openWindow.write(Types.STRING, "minecraft:brewing_stand");
 
-        TextComponent title = new StringComponent().
-            append(new TranslationComponent("container.brewing")).
-            append(new StringComponent(": " + TextFormatting.DARK_GRAY)).
-            append(new StringComponent(amount + " " + TextFormatting.DARK_RED)).
-            append(new TranslationComponent("item.blazePowder.name", TextFormatting.DARK_RED));
+        TextComponent title = new StringComponent()
+            .append(new TranslationComponent("container.brewing"))
+            .append(new StringComponent(": ").formatted(TextFormatting.DARK_GRAY))
+            .append(new StringComponent(amount + " ").formatted(TextFormatting.DARK_RED))
+            .append(new TranslationComponent("item.blazePowder.name").formatted(TextFormatting.DARK_RED));
 
         openWindow.write(Types.COMPONENT, TextComponentSerializer.V1_8.serializeJson(title));
         openWindow.write(Types.UNSIGNED_BYTE, (short) 420);

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
 project_jvm_version=17
 
 project_group=com.viaversion
-project_version=4.1.0-SNAPSHOT
+project_version=4.1.1
 project_description=ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions.
 
 publishing_dev_id=florianreuth