Unable to create injector (1.12)

API/api/pom.xml

@@ -5,7 +5,7 @@
         <groupId>tc.oc</groupId>
         <artifactId>api-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.11-SNAPSHOT</version>
+        <version>1.12.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>api</artifactId>

API/api/src/main/java/tc/oc/api/ApiManifest.java

@@ -1,7 +1,9 @@
 package tc.oc.api;
 
+import tc.oc.api.chat.ChatModelManifest;
 import tc.oc.api.document.DocumentsManifest;
 import tc.oc.api.engagement.EngagementModelManifest;
+import tc.oc.api.friendships.FriendshipModelManifest;
 import tc.oc.api.games.GameModelManifest;
 import tc.oc.api.http.HttpManifest;
 import tc.oc.api.maps.MapModelManifest;
@@ -44,5 +46,7 @@ protected void configure() {
         install(new WhisperModelManifest());
         install(new TrophyModelManifest());
         install(new TournamentModelManifest());
+        install(new FriendshipModelManifest());
+        install(new ChatModelManifest());
     }
 }

API/api/src/main/java/tc/oc/api/chat/ChatModelManifest.java

@@ -0,0 +1,16 @@
+package tc.oc.api.chat;
+
+import tc.oc.api.docs.Chat;
+import tc.oc.api.docs.virtual.ChatDoc;
+import tc.oc.api.model.ModelBinders;
+import tc.oc.commons.core.inject.HybridManifest;
+
+public class ChatModelManifest extends HybridManifest implements ModelBinders {
+
+    @Override
+    protected void configure() {
+        bindModel(Chat.class, ChatDoc.Partial.class, model -> {
+            model.bindDefaultService().to(model.nullService());
+        });
+    }
+}

API/api/src/main/java/tc/oc/api/docs/Chat.java

@@ -0,0 +1,7 @@
+package tc.oc.api.docs;
+
+import tc.oc.api.annotations.Serialize;
+import tc.oc.api.docs.virtual.ChatDoc;
+
+@Serialize
+public interface Chat extends ChatDoc.Complete {}

API/api/src/main/java/tc/oc/api/docs/Friendship.java

@@ -0,0 +1,5 @@
+package tc.oc.api.docs;
+
+import tc.oc.api.docs.virtual.FriendshipDoc;
+
+public interface Friendship extends FriendshipDoc.Complete {}

API/api/src/main/java/tc/oc/api/docs/virtual/ChatDoc.java

@@ -0,0 +1,52 @@
+package tc.oc.api.docs.virtual;
+
+import tc.oc.api.annotations.Serialize;
+import tc.oc.api.docs.PlayerId;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.time.Instant;
+
+public interface ChatDoc {
+    interface Partial extends PartialModel {}
+
+    @Serialize
+    interface Base extends Model, Partial {
+        @Nonnull String message();
+        @Nonnull String server_id();
+        @Nullable String match_id();
+        @Nonnull Type type();
+        @Nonnull Instant sent_at();
+        @Nullable Broadcast broadcast();
+    }
+
+    @Serialize
+    interface Broadcast extends Partial {
+        @Nonnull Destination destination();
+        @Nullable String id();
+    }
+
+    @Serialize
+    interface Creation extends Base {
+        @Nullable String sender_id();
+    }
+
+    @Serialize
+    interface Complete extends Base {
+        @Nullable PlayerId sender();
+    }
+
+    enum Type {
+        TEAM(true), SERVER(true), ADMIN(false), BROADCAST(false);
+
+        public boolean batchUpdate;
+
+        Type(boolean batchUpdate) {
+            this.batchUpdate = batchUpdate;
+        }
+    }
+
+    enum Destination {
+        SERVER, FAMILY, GAME, NETWORK, GLOBAL
+    }
+}

API/api/src/main/java/tc/oc/api/docs/virtual/FriendshipDoc.java

@@ -0,0 +1,23 @@
+package tc.oc.api.docs.virtual;
+
+import tc.oc.api.annotations.Serialize;
+import tc.oc.api.docs.PlayerId;
+
+import javax.annotation.Nullable;
+import java.time.Instant;
+
+public interface FriendshipDoc {
+
+    interface Partial extends PartialModel {}
+
+    @Serialize
+    interface Complete extends Model, Partial {
+        Instant sent_date();
+        @Nullable Instant decision_date();
+        PlayerId friender();
+        PlayerId friended();
+        boolean undecided();
+        boolean accepted();
+        boolean rejected();
+    }
+}

API/api/src/main/java/tc/oc/api/docs/virtual/MapDoc.java

@@ -43,7 +43,7 @@ enum Edition {
     enum Genre { OBJECTIVES, DEATHMATCH, OTHER }
     Genre genre();
 
-    enum Gamemode { tdm, ctw, ctf, dtc, dtm, ad, koth, blitz, rage, scorebox, arcade, gs, ffa, mixed, skywars, survival }
+    enum Gamemode { tdm, ctw, ctf, dtc, dtm, ad, koth, blitz, rage, scorebox, arcade, gs, ffa, mixed, skywars, survival, payload }
     Set<Gamemode> gamemode();
 
     List<Team> teams();

API/api/src/main/java/tc/oc/api/docs/virtual/MatchDoc.java

@@ -30,11 +30,7 @@ public interface MatchDoc extends Model {
     Collection<String> winning_team_ids();
     Collection<String> winning_user_ids();
 
-    enum Mutation {
-        BLITZ, UHC, EXPLOSIVES, NO_FALL, MOBS, STRENGTH, DOUBLE_JUMP, INVISIBILITY, LIGHTNING, RAGE, ELYTRA;
-    }
-
-    Set<Mutation> mutations();
+    Set<String> mutations();
 
     @Serialize
     interface Team extends MapDoc.Team, CompetitorDoc {

API/api/src/main/java/tc/oc/api/docs/virtual/PunishmentDoc.java

@@ -22,14 +22,14 @@ interface Base extends Model, Partial {
         boolean silent();
         boolean automatic();
         boolean active();
+        boolean off_record();
     }
 
     @Serialize
     interface Creation extends Base {
         @Nullable String punisher_id();
         @Nullable String punished_id();
         @Nullable Type type();
-        boolean off_record();
     }
 
     @Serialize

API/api/src/main/java/tc/oc/api/docs/virtual/ServerDoc.java

@@ -50,10 +50,15 @@ interface BungeeName extends Partial {
     }
 
     @Serialize
-    interface CurrentPort extends Partial {
+    interface Port extends Partial {
         Integer current_port();
     }
 
+    @Serialize
+    interface Ip extends Partial {
+        String ip();
+    }
+
     @Serialize
     interface Online extends Partial {
         boolean online();
@@ -95,7 +100,7 @@ interface Visible extends Partial {
      * Startup info sent to the API
      */
     @Serialize
-    interface Startup extends Online, CurrentPort {
+    interface Startup extends Online, Port {
         @Nullable DeployInfo deploy_info();
         Map<String, String> plugin_versions();
         Set<Integer> protocol_versions();
@@ -105,7 +110,8 @@ interface Startup extends Online, CurrentPort {
      * Startup info received from the API
      */
     @Serialize
-    interface Configuration extends Partial {
+    interface Configuration extends Rotations {
+        String domain();
         String settings_profile();
         Map<UUID, String> operators();
         @Nullable Team team();
@@ -116,10 +122,10 @@ interface Configuration extends Partial {
         Visibility startup_visibility();
         boolean whitelist_enabled();
         boolean waiting_room();
-
         @Nullable String resource_pack_url();
         @Nullable String resource_pack_sha1();
         boolean resource_pack_fast_update();
+        @Nullable String cross_server_profile();
     }
 
     @Serialize
@@ -138,7 +144,18 @@ interface MatchStatus extends Partial {
 
     @Serialize
     interface Mutation extends Partial {
-        Set<MatchDoc.Mutation> queued_mutations();
+        Set<String> queued_mutations();
+    }
+
+    @Serialize
+    interface Rotations extends Partial {
+        List<Rotation> rotations();
+    }
+
+    @Serialize
+    interface Rotation extends Document {
+        String name();
+        String next_map_id();
     }
 
     /**

API/api/src/main/java/tc/oc/api/docs/virtual/SessionDoc.java

@@ -14,6 +14,7 @@ interface Partial extends PartialModel {}
     interface Complete extends Model, Partial {
         String family_id();
         String server_id();
+        @Nullable String version();
         PlayerId user();
         @Nullable String nickname();
         @Nullable String nickname_lower();

API/api/src/main/java/tc/oc/api/docs/virtual/UserDoc.java

@@ -1,6 +1,5 @@
 package tc.oc.api.docs.virtual;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +43,11 @@ interface Trophies extends Partial {
         List<String> trophy_ids();
     }
 
+    @Serialize
+    interface Channel extends Partial {
+        @Nonnull ChatDoc.Type chat_channel();
+    }
+
     interface License {
 
         @Serialize
@@ -80,10 +84,14 @@ interface Complete extends Request, Grant {}
      * Stuff we get from the API on login, and keep around for plugins to use
      */
     @Serialize
-    interface Login extends Identity, Locale, Trophies, License.Complete {
+    interface Login extends Identity, Locale, Trophies, DefaultServer, FriendTokens, DeathScreen, License.Complete, Channel {
         int raindrops();
+        int maptokens();
+        int mutationtokens();
         String mc_last_sign_in_ip();
         @Nullable Date trial_expires_at();
+        @Nullable Instant nickname_updated_at();
+        Map<String, Map<String, Map<String, Object>>> stats_value();
         Map<String, Map<String, Boolean>> mc_permissions_by_realm();
         Map<String, Map<String, String>> mc_settings_by_profile();
         Map<String, String> classes();
@@ -110,4 +118,20 @@ enum ResourcePackStatus {
     interface ResourcePackResponse extends Partial {
         UserDoc.ResourcePackStatus resource_pack_status();
     }
+
+    @Serialize
+    interface DefaultServer extends Partial {
+        @Nullable String default_server_id();
+    }
+
+    @Serialize
+    interface DeathScreen extends Partial {
+        String death_screen();
+    }
+
+    @Serialize
+    interface FriendTokens extends Partial {
+        int friend_tokens_limit();
+        int friend_tokens_concurrent();
+    }
 }

API/api/src/main/java/tc/oc/api/friendships/FriendshipModelManifest.java

@@ -0,0 +1,20 @@
+package tc.oc.api.friendships;
+
+import com.google.inject.multibindings.OptionalBinder;
+import tc.oc.api.docs.Friendship;
+import tc.oc.api.docs.virtual.FriendshipDoc;
+import tc.oc.api.model.ModelBinders;
+import tc.oc.commons.core.inject.HybridManifest;
+
+public class FriendshipModelManifest extends HybridManifest implements ModelBinders {
+
+    @Override
+    protected void configure() {
+        bindModel(Friendship.class, FriendshipDoc.Partial.class, model -> {
+            model.bindService().to(FriendshipService.class);
+        });
+
+        OptionalBinder.newOptionalBinder(publicBinder(), FriendshipService.class)
+                .setDefault().to(NullFriendshipService.class);
+    }
+}

API/api/src/main/java/tc/oc/api/friendships/FriendshipRequest.java

@@ -0,0 +1,19 @@
+package tc.oc.api.friendships;
+
+import tc.oc.api.annotations.Serialize;
+import tc.oc.api.docs.virtual.Document;
+
+import javax.annotation.Nullable;
+
+@Serialize
+public interface FriendshipRequest extends Document {
+    String friender_id();
+    @Nullable String friended_id();
+
+    static FriendshipRequest create(String friender_id, @Nullable String friended_id) {
+        return new FriendshipRequest() {
+            public String friender_id() { return friender_id; }
+            public String friended_id() { return friended_id; }
+        };
+    }
+}

API/api/src/main/java/tc/oc/api/friendships/FriendshipResponse.java

@@ -0,0 +1,15 @@
+package tc.oc.api.friendships;
+
+import tc.oc.api.annotations.Serialize;
+import tc.oc.api.docs.Friendship;
+import tc.oc.api.docs.virtual.Document;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+@Serialize
+public interface FriendshipResponse extends Document {
+    boolean success();
+    @Nullable String error();
+    @Nullable List<Friendship> friendships();
+}

API/api/src/main/java/tc/oc/api/friendships/FriendshipService.java

@@ -0,0 +1,16 @@
+package tc.oc.api.friendships;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import tc.oc.api.docs.Friendship;
+import tc.oc.api.docs.virtual.FriendshipDoc;
+import tc.oc.api.model.ModelService;
+
+public interface FriendshipService extends ModelService<Friendship, FriendshipDoc.Partial> {
+
+    ListenableFuture<FriendshipResponse> create(FriendshipRequest request);
+
+    ListenableFuture<FriendshipResponse> destroy(FriendshipRequest request);
+
+    ListenableFuture<FriendshipResponse> list(FriendshipRequest request);
+
+}