zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

⚡ Fix dependency graph and replace Guava

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-28 16:05:14 +02:00 • committed by Alexander Söderberg
parent 4ca47777a3
commit e914d04450
35 changed files with 184 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cloud-minecraft/cloud-bukkit/build.gradle
View file

@ -1,12 +1,6 @@
dependencies {
api (project(':cloud-core')) {
/* Exposed by Bukkit */
exclude group: 'com.google.guava', module: 'guava'
}
api (project(':cloud-brigadier')) {
/* Once again exposed by Bukkit */
exclude group: 'com.google.guava', module: 'guava'
}
implementation 'org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT'
implementation 'me.lucko:commodore:1.9'
api project(':cloud-core')
api project(':cloud-brigadier')
compileOnly 'org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT'
compileOnly 'me.lucko:commodore:1.9'
}

6
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
View file

@ -28,7 +28,7 @@ import cloud.commandframework.CommandTree;
import cloud.commandframework.bukkit.parsers.MaterialArgument;
import cloud.commandframework.bukkit.parsers.WorldArgument;
import cloud.commandframework.execution.CommandExecutionCoordinator;
import com.google.common.reflect.TypeToken;
import io.leangen.geantyref.TypeToken;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World;
@ -84,8 +84,8 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
this.backwardsCommandSenderMapper = backwardsCommandSenderMapper;
/* Register Bukkit parsers */
this.getParserRegistry().registerParserSupplier(TypeToken.of(World.class), params -> new WorldArgument.WorldParser<>());
this.getParserRegistry().registerParserSupplier(TypeToken.of(Material.class),
this.getParserRegistry().registerParserSupplier(TypeToken.get(World.class), params -> new WorldArgument.WorldParser<>());
this.getParserRegistry().registerParserSupplier(TypeToken.get(Material.class),
params -> new MaterialArgument.MaterialParser<>());
/* Try to determine the Minecraft version */