Skip to content

Commit 64bd275

Browse files
committed
A big cleanup
- Simplified commands a lot, new API (breaking) - Command API uses wrapper types now - CommandNode got yeeted - No platform command code needed anymore (for consuming plugins) - Restructured sponge implementation - Started Sponge API8 implementation - Moved a lot of classes to kotlin Use Component instead of TextComponent Added Sponge8KickService and other small fixes Added Usage and Description to the help command output fixed duplicate subcommand alias printing Commands now register properly on Velocity (Sponge needs some work) Signed-off-by: STG-Allen <[email protected]> More cleanup, converted AnvilNukkit to Kotlin small stuff More work on Sponge8 Moved to new math lib, more cleanup Removed platform-specific modules Move towards using Adventure where possible Revert "Move towards using Adventure where possible" This reverts commit e7949f9. [0.4] Remove TString (#37) * Yeetus deletus 'TString' * Fix minor issues with PaginationService * Cleanup StringTextService * Cleanup Sponge7TextService, fix binding issue with NukkitTextService * Cleanup javadoc * Removed BasicPluginInfo * Fix requested changes * Fix javadoc in TextService * More stuff * More work * Can't forget those pesky bindings * Fix appendJoining not properly appending and joining * Rename our Component to DBComponent for now (until a better name is decided on) to not conflict with kyori's Component * Oops, forgot these * Fix even more stuff * Fix imports * Small final fixes Co-authored-by: Alexander Staeding <[email protected]> tmp Convert parts of the api to Kotlin un-get sponge 8 Revert changes to coremember classes, fix some other issues Actually revert indentation in datastore and coremember package oops Remove accidental code gotta remember those imports Mistakes were made Moar fix Clean up guice modules tmp
1 parent 10bc39d commit 64bd275

File tree

231 files changed

+5977
-10390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+5977
-10390
lines changed

anvil-api/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ version = rootProject.apiVersion
33
dependencies {
44
api bson
55
api configurate_core
6-
api(flow_math)
76
api(guice + ":" + guice_version)
87
api hikari
98
api jedis
109
api jetbrains_annotations
10+
api(kyori_api)
1111
api mongodb_driver_sync
1212
api morphia
1313
api reflections
14+
api(sponge_math)
1415
api xodus_entity_store
1516
}
1617

anvil-api/src/main/java/org/anvilpowered/anvil/api/Anvil.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
package org.anvilpowered.anvil.api;
2020

2121
import com.google.common.base.Preconditions;
22-
import com.google.inject.Binder;
2322
import com.google.inject.Binding;
2423
import com.google.inject.Injector;
2524
import com.google.inject.Module;
2625
import org.anvilpowered.anvil.api.coremember.CoreMemberManager;
2726
import org.anvilpowered.anvil.api.coremember.CoreMemberRepository;
28-
import org.anvilpowered.anvil.api.misc.BindingExtensions;
2927
import org.anvilpowered.anvil.api.registry.Registry;
3028
import org.anvilpowered.anvil.base.plugin.BasePlugin;
3129

@@ -44,10 +42,6 @@ public class Anvil extends BasePlugin {
4442
super(name, rootInjector, module);
4543
}
4644

47-
public static BindingExtensions getBindingExtensions(Binder binder) {
48-
return getServiceManager().provide(BindingExtensions.class, binder);
49-
}
50-
5145
public static Environment.Builder getEnvironmentBuilder() {
5246
return getServiceManager().provide(Environment.Builder.class);
5347
}

anvil-api/src/main/java/org/anvilpowered/anvil/api/Environment.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.inject.Module;
2727
import com.google.inject.Provider;
2828
import com.google.inject.TypeLiteral;
29-
import org.anvilpowered.anvil.api.command.CommandNode;
3029
import org.anvilpowered.anvil.api.misc.Named;
3130
import org.anvilpowered.anvil.api.plugin.PluginInfo;
3231
import org.anvilpowered.anvil.api.registry.Registry;
@@ -92,9 +91,9 @@ default <T> T getInstance(String name) {
9291

9392
Object getPlugin();
9493

95-
<TString> PluginInfo<TString> getPluginInfo();
94+
PluginInfo getPluginInfo();
9695

97-
<TString, TCommandSource> TextService<TString, TCommandSource> getTextService();
96+
<TCommandSource> TextService<TCommandSource> getTextService();
9897

9998
Registry getRegistry();
10099

@@ -155,14 +154,6 @@ interface Builder {
155154
*/
156155
Builder setLoggerSupplier(Supplier<?> logger);
157156

158-
/**
159-
* This will load your root {@link CommandNode} as
160-
* defined by your guice module
161-
*
162-
* @return {@code this}
163-
*/
164-
Builder withRootCommand();
165-
166157
/**
167158
* Called when the {@link Environment} is loaded.
168159
*

anvil-api/src/main/java/org/anvilpowered/anvil/api/command/CommandService.java

Lines changed: 0 additions & 82 deletions
This file was deleted.

anvil-api/src/main/java/org/anvilpowered/anvil/api/coremember/CoreMemberManager.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,4 @@
2121
import org.anvilpowered.anvil.api.datastore.Manager;
2222

2323
public interface CoreMemberManager extends Manager<CoreMemberRepository<?, ?>> {
24-
25-
@Override
26-
default String getDefaultIdentifierSingularUpper() {
27-
return "Core member";
28-
}
29-
30-
@Override
31-
default String getDefaultIdentifierPluralUpper() {
32-
return "Core members";
33-
}
34-
35-
@Override
36-
default String getDefaultIdentifierSingularLower() {
37-
return "core member";
38-
}
39-
40-
@Override
41-
default String getDefaultIdentifierPluralLower() {
42-
return "core members";
43-
}
4424
}

anvil-api/src/main/java/org/anvilpowered/anvil/api/coremember/MongoCoreMemberRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public interface MongoCoreMemberRepository
119119
/**
120120
* Deletes the property {@code nickName} for
121121
* documents that match the provided {@link boolean}
122+
*
122123
* @param query {@link Query} to update documents for
123124
* @return {@link CompletableFuture} wrapped {@link Boolean}
124125
* true if successful, otherwise false

anvil-api/src/main/java/org/anvilpowered/anvil/api/datastore/Component.java renamed to anvil-api/src/main/java/org/anvilpowered/anvil/api/datastore/DBComponent.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
package org.anvilpowered.anvil.api.datastore;
2020

21-
import org.anvilpowered.anvil.api.misc.BindingExtensions;
22-
2321
import java.util.Optional;
2422

2523
/**
@@ -28,9 +26,8 @@
2826
* @see Manager
2927
* @see Repository
3028
* @see CacheService
31-
* @see BindingExtensions
3229
*/
33-
public interface Component<
30+
public interface DBComponent<
3431
TKey,
3532
TDataStore> {
3633

0 commit comments

Comments
 (0)