diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9563893d --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..0a041280 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/README.md b/README.md index 940b87e3..85614794 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ -# fabric-carpet -Carpets are made of fabric +# Fabric Carpet + +Cause all carpets are made of fabric? diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..f7c0c66e --- /dev/null +++ b/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'fabric-loom' version '0.2.2-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}" + modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modCompile "net.fabricmc:fabric:${project.fabric_version}" + + // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. + // You may need to force-disable transitiveness on them. +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(jar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..47b943f2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.14.1 Pre-Release 2 + yarn_mappings=1.14.1 Pre-Release 2+build.1 + loader_version=0.4.6+build.143 + +# Mod Properties + mod_version = 1.0.0 + maven_group = carpet + archives_base_name = fabric-carpet + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric + fabric_version=0.2.7+build.127 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..29953ea1 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 00000000..290541c7 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /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 00000000..f9553162 --- /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/settings.gradle b/settings.gradle new file mode 100644 index 00000000..5b60df3d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java new file mode 100644 index 00000000..dd1dab93 --- /dev/null +++ b/src/main/java/carpet/CarpetServer.java @@ -0,0 +1,69 @@ +package carpet; + +//import carpet.commands.CameraModeCommand; +//import carpet.commands.CarpetCommand; +//import carpet.commands.CounterCommand; +//import carpet.commands.DistanceCommand; +//import carpet.commands.DrawCommand; +//import carpet.commands.ScriptCommand; +//import carpet.commands.InfoCommand; +//import carpet.commands.LogCommand; +//import carpet.commands.PerimeterInfoCommand; +//import carpet.commands.PlayerCommand; +//import carpet.commands.SpawnCommand; +import carpet.commands.TestCommand; +//import carpet.commands.TickCommand; +//import carpet.logging.LoggerRegistry; +//import carpet.script.ExpressionInspector; +//import carpet.utils.HUDController; + +import java.util.Random; + +//import carpet.helpers.TickSpeed; +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.MinecraftServer; + +public class CarpetServer // static for now - easier to handle all around the code, its one anyways +{ + public static final Random rand = new Random((int)((2>>16)*Math.random())); + public static MinecraftServer minecraft_server; + public static void init(MinecraftServer server) //aka constructor of this static singleton class + { + CarpetServer.minecraft_server = server; + } + public static void onServerLoaded(MinecraftServer server) + { + //CarpetSettings.apply_settings_from_conf(server); + //ExpressionInspector.CarpetExpression_resetExpressionEngine(); + } + // Separate from onServerLoaded, because a server can be loaded multiple times in singleplayer + public static void onGameStarted() { + //LoggerRegistry.initLoggers(); + } + + public static void tick(MinecraftServer server) + { + //TickSpeed.tick(server); + //HUDController.update_hud(server); + } + + public static void registerCarpetCommands(CommandDispatcher dispatcher) + { + //CarpetCommand.register(dispatcher); + //TickCommand.register(dispatcher); + //CounterCommand.register(dispatcher); + //LogCommand.register(dispatcher); + //SpawnCommand.register(dispatcher); + //PlayerCommand.register(dispatcher); + //CameraModeCommand.register(dispatcher); + //InfoCommand.register(dispatcher); + //DistanceCommand.register(dispatcher); + //PerimeterInfoCommand.register(dispatcher); + //DrawCommand.register(dispatcher); + //ScriptCommand.register(dispatcher); + + TestCommand.register(dispatcher); + } +} + diff --git a/src/main/java/carpet/commands/TestCommand.java b/src/main/java/carpet/commands/TestCommand.java new file mode 100644 index 00000000..39a94086 --- /dev/null +++ b/src/main/java/carpet/commands/TestCommand.java @@ -0,0 +1,29 @@ +package carpet.commands; + +import carpet.utils.Messenger; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.server.command.ServerCommandSource; + +import static com.mojang.brigadier.arguments.StringArgumentType.getString; +import static com.mojang.brigadier.arguments.StringArgumentType.word; +import static net.minecraft.server.command.CommandManager.argument; +import static net.minecraft.server.command.CommandManager.literal; + +public class TestCommand +{ + public static void register(CommandDispatcher dispatcher) + { + dispatcher.register(literal("test"). + then(argument("first",word()). + executes( (c)-> test(c, getString(c, "first")+" 1"))). + then(argument("second", word()). + executes( (c)-> test(c, getString(c, "second")+" 2")))); + } + + private static int test(CommandContext c, String term) + { + Messenger.m(c.getSource(),"w term is: ",term.substring(0,1)+"b "+term); + return 1; + } +} diff --git a/src/main/java/carpet/mixins/CommandManagerMixin.java b/src/main/java/carpet/mixins/CommandManagerMixin.java new file mode 100644 index 00000000..7f1262e9 --- /dev/null +++ b/src/main/java/carpet/mixins/CommandManagerMixin.java @@ -0,0 +1,27 @@ +package carpet.mixins; + +import carpet.CarpetServer; +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +@Mixin(CommandManager.class) +public abstract class CommandManagerMixin +{ + + @Shadow + @Final + private CommandDispatcher dispatcher; + + @Inject(method = "", at = @At("RETURN")) + private void onRegister(boolean boolean_1, CallbackInfo ci) { + CarpetServer.registerCarpetCommands(this.dispatcher); + } +} \ No newline at end of file diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java new file mode 100644 index 00000000..509933a3 --- /dev/null +++ b/src/main/java/carpet/utils/Messenger.java @@ -0,0 +1,299 @@ +package carpet.utils; + +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.entity.EntityCategory; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.ChatFormat; +import net.minecraft.network.chat.BaseComponent; +import net.minecraft.server.MinecraftServer; +import net.minecraft.network.chat.ClickEvent;// text.event.ClickEvent; +import net.minecraft.network.chat.HoverEvent;// text.event.HoverEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class Messenger +{ + public static final Logger LOG = LogManager.getLogger(); + + /* + messsage: "desc me ssa ge" + desc contains: + i = italic + s = strikethrough + u = underline + b = bold + o = obfuscated + + w = white + y = yellow + m = magenta (light purple) + r = red + c = cyan (aqua) + l = lime (green) + t = light blue (blue) + f = dark gray + g = gray + d = gold + p = dark purple (purple) + n = dark red (brown) + q = dark aqua + e = dark green + v = dark blue (navy) + k = black + + / = action added to the previous component + */ + + private static BaseComponent _applyStyleToTextComponent(BaseComponent comp, String style) + { + //could be rewritten to be more efficient + comp.getStyle().setItalic(style.indexOf('i')>=0); + comp.getStyle().setStrikethrough(style.indexOf('s')>=0); + comp.getStyle().setUnderline(style.indexOf('u')>=0); + comp.getStyle().setBold(style.indexOf('b')>=0); + comp.getStyle().setObfuscated(style.indexOf('o')>=0); + comp.getStyle().setColor(ChatFormat.WHITE); + if (style.indexOf('w')>=0) comp.getStyle().setColor(ChatFormat.WHITE); // not needed + if (style.indexOf('y')>=0) comp.getStyle().setColor(ChatFormat.YELLOW); + if (style.indexOf('m')>=0) comp.getStyle().setColor(ChatFormat.LIGHT_PURPLE); + if (style.indexOf('r')>=0) comp.getStyle().setColor(ChatFormat.RED); + if (style.indexOf('c')>=0) comp.getStyle().setColor(ChatFormat.AQUA); + if (style.indexOf('l')>=0) comp.getStyle().setColor(ChatFormat.GREEN); + if (style.indexOf('t')>=0) comp.getStyle().setColor(ChatFormat.BLUE); + if (style.indexOf('f')>=0) comp.getStyle().setColor(ChatFormat.DARK_GRAY); + if (style.indexOf('g')>=0) comp.getStyle().setColor(ChatFormat.GRAY); + if (style.indexOf('d')>=0) comp.getStyle().setColor(ChatFormat.GOLD); + if (style.indexOf('p')>=0) comp.getStyle().setColor(ChatFormat.DARK_PURPLE); + if (style.indexOf('n')>=0) comp.getStyle().setColor(ChatFormat.DARK_RED); + if (style.indexOf('q')>=0) comp.getStyle().setColor(ChatFormat.DARK_AQUA); + if (style.indexOf('e')>=0) comp.getStyle().setColor(ChatFormat.DARK_GREEN); + if (style.indexOf('v')>=0) comp.getStyle().setColor(ChatFormat.DARK_BLUE); + if (style.indexOf('k')>=0) comp.getStyle().setColor(ChatFormat.BLACK); + return comp; + } + public static String heatmap_color(double actual, double reference) + { + String color = "e"; + if (actual > 0.5D*reference) color = "y"; + if (actual > 0.8D*reference) color = "r"; + if (actual > reference) color = "m"; + return color; + } + public static String creatureTypeColor(EntityCategory type) + { + switch (type) + { + case MONSTER: + return "n"; + case CREATURE: + return "e"; + case AMBIENT: + return "f"; + case WATER_CREATURE: + return "v"; + } + return "w"; + } + + private static BaseComponent _getChatComponentFromDesc(String message, BaseComponent previous_message) + { + if (message.equalsIgnoreCase("")) + { + return new TextComponent(""); + } + String parts[] = message.split("\\s", 2); + String desc = parts[0]; + String str = ""; + if (parts.length > 1) str = parts[1]; + if (desc.charAt(0) == '/') // deprecated + { + if (previous_message != null) + previous_message.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, message)); + return previous_message; + } + if (desc.charAt(0) == '?') + { + if (previous_message != null) + previous_message.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, message.substring(1))); + return previous_message; + } + if (desc.charAt(0) == '!') + { + if (previous_message != null) + previous_message.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, message.substring(1))); + return previous_message; + } + if (desc.charAt(0) == '^') + { + if (previous_message != null) + previous_message.getStyle().setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, c(message.substring(1)))); + return previous_message; + } + BaseComponent txt = new TextComponent(str); + return _applyStyleToTextComponent(txt, desc); + } + public static BaseComponent tp(String desc, Vec3d pos) { return tp(desc, pos.x, pos.y, pos.z); } + public static BaseComponent tp(String desc, BlockPos pos) { return tp(desc, pos.getX(), pos.getY(), pos.getZ()); } + public static BaseComponent tp(String desc, double x, double y, double z) { return tp(desc, (float)x, (float)y, (float)z);} + public static BaseComponent tp(String desc, float x, float y, float z) + { + return _getCoordsTextComponent(desc, x, y, z, false); + } + public static BaseComponent tp(String desc, int x, int y, int z) + { + return _getCoordsTextComponent(desc, (float)x, (float)y, (float)z, true); + } + + /// to be continued + public static BaseComponent dbl(String style, double double_value) + { + return c(String.format("%s %.1f",style,double_value),String.format("^w %f",double_value)); + } + public static BaseComponent dbls(String style, double ... doubles) + { + StringBuilder str = new StringBuilder(style + " [ "); + String prefix = ""; + for (double dbl : doubles) + { + str.append(String.format("%s%.1f", prefix, dbl)); + prefix = ", "; + } + str.append(" ]"); + return c(str.toString()); + } + public static BaseComponent dblf(String style, double ... doubles) + { + StringBuilder str = new StringBuilder(style + " [ "); + String prefix = ""; + for (double dbl : doubles) + { + str.append(String.format("%s%f", prefix, dbl)); + prefix = ", "; + } + str.append(" ]"); + return c(str.toString()); + } + public static BaseComponent dblt(String style, double ... doubles) + { + List components = new ArrayList<>(); + components.add(style+" [ "); + String prefix = ""; + for (double dbl:doubles) + { + + components.add(String.format("%s %s%.1f",style, prefix, dbl)); + components.add("?"+dbl); + components.add("^w "+dbl); + prefix = ", "; + } + //components.remove(components.size()-1); + components.add(style+" ]"); + return c(components.toArray(new Object[0])); + } + + private static BaseComponent _getCoordsTextComponent(String style, float x, float y, float z, boolean isInt) + { + String text; + String command; + if (isInt) + { + text = String.format("%s [ %d, %d, %d ]",style, (int)x,(int)y, (int)z ); + command = String.format("!/tp %d %d %d",(int)x,(int)y, (int)z); + } + else + { + text = String.format("%s [ %.1f, %.1f, %.1f]",style, x, y, z); + command = String.format("!/tp %.3f %.3f %.3f",x, y, z); + } + return c(text, command); + } + + //message source + public static void m(ServerCommandSource source, Object ... fields) + { + source. sendFeedback(Messenger.c(fields),true); + } + public static void m(PlayerEntity player, Object ... fields) + { + player.sendMessage(Messenger.c(fields)); + } + + /* + composes single line, multicomponent message, and returns as one chat messagge + */ + public static BaseComponent c(Object ... fields) + { + BaseComponent message = new TextComponent(""); + BaseComponent previous_component = null; + for (Object o: fields) + { + if (o instanceof BaseComponent) + { + message.append((BaseComponent)o); + previous_component = (BaseComponent)o; + continue; + } + String txt = o.toString(); + BaseComponent comp = _getChatComponentFromDesc(txt,previous_component); + if (comp != previous_component) message.append(comp); + previous_component = comp; + } + return message; + } + + //simple text + + public static BaseComponent s(String text) + { + return s(text,""); + } + public static BaseComponent s(String text, String style) + { + BaseComponent message = new TextComponent(text); + _applyStyleToTextComponent(message, style); + return message; + } + + + + + public static void send(PlayerEntity player, Collection lines) + { + lines.forEach(player::sendMessage); + } + public static void send(ServerCommandSource source, Collection lines) + { + lines.stream().forEachOrdered((s) -> source.sendFeedback(s, false)); + } + + + public static void print_server_message(MinecraftServer server, String message) + { + if (server == null) + LOG.error("Message not delivered: "+message); + server.sendMessage(new TextComponent(message)); + BaseComponent txt = c("gi "+message); + for (PlayerEntity entityplayer : server.getPlayerManager().getPlayerList()) + { + entityplayer.sendMessage(txt); + } + } + public static void print_server_message(MinecraftServer server, BaseComponent message) + { + if (server == null) + LOG.error("Message not delivered: "+message.getString()); + server.sendMessage(message); + for (PlayerEntity entityplayer : server.getPlayerManager().getPlayerList()) + { + entityplayer.sendMessage(message); + } + } +} + diff --git a/src/main/java/net/fabricmc/example/ExampleMod.java b/src/main/java/net/fabricmc/example/ExampleMod.java new file mode 100644 index 00000000..e5ed082e --- /dev/null +++ b/src/main/java/net/fabricmc/example/ExampleMod.java @@ -0,0 +1,14 @@ +package net.fabricmc.example; + +import net.fabricmc.api.ModInitializer; + +public class ExampleMod implements ModInitializer { + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + System.out.println("Hello Fabric world!"); + } +} diff --git a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java b/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java new file mode 100644 index 00000000..0fc8f682 --- /dev/null +++ b/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package net.fabricmc.example.mixin; + +import net.minecraft.client.MinecraftClient; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftClient.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "init()V") + private void init(CallbackInfo info) { + System.out.println("This line is printed by an example mod mixin!"); + } +} diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/modid/icon.png new file mode 100644 index 00000000..047b91f2 Binary files /dev/null and b/src/main/resources/assets/modid/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..26ac594c --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,36 @@ +{ + "schemaVersion": 1, + "id": "modid", + "version": "${version}", + + "name": "Example Mod", + "description": "This is an example description! Tell everyone what your mod is about!", + "authors": [ + "Me!" + ], + "contact": { + "homepage": "https://fabricmc.net/", + "sources": "https://github.com/FabricMC/fabric-example-mod" + }, + + "license": "CC0-1.0", + "icon": "assets/modid/icon.png", + + "environment": "*", + "entrypoints": { + "main": [ + "net.fabricmc.example.ExampleMod" + ] + }, + "mixins": [ + "modid.mixins.json" + ], + + "requires": { + "fabricloader": ">=0.4.0", + "fabric": "*" + }, + "suggests": { + "flamingo": "*" + } +} diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json new file mode 100644 index 00000000..ee4411e6 --- /dev/null +++ b/src/main/resources/modid.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "package": "carpet.mixins", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "CommandManagerMixin" + ], + "client": [ + "CommandManagerMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}