commit 563c8c3a4c08d0af4e87f7d69e657266c8ce875b Author: MrLetsplay Date: Thu Dec 7 18:39:04 2023 +0100 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4e6870b --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Julian Köglmeier/MrLetsplay2003 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..c74f3a6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,86 @@ +plugins { + id 'fabric-loom' version '1.3-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + maven { + name = "Graphite-Official" + url = 'https://maven.graphite-official.com/releases/' + } +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" + modImplementation "me.mrletsplay:MrCore-Fabric:1.2.0" + + implementation "me.mrletsplay:MrCore:4.4-SNAPSHOT" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..cc6cf5d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.22 + +# Mod Properties +mod_version=1.0.0 +maven_group=me.mrletsplay.versionspawns +archives_base_name=versionspawns + +# Dependencies +fabric_version=0.87.0+1.20.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..033e24c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9f4197d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..fcb6fca --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/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/subprojects/plugins/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##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && 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=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=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, 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. + +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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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. +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 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. + +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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/me/mrletsplay/versionspawns/Location.java b/src/main/java/me/mrletsplay/versionspawns/Location.java new file mode 100644 index 0000000..97bed80 --- /dev/null +++ b/src/main/java/me/mrletsplay/versionspawns/Location.java @@ -0,0 +1,47 @@ +package me.mrletsplay.versionspawns; + +import me.mrletsplay.mrcore.json.JSONObject; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.Vec2f; +import net.minecraft.util.math.Vec3d; + +public class Location { + + private ServerWorld world; + private Vec3d pos; + private Vec2f rot; + + public Location(ServerWorld world, Vec3d pos, Vec2f rot) { + this.world = world; + this.pos = pos; + this.rot = rot; + } + + public ServerWorld getWorld() { + return world; + } + + public Vec3d getPos() { + return pos; + } + + public Vec2f getRot() { + return rot; + } + + public JSONObject toJSON() { + JSONObject obj = new JSONObject(); + obj.put("world", VersionSpawnsMod.getWorldIdentifier(world)); + obj.put("x", pos.x); + obj.put("y", pos.y); + obj.put("z", pos.z); + obj.put("pitch", rot.x); + obj.put("yaw", rot.y); + return obj; + } + + public static Location fromJSON(JSONObject obj) { + return new Location(VersionSpawnsMod.getWorldByIdentifier(obj.getString("world")), new Vec3d(obj.getDouble("x"), obj.getDouble("y"), obj.getDouble("z")), new Vec2f(obj.getFloat("pitch"), obj.getFloat("yaw"))); + } + +} diff --git a/src/main/java/me/mrletsplay/versionspawns/VersionSpawnsMod.java b/src/main/java/me/mrletsplay/versionspawns/VersionSpawnsMod.java new file mode 100644 index 0000000..4892c6c --- /dev/null +++ b/src/main/java/me/mrletsplay/versionspawns/VersionSpawnsMod.java @@ -0,0 +1,121 @@ +package me.mrletsplay.versionspawns; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import me.mrletsplay.mrcore.json.JSONObject; +import me.mrletsplay.versionspawns.command.DelWarpCommand; +import me.mrletsplay.versionspawns.command.SetWarpCommand; +import me.mrletsplay.versionspawns.command.WarpCommand; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; + +public class VersionSpawnsMod implements ModInitializer { + + public static final Logger LOGGER = LoggerFactory.getLogger("versionspawns"); + + private static final Path WARPS_FILE = Paths.get("config/versionspawns/warps.json"); + + public static MinecraftServer server; + + private static JSONObject warps; + + @Override + public void onInitialize() { + try { + Files.createDirectories(WARPS_FILE.getParent()); + } catch (IOException e) { + LOGGER.error("Failed to create config directory", e); + return; + } + + if(loadWarps() == null) { + LOGGER.error("Failed to load warps, exiting"); + return; + } + + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> { + dispatcher.register(new WarpCommand().create()); + dispatcher.register(new SetWarpCommand().create()); + dispatcher.register(new DelWarpCommand().create()); + }); + + ServerLifecycleEvents.SERVER_STARTED.register(s -> server = s); + + LOGGER.info("VersionSpawns loaded!"); + } + + public static List getWarps() { + return new ArrayList<>(warps.keys()); + } + + private static JSONObject loadWarps() { + if(warps != null) return warps; + + try { + if(!Files.exists(WARPS_FILE)) { + Files.createFile(WARPS_FILE); + } + + String str = Files.readString(WARPS_FILE, StandardCharsets.UTF_8); + if(str.isEmpty()) str = "{}"; + return warps = new JSONObject(str); + } catch (IOException e) { + LOGGER.error("Failed to read config", e); + return null; + } + } + + private static void saveSpawns(JSONObject warps) { + try { + VersionSpawnsMod.warps = warps; + Files.write(WARPS_FILE, warps.toFancyString().getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + LOGGER.error("Failed to write config", e); + return; + } + } + + public static void setWarp(String name, Location loc) { + JSONObject spawns = loadWarps(); + spawns.set(name, loc.toJSON()); + saveSpawns(spawns); + } + + public static Location getWarp(String name) { + JSONObject warp = loadWarps().optJSONObject(name).orElse(null); + if(warp == null) return null; + return Location.fromJSON(warp); + } + + public static void deleteWarp(String name) { + JSONObject spawns = loadWarps(); + spawns.unset(name); + saveSpawns(spawns); + } + + public static String getWorldIdentifier(ServerWorld world) { + return world.getRegistryKey().getValue().getNamespace() + ":" + world.getRegistryKey().getValue().getPath(); + } + + public static ServerWorld getWorldByIdentifier(String identifier) { + String[] spl = identifier.split(":", 2); + if(spl.length != 2) throw new IllegalArgumentException("Invalid identifier"); + return server.getWorld(RegistryKey.of(RegistryKeys.WORLD, Identifier.of(spl[0], spl[1]))); + } + +} \ No newline at end of file diff --git a/src/main/java/me/mrletsplay/versionspawns/command/DelWarpCommand.java b/src/main/java/me/mrletsplay/versionspawns/command/DelWarpCommand.java new file mode 100644 index 0000000..71b1b63 --- /dev/null +++ b/src/main/java/me/mrletsplay/versionspawns/command/DelWarpCommand.java @@ -0,0 +1,52 @@ +package me.mrletsplay.versionspawns.command; + +import java.util.Collections; + +import me.mrletsplay.mrcore.command.event.CommandInvokedEvent; +import me.mrletsplay.mrcore.fabric.command.FabricCommand; +import me.mrletsplay.versionspawns.VersionSpawnsMod; +import net.minecraft.server.network.ServerPlayerEntity; + +public class DelWarpCommand extends FabricCommand { + + public DelWarpCommand() { + super("delwarp"); + + setDescription("Delete a warp"); + setUsage("/delwarp [name]"); + + getProperties().setRequires(s -> s.hasPermissionLevel(4)); + + setTabCompleter(event -> { + if(event.getArgs().length == 0) { + return VersionSpawnsMod.getWarps(); + } + + return Collections.emptyList(); + }); + } + + @Override + public void action(CommandInvokedEvent event) { + ServerPlayerEntity player = getSenderPlayer(event); + if(player == null) { + event.getSender().sendMessage("Player only!"); + return; + } + + if(event.getArguments().length != 1) { + sendCommandInfo(event.getSender()); + return; + } + + String name = event.getArguments()[0]; + if(VersionSpawnsMod.getWarp(name) == null) { + event.getSender().sendMessage("§cThat warp doesn't exist"); + return; + } + + VersionSpawnsMod.deleteWarp(name); + event.getSender().sendMessage("§aWarp §7" + name + " §adeleted"); + } + +} diff --git a/src/main/java/me/mrletsplay/versionspawns/command/SetWarpCommand.java b/src/main/java/me/mrletsplay/versionspawns/command/SetWarpCommand.java new file mode 100644 index 0000000..5e98ba3 --- /dev/null +++ b/src/main/java/me/mrletsplay/versionspawns/command/SetWarpCommand.java @@ -0,0 +1,39 @@ +package me.mrletsplay.versionspawns.command; + +import me.mrletsplay.mrcore.command.event.CommandInvokedEvent; +import me.mrletsplay.mrcore.fabric.command.FabricCommand; +import me.mrletsplay.versionspawns.Location; +import me.mrletsplay.versionspawns.VersionSpawnsMod; +import net.minecraft.server.network.ServerPlayerEntity; + +public class SetWarpCommand extends FabricCommand { + + public SetWarpCommand() { + super("setwarp"); + + setDescription("Set a warp"); + setUsage("/setwarp [name]"); + + getProperties().setRequires(s -> s.hasPermissionLevel(4)); + } + + @Override + public void action(CommandInvokedEvent event) { + ServerPlayerEntity player = getSenderPlayer(event); + if(player == null) { + event.getSender().sendMessage("Player only!"); + return; + } + + if(event.getArguments().length != 1) { + sendCommandInfo(event.getSender()); + return; + } + + String name = event.getArguments()[0]; + Location loc = new Location(player.getServerWorld(), player.getPos(), player.getRotationClient()); + VersionSpawnsMod.setWarp(name, loc); + event.getSender().sendMessage("§aWarp §7" + name + " §aset to current position"); + } + +} diff --git a/src/main/java/me/mrletsplay/versionspawns/command/WarpCommand.java b/src/main/java/me/mrletsplay/versionspawns/command/WarpCommand.java new file mode 100644 index 0000000..a27173e --- /dev/null +++ b/src/main/java/me/mrletsplay/versionspawns/command/WarpCommand.java @@ -0,0 +1,52 @@ +package me.mrletsplay.versionspawns.command; + +import java.util.Collections; + +import me.mrletsplay.mrcore.command.event.CommandInvokedEvent; +import me.mrletsplay.mrcore.fabric.command.FabricCommand; +import me.mrletsplay.versionspawns.Location; +import me.mrletsplay.versionspawns.VersionSpawnsMod; +import net.minecraft.server.network.ServerPlayerEntity; + +public class WarpCommand extends FabricCommand { + + public WarpCommand() { + super("warp"); + + setDescription("Teleport to warp"); + setUsage("/warp [name]"); + + setTabCompleter(event -> { + if(event.getArgs().length == 0) { + return VersionSpawnsMod.getWarps(); + } + + return Collections.emptyList(); + }); + } + + @Override + public void action(CommandInvokedEvent event) { + ServerPlayerEntity player = getSenderPlayer(event); + if(player == null) { + event.getSender().sendMessage("Player only!"); + return; + } + + if(event.getArguments().length != 1) { + sendCommandInfo(event.getSender()); + return; + } + + String name = event.getArguments()[0]; + Location loc = VersionSpawnsMod.getWarp(name); + if(loc == null) { + event.getSender().sendMessage("§cThat warp doesn't exist"); + return; + } + + player.teleport(loc.getWorld(), loc.getPos().x, loc.getPos().y, loc.getPos().z, loc.getRot().y, loc.getRot().x); + event.getSender().sendMessage("§aTeleported to §7" + name); + } + +} diff --git a/src/main/resources/assets/versionspawns/icon.png b/src/main/resources/assets/versionspawns/icon.png new file mode 100644 index 0000000..047b91f Binary files /dev/null and b/src/main/resources/assets/versionspawns/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..4336b8e --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,31 @@ +{ + "schemaVersion": 1, + "id": "versionspawns", + "version": "${version}", + "name": "VersionSpawns", + "description": "This is an example description! Tell everyone what your mod is about!", + "authors": [ + "MrLetsplay2003" + ], + "contact": { + "homepage": "https://fabricmc.net/", + "sources": "https://github.com/FabricMC/fabric-example-mod" + }, + "license": "MIT", + "icon": "assets/versionspawns/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "me.mrletsplay.versionspawns.VersionSpawnsMod" + ] + }, + "mixins": [], + "depends": { + "fabricloader": ">=0.14.22", + "minecraft": "~1.20", + "java": ">=17", + "fabric-api": "*", + "mrcore": "*" + }, + "suggests": {} +} \ No newline at end of file