Remove serverside hotbars & views

src/main/java/com/moulberry/axiom/AxiomConstants.java

@@ -13,10 +13,5 @@ public class AxiomConstants {
     }
 
     public static final int API_VERSION = 8;
-    public static final NamespacedKey ACTIVE_HOTBAR_INDEX = new NamespacedKey("axiom", "active_hotbar_index");
-    public static final NamespacedKey HOTBAR_DATA = new NamespacedKey("axiom", "hotbar_data");
-
-    public static final NamespacedKey ACTIVE_VIEW = new NamespacedKey("axiom", "active_view");
-    public static final NamespacedKey VIEWS = new NamespacedKey("axiom", "views");
 
 }

src/main/java/com/moulberry/axiom/AxiomPaper.java

@@ -137,10 +137,7 @@ public void onEnable() {
         registerPacketHandler("set_world_time", new SetTimePacketListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
         registerPacketHandler("set_world_property", new SetWorldPropertyListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
         registerPacketHandler("set_block", new SetBlockPacketListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers); // set-single-block
-        registerPacketHandler("set_hotbar_slot", new SetHotbarSlotPacketListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
-        registerPacketHandler("switch_active_hotbar", new SwitchActiveHotbarPacketListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
         registerPacketHandler("teleport", new TeleportPacketListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
-        registerPacketHandler("set_editor_views", new SetEditorViewsPacketListener(this), msg, LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
         registerPacketHandler("request_chunk_data", new RequestChunkDataPacketListener(this, !configuration.getBoolean("packet-handlers.request-chunk-data")), msg,
                 this.configuration.getBoolean("allow-large-chunk-data-request") ? LargePayloadBehaviour.FORCE_LARGE : LargePayloadBehaviour.DEFAULT, largePayloadHandlers);
         registerPacketHandler("request_entity_data", new RequestEntityDataPacketListener(this, !configuration.getBoolean("packet-handlers.request-entity-data")), msg,

src/main/java/com/moulberry/axiom/packet/impl/HelloPacketListener.java

@@ -5,8 +5,6 @@
 import com.moulberry.axiom.blueprint.ServerBlueprintManager;
 import com.moulberry.axiom.event.AxiomHandshakeEvent;
 import com.moulberry.axiom.packet.PacketHandler;
-import com.moulberry.axiom.persistence.ItemStackDataType;
-import com.moulberry.axiom.persistence.UUIDDataType;
 import com.moulberry.axiom.viaversion.ViaVersionHelper;
 import com.moulberry.axiom.world_properties.server.ServerWorldPropertiesRegistry;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -20,18 +18,11 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Bukkit;
-import org.bukkit.NamespacedKey;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
 
 import java.util.List;
-import java.util.UUID;
 
 public class HelloPacketListener implements PacketHandler {
 
@@ -146,47 +137,6 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
         buf.getBytes(0, enableBytes);
         player.sendPluginMessage(this.plugin, "axiom:enable", enableBytes);
 
-        // Initialize Hotbars
-        PersistentDataContainer container = player.getPersistentDataContainer();
-        if (!this.plugin.isMismatchedDataVersion(player.getUniqueId())) {
-            int activeHotbarIndex = container.getOrDefault(AxiomConstants.ACTIVE_HOTBAR_INDEX, PersistentDataType.BYTE, (byte) 0);
-            PersistentDataContainer hotbarItems = container.get(AxiomConstants.HOTBAR_DATA, PersistentDataType.TAG_CONTAINER);
-            if (hotbarItems != null) {
-                buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), MinecraftServer.getServer().registryAccess());
-                buf.writeByte((byte) activeHotbarIndex);
-                for (int i=0; i<9*9; i++) {
-                    // Ignore selected hotbar
-                    if (i / 9 == activeHotbarIndex) {
-                        net.minecraft.world.item.ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, net.minecraft.world.item.ItemStack.EMPTY);
-                    } else {
-                        ItemStack stack = hotbarItems.get(new NamespacedKey("axiom", "slot_"+i), ItemStackDataType.INSTANCE);
-                        net.minecraft.world.item.ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, CraftItemStack.asNMSCopy(stack));
-                    }
-                }
-
-                byte[] bytes = new byte[buf.writerIndex()];
-                buf.getBytes(0, bytes);
-                player.sendPluginMessage(this.plugin, "axiom:initialize_hotbars", bytes);
-            }
-        }
-
-        // Initialize Views
-        UUID activeView = container.get(AxiomConstants.ACTIVE_VIEW, UUIDDataType.INSTANCE);
-        if (activeView != null) {
-            buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), MinecraftServer.getServer().registryAccess());
-            buf.writeUUID(activeView);
-
-            PersistentDataContainer[] views = container.get(AxiomConstants.VIEWS, PersistentDataType.TAG_CONTAINER_ARRAY);
-            buf.writeVarInt(views.length);
-            for (PersistentDataContainer view : views) {
-                View.load(view).write(buf);
-            }
-
-            byte[] bytes = new byte[buf.writerIndex()];
-            buf.getBytes(0, bytes);
-            player.sendPluginMessage(this.plugin, "axiom:set_editor_views", bytes);
-        }
-
         // Register world properties
         World world = player.getWorld();
         ServerWorldPropertiesRegistry properties = plugin.getOrCreateWorldProperties(world);