diff --git a/common/build.gradle b/common/build.gradle index e69de29..5c33cdd 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'java' + +group = "com.therainbowville.minegasm" +version = "0.1.0" + +repositories { + mavenCentral() +} + +dependencies { + implementation 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105' +} \ No newline at end of file diff --git a/common/gradle.properties b/common/gradle.properties index b42a06d..8b961b9 100644 --- a/common/gradle.properties +++ b/common/gradle.properties @@ -11,7 +11,7 @@ mod_name=Minegasm # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GNU Affero General Public License v3.0 # The mod version. See https://semver.org/ -mod_version=0.4.0 +mod_version=0.6.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/common/gradle/wrapper/gradle-wrapper.jar b/common/gradle/wrapper/gradle-wrapper.jar index c1962a7..2c35211 100644 Binary files a/common/gradle/wrapper/gradle-wrapper.jar and b/common/gradle/wrapper/gradle-wrapper.jar differ diff --git a/common/gradle/wrapper/gradle-wrapper.properties b/common/gradle/wrapper/gradle-wrapper.properties index 17a8ddc..09523c0 100644 --- a/common/gradle/wrapper/gradle-wrapper.properties +++ b/common/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/common/gradlew b/common/gradlew old mode 100644 new mode 100755 index aeb74cb..f5feea6 --- a/common/gradlew +++ b/common/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/common/gradlew.bat b/common/gradlew.bat index 93e3f59..9d21a21 100644 --- a/common/gradlew.bat +++ b/common/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/common/settings.gradle b/common/settings.gradle index c4f2d6f..c2740da 100644 --- a/common/settings.gradle +++ b/common/settings.gradle @@ -8,4 +8,4 @@ pluginManagement { } } -rootProject.name = 'minegasm-common' +rootProject.name = 'common' diff --git a/common/src/main/java/com/therainbowville/minegasm/core/EventProcessor.java b/common/src/main/java/com/therainbowville/minegasm/core/EventProcessor.java new file mode 100644 index 0000000..559f9ce --- /dev/null +++ b/common/src/main/java/com/therainbowville/minegasm/core/EventProcessor.java @@ -0,0 +1,36 @@ +package com.therainbowville.minegasm.core; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class EventProcessor { + private static final Map activeEvents = new ConcurrentHashMap<>(); + + public void startEvent(String playerName, String eventType, int duration, int intensity) { + activeEvents.put(playerName, new EventData(eventType, duration, intensity)); + } + + public void processEvents() { + activeEvents.forEach((playerName, eventData) -> { + if (eventData.duration > 0) { + // TODO: Implement event processing logic + + eventData.duration--; + } else { + activeEvents.remove(playerName); + } + }); + } + + private static class EventData { + private final String eventType; + private int duration; + private int intensity; + + public EventData(String eventType, int duration, int intensity) { + this.eventType = eventType; + this.duration = duration; + this.intensity = intensity; + } + } +} \ No newline at end of file diff --git a/neoforge/ng-7.0/1.21/build.gradle b/neoforge/ng-7.0/1.21/build.gradle index 9d0fd92..ae817ce 100644 --- a/neoforge/ng-7.0/1.21/build.gradle +++ b/neoforge/ng-7.0/1.21/build.gradle @@ -103,6 +103,8 @@ dependencies { implementation "net.neoforged:neoforge:${neo_version}" implementation 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105' + implementation 'com.therainbowville.minegasm:common:0.1.0' + // Example optional mod dependency with JEI // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" diff --git a/neoforge/ng-7.0/settings.gradle b/neoforge/ng-7.0/settings.gradle index c099974..f729c40 100644 --- a/neoforge/ng-7.0/settings.gradle +++ b/neoforge/ng-7.0/settings.gradle @@ -15,4 +15,6 @@ rootDir.eachDir { dir -> if (dir.name.startsWith('1.')) { include ":${dir.name}" } -} \ No newline at end of file +} + +includeBuild '../../common' \ No newline at end of file