commit 5a868d239664c52d1d68dea7d16e9a401ff31182 Author: Weetile Date: Fri Jan 16 21:02:46 2026 +0000 Initial commit diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..8fc3827 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + runs-on: ubuntu-24.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: setup jdk + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file 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..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0439856 --- /dev/null +++ b/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + 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. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "ultcraft" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings loom.officialMojangMappings() + 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_api_version}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +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_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + inputs.property "archivesName", project.base.archivesName + + from("LICENSE") { + rename { "${it}_${inputs.properties.archivesName}"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + 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..36b566c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.11 +loader_version=0.18.4 +loom_version=1.14-SNAPSHOT + +# Mod Properties +mod_version=1.0.0 +maven_group=com.ottohg.ultcraft +archives_base_name=ultcraft + +# Dependencies +fabric_api_version=0.141.1+1.21.11 \ 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..f8e1ee3 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..23449a2 --- /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-9.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..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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 + + + +# 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" ) + + 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 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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 + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/client/java/com/ottohg/ultcraft/UltcraftClient.java b/src/client/java/com/ottohg/ultcraft/UltcraftClient.java new file mode 100644 index 0000000..86d2ed5 --- /dev/null +++ b/src/client/java/com/ottohg/ultcraft/UltcraftClient.java @@ -0,0 +1,45 @@ +package com.ottohg.ultcraft; + +import com.ottohg.ultcraft.client.ClientUltimateData; +import com.ottohg.ultcraft.client.UltimateHudRenderer; +import com.ottohg.ultcraft.client.UltimateKeybinding; +import com.ottohg.ultcraft.network.UltimateActivatePacket; +import com.ottohg.ultcraft.network.UltimateSyncPacket; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; + +public class UltcraftClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + Ultcraft.LOGGER.info("Initializing Ultcraft Client..."); + + // Register keybindings + UltimateKeybinding.register(); + + // Register HUD renderer + UltimateHudRenderer.register(); + + // Register client packet receiver + ClientPlayNetworking.registerGlobalReceiver(UltimateSyncPacket.TYPE, (packet, context) -> { + context.client().execute(() -> { + if (context.player() != null) { + ClientUltimateData.setCharge(packet.charge()); + } + }); + }); + + // Handle keybinding presses + ClientTickEvents.END_CLIENT_TICK.register(client -> { + while (UltimateKeybinding.activateUltimateKey.consumeClick()) { + if (ClientUltimateData.isReady()) { + // Send activation packet to server + ClientPlayNetworking.send(new UltimateActivatePacket()); + Ultcraft.LOGGER.info("Ultimate activation requested!"); + } + } + }); + + Ultcraft.LOGGER.info("Ultcraft Client initialized successfully!"); + } +} \ No newline at end of file diff --git a/src/client/java/com/ottohg/ultcraft/client/ClientUltimateData.java b/src/client/java/com/ottohg/ultcraft/client/ClientUltimateData.java new file mode 100644 index 0000000..e3ff66c --- /dev/null +++ b/src/client/java/com/ottohg/ultcraft/client/ClientUltimateData.java @@ -0,0 +1,53 @@ +package com.ottohg.ultcraft.client; + +/** + * Client-side storage for the local player's ultimate charge. + * This is synced from the server. + */ +public class ClientUltimateData { + private static float targetCharge = 0.0f; + private static float displayedCharge = 0.0f; + private static long lastAnimationTime = 0; + private static boolean isAnimatingReset = false; + private static final float RESET_DURATION = 500.0f; // 0.5 seconds + + public static float getCharge() { + return targetCharge; + } + + public static float getDisplayCharge() { + if (isAnimatingReset) { + long currentTime = System.currentTimeMillis(); + float timeDelta = currentTime - lastAnimationTime; + float progress = timeDelta / RESET_DURATION; + + if (progress >= 1.0f) { + displayedCharge = targetCharge; + isAnimatingReset = false; + } else { + // Lerp from 100 to 0 + displayedCharge = 100.0f * (1.0f - progress); + } + } else { + displayedCharge = targetCharge; + } + return displayedCharge; + } + + public static void setCharge(float charge) { + float newCharge = Math.min(charge, 100.0f); + + // Check if we should trigger reset animation (high charge -> low charge) + // Relaxed condition to catch cases where passive charge might have ticked once + if (targetCharge > 90.0f && newCharge < 10.0f) { + isAnimatingReset = true; + lastAnimationTime = System.currentTimeMillis(); + } + + targetCharge = newCharge; + } + + public static boolean isReady() { + return targetCharge >= 100.0f; + } +} diff --git a/src/client/java/com/ottohg/ultcraft/client/UltimateHudRenderer.java b/src/client/java/com/ottohg/ultcraft/client/UltimateHudRenderer.java new file mode 100644 index 0000000..7edd048 --- /dev/null +++ b/src/client/java/com/ottohg/ultcraft/client/UltimateHudRenderer.java @@ -0,0 +1,186 @@ +package com.ottohg.ultcraft.client; + +import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; +import net.minecraft.client.DeltaTracker; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; + +/** + * Renders the ultimate charge as a circular progress bar on the HUD. + * Similar to Overwatch's ultimate indicator. + */ +public class UltimateHudRenderer implements HudRenderCallback { + private static final int CIRCLE_RADIUS = 30; + private static final int CIRCLE_THICKNESS = 4; + private static final int HUD_X_OFFSET = 50; + private static final int HUD_Y_OFFSET = 50; + + // Colors + private static final int COLOR_BACKGROUND = 0x80000000; // Semi-transparent black + private static final int COLOR_PROGRESS = 0xFFFFD700; // Gold + private static final int COLOR_READY = 0xFF00FF00; // Bright green + + @Override + public void onHudRender(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { + Minecraft mc = Minecraft.getInstance(); + + // Don't render in F3 debug screen + if (mc.getDebugOverlay().showDebugScreen()) { + return; + } + + // Get charge percentage + float charge = ClientUltimateData.getDisplayCharge(); + boolean isReady = ClientUltimateData.isReady(); + + // Calculate position (bottom left of screen) + int screenWidth = mc.getWindow().getGuiScaledWidth(); + int screenHeight = mc.getWindow().getGuiScaledHeight(); + int centerX = HUD_X_OFFSET; + int centerY = screenHeight - HUD_Y_OFFSET; + + // Draw background circle + drawCircle(guiGraphics, centerX, centerY, CIRCLE_RADIUS, COLOR_BACKGROUND, true); + + // Draw progress arc + int progressColor = isReady ? COLOR_READY : COLOR_PROGRESS; + drawArc(guiGraphics, centerX, centerY, CIRCLE_RADIUS, CIRCLE_THICKNESS, + charge / 100.0f, progressColor); + + // Draw percentage text + String text = String.format("%d%%", (int) charge); + int textWidth = mc.font.width(text); + guiGraphics.drawString(mc.font, text, + centerX - textWidth / 2, + centerY - mc.font.lineHeight / 2, + progressColor, false); + + // Draw "READY!" text if ultimate is charged + if (isReady) { + String readyText = "READY!"; + int readyWidth = mc.font.width(readyText); + guiGraphics.drawString(mc.font, readyText, + centerX - readyWidth / 2, + centerY - CIRCLE_RADIUS - mc.font.lineHeight - 5, + COLOR_READY, true); + } + } + + /** + * Draws a filled or outlined circle. + */ + private void drawCircle(GuiGraphics guiGraphics, int centerX, int centerY, int radius, + int color, boolean filled) { + float segments = 36; + float angleStep = (float) (2 * Math.PI / segments); + + for (int i = 0; i < segments; i++) { + float angle1 = i * angleStep; + float angle2 = (i + 1) * angleStep; + + int x1 = centerX + (int) (Math.cos(angle1) * radius); + int y1 = centerY + (int) (Math.sin(angle1) * radius); + int x2 = centerX + (int) (Math.cos(angle2) * radius); + int y2 = centerY + (int) (Math.sin(angle2) * radius); + + if (filled) { + // Draw triangle from center to edge + guiGraphics.fill(centerX, centerY, x1, y1, color); + guiGraphics.fill(x1, y1, x2, y2, color); + } else { + // Draw line segment + drawLine(guiGraphics, x1, y1, x2, y2, color); + } + } + } + + /** + * Draws a circular arc representing progress. + */ + private void drawArc(GuiGraphics guiGraphics, int centerX, int centerY, int radius, + int thickness, float progress, int color) { + float segments = 72; + float angleStep = (float) (2 * Math.PI / segments); + float startAngle = -(float) Math.PI / 2; // Start at top + + int numSegments = (int) (segments * progress); + + for (int i = 0; i < numSegments; i++) { + float angle1 = startAngle + i * angleStep; + float angle2 = startAngle + (i + 1) * angleStep; + + // Outer edge + int x1Out = centerX + (int) (Math.cos(angle1) * radius); + int y1Out = centerY + (int) (Math.sin(angle1) * radius); + int x2Out = centerX + (int) (Math.cos(angle2) * radius); + int y2Out = centerY + (int) (Math.sin(angle2) * radius); + + // Inner edge + int innerRadius = radius - thickness; + int x1In = centerX + (int) (Math.cos(angle1) * innerRadius); + int y1In = centerY + (int) (Math.sin(angle1) * innerRadius); + int x2In = centerX + (int) (Math.cos(angle2) * innerRadius); + int y2In = centerY + (int) (Math.sin(angle2) * innerRadius); + + // Draw quad (two triangles) + drawQuad(guiGraphics, x1Out, y1Out, x2Out, y2Out, x2In, y2In, x1In, y1In, color); + } + } + + /** + * Draws a line between two points. + */ + private void drawLine(GuiGraphics guiGraphics, int x1, int y1, int x2, int y2, int color) { + guiGraphics.fill(x1, y1, x2, y2, color); + } + + /** + * Draws a quadrilateral using two triangles. + */ + private void drawQuad(GuiGraphics guiGraphics, int x1, int y1, int x2, int y2, + int x3, int y3, int x4, int y4, int color) { + // Triangle 1 + fillTriangle(guiGraphics, x1, y1, x2, y2, x3, y3, color); + // Triangle 2 + fillTriangle(guiGraphics, x1, y1, x3, y3, x4, y4, color); + } + + /** + * Fills a triangle using scanline algorithm. + */ + private void fillTriangle(GuiGraphics guiGraphics, int x1, int y1, int x2, int y2, + int x3, int y3, int color) { + // Simple approximation: fill with small rectangles + int minX = Math.min(x1, Math.min(x2, x3)); + int maxX = Math.max(x1, Math.max(x2, x3)); + int minY = Math.min(y1, Math.min(y2, y3)); + int maxY = Math.max(y1, Math.max(y2, y3)); + + for (int y = minY; y <= maxY; y++) { + for (int x = minX; x <= maxX; x++) { + if (isPointInTriangle(x, y, x1, y1, x2, y2, x3, y3)) { + guiGraphics.fill(x, y, x + 1, y + 1, color); + } + } + } + } + + /** + * Checks if a point is inside a triangle using barycentric coordinates. + */ + private boolean isPointInTriangle(int px, int py, int x1, int y1, int x2, int y2, + int x3, int y3) { + float denominator = ((y2 - y3) * (x1 - x3) + (x3 - x2) * (y1 - y3)); + if (Math.abs(denominator) < 0.001f) return false; + + float a = ((y2 - y3) * (px - x3) + (x3 - x2) * (py - y3)) / denominator; + float b = ((y3 - y1) * (px - x3) + (x1 - x3) * (py - y3)) / denominator; + float c = 1 - a - b; + + return a >= 0 && a <= 1 && b >= 0 && b <= 1 && c >= 0 && c <= 1; + } + + public static void register() { + HudRenderCallback.EVENT.register(new UltimateHudRenderer()); + } +} diff --git a/src/client/java/com/ottohg/ultcraft/client/UltimateKeybinding.java b/src/client/java/com/ottohg/ultcraft/client/UltimateKeybinding.java new file mode 100644 index 0000000..bd93492 --- /dev/null +++ b/src/client/java/com/ottohg/ultcraft/client/UltimateKeybinding.java @@ -0,0 +1,24 @@ +package com.ottohg.ultcraft.client; + +import com.mojang.blaze3d.platform.InputConstants; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.minecraft.client.KeyMapping; +import net.minecraft.resources.Identifier; +import org.lwjgl.glfw.GLFW; + +/** + * Manages the keybinding for activating ultimates. + */ +public class UltimateKeybinding { + public static KeyMapping activateUltimateKey; + public static final KeyMapping.Category ULTIMATE_CATEGORY = KeyMapping.Category.register(Identifier.fromNamespaceAndPath("ultcraft", "ultimate")); + + public static void register() { + activateUltimateKey = KeyBindingHelper.registerKeyBinding(new KeyMapping( + "key.ultcraft.activate_ultimate", // Translation key + InputConstants.Type.KEYSYM, + GLFW.GLFW_KEY_Z, // Default to 'Z' key + ULTIMATE_CATEGORY // Category + )); + } +} diff --git a/src/client/java/com/ottohg/ultcraft/mixin/client/ExampleClientMixin.java b/src/client/java/com/ottohg/ultcraft/mixin/client/ExampleClientMixin.java new file mode 100644 index 0000000..46eb1db --- /dev/null +++ b/src/client/java/com/ottohg/ultcraft/mixin/client/ExampleClientMixin.java @@ -0,0 +1,15 @@ +package com.ottohg.ultcraft.mixin.client; + +import net.minecraft.client.Minecraft; +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(Minecraft.class) +public class ExampleClientMixin { + @Inject(at = @At("HEAD"), method = "run") + private void init(CallbackInfo info) { + // This code is injected into the start of Minecraft.run()V + } +} \ No newline at end of file diff --git a/src/client/resources/ultcraft.client.mixins.json b/src/client/resources/ultcraft.client.mixins.json new file mode 100644 index 0000000..b6905fd --- /dev/null +++ b/src/client/resources/ultcraft.client.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "com.ottohg.ultcraft.mixin.client", + "compatibilityLevel": "JAVA_21", + "refmap": "ultcraft.refmap.json", + "client": [ + "ExampleClientMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/java/com/ottohg/ultcraft/Ultcraft.java b/src/main/java/com/ottohg/ultcraft/Ultcraft.java new file mode 100644 index 0000000..b7f22cc --- /dev/null +++ b/src/main/java/com/ottohg/ultcraft/Ultcraft.java @@ -0,0 +1,50 @@ +package com.ottohg.ultcraft; + +import com.ottohg.ultcraft.network.UltimateActivatePacket; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.server.level.ServerPlayer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Ultcraft implements ModInitializer { + public static final String MOD_ID = "ultcraft"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + @Override + public void onInitialize() { + LOGGER.info("Initializing Ultcraft - Ultimate System Loading..."); + + // Register network packets + PayloadTypeRegistry.playC2S().register(UltimateActivatePacket.TYPE, UltimateActivatePacket.CODEC); + PayloadTypeRegistry.playS2C().register(com.ottohg.ultcraft.network.UltimateSyncPacket.TYPE, + com.ottohg.ultcraft.network.UltimateSyncPacket.CODEC); + + UltimateActivatePacket.register(); + + // Register server tick event for passive charging + ServerTickEvents.END_SERVER_TICK.register(server -> { + for (ServerPlayer player : server.getPlayerList().getPlayers()) { + // Tick passive charge + UltimateData.tickPassiveCharge(player.getUUID()); + + // Sync charge to client every second (20 ticks) + if (server.getTickCount() % 20 == 0) { + float charge = UltimateData.getCharge(player.getUUID()); + ServerPlayNetworking.send(player, + new com.ottohg.ultcraft.network.UltimateSyncPacket(charge)); + } + } + }); + + // Clean up data when player disconnects + ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> { + UltimateData.removePlayer(handler.getPlayer().getUUID()); + }); + + LOGGER.info("Ultcraft initialized successfully!"); + } +} \ No newline at end of file diff --git a/src/main/java/com/ottohg/ultcraft/UltimateData.java b/src/main/java/com/ottohg/ultcraft/UltimateData.java new file mode 100644 index 0000000..f92f9ae --- /dev/null +++ b/src/main/java/com/ottohg/ultcraft/UltimateData.java @@ -0,0 +1,112 @@ +package com.ottohg.ultcraft; + +import com.ottohg.ultcraft.network.UltimateSyncPacket; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.Identifier; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * Manages ultimate charge data for all players. + * Handles passive charging, damage-based charging, and ultimate activation. + */ +public class UltimateData { + private static final Map ultimateCharges = new HashMap<>(); + private static final Map lastTickTimes = new HashMap<>(); + + // Constants + private static final float PASSIVE_CHARGE_PER_MINUTE = 100.0f / 15.0f; // 100% over 15 minutes + private static final float DAMAGE_CHARGE_RATIO = 3.0f / 6.0f; // 3% per 6 damage points (3 hearts) + private static final float MAX_CHARGE = 100.0f; + + public static float getCharge(UUID playerId) { + return ultimateCharges.getOrDefault(playerId, 0.0f); + } + + public static void setCharge(UUID playerId, float charge) { + ultimateCharges.put(playerId, Math.min(charge, MAX_CHARGE)); + } + + public static void addCharge(UUID playerId, float amount) { + float current = getCharge(playerId); + setCharge(playerId, current + amount); + } + + public static void addChargeFromDamage(ServerPlayer player, float damage) { + float chargeGain = damage * DAMAGE_CHARGE_RATIO; + addCharge(player.getUUID(), chargeGain); + Ultcraft.LOGGER.info("Player {} gained {}% ultimate charge from {} damage", + player.getUUID(), String.format("%.2f", chargeGain), damage); + + // Sync to client immediately to reduce UI delay + ServerPlayNetworking.send(player, new UltimateSyncPacket(getCharge(player.getUUID()))); + } + + public static void tickPassiveCharge(UUID playerId) { + long currentTime = System.currentTimeMillis(); + Long lastTime = lastTickTimes.get(playerId); + + if (lastTime != null) { + long deltaMs = currentTime - lastTime; + float deltaMinutes = deltaMs / 60000.0f; + float chargeGain = PASSIVE_CHARGE_PER_MINUTE * deltaMinutes; + + float currentCharge = getCharge(playerId); + if (currentCharge < MAX_CHARGE) { + addCharge(playerId, chargeGain); + } + } + + lastTickTimes.put(playerId, currentTime); + } + + public static boolean isUltimateReady(UUID playerId) { + return getCharge(playerId) >= MAX_CHARGE; + } + + public static boolean activateUltimate(ServerPlayer player) { + if (!isUltimateReady(player.getUUID())) { + return false; + } + + // Apply effects: Strength 2 and Regeneration 2 for 5 seconds + Holder strength = BuiltInRegistries.MOB_EFFECT.wrapAsHolder( + BuiltInRegistries.MOB_EFFECT.getValue(Identifier.fromNamespaceAndPath("minecraft", "strength")) + ); + Holder regeneration = BuiltInRegistries.MOB_EFFECT.wrapAsHolder( + BuiltInRegistries.MOB_EFFECT.getValue(Identifier.fromNamespaceAndPath("minecraft", "regeneration")) + ); + + player.addEffect(new MobEffectInstance(strength, 200, 1)); + player.addEffect(new MobEffectInstance(regeneration, 200, 1)); + + // Reset charge + setCharge(player.getUUID(), 0.0f); + + Ultcraft.LOGGER.info("Player {} activated ultimate!", player.getName().getString()); + return true; + } + + public static void removePlayer(UUID playerId) { + ultimateCharges.remove(playerId); + lastTickTimes.remove(playerId); + } + + public static void saveToNBT(UUID playerId, CompoundTag tag) { + tag.putFloat("UltimateCharge", getCharge(playerId)); + } + + public static void loadFromNBT(UUID playerId, CompoundTag tag) { + if (tag.contains("UltimateCharge")) { + setCharge(playerId, tag.getFloat("UltimateCharge").orElse(0.0f)); + } + } +} diff --git a/src/main/java/com/ottohg/ultcraft/mixin/DamageTrackingMixin.java b/src/main/java/com/ottohg/ultcraft/mixin/DamageTrackingMixin.java new file mode 100644 index 0000000..bd414ab --- /dev/null +++ b/src/main/java/com/ottohg/ultcraft/mixin/DamageTrackingMixin.java @@ -0,0 +1,37 @@ +package com.ottohg.ultcraft.mixin; + +import com.ottohg.ultcraft.UltimateData; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.LivingEntity; +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.CallbackInfoReturnable; + +/** + * Mixin to track damage dealt by players and charge their ultimate accordingly. + */ +@Mixin(LivingEntity.class) +public class DamageTrackingMixin { + + @Inject(method = "hurtServer", at = @At("RETURN")) + private void onHurt(ServerLevel level, DamageSource source, float amount, CallbackInfoReturnable cir) { + // Only process if damage was actually dealt + if (!cir.getReturnValue()) { + return; + } + + // Check if the damage source is a player + if (source.getEntity() instanceof ServerPlayer player) { + LivingEntity target = (LivingEntity) (Object) this; + + // Only charge from damage to other entities (not self-damage) + if (target != player) { + // Add charge based on damage dealt + UltimateData.addChargeFromDamage(player, amount); + } + } + } +} diff --git a/src/main/java/com/ottohg/ultcraft/mixin/ExampleMixin.java b/src/main/java/com/ottohg/ultcraft/mixin/ExampleMixin.java new file mode 100644 index 0000000..27f270a --- /dev/null +++ b/src/main/java/com/ottohg/ultcraft/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package com.ottohg.ultcraft.mixin; + +import net.minecraft.server.MinecraftServer; +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(MinecraftServer.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "loadLevel") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftServer.loadLevel()V + } +} \ No newline at end of file diff --git a/src/main/java/com/ottohg/ultcraft/network/UltimateActivatePacket.java b/src/main/java/com/ottohg/ultcraft/network/UltimateActivatePacket.java new file mode 100644 index 0000000..fb74388 --- /dev/null +++ b/src/main/java/com/ottohg/ultcraft/network/UltimateActivatePacket.java @@ -0,0 +1,34 @@ +package com.ottohg.ultcraft.network; + +import com.ottohg.ultcraft.Ultcraft; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; + +/** + * Packet sent from client to server to activate ultimate. + */ +public record UltimateActivatePacket() implements CustomPacketPayload { + public static final CustomPacketPayload.Type TYPE = + new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(Ultcraft.MOD_ID, "activate_ultimate")); + + public static final StreamCodec CODEC = StreamCodec.of( + (buf, packet) -> {}, // Write (nothing to write) + (buf) -> new UltimateActivatePacket() // Read + ); + + @Override + public Type type() { + return TYPE; + } + + public static void register() { + ServerPlayNetworking.registerGlobalReceiver(TYPE, (packet, context) -> { + context.server().execute(() -> { + com.ottohg.ultcraft.UltimateData.activateUltimate(context.player()); + }); + }); + } +} diff --git a/src/main/java/com/ottohg/ultcraft/network/UltimateSyncPacket.java b/src/main/java/com/ottohg/ultcraft/network/UltimateSyncPacket.java new file mode 100644 index 0000000..74a8ae1 --- /dev/null +++ b/src/main/java/com/ottohg/ultcraft/network/UltimateSyncPacket.java @@ -0,0 +1,25 @@ +package com.ottohg.ultcraft.network; + +import com.ottohg.ultcraft.Ultcraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; + +/** + * Packet sent from server to client to sync ultimate charge. + */ +public record UltimateSyncPacket(float charge) implements CustomPacketPayload { + public static final CustomPacketPayload.Type TYPE = + new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(Ultcraft.MOD_ID, "sync_ultimate")); + + public static final StreamCodec CODEC = StreamCodec.of( + (buf, packet) -> buf.writeFloat(packet.charge), + (buf) -> new UltimateSyncPacket(buf.readFloat()) + ); + + @Override + public Type type() { + return TYPE; + } +} diff --git a/src/main/resources/assets/ultcraft/icon.png b/src/main/resources/assets/ultcraft/icon.png new file mode 100644 index 0000000..e6c0a2b Binary files /dev/null and b/src/main/resources/assets/ultcraft/icon.png differ diff --git a/src/main/resources/assets/ultcraft/lang/en_us.json b/src/main/resources/assets/ultcraft/lang/en_us.json new file mode 100644 index 0000000..35bee7f --- /dev/null +++ b/src/main/resources/assets/ultcraft/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "key.ultcraft.activate_ultimate": "Activate Ultimate", + "category.ultcraft.ultimate": "Ultcraft" +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..cbeee12 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,38 @@ +{ + "schemaVersion": 1, + "id": "ultcraft", + "version": "${version}", + "name": "Ultcraft", + "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/ultcraft/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "com.ottohg.ultcraft.Ultcraft" + ], + "client": [ + "com.ottohg.ultcraft.UltcraftClient" + ] + }, + "mixins": [ + "ultcraft.mixins.json", + { + "config": "ultcraft.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.18.4", + "minecraft": "~1.21.11", + "java": ">=21", + "fabric-api": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/ultcraft.mixins.json b/src/main/resources/ultcraft.mixins.json new file mode 100644 index 0000000..85332c1 --- /dev/null +++ b/src/main/resources/ultcraft.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "com.ottohg.ultcraft.mixin", + "compatibilityLevel": "JAVA_21", + "refmap": "ultcraft.refmap.json", + "mixins": [ + "ExampleMixin", + "DamageTrackingMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file