From 3c7ff246de4adf9e9973c5fd8d45ceb5e205ac03 Mon Sep 17 00:00:00 2001 From: Joshua Rodriguez Date: Thu, 3 Mar 2016 15:11:14 -0800 Subject: [PATCH] Text messing around --- gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew.bat | 180 +++++++++--------- .../year4000/utilities/sponge/Messages.java | 1 + .../sponge/command/ChunksCommand.java | 29 ++- 4 files changed, 114 insertions(+), 100 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a550b1a..f9f855d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 11 08:51:59 PST 2016 +#Tue Mar 01 13:41:52 PST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..aec9973 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/sponge/src/main/java/net/year4000/utilities/sponge/Messages.java b/sponge/src/main/java/net/year4000/utilities/sponge/Messages.java index b729751..e7838be 100644 --- a/sponge/src/main/java/net/year4000/utilities/sponge/Messages.java +++ b/sponge/src/main/java/net/year4000/utilities/sponge/Messages.java @@ -34,6 +34,7 @@ public enum Messages implements LocaleKeys { CMD_CHUNKS_UNLOADED, CHUNKS_UNLOADING, CHUNKS_UNLOADED, + CHUNKS_WORLD, // System Command CMD_SYSTEM, diff --git a/sponge/src/main/java/net/year4000/utilities/sponge/command/ChunksCommand.java b/sponge/src/main/java/net/year4000/utilities/sponge/command/ChunksCommand.java index 2f15910..7e1aa62 100644 --- a/sponge/src/main/java/net/year4000/utilities/sponge/command/ChunksCommand.java +++ b/sponge/src/main/java/net/year4000/utilities/sponge/command/ChunksCommand.java @@ -13,6 +13,7 @@ import org.spongepowered.api.command.spec.CommandSpec; import org.spongepowered.api.scheduler.Task; import org.spongepowered.api.text.Text; +import org.spongepowered.api.text.action.TextActions; import org.spongepowered.api.text.chat.ChatTypes; import org.spongepowered.api.text.format.TextColors; import org.spongepowered.api.text.format.TextStyles; @@ -22,6 +23,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; +import static net.year4000.utilities.sponge.Messages.*; + /** View the status of the chunks of each world */ public final class ChunksCommand implements CommandExecutor { private static final String[] ALIAS = new String[] {"chunks", "memory"}; @@ -38,18 +41,28 @@ public static void register(Object object) { @Override public CommandResult execute(CommandSource src, CommandContext args) throws CommandException { - List pendingUnload = Lists.newLinkedList(); - Sponge.getServer().getWorlds().stream() - .map(World::getLoadedChunks) - .forEach(iterator -> pendingUnload.addAll(Lists.newLinkedList(iterator))); - - src.sendMessage(Text.of("Chunk Size: ", pendingUnload.size())); + List pendingUnload = loadedChunks().subList(1, 5); + src.sendMessage(CHUNKS_WORLD.get(src, pendingUnload.size())); + pendingUnload.forEach(chunk -> { + src.sendMessage(formatWorld(chunk.getWorld(), src)); + }); return CommandResult.success(); } /** Format the text line for the world */ - private Text formatWorld(World world) { - return Text.EMPTY; + private Text formatWorld(World world,CommandSource src) { + Text worldPart = Text.builder(world.getName()).onHover(TextActions.showText(Text.of(world.getUniqueId()))).build(); + Text chunksPart = Text.builder(world.getDimension().getName()).onHover(TextActions.showText(Text.of(world.getDimension().getType().getName()))).build(); + return CHUNKS_WORLD.get(src, worldPart, chunksPart); + } + + /** Get all the loaded chunks at this point in time */ + private List loadedChunks() { + List chunks = Lists.newLinkedList(); + Sponge.getServer().getWorlds().stream() + .map(World::getLoadedChunks) + .forEach(iterator -> chunks.addAll(Lists.newLinkedList(iterator))); + return chunks; } /** Command to unload all chunks on the server inorder to save memory */