diff --git a/gradle.properties b/gradle.properties index 478c136..6a6cce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.8 -yarn_mappings=1.21.8+build.1 -loader_version=0.16.14 +minecraft_version=1.21.9 +yarn_mappings=1.21.9+build.1 +loader_version=0.17.2 # Mod Properties - mod_version = 1.0 + mod_version = 1.1 maven_group = com.kasetoatz archives_base_name = WeatherVote # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.131.0+1.21.8 +fabric_version=0.133.14+1.21.9 diff --git a/plugin/build.gradle b/plugin/build.gradle deleted file mode 100644 index bf58ecc..0000000 --- a/plugin/build.gradle +++ /dev/null @@ -1,55 +0,0 @@ -plugins { - id 'java' - id("xyz.jpenilla.run-paper") version "2.3.1" -} - -group = 'com.kasetoatz' -version = '1.0' - -repositories { - mavenCentral() - maven { - name = "spigotmc-repo" - url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" - } -} - -dependencies { - compileOnly("org.spigotmc:spigot-api:1.21.8-R0.1-SNAPSHOT") -} - -tasks { - runServer { - // Configure the Minecraft version for our task. - // This is the only required configuration besides applying the plugin. - // Your plugin's jar (or shadowJar if present) will be used automatically. - minecraftVersion("1.21") - } -} - -def targetJavaVersion = 21 -java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - sourceCompatibility = javaVersion - targetCompatibility = javaVersion - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' - - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - options.release.set(targetJavaVersion) - } -} - -processResources { - def props = [version: version] - inputs.properties props - filteringCharset 'UTF-8' - filesMatching('plugin.yml') { - expand props - } -} diff --git a/plugin/gradle.properties b/plugin/gradle.properties deleted file mode 100644 index e69de29..0000000 diff --git a/plugin/gradle/wrapper/gradle-wrapper.jar b/plugin/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e644113..0000000 Binary files a/plugin/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/plugin/gradle/wrapper/gradle-wrapper.properties b/plugin/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a441313..0000000 --- a/plugin/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/plugin/gradlew b/plugin/gradlew deleted file mode 100644 index b740cf1..0000000 --- a/plugin/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed 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. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# 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/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -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 - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - 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. -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=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -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, 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" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/plugin/gradlew.bat b/plugin/gradlew.bat deleted file mode 100644 index 25da30d..0000000 --- a/plugin/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem 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, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@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 - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@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="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -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 - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -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 - -: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 %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 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! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/plugin/settings.gradle b/plugin/settings.gradle deleted file mode 100644 index d190866..0000000 --- a/plugin/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'WeatherVote' diff --git a/plugin/src/main/java/com/kasetoatz/weatherVote/WeatherVote.java b/plugin/src/main/java/com/kasetoatz/weatherVote/WeatherVote.java deleted file mode 100644 index e3f45ab..0000000 --- a/plugin/src/main/java/com/kasetoatz/weatherVote/WeatherVote.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.kasetoatz.weatherVote; - -import com.kasetoatz.weatherVote.votes.Votes; -import com.kasetoatz.weatherVote.weather.Weather; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.stream.Collectors; - -public final class WeatherVote extends JavaPlugin -{ - public static boolean enabled; - public static int votingPercentage; - public static String completedVoteMessage; - public static String voteMessage; - public static String disabledMessage; - public static String invalidUsage; - public static String noPlayerCommand; - private final List OPTIONS = List.of("clear", "rain", "thunder"); - - @Override - public void onEnable() - { - saveDefaultConfig(); - enabled = getConfig().getBoolean("enabled"); - votingPercentage = getConfig().getInt("voting-percentage"); - completedVoteMessage = getConfig().getString("completed-vote-message"); - voteMessage = getConfig().getString("vote-message"); - disabledMessage = getConfig().getString("disabled-message"); - invalidUsage = getConfig().getString("invalid-usage"); - noPlayerCommand = getConfig().getString("non-player-command"); - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, Command command, @NotNull String label, @NotNull String[] args) - { - if (command.getName().equalsIgnoreCase("weathervote")) - { - if (!(sender instanceof Player player)) - { - sender.sendMessage(noPlayerCommand); - return true; - } - if (args.length == 0) - { - sender.sendMessage(invalidUsage); - return true; - } - - switch (args[0].toLowerCase()) - { - case "clear": - Weather.update(Votes.voteClear(player)); - break; - case "rain": - Weather.update(Votes.voteRain(player)); - break; - case "thunder": - Weather.update(Votes.voteThunder(player)); - break; - default: - sender.sendMessage(invalidUsage); - break; - } - return true; - } - return false; - } - - @Override - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) - { - if (command.getName().equalsIgnoreCase("weathervote")) - { - if (args.length == 1) - { - String partial = args[0].toLowerCase(); - return OPTIONS.stream().filter(opt -> opt.startsWith(partial)).collect(Collectors.toList()); - } - return List.of(); - } - return null; - } -} diff --git a/plugin/src/main/java/com/kasetoatz/weatherVote/enums/WeatherType.java b/plugin/src/main/java/com/kasetoatz/weatherVote/enums/WeatherType.java deleted file mode 100644 index f9e018d..0000000 --- a/plugin/src/main/java/com/kasetoatz/weatherVote/enums/WeatherType.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.kasetoatz.weatherVote.enums; - -public enum WeatherType -{ - CLEAR, - RAIN, - THUNDER -} \ No newline at end of file diff --git a/plugin/src/main/java/com/kasetoatz/weatherVote/votes/VoteResponse.java b/plugin/src/main/java/com/kasetoatz/weatherVote/votes/VoteResponse.java deleted file mode 100644 index c4fd1e2..0000000 --- a/plugin/src/main/java/com/kasetoatz/weatherVote/votes/VoteResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.kasetoatz.weatherVote.votes; - -import com.kasetoatz.weatherVote.enums.WeatherType; -import org.bukkit.entity.Player; - -public class VoteResponse -{ - private final Player source; - private final WeatherType weather; - private final boolean votePassed; - - public VoteResponse(Player source, WeatherType weather, boolean votePassed) - { - this.source = source; - this.weather = weather; - this.votePassed = votePassed; - } - - public Player getSource() - { - return source; - } - - public WeatherType getWeather() - { - return weather; - } - - public boolean hasVotePassed() - { - return votePassed; - } -} diff --git a/plugin/src/main/java/com/kasetoatz/weatherVote/votes/Votes.java b/plugin/src/main/java/com/kasetoatz/weatherVote/votes/Votes.java deleted file mode 100644 index f707d4b..0000000 --- a/plugin/src/main/java/com/kasetoatz/weatherVote/votes/Votes.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.kasetoatz.weatherVote.votes; - -import com.kasetoatz.weatherVote.WeatherVote; -import com.kasetoatz.weatherVote.enums.WeatherType; -import org.bukkit.Server; -import org.bukkit.entity.Player; - -import java.util.HashSet; -import java.util.UUID; - -public class Votes -{ - private static final HashSet clearVotes = new HashSet<>(); - private static final HashSet rainVotes = new HashSet<>(); - private static final HashSet thunderVotes = new HashSet<>(); - - private static void removeVote(UUID player) - { - clearVotes.remove(player); - rainVotes.remove(player); - thunderVotes.remove(player); - } - - public static VoteResponse voteClear(Player player) - { - UUID id = player.getUniqueId(); - removeVote(id); - clearVotes.add(id); - return new VoteResponse(player, WeatherType.CLEAR, clearVotes.size() >= requiredVotes(player.getServer())); - } - - public static int clearSize() - { - return clearVotes.size(); - } - - public static VoteResponse voteRain(Player player) - { - UUID id = player.getUniqueId(); - removeVote(id); - rainVotes.add(id); - return new VoteResponse(player, WeatherType.RAIN, rainVotes.size() >= requiredVotes(player.getServer())); - } - - public static int rainSize() - { - return rainVotes.size(); - } - - public static VoteResponse voteThunder(Player player) - { - UUID id = player.getUniqueId(); - removeVote(id); - thunderVotes.add(id); - return new VoteResponse(player, WeatherType.THUNDER, thunderVotes.size() >= requiredVotes(player.getServer())); - } - - public static int thunderSize() - { - return thunderVotes.size(); - } - - public static void removeVotes() - { - clearVotes.clear(); - rainVotes.clear(); - thunderVotes.clear(); - } - - public static int requiredVotes(Server server) - { - return Math.round((float)server.getOnlinePlayers().size() / (100.f / WeatherVote.votingPercentage)); - } -} diff --git a/plugin/src/main/java/com/kasetoatz/weatherVote/weather/Weather.java b/plugin/src/main/java/com/kasetoatz/weatherVote/weather/Weather.java deleted file mode 100644 index 44cba6d..0000000 --- a/plugin/src/main/java/com/kasetoatz/weatherVote/weather/Weather.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.kasetoatz.weatherVote.weather; - -import com.kasetoatz.weatherVote.WeatherVote; -import com.kasetoatz.weatherVote.enums.WeatherType; -import com.kasetoatz.weatherVote.votes.VoteResponse; -import com.kasetoatz.weatherVote.votes.Votes; -import org.bukkit.entity.Player; - -public class Weather -{ - public static void update(VoteResponse vote) - { - if (!WeatherVote.enabled) - { - vote.getSource().sendMessage(WeatherVote.disabledMessage); - } - else if (vote.hasVotePassed()) - { - Votes.removeVotes(); - setWeather(vote.getSource(), vote.getWeather()); - } - else - { - incompleteVote(vote.getSource(), vote.getWeather()); - } - } - - private static void setWeather(Player player, WeatherType weather) - { - switch (weather) - { - case CLEAR: - broadcastVote(player, "clear", -1); - player.getWorld().setStorm(false); - player.getWorld().setThundering(false); - player.getWorld().setWeatherDuration(6000); - break; - case RAIN: - broadcastVote(player, "rain", -1); - player.getWorld().setStorm(true); - player.getWorld().setThundering(false); - player.getWorld().setWeatherDuration(6000); - break; - case THUNDER: - broadcastVote(player, "thunder", -1); - player.getWorld().setStorm(true); - player.getWorld().setThundering(true); - player.getWorld().setWeatherDuration(6000); - player.getWorld().setThunderDuration(6000); - } - } - - private static void incompleteVote(Player player, WeatherType weather) - { - switch (weather) - { - case CLEAR: - broadcastVote(player, "clear weather", Votes.clearSize()); - break; - case RAIN: - broadcastVote(player, "rain", Votes.rainSize()); - break; - case THUNDER: - broadcastVote(player, "thunder", Votes.thunderSize()); - break; - } - } - - private static void broadcastVote(Player player, String weather, int votes) - { - String message = (votes == -1) ? WeatherVote.completedVoteMessage : WeatherVote.voteMessage; - message = message.replace("$name", player.getName()); - message = message.replace("$weather", weather); - message = message.replace("current", String.valueOf(votes)); - message = message.replace("$required", String.valueOf(Votes.requiredVotes(player.getServer()))); - String finalMessage = message; - player.getServer().getOnlinePlayers().forEach(p -> p.sendMessage(finalMessage)); - } -} diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml deleted file mode 100644 index 4e5df62..0000000 --- a/plugin/src/main/resources/config.yml +++ /dev/null @@ -1,7 +0,0 @@ -enabled: true -voting-percentage: 50 -completed-vote-message: "§2[WeatherVote]§r Voting passed. Changing weather to $weather" -vote-message: "§2[WeatherVote]§r $name voted for $weather. ($current/$required) required votes." -disabled-message: "§cVoting is currently disabled." -invalid-usage: "§cUsage: /weathervote " -non-player-command: "§cOnly players can run this command." \ No newline at end of file diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml deleted file mode 100644 index 9ba1a20..0000000 --- a/plugin/src/main/resources/plugin.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: WeatherVote -version: '1.0' -main: com.kasetoatz.weatherVote.WeatherVote -api-version: '1.21' -commands: - weathervote: - description: "Vote for weather changes" - usage: "/weathervote " \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 24e2c1f..38ae227 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,9 +5,7 @@ "name": "WeatherVote", "description": "", "authors": [], - "contact": { - "repo": "https://github.com/KaseToatz1337/NoExplosionGrief" - }, + "contact": {}, "license": "MIT", "environment": "*", "entrypoints": {