Update custom-entities to 1.19.2

.github/ISSUE_TEMPLATE/config.yml

@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: Common Issues
-    url: https://github.com/GeyserMC/Geyser/wiki/Common-Issues
+    url: https://wiki.geysermc.org/geyser/common-issues
     about: Check the common issues to see if you are not alone with that issue and see how you can fix them.
   - name: Frequently Asked Questions
-    url: https://github.com/GeyserMC/Geyser/wiki/FAQ
+    url: https://wiki.geysermc.org/geyser/faq
     about: Look at the FAQ page for answers to frequently asked questions.
   - name: Get help on the GeyserMC Discord server
     url: https://discord.gg/geysermc

.github/workflows/pullrequest.yml

@@ -9,11 +9,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
           distribution: 'temurin'
-          java-version: 16
+          java-version: 17
           cache: 'gradle'
       - name: submodules-init
         uses: snickerbockers/submodules-init@v4

.gitignore

@@ -248,4 +248,6 @@ locales/
 /cache/
 /packs/
 /dump.json
-/saved-refresh-tokens.json
+/saved-refresh-tokens.json
+/custom_mappings/
+/languages/

Jenkinsfile

@@ -2,7 +2,7 @@ pipeline {
     agent any
     tools {
         gradle 'Gradle 7'
-        jdk 'Java 16'
+        jdk 'Java 17'
     }
     options {
         buildDiscarder(logRotator(artifactNumToKeepStr: '20'))
@@ -102,7 +102,7 @@ pipeline {
         success {
             script {
                 if (env.BRANCH_NAME == 'master') {
-                    build propagate: false, wait: false, job: 'GeyserMC/Geyser-Fabric/java-1.18', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
+                    build propagate: false, wait: false, job: 'GeyserMC/Geyser-Fabric/master', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
                     build propagate: false, wait: false, job: 'GeyserMC/GeyserConnect/master', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
                 }
             }

README.md

@@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
-### Currently supporting Minecraft Bedrock 1.18.0 - 1.18.31 and Minecraft Java 1.18.2.
+### Currently supporting Minecraft Bedrock 1.19.0/1.19.1x/1.19.20 and Minecraft Java 1.19.1/1.19.2.
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

api/base/src/main/java/org/geysermc/api/GeyserApiBase.java

@@ -78,7 +78,7 @@ public interface GeyserApiBase {
      * @return the major API version. Bumped whenever a significant breaking change or feature addition is added.
      */
     default int majorApiVersion() {
-        return 0;
+        return 1;
     }
 
     /**

api/geyser/src/main/java/org/geysermc/geyser/api/GeyserApi.java

@@ -35,7 +35,6 @@
 import org.geysermc.geyser.api.extension.ExtensionManager;
 import org.geysermc.geyser.api.network.BedrockListener;
 import org.geysermc.geyser.api.network.RemoteServer;
-import org.geysermc.geyser.api.provider.ProviderManager;
 
 import java.util.List;
 import java.util.UUID;
@@ -44,24 +43,6 @@
  * Represents the API used in Geyser.
  */
 public interface GeyserApi extends GeyserApiBase {
-    /**
-     * Shuts down the current Geyser instance.
-     */
-    void shutdown();
-
-    /**
-     * Reloads the current Geyser instance.
-     */
-    void reload();
-
-    /**
-     * Gets if this Geyser instance is running in an IDE. This only needs to be used in cases where files
-     * expected to be in a jarfile are not present.
-     *
-     * @return if we are in a production environment
-     */
-    boolean isProductionEnvironment();
-
     /**
      * {@inheritDoc}
      */
@@ -101,11 +82,15 @@ public interface GeyserApi extends GeyserApiBase {
     CommandManager commandManager();
 
     /**
-     * Gets the {@link ProviderManager}.
+     * Provides an implementation for the specified API type.
      *
-     * @return the provider manager
+     * @param apiClass the builder class
+     * @param <R> the implementation type
+     * @param <T> the API type
+     * @return the builder instance
      */
-    ProviderManager providerManager();
+    @NonNull
+    <R extends T, T> R provider(@NonNull Class<T> apiClass, @Nullable Object... args);
 
     /**
      * Gets the {@link EventBus} for handling
@@ -116,7 +101,7 @@ public interface GeyserApi extends GeyserApiBase {
     EventBus eventBus();
 
     /**
-     * Get's the default {@link RemoteServer} configured
+     * Gets the default {@link RemoteServer} configured
      * within the config file that is used by default.
      *
      * @return the default remote server used within Geyser
@@ -131,15 +116,6 @@ public interface GeyserApi extends GeyserApiBase {
      */
     BedrockListener bedrockListener();
 
-    /**
-     * Gets the maximum number of players that
-     * can join this Geyser instance.
-     *
-     * @return the maximum number of players that
-     *         can join this Geyser instance
-     */
-    int maxPlayers();
-
     /**
      * Gets the current {@link GeyserApiBase} instance.
      *

api/geyser/src/main/java/org/geysermc/geyser/api/command/Command.java

@@ -69,6 +69,13 @@ public interface Command {
     @NonNull
     List<String> aliases();
 
+    /**
+     * Gets if this command is designed to be used only by server operators.
+     *
+     * @return if this command is designated to be used only by server operators.
+     */
+    boolean isSuggestedOpOnly();
+
     /**
      * Gets if this command is executable on console.
      *
@@ -98,7 +105,7 @@ default boolean isBedrockOnly() {
     }
 
     static <T extends CommandSource> Command.Builder<T> builder(Class<T> sourceType) {
-        return GeyserApi.api().providerManager().builderProvider().provideBuilder(Builder.class, sourceType);
+        return GeyserApi.api().provider(Builder.class, sourceType);
     }
 
     interface Builder<T extends CommandSource> {
@@ -135,6 +142,14 @@ interface Builder<T extends CommandSource> {
          */
         Builder<T> aliases(List<String> aliases);
 
+        /**
+         * Sets if this command is designed to be used only by server operators.
+         *
+         * @param suggestedOpOnly if this command is designed to be used only by server operators
+         * @return the builder
+         */
+        Builder<T> suggestedOpOnly(boolean suggestedOpOnly);
+
         /**
          * Sets if this command is executable on console.
          *

api/geyser/src/main/java/org/geysermc/geyser/api/entity/EntityDefinition.java

@@ -109,7 +109,7 @@ public interface EntityDefinition {
     float offset();
 
     static Builder builder() {
-        return GeyserApi.api().providerManager().builderProvider().provideBuilder(Builder.class);
+        return GeyserApi.api().provider(EntityDefinition.Builder.class);
     }
 
     interface Builder {

api/geyser/src/main/java/org/geysermc/geyser/api/entity/EntityIdentifier.java

@@ -58,7 +58,7 @@ public interface EntityIdentifier {
 
     @NonNull
     static Builder builder() {
-        return GeyserApi.api().providerManager().builderProvider().provideBuilder(Builder.class);
+        return GeyserApi.api().provider(EntityIdentifier.Builder.class);
     }
 
     interface Builder {

api/geyser/src/main/java/org/geysermc/geyser/api/event/EventBus.java

@@ -76,7 +76,7 @@ public interface EventBus {
      void unregisterAll(@NonNull Extension extension);
 
     /**
-     * Fires the given {@link Event}.
+     * Fires the given {@link Event} and returns the result.
      *
      * @param event the event to fire
      *

api/geyser/src/main/java/org/geysermc/geyser/api/event/downstream/command/ServerDefineCommandsEvent.java

@@ -33,7 +33,9 @@
 import java.util.Set;
 
 /**
- * Called when the downstream server defines the commands available on the server.
+ * Called when the Java server defines the commands available on the server.
+ * <br>
+ * This event is mapped to the existence of Brigadier on the server.
  */
 public class ServerDefineCommandsEvent extends ConnectionEvent implements Cancellable {
     private final Set<? extends CommandInfo> commands;
@@ -45,9 +47,10 @@ public ServerDefineCommandsEvent(@NonNull GeyserConnection connection, @NonNull
     }
 
     /**
-     * A mutable collection of the commands sent over.
+     * A collection of commands sent from the server. Any element in this collection can be removed, but no element can
+     * be added.
      *
-     * @return a mutable collection of the commands sent over
+     * @return a collection of the commands sent over
      */
     @NonNull
     public Set<? extends CommandInfo> commands() {
@@ -65,7 +68,6 @@ public void setCancelled(boolean cancelled) {
     }
 
     public interface CommandInfo {
-
         /**
          * Gets the name of the command.
          *

api/geyser/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomItemsEvent.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.api.event.lifecycle;
+
+import com.google.common.collect.Multimap;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.geysermc.geyser.api.event.Event;
+import org.geysermc.geyser.api.item.custom.CustomItemData;
+import org.geysermc.geyser.api.item.custom.NonVanillaCustomItemData;
+
+import java.util.*;
+
+/**
+ * Called on Geyser's startup when looking for custom items. Custom items must be registered through this event.
+ *
+ * This event will not be called if the "add non-Bedrock items" setting is disabled in the Geyser config.
+ */
+public abstract class GeyserDefineCustomItemsEvent implements Event {
+    private final Multimap<String, CustomItemData> customItems;
+    private final List<NonVanillaCustomItemData> nonVanillaCustomItems;
+
+    public GeyserDefineCustomItemsEvent(Multimap<String, CustomItemData> customItems, List<NonVanillaCustomItemData> nonVanillaCustomItems) {
+        this.customItems = customItems;
+        this.nonVanillaCustomItems = nonVanillaCustomItems;
+    }
+
+    /**
+     * Gets a multimap of all the already registered custom items indexed by the item's extended java item's identifier.
+     *
+     * @return a multimap of all the already registered custom items
+     */
+    public Map<String, Collection<CustomItemData>> getExistingCustomItems() {
+        return Collections.unmodifiableMap(this.customItems.asMap());
+    }
+
+    /**
+     * Gets the list of the already registered non-vanilla custom items.
+     *
+     * @return the list of the already registered non-vanilla custom items
+     */
+    public List<NonVanillaCustomItemData> getExistingNonVanillaCustomItems() {
+        return Collections.unmodifiableList(this.nonVanillaCustomItems);
+    }
+
+    /**
+     * Registers a custom item with a base Java item. This is used to register items with custom textures and properties
+     * based on NBT data.
+     *
+     * @param identifier the base (java) item
+     * @param customItemData the custom item data to register
+     * @return if the item was registered
+     */
+    public abstract boolean register(@NonNull String identifier, @NonNull CustomItemData customItemData);
+
+    /**
+     * Registers a custom item with no base item. This is used for mods.
+     *
+     * @param customItemData the custom item data to register
+     * @return if the item was registered
+     */
+    public abstract boolean register(@NonNull NonVanillaCustomItemData customItemData);
+}

api/geyser/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCommandsEvent.java → api/geyser/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java

@@ -26,18 +26,15 @@
 package org.geysermc.geyser.api.event.lifecycle;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.geysermc.geyser.api.command.Command;
-import org.geysermc.geyser.api.command.CommandManager;
 import org.geysermc.geyser.api.event.Event;
 
-import java.util.Map;
+import java.nio.file.Path;
+import java.util.List;
 
 /**
- * Called when commands are defined within Geyser.
+ * Called when resource packs are loaded within Geyser.
  *
- * @param commandManager the command manager
- * @param commands a mutable list of the currently
- *                 registered default commands
+ * @param resourcePacks a mutable list of the currently listed resource packs
  */
-public record GeyserDefineCommandsEvent(@NonNull CommandManager commandManager, @NonNull Map<String, Command> commands) implements Event {
+public record GeyserLoadResourcePacksEvent(@NonNull List<Path> resourcePacks) implements Event {
 }