Use Adventure ResourcePackInfo

SpongePowered · May 18, 2024 · 91da7e6 · 91da7e6
1 parent 6570071
commit 91da7e6
Show file tree

Hide file tree

Showing 20 changed files with 304 additions and 430 deletions.
diff --git a/SpongeAPI b/SpongeAPI
diff --git a/...pongepowered/common/bridge/network/protocol/game/ClientboundResourcePackPacketBridge.java b/...pongepowered/common/bridge/network/protocol/game/ClientboundResourcePackPacketBridge.java
@@ -24,11 +24,11 @@
  */
 package org.spongepowered.common.bridge.network.protocol.game;
 
-import org.spongepowered.api.resourcepack.ResourcePack;
+import net.kyori.adventure.resource.ResourcePackInfo;
 
 public interface ClientboundResourcePackPacketBridge {
 
-    ResourcePack bridge$getSpongePack();
+    void bridge$setPackInfo(ResourcePackInfo resourcePackInfo);
 
-    void bridge$setSpongePack(ResourcePack pack);
+    ResourcePackInfo bridge$getPackInfo();
 }
diff --git a/src/main/java/org/spongepowered/common/bridge/server/MinecraftServerBridge.java b/src/main/java/org/spongepowered/common/bridge/server/MinecraftServerBridge.java
@@ -25,12 +25,12 @@
 package org.spongepowered.common.bridge.server;
 
 import com.google.inject.Injector;
+import net.kyori.adventure.resource.ResourcePackRequest;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.thread.BlockableEventLoop;
 import net.minecraft.world.Difficulty;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.Game;
-import org.spongepowered.api.resourcepack.ResourcePack;
 import org.spongepowered.common.service.server.SpongeServerScopedServiceProvider;
 import org.spongepowered.common.user.SpongeUserManager;
 
@@ -40,7 +40,7 @@ public interface MinecraftServerBridge {
 
     SpongeServerScopedServiceProvider bridge$getServiceProvider();
 
-    @Nullable ResourcePack bridge$getResourcePack();
+    @Nullable ResourcePackRequest bridge$getResourcePack();
 
     void bridge$setDifficulty(ServerLevel world, Difficulty newDifficulty, boolean forceDifficulty);
 

diff --git a/...n/resourcepack/SpongeURIResourcePack.java → ...ServerCommonPacketListenerImplBridge.java b/...n/resourcepack/SpongeURIResourcePack.java → ...ServerCommonPacketListenerImplBridge.java
@@ -22,49 +22,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.resourcepack;
+package org.spongepowered.common.bridge.server.network;
 
-import net.kyori.adventure.text.Component;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import net.kyori.adventure.resource.ResourcePackRequest;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.util.UUID;
 
+public interface ServerCommonPacketListenerImplBridge {
 
-public final class SpongeURIResourcePack extends SpongeResourcePack {
+    void bridge$sendResourcePacks(final @NonNull ResourcePackRequest request);
 
-    private final URI uri;
-    private final String name;
-
-    public SpongeURIResourcePack(final URI uri, final @Nullable String hash, final Component component) {
-        super(hash, component);
-        this.uri = uri;
-        this.name = this.getName0();
-    }
-
-    public SpongeURIResourcePack(final String uri, final @Nullable String hash, final Component component) throws URISyntaxException {
-        this(new URI(uri), hash, component);
-    }
-
-    private String getName0() {
-        String name = this.uri.getPath();
-        name = name.substring(name.lastIndexOf("/") + 1);
-        return name.replaceAll("\\W", "");
-    }
-
-    @Override
-    public String getUrlString() {
-        return this.uri.toString();
-    }
-
-    @Override
-    public String name() {
-        return this.name;
-    }
-
-    @Override
-    public URI uri() {
-        return this.uri;
-    }
+    void bridge$removeResourcePacks(final @NonNull UUID id, final @NonNull UUID @NonNull... others);
 
+    void bridge$clearResourcePacks();
 }
diff --git a/...va/org/spongepowered/common/bridge/server/network/ServerGamePacketListenerImplBridge.java b/...va/org/spongepowered/common/bridge/server/network/ServerGamePacketListenerImplBridge.java
@@ -24,16 +24,10 @@
  */
 package org.spongepowered.common.bridge.server.network;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.api.resourcepack.ResourcePack;
 import org.spongepowered.api.world.server.ServerLocation;
 
 public interface ServerGamePacketListenerImplBridge {
 
-    @Nullable ResourcePack bridge$popReceivedResourcePack(boolean markAccepted);
-
-    @Nullable ResourcePack bridge$popAcceptedResourcePack();
-
     void bridge$setLastMoveLocation(ServerLocation location);
 
     long bridge$getLastTryBlockPacketTimeStamp();

diff --git a/src/main/java/org/spongepowered/common/event/tracking/phase/packet/BasicPacketContext.java b/src/main/java/org/spongepowered/common/event/tracking/phase/packet/BasicPacketContext.java
@@ -35,9 +35,6 @@ public BasicPacketContext(final PacketState<BasicPacketContext> state, final Pha
     @SuppressWarnings("unchecked")
     @Override
     public boolean hasCaptures() {
-        if (this.state == PacketPhase.General.RESOURCE_PACK) {
-            return true;
-        }
         if (this.state == PacketPhase.General.CLOSE_WINDOW) {
             return true;
         }

diff --git a/src/main/java/org/spongepowered/common/event/tracking/phase/packet/PacketPhase.java b/src/main/java/org/spongepowered/common/event/tracking/phase/packet/PacketPhase.java
@@ -92,7 +92,6 @@
 import org.spongepowered.common.event.tracking.phase.packet.player.PacketCommandState;
 import org.spongepowered.common.event.tracking.phase.packet.player.PlaceBlockPacketState;
 import org.spongepowered.common.event.tracking.phase.packet.player.PlayerCommandPhaseContext;
-import org.spongepowered.common.event.tracking.phase.packet.player.ResourcePackState;
 import org.spongepowered.common.event.tracking.phase.packet.player.StopSleepingPacketState;
 import org.spongepowered.common.event.tracking.phase.packet.player.UnknownPacketState;
 import org.spongepowered.common.event.tracking.phase.packet.player.UseItemPacketState;
@@ -130,7 +129,6 @@ public static final class General {
         static final IPhaseState<BasicPacketContext> TAB_COMPLETE = new BasicPacketState();
         public static final IPhaseState<BasicPacketContext> CLOSE_WINDOW = new CloseWindowState();
         public static final IPhaseState<BasicPacketContext> UPDATE_SIGN = new BasicPacketState();
-        static final IPhaseState<BasicPacketContext> RESOURCE_PACK = new ResourcePackState();
         static final IPhaseState<BasicPacketContext> STOP_RIDING_JUMP = new BasicPacketState();
         static final IPhaseState<BasicPacketContext> HANDLED_EXTERNALLY = new UnknownPacketState();
         static final IPhaseState<BasicPacketContext> START_FALL_FLYING = new BasicPacketState();
@@ -333,7 +331,7 @@ private void setupPacketToStateMapping() {
         });
         this.packetTranslationMap.put(ServerboundCustomPayloadPacket.class, packet -> PacketPhase.General.HANDLED_EXTERNALLY);
         this.packetTranslationMap.put(ServerboundTeleportToEntityPacket.class, packet -> PacketPhase.General.IGNORED);
-        this.packetTranslationMap.put(ServerboundResourcePackPacket.class, packet -> PacketPhase.General.RESOURCE_PACK);
+        this.packetTranslationMap.put(ServerboundResourcePackPacket.class, packet -> PacketPhase.General.HANDLED_EXTERNALLY);
         this.packetTranslationMap.put(ServerboundPlaceRecipePacket.class, packet -> PacketPhase.Inventory.PLACE_RECIPE);
     }
 

diff --git a/...n/java/org/spongepowered/common/event/tracking/phase/packet/player/ResourcePackState.java b/...n/java/org/spongepowered/common/event/tracking/phase/packet/player/ResourcePackState.java
diff --git a/src/main/java/org/spongepowered/common/registry/SpongeFactoryProvider.java b/src/main/java/org/spongepowered/common/registry/SpongeFactoryProvider.java
@@ -62,7 +62,6 @@
 import org.spongepowered.api.resource.ResourcePath;
 import org.spongepowered.api.resource.pack.PackStatus;
 import org.spongepowered.api.resource.pack.PackType;
-import org.spongepowered.api.resourcepack.ResourcePack;
 import org.spongepowered.api.scoreboard.ScoreFormat;
 import org.spongepowered.api.scoreboard.displayslot.DisplaySlot;
 import org.spongepowered.api.service.permission.NodeTree;
@@ -131,7 +130,6 @@
 import org.spongepowered.common.resource.SpongeResourcePath;
 import org.spongepowered.common.resource.pack.SpongePackStatusFactory;
 import org.spongepowered.common.resource.pack.SpongePackTypeFactory;
-import org.spongepowered.common.resourcepack.SpongeResourcePack;
 import org.spongepowered.common.scoreboard.SpongeDisplaySlotFactory;
 import org.spongepowered.common.scoreboard.SpongeScoreFormatFactory;
 import org.spongepowered.common.service.server.permission.SpongeNodeTree;
@@ -214,7 +212,6 @@ public void registerDefaultFactories() {
                 .registerFactory(CommandTreeNode.NodeFactory.class, new SpongeCommandTreeBuilderFactory())
                 .registerFactory(ItemStackSnapshot.Factory.class, () -> SpongeItemStackSnapshot.EMPTY)
                 .registerFactory(Parameter.Value.Factory.class, new SpongeParameterFactory())
-                .registerFactory(ResourcePack.Factory.class, new SpongeResourcePack.Factory())
                 .registerFactory(ServerLocation.Factory.class, new SpongeServerLocation.Factory())
                 .registerFactory(SpongeComponents.Factory.class, new SpongeAdventure.Factory())
                 .registerFactory(Transform.Factory.class, new SpongeTransform.Factory())