commit 085fc2ee361bebbc33f4d1170a2abe4c565871c1 Author: bloodwiing Date: Mon Dec 11 01:08:29 2023 +0200 Gossip Initial diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..ede0b46 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100644 index 0000000..30bab2a --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..f93aba9 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..5c4ce7c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Client.xml b/.idea/runConfigurations/Client.xml new file mode 100644 index 0000000..fc57e72 --- /dev/null +++ b/.idea/runConfigurations/Client.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Server.xml b/.idea/runConfigurations/Server.xml new file mode 100644 index 0000000..67de087 --- /dev/null +++ b/.idea/runConfigurations/Server.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..6b8715c --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Client/.gitignore b/Client/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/Client/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Client/.idea/.gitignore b/Client/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Client/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Client/.idea/encodings.xml b/Client/.idea/encodings.xml new file mode 100644 index 0000000..17614b0 --- /dev/null +++ b/Client/.idea/encodings.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Client/.idea/misc.xml b/Client/.idea/misc.xml new file mode 100644 index 0000000..ae946ce --- /dev/null +++ b/Client/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Client/.idea/runConfigurations/Program.xml b/Client/.idea/runConfigurations/Program.xml new file mode 100644 index 0000000..912cfa4 --- /dev/null +++ b/Client/.idea/runConfigurations/Program.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/Client/.idea/uiDesigner.xml b/Client/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/Client/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/.idea/vcs.xml b/Client/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/Client/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Client/.mvn/wrapper/maven-wrapper.jar b/Client/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..c1dd12f Binary files /dev/null and b/Client/.mvn/wrapper/maven-wrapper.jar differ diff --git a/Client/.mvn/wrapper/maven-wrapper.properties b/Client/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..40ca015 --- /dev/null +++ b/Client/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar \ No newline at end of file diff --git a/Client/mvnw b/Client/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/Client/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/Client/mvnw.cmd b/Client/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/Client/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/Client/pom.xml b/Client/pom.xml new file mode 100644 index 0000000..1a04367 --- /dev/null +++ b/Client/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + dev.wiing.gossip + Client + 1.0-SNAPSHOT + Client + + + UTF-8 + 5.9.2 + + + + + + dev.wiing.gossip + Lib + 1.0-SNAPSHOT + + + + org.openjfx + javafx-controls + 21-ea+24 + + + org.openjfx + javafx-fxml + 21-ea+24 + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + 17 + + + + org.openjfx + javafx-maven-plugin + 0.0.8 + + + + default-cli + + dev.wiing.gossip.client/dev.wiing.gossip.client.Program + app + app + app + true + true + true + + + + + + + \ No newline at end of file diff --git a/Client/src/main/java/dev/wiing/gossip/client/Connection.java b/Client/src/main/java/dev/wiing/gossip/client/Connection.java new file mode 100644 index 0000000..c400349 --- /dev/null +++ b/Client/src/main/java/dev/wiing/gossip/client/Connection.java @@ -0,0 +1,65 @@ +package dev.wiing.gossip.client; + +import dev.wiing.gossip.lib.PacketManager; +import dev.wiing.gossip.lib.models.SecretUser; +import dev.wiing.gossip.lib.packets.Packet; + +import java.io.IOException; +import java.net.Socket; + +public class Connection { + + private static final Connection instance = new Connection(); + + private final PacketManager packetManager; + + private Socket socket; + + private SecretUser self; + + private Connection() { + packetManager = new PacketManager(); + packetManager.registerPackets(); + } + + public static Connection getInstance() { + return instance; + } + + public PacketManager getPacketManager() { + return packetManager; + } + + public Socket getSocket() { + return socket; + } + + public void setSocket(Socket socket) { + this.socket = socket; + } + + public void sendPacket(Packet packet) { + try { + getPacketManager().writePacket(getSocket().getOutputStream(), packet); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public Packet nextPacket() { + try { + return getPacketManager().readPacket(getSocket().getInputStream()); + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + public SecretUser getSelf() { + return self; + } + + public void setSelf(SecretUser self) { + this.self = self; + } +} diff --git a/Client/src/main/java/dev/wiing/gossip/client/GossipApp.java b/Client/src/main/java/dev/wiing/gossip/client/GossipApp.java new file mode 100644 index 0000000..a1702b9 --- /dev/null +++ b/Client/src/main/java/dev/wiing/gossip/client/GossipApp.java @@ -0,0 +1,19 @@ +package dev.wiing.gossip.client; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import java.io.IOException; + +public class GossipApp extends Application { + @Override + public void start(Stage stage) throws IOException { + FXMLLoader fxmlLoader = new FXMLLoader(Program.class.getResource("views/login-view.fxml")); + Scene scene = new Scene(fxmlLoader.load(), 320, 240); + stage.setTitle("GossipApp"); + stage.setScene(scene); + stage.show(); + } +} diff --git a/Client/src/main/java/dev/wiing/gossip/client/Program.java b/Client/src/main/java/dev/wiing/gossip/client/Program.java new file mode 100644 index 0000000..141a591 --- /dev/null +++ b/Client/src/main/java/dev/wiing/gossip/client/Program.java @@ -0,0 +1,26 @@ +package dev.wiing.gossip.client; + +import dev.wiing.gossip.lib.Config; +import javafx.application.Application; + +import java.io.IOException; +import java.net.Socket; + +public class Program { + + public static void main(String[] args) { + + try { + Connection.getInstance().setSocket(new Socket("0.0.0.0", Config.getPort())); + } catch (IOException e) { + throw new RuntimeException(e); + } + + Application.launch(GossipApp.class, args); + + try { + Connection.getInstance().getSocket().close(); + } catch (IOException ignored) { + } + } +} \ No newline at end of file diff --git a/Client/src/main/java/dev/wiing/gossip/client/controllers/LoginController.java b/Client/src/main/java/dev/wiing/gossip/client/controllers/LoginController.java new file mode 100644 index 0000000..95105ab --- /dev/null +++ b/Client/src/main/java/dev/wiing/gossip/client/controllers/LoginController.java @@ -0,0 +1,87 @@ +package dev.wiing.gossip.client.controllers; + + +import dev.wiing.gossip.client.Connection; +import dev.wiing.gossip.client.data.UserIcon; +import dev.wiing.gossip.lib.models.SecretUser; +import dev.wiing.gossip.lib.packets.CredentialsPacket; +import dev.wiing.gossip.lib.packets.Packet; +import dev.wiing.gossip.lib.packets.RegisterPacket; +import javafx.animation.FadeTransition; +import javafx.event.ActionEvent; +import javafx.event.Event; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.TextField; +import javafx.scene.input.MouseEvent; +import javafx.scene.layout.*; +import javafx.scene.shape.Circle; +import javafx.util.Duration; + +import java.net.URL; +import java.util.ResourceBundle; + +public class LoginController implements Initializable { + + @FXML + private AnchorPane paneIcon; + + @FXML + private HBox hboxEditOverlay; + + @FXML + private TextField txtUsername; + + @Override + public void initialize(URL location, ResourceBundle resources) { + paneIcon.setBackground(new Background( + new BackgroundImage( + UserIcon.MORNING.getImage(), + BackgroundRepeat.NO_REPEAT, + BackgroundRepeat.NO_REPEAT, + BackgroundPosition.CENTER, + new BackgroundSize(100.0, 100.0, true, true, false, true) + ) + )); + + Circle circle = new Circle(paneIcon.getMinWidth() * 0.5); + paneIcon.setShape(circle); + hboxEditOverlay.setShape(circle); + } + + @FXML + public void onChangeIcon(MouseEvent event) { + + } + + @FXML + public void onLogin(ActionEvent event) { + RegisterPacket packet = new RegisterPacket(); + packet.setIconID((char)0); + packet.setUsername(txtUsername.getText()); + + Connection.getInstance().sendPacket(packet); + + Packet result = Connection.getInstance().nextPacket(); + if (result != null && result.getType() == CredentialsPacket.TYPE) { + CredentialsPacket creds = (CredentialsPacket)result; + + SecretUser user = new SecretUser(packet.getUsername(), packet.getIconID(), creds.getUID(), creds.getSecret()); + Connection.getInstance().setSelf(user); + } + } + + @FXML + public void onIconMouseEnter(Event event) { + FadeTransition ft = new FadeTransition(Duration.millis(100), hboxEditOverlay); + ft.setToValue(1.0); + ft.play(); + } + + @FXML + public void onIconMouseExit(Event event) { + FadeTransition ft = new FadeTransition(Duration.millis(100), hboxEditOverlay); + ft.setToValue(0.0); + ft.play(); + } +} diff --git a/Client/src/main/java/dev/wiing/gossip/client/data/UserIcon.java b/Client/src/main/java/dev/wiing/gossip/client/data/UserIcon.java new file mode 100644 index 0000000..fc7d2b8 --- /dev/null +++ b/Client/src/main/java/dev/wiing/gossip/client/data/UserIcon.java @@ -0,0 +1,72 @@ +package dev.wiing.gossip.client.data; + +import dev.wiing.gossip.client.Program; +import javafx.scene.image.Image; + +import java.io.IOException; +import java.net.URL; + +public class UserIcon { + + public static final UserIcon MORNING = new UserIcon("Morning", "Eggs and Bacon", 0, "icons/icon_0.png"); + public static final UserIcon VINTAGE = new UserIcon("Vintage", "Red Car", 1, "icons/icon_1.png"); + public static final UserIcon ROUTINE = new UserIcon("Routine", "Coffee Cup", 2, "icons/icon_2.png"); + public static final UserIcon SILLY = new UserIcon("Silly", "Ghost Toy", 3, "icons/icon_3.png"); + public static final UserIcon ADVENTURE = new UserIcon("Adventure", "Slide with a Plant", 4, "icons/icon_4.png"); + public static final UserIcon REBELLION = new UserIcon("Rebellion", "Potted Cactus", 5, "icons/icon_5.png"); + public static final UserIcon DIGITAL = new UserIcon("Digital", "Game Controller", 6, "icons/icon_6.png"); + public static final UserIcon MYSTERY = new UserIcon("Mystery", "Floating Sphere", 7, "icons/icon_7.png"); + public static final UserIcon VACATION = new UserIcon("Vacation", "Cat under an Umbrella", 8, "icons/icon_8.png"); + public static final UserIcon SIMPLE = new UserIcon("Simple", "Potted Succulent", 9, "icons/icon_9.png"); + + public static UserIcon[] getIcons() { + return new UserIcon[]{ + MORNING, + VINTAGE, + ROUTINE, + SILLY, + ADVENTURE, + REBELLION, + DIGITAL, + MYSTERY, + VACATION, + SIMPLE + }; + } + + private final String name; + private final String description; + private final int id; + private final URL url; + + private UserIcon(String name, String description, int id, String path) { + this.name = name; + this.description = description; + this.id = id; + this.url = Program.class.getResource(path); + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public int getId() { + return id; + } + + public URL getUrl() { + return url; + } + + public Image getImage() { + try { + return new Image(url.openStream()); + } catch (IOException e) { + return null; + } + } +} diff --git a/Client/src/main/java/module-info.java b/Client/src/main/java/module-info.java new file mode 100644 index 0000000..9736d4f --- /dev/null +++ b/Client/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module dev.wiing.gossip.client { + requires javafx.controls; + requires javafx.fxml; + requires dev.wiing.gossip.lib; + + exports dev.wiing.gossip.client; + opens dev.wiing.gossip.client to javafx.fxml; + opens dev.wiing.gossip.client.controllers to javafx.fxml; +} \ No newline at end of file diff --git a/Client/src/main/resources/dev/wiing/gossip/client/axis.ttf b/Client/src/main/resources/dev/wiing/gossip/client/axis.ttf new file mode 100644 index 0000000..d40c06d Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/axis.ttf differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/edit.png b/Client/src/main/resources/dev/wiing/gossip/client/edit.png new file mode 100644 index 0000000..d0def60 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/edit.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_0.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_0.png new file mode 100644 index 0000000..d006284 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_0.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_1.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_1.png new file mode 100644 index 0000000..f90f1d5 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_1.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_2.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_2.png new file mode 100644 index 0000000..7bfad12 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_2.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_3.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_3.png new file mode 100644 index 0000000..9d19478 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_3.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_4.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_4.png new file mode 100644 index 0000000..564d4c0 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_4.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_5.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_5.png new file mode 100644 index 0000000..1f8a374 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_5.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_6.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_6.png new file mode 100644 index 0000000..37436cf Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_6.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_7.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_7.png new file mode 100644 index 0000000..a770b3e Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_7.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_8.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_8.png new file mode 100644 index 0000000..7278fd1 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_8.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_9.png b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_9.png new file mode 100644 index 0000000..106fd37 Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/icons/icon_9.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/logo.png b/Client/src/main/resources/dev/wiing/gossip/client/logo.png new file mode 100644 index 0000000..66714ea Binary files /dev/null and b/Client/src/main/resources/dev/wiing/gossip/client/logo.png differ diff --git a/Client/src/main/resources/dev/wiing/gossip/client/scroll.css b/Client/src/main/resources/dev/wiing/gossip/client/scroll.css new file mode 100644 index 0000000..06ec3bc --- /dev/null +++ b/Client/src/main/resources/dev/wiing/gossip/client/scroll.css @@ -0,0 +1,55 @@ +.scroll-bar:horizontal .track, +.scroll-bar:vertical .track { + -fx-background-color : #111; + -fx-border-color : #111; + -fx-background-radius : 0.0em; + -fx-border-radius :2.0em; +} + +.scroll-bar .corner { + -fx-background-color : transparent; + -fx-border-color : transparent; +} + + +.scroll-bar:horizontal .increment-button , +.scroll-bar:horizontal .decrement-button { + -fx-background-color :transparent; + -fx-background-radius : 0.0em; + -fx-padding :0.0 0.0 10.0 0.0; + +} + +.scroll-bar:vertical .increment-button , +.scroll-bar:vertical .decrement-button { + -fx-background-color :transparent; + -fx-background-radius : 0.0em; + -fx-padding :0.0 10.0 0.0 0.0; + +} + + .scroll-bar .increment-arrow, + .scroll-bar .decrement-arrow{ + -fx-shape : " "; + -fx-padding :0.15em 0.0; +} + + .scroll-bar:vertical .increment-arrow, + .scroll-bar:vertical .decrement-arrow{ + -fx-shape : " "; + -fx-padding :0.0 0.15em; +} + +.scroll-bar:horizontal .thumb, +.scroll-bar:vertical .thumb { + -fx-background-color : #19191d; + -fx-background-insets : 2.0, 0.0, 0.0; + -fx-background-radius : 2.0em; +} + +.scroll-bar:horizontal .thumb:hover, +.scroll-bar:vertical .thumb:hover { + -fx-background-color : #333; + -fx-background-insets : 2.0, 0.0, 0.0; + -fx-background-radius : 2.0em; +} diff --git a/Client/src/main/resources/dev/wiing/gossip/client/styling.css b/Client/src/main/resources/dev/wiing/gossip/client/styling.css new file mode 100644 index 0000000..1545f52 --- /dev/null +++ b/Client/src/main/resources/dev/wiing/gossip/client/styling.css @@ -0,0 +1,140 @@ +@font-face { + src: url("axis.ttf"); +} + +.root { + -fx-background-color: #111; + -accent: #dd447f; + -accent-2: #fcd12c; +} + +.list { + -fx-background-color: #0000; + -fx-background-insets: 0; +} + +.list .viewport, +.pane.list.container { + -fx-background-color: #0000; + -fx-background-radius: 16px; +} + +.list.container .viewport, +.section, +.pane.list.container { + -fx-background-color: #19191d; +} + +.list.container.dim .viewport { + -fx-background-color: #111; +} + +SplitPane { + -fx-background-color: #111; +} + +SplitPane .split-pane-divider { + -fx-background-color: #19191d; + -fx-padding: 0.0 5.0 0.0 0.0; +} + +.elevated { + -fx-background-color: #25252c; +} + +.border-radius { + -fx-background-radius: 16px; +} + +.border-radius-small { + -fx-background-radius: 8px; +} + +Label, +RadioButton, +TextField { + -fx-text-fill: #fff; + -fx-fill: #fff; +} + +ChoiceBox, +TextField { + -fx-background-color: #19191d; +} + +ColorPicker { + -fx-background-color: #29292F; + -fx-padding: 4px 14px; +} + +.dark { + -fx-text-fill: #888; + -fx-fill: #888; +} + +.faint { + -fx-text-fill: #556; + -fx-fill: #556; +} + +.accent { + -fx-text-fill: -accent; +} + +Separator { + -fx-opacity: 0.1; +} + +Button { + -fx-background-color: -accent; + -fx-background-insets: 0; + -fx-text-fill: white; + -fx-padding: 4px 14px; +} + +Button.gray { + -fx-background-color: #4a4a55; +} + +Button, +.clickable { + -fx-cursor: hand; +} + +ChoiceBox { + -fx-background-insets: 0; +} + +.axis { + -fx-font-family: "AXIS Extra Bold"; +} + +Label.tag { + -fx-background-color: ladder(hsb(0, 0%, 70%), -color, #0000); + -fx-background-radius: 8px; + -fx-border-radius: 8px; + -fx-border-width: 2px; + -fx-border-color: -color; + -fx-text-fill: -color; + -fx-padding: 6px 14px; +} + +CheckBox .box { + -fx-background-color: #25252c; +} + +CheckBox .text { + -fx-fill: #888; +} + +CheckBox:selected .box { + -fx-background-color: -accent; +} + +CheckBox:selected .box .mark { + -fx-background-color: white; +} + +CheckBox:selected .text { + -fx-fill: #ccc; +} diff --git a/Client/src/main/resources/dev/wiing/gossip/client/views/login-view.fxml b/Client/src/main/resources/dev/wiing/gossip/client/views/login-view.fxml new file mode 100644 index 0000000..8d2ee5c --- /dev/null +++ b/Client/src/main/resources/dev/wiing/gossip/client/views/login-view.fxml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +