Skip to content

Fixes Sponge 5 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aztorius wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes Sponge 5 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6728dd6
Fix an issue with Sponge ID format
Aztorius Mar 27, 2017
425069a
color console
THEJean-Kevin Apr 9, 2017
1e755e4
Catch an Index exception
Aztorius Mar 29, 2017
8410613
Fix using Sponge API 5.1.0
Aztorius Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/greatmancode/tools/caller/sponge/SpongePlayerCaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public boolean checkPermission(String playerName, String perm) {
@Override
public void sendMessage(String playerName, String message) {
if (playerName.equals("console")) {
caller.getLogger().info(message);
loader.getGame().getServer().getConsole().sendMessage(((SpongeServerCaller)getCaller()).addColorSponge(message));
return;
}
loader.getGame().getServer().getPlayer(playerName).get().sendMessage(((SpongeServerCaller)getCaller()).addColorSponge(message));
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/greatmancode/tools/caller/sponge/SpongeServerCaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import org.spongepowered.api.text.format.TextColors;
import org.spongepowered.api.text.format.TextStyle;
import org.spongepowered.api.text.format.TextStyles;
import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World;

import java.io.File;
import java.util.ArrayList;
Expand Down Expand Up @@ -73,7 +75,7 @@ public Text addColorSponge(String message) {
TextColor color = null;
TextStyle.Base style = null;
while (m.find()) {

String entry = m.group();
if (entry.contains("{{")) {
color = null;
Expand Down Expand Up @@ -205,7 +207,7 @@ public CommandResult process(CommandSource source, String arguments) throws Comm
}

@Override
public List<String> getSuggestions(CommandSource source, String arguments) throws CommandException {
public List<String> getSuggestions(CommandSource source, String arguments, Location<World> targetPosition) throws CommandException {
List<String> list = new ArrayList<>();
list.addAll(subCommand.getSubCommandKeys());
return list;
Expand All @@ -217,12 +219,12 @@ public boolean testPermission(CommandSource source) {
}

@Override
public java.util.Optional<? extends Text> getShortDescription(CommandSource source) {
public java.util.Optional<Text> getShortDescription(CommandSource source) {
return Optional.empty();
}

@Override
public java.util.Optional<? extends Text> getHelp(CommandSource source) {
public java.util.Optional<Text> getHelp(CommandSource source) {
return Optional.empty();
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/greatmancode/tools/interfaces/SpongeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.io.InputStreamReader;
import java.util.logging.Level;

@Plugin(id = "GreatmancodeToolsLoader", name = "GreatmancodeToolsLoader", version = "1.0")
@Plugin(id = "greatmancodetoolsloader", name = "greatmancodetoolsloader", version = "1.0")
public class SpongeLoader implements Loader {

@Getter
Expand Down Expand Up @@ -87,6 +87,8 @@ public void onEnable() {
serverCaller.getLogger().log(Level.SEVERE, "Unable to load the main class!", e);
} catch (IllegalAccessException e) {
serverCaller.getLogger().log(Level.SEVERE, "Unable to load the main class!", e);
} catch (ArrayIndexOutOfBoundsException e) {
serverCaller.getLogger().log(Level.SEVERE, "Unable to load the main class!", e);
}
}

Expand Down