commit 013b4d1ddece3c4c46598a58984c3f81ec097286 Author: dragontamerfred Date: Wed Oct 2 14:59:00 2019 +0200 Initial commit. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6e9a8c9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ + Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# intelij config files +.idea + + + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..df8493e --- /dev/null +++ b/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'java' + +group = pluginGroup +version = pluginVersion + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +repositories { + mavenCentral() + maven { + name = 'spigotmc-repo' + url = 'https://hub.spigotmc.org/nexus/content/groups/public/' + } + maven { + name = 'sonatype' + url = 'https://oss.sonatype.org/content/groups/public/' + } +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' + compile 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT' +} + +import org.apache.tools.ant.filters.ReplaceTokens + +processResources { + from(sourceSets.main.resources.srcDirs) { + filter ReplaceTokens, tokens: [version: version] + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f6446db --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +pluginGroup=nl.kallestruik +pluginVersion=1.0 diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +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 +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/src/main/java/nl/kallestruik/vanillatweaks/Commands/CommandToggletrample.java b/src/main/java/nl/kallestruik/vanillatweaks/Commands/CommandToggletrample.java new file mode 100644 index 0000000..bf7225d --- /dev/null +++ b/src/main/java/nl/kallestruik/vanillatweaks/Commands/CommandToggletrample.java @@ -0,0 +1,29 @@ +package nl.kallestruik.vanillatweaks.Commands; + +import nl.kallestruik.vanillatweaks.Handlers.TrampleHandler; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class CommandToggletrample implements CommandExecutor { + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (!(sender instanceof Player)) { + sender.sendMessage("This command can only be used by players!"); + return true; + } + + Player player = (Player) sender; + + if (TrampleHandler.trampleEnabled.remove(player.getUniqueId())) { + player.sendMessage(ChatColor.translateAlternateColorCodes('&', "&2Crop Trampling: &2&lEnabled")); + } else { + TrampleHandler.trampleEnabled.add(player.getUniqueId()); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', "&2Crop Trampling: &4&lDisabled")); + } + return true; + } +} \ No newline at end of file diff --git a/src/main/java/nl/kallestruik/vanillatweaks/Handlers/TrampleHandler.java b/src/main/java/nl/kallestruik/vanillatweaks/Handlers/TrampleHandler.java new file mode 100644 index 0000000..e5ecfbc --- /dev/null +++ b/src/main/java/nl/kallestruik/vanillatweaks/Handlers/TrampleHandler.java @@ -0,0 +1,74 @@ +package nl.kallestruik.vanillatweaks.Handlers; + +import org.bukkit.Material; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.IronGolem; +import org.bukkit.entity.Player; +import org.bukkit.entity.Villager; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityChangeBlockEvent; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.UUID; + +public class TrampleHandler implements Listener { + + public static HashSet trampleEnabled = new HashSet<>(); + + @EventHandler + public void onBlockBreak(EntityChangeBlockEvent event) { + if (event.getBlock().getType() != Material.FARMLAND) + return; + + if (event.getEntity() instanceof Villager) { + event.setCancelled(true); + return; + } + + if (event.getEntity() instanceof IronGolem) { + event.setCancelled(true); + return; + } + + if (!(event.getEntity() instanceof Player)) + return; + + if (trampleEnabled.contains(event.getEntity().getUniqueId())) + event.setCancelled(true); + } + + public static void loadTrampleEnabled(File file) throws IOException, InvalidConfigurationException { + file.getParentFile().mkdirs(); + file.createNewFile(); + + YamlConfiguration config = new YamlConfiguration(); + config.load(file); + + for (String item : config.getStringList("enabled")) + trampleEnabled.add(UUID.fromString(item)); + + } + + public static void saveTrampleEnabled(File file) throws IOException, InvalidConfigurationException { + file.getParentFile().mkdirs(); + file.createNewFile(); + + YamlConfiguration config = new YamlConfiguration(); + config.load(file); + + List list = new ArrayList<>(); + for (UUID entry : trampleEnabled) + list.add(entry.toString()); + + config.set("enabled", list); + + config.save(file); + + } +} \ No newline at end of file diff --git a/src/main/java/nl/kallestruik/vanillatweaks/VanillaTweaks.java b/src/main/java/nl/kallestruik/vanillatweaks/VanillaTweaks.java new file mode 100644 index 0000000..6c779c4 --- /dev/null +++ b/src/main/java/nl/kallestruik/vanillatweaks/VanillaTweaks.java @@ -0,0 +1,79 @@ +package nl.kallestruik.vanillatweaks; + +import nl.kallestruik.vanillatweaks.Commands.CommandToggletrample; +import nl.kallestruik.vanillatweaks.Handlers.TrampleHandler; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.plugin.java.JavaPlugin; + +import java.io.*; + +public final class VanillaTweaks extends JavaPlugin { + + @Override + public void onEnable() { + try { + // Config loading + config.load(new File(this.getDataFolder(), c.CONFIG_FILE_NAME)); + + /** + * Toggle trample + * + * Enable/disable your ability to trample crops with a simple command. Also stops villagers and iron golems + * from trampling your crops. + */ + TrampleHandler.loadTrampleEnabled(new File(this.getDataFolder(), c.TRAMPLE_ENABLED_FILE_NAME)); + getServer().getPluginCommand("toggletrample").setExecutor(new CommandToggletrample()); + getServer().getPluginManager().registerEvents(new TrampleHandler(), this); + + /** + * Crafting + * + * Add some extra crafting recipes to the game. Examples: 8 logs -> 4 chests, 1 wool -> 4 string, + * 8 stairs instead of 6, 2 paper + 1 iron -> name tag. + */ + + /** + * Dynamite + * + * Throwable tnt with a smaller explosion. + */ + + /** + * Seed drop planting + * + * Seeds dropped on tilled soil will plant themselves after a random amount of time. + */ + + /** + * Sign editing + * + * Shift right-click on a sign to edit it. + */ + + /** + * Armour stand swap + * + * Shift right-click on armour stand to swap armour with it. + */ + + /** + * Sponges in nether dry instantly + * + * Kind of what is says. + */ + + + } catch (IOException | InvalidConfigurationException | NullPointerException e) { + util.printException(e); + } + } + + @Override + public void onDisable() { + try { + TrampleHandler.saveTrampleEnabled(new File(this.getDataFolder(), c.TRAMPLE_ENABLED_FILE_NAME)); + } catch (IOException | InvalidConfigurationException | NullPointerException e) { + util.printException(e); + } + } +} diff --git a/src/main/java/nl/kallestruik/vanillatweaks/c.java b/src/main/java/nl/kallestruik/vanillatweaks/c.java new file mode 100644 index 0000000..baba27b --- /dev/null +++ b/src/main/java/nl/kallestruik/vanillatweaks/c.java @@ -0,0 +1,6 @@ +package nl.kallestruik.vanillatweaks; + +public class c { + public static final String CONFIG_FILE_NAME = "config.yml"; + public static String TRAMPLE_ENABLED_FILE_NAME = "tramplestore.yml"; +} \ No newline at end of file diff --git a/src/main/java/nl/kallestruik/vanillatweaks/config.java b/src/main/java/nl/kallestruik/vanillatweaks/config.java new file mode 100644 index 0000000..528cd1d --- /dev/null +++ b/src/main/java/nl/kallestruik/vanillatweaks/config.java @@ -0,0 +1,24 @@ +package nl.kallestruik.vanillatweaks; + +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; + +import java.io.File; +import java.io.IOException; + +public class config { + + public static boolean TOGGLE_TRAMPLE_ENABLED; + + public static void load(File file) throws IOException, InvalidConfigurationException { + if (!file.getParentFile().exists()) + file.getParentFile().mkdirs(); + if (!file.exists()) + util.ExportResource(c.CONFIG_FILE_NAME, file); + YamlConfiguration config = new YamlConfiguration(); + config.load(file); + + TOGGLE_TRAMPLE_ENABLED = config.getBoolean("toggle-trample.enabled"); + + } +} diff --git a/src/main/java/nl/kallestruik/vanillatweaks/util.java b/src/main/java/nl/kallestruik/vanillatweaks/util.java new file mode 100644 index 0000000..597dd9f --- /dev/null +++ b/src/main/java/nl/kallestruik/vanillatweaks/util.java @@ -0,0 +1,32 @@ +package nl.kallestruik.vanillatweaks; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; + +public class util { + + public static void printException(Exception e) { + System.err.println("-------------------------------------------------------------------------------------"); + System.err.println("An error seems to have occurred. A detailed stacktrace of the error is printed below."); + System.err.println("-------------------------------------------------------------------------------------"); + e.printStackTrace(); + } + + public static void ExportResource(String resourceName, File output) { + try (InputStream stream = VanillaTweaks.class.getResourceAsStream(resourceName); OutputStream resStreamOut = new FileOutputStream(output)) { + if (stream == null) { + throw new Exception("Cannot get resource \"" + resourceName + "\" from Jar file."); + } + + int readBytes; + byte[] buffer = new byte[4096]; + while ((readBytes = stream.read(buffer)) > 0) { + resStreamOut.write(buffer, 0, readBytes); + } + } catch (Exception ex) { + util.printException(ex); + } + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..ec7287e --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,2 @@ +toggle-trample: + enabled: true \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..e3f384b --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,6 @@ +name: VanillaTweaks +version: @version@ +main: nl.kallestruik.vanillatweaks.VanillaTweaks +api-version: 1.13 +commands: + toggeltrample: