Merge remote-tracking branch 'origin/dev'

Author: Johni0702

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -71,7 +71,7 @@ body:
     attributes:
       label: Additional Server Info
       description: |
-        Do you use a proxy (eg. BungeeCord)? What software do you use and what plugins?
+        Do you use a proxy (e.g. BungeeCord)? What software do you use and what plugins?
       placeholder: |
         Example: "I also use BungeeCord with the following plugins: x, y, z"
     validations:

api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -88,6 +88,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
     public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new VersionRange("1.20", 0, 1));
     public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
+    public static final ProtocolVersion v1_20_3 = register(765, "1.20.3");
     public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
 
     public static ProtocolVersion register(int version, String name) {

api/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     id("net.kyori.blossom")
     id("org.jetbrains.gradle.plugin.idea-ext")
-    id("via.shadow-conventions")
 }
 
 sourceSets {
@@ -22,7 +21,7 @@ dependencies {
     api(libs.fastutil)
     api(libs.flare)
     api(libs.flareFastutil)
-    api(libs.openNBT)
+    api(libs.vianbt)
     api(libs.gson)
 
     compileOnlyApi(libs.snakeYaml)
@@ -34,3 +33,5 @@ dependencies {
 java {
     withJavadocJar()
 }
+
+publishShadowJar()

api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java

@@ -63,7 +63,7 @@ default int majorVersion() {
      * @return API version incremented with meaningful API changes
      */
     default int apiVersion() {
-        return 20;
+        return 22;
     }
 
     /**
@@ -117,7 +117,7 @@ default int apiVersion() {
      * Sends a raw packet to the player.
      *
      * @param player the platform's player object, e.g. for Bukkit this is Player
-     * @param packet the packet; you need a VarInt Id, then the packet contents
+     * @param packet the packet; you need a VarInt id, then the packet contents
      * @throws IllegalArgumentException if the player is not injected by Via
      */
     void sendRawPacket(T player, ByteBuf packet);
@@ -126,7 +126,7 @@ default int apiVersion() {
      * Sends a raw packet to the player.
      *
      * @param uuid   the uuid from the player to send packet
-     * @param packet the packet; you need a VarInt Id, then the packet contents
+     * @param packet the packet; you need a VarInt id, then the packet contents
      * @throws IllegalArgumentException if the player is not injected by Via
      */
     void sendRawPacket(UUID uuid, ByteBuf packet);

api/src/main/java/com/viaversion/viaversion/api/ViaManager.java

@@ -23,6 +23,7 @@
 package com.viaversion.viaversion.api;
 
 import com.viaversion.viaversion.api.command.ViaVersionCommand;
+import com.viaversion.viaversion.api.configuration.ConfigurationProvider;
 import com.viaversion.viaversion.api.connection.ConnectionManager;
 import com.viaversion.viaversion.api.debug.DebugHandler;
 import com.viaversion.viaversion.api.platform.ViaInjector;
@@ -91,6 +92,13 @@ public interface ViaManager {
      */
     Scheduler getScheduler();
 
+    /**
+     * Returns the configuration provider.
+     *
+     * @return the configuration provider
+     */
+    ConfigurationProvider getConfigurationProvider();
+
     /**
      * If debug is enabled, packets and other otherwise suppressed warnings will be logged.
      *
@@ -138,4 +146,5 @@ default void setDebug(boolean debug) {
      * @return whether the manager has been initialized
      */
     boolean isInitialized();
+
 }

api/src/main/java/com/viaversion/viaversion/api/command/ViaCommandSender.java

@@ -28,7 +28,7 @@ public interface ViaCommandSender {
     /**
      * Check if the sender has a permission.
      *
-     * @param permission Permission string eg. viaversion.admin
+     * @param permission Permission string e.g. viaversion.admin
      * @return True if the sender has the permission
      */
     boolean hasPermission(String permission);

api/src/main/java/com/viaversion/viaversion/api/command/ViaSubCommand.java

@@ -58,7 +58,7 @@ public String usage() {
      * @return The permission required to use the commands
      */
     public String permission() {
-        return "viaversion.admin";
+        return "viaversion.admin." + name();
     }
 
     /**

api/src/main/java/com/viaversion/viaversion/api/command/ViaVersionCommand.java

@@ -32,7 +32,7 @@ public interface ViaVersionCommand {
      * @param command Your own SubCommand instance to handle it.
      * @throws Exception throws an exception when the subcommand already exists or if it's not valid, example: spacee
      */
-    void registerSubCommand(ViaSubCommand command) throws Exception;
+    void registerSubCommand(ViaSubCommand command);
 
     /**
      * Check if a subcommand is registered.

…/type/types/minecraft/BaseChunkType.java …viaversion/api/configuration/Config.javaapi/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/BaseChunkType.java renamed to api/src/main/java/com/viaversion/viaversion/api/configuration/Config.java api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/BaseChunkType.java renamed to api/src/main/java/com/viaversion/viaversion/api/configuration/Config.java

@@ -20,23 +20,34 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.configuration;
 
-import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
-import com.viaversion.viaversion.api.type.Type;
+import java.util.Map;
 
-public abstract class BaseChunkType extends Type<Chunk> {
+public interface Config {
 
-    protected BaseChunkType() {
-        super(Chunk.class);
-    }
+    /**
+     * Reloads the config
+     */
+    void reload();
 
-    protected BaseChunkType(String typeName) {
-        super(typeName, Chunk.class);
-    }
+    /**
+     * Saves the config
+     */
+    void save();
 
-    @Override
-    public Class<? extends Type> getBaseClass() {
-        return BaseChunkType.class;
-    }
+    /**
+     * Sets the specified path to the given value.
+     *
+     * @param path  Path of the object to set.
+     * @param value New value to set the path to
+     */
+    void set(String path, Object value);
+
+    /**
+     * Get all the configuration values
+     *
+     * @return Map with key-values
+     */
+    Map<String, Object> getValues();
 }

api/src/main/java/com/viaversion/viaversion/api/configuration/ConfigurationProvider.java

@@ -22,32 +22,26 @@
  */
 package com.viaversion.viaversion.api.configuration;
 
-import java.util.Map;
+import java.util.Collection;
 
 public interface ConfigurationProvider {
 
     /**
-     * Sets the specified path to the given value.
+     * Registers a config to be saved or reloaded when {@link #reloadConfigs()} is called.
      *
-     * @param path  Path of the object to set.
-     * @param value New value to set the path to
+     * @param config the config to register
      */
-    void set(String path, Object value);
+    void register(Config config);
 
     /**
-     * Saves the config
-     */
-    void saveConfig();
-
-    /**
-     * Reloads the config
+     * Returns all registered configs.
+     *
+     * @return unmodifiable collection of all registered configs
      */
-    void reloadConfig();
+    Collection<Config> configs();
 
     /**
-     * Get all the configuration values
-     *
-     * @return Map with key-values
+     * Reloads the configuration files.
      */
-    Map<String, Object> getValues();
+    void reloadConfigs();
 }