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..5adf394 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,41 @@ +# 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: + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + 21, # Current Java LTS + ] + # and run on both Linux and Windows + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS + uses: actions/upload-artifact@v3 + 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/build.gradle b/build.gradle new file mode 100644 index 0000000..16e1833 --- /dev/null +++ b/build.gradle @@ -0,0 +1,91 @@ +plugins { + id 'fabric-loom' version '1.5-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 = 'GeckoLib' + url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' + content { + includeGroupByRegex("software\\.bernie.*") + includeGroup("com.eliotlash.mclib") + } + } + + dependencies { + modImplementation 'software.bernie.geckolib:geckolib-fabric-1.20.1:4.4.2' + } +} + +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}" +} + +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..9a99879 --- /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.25 + +# Mod Properties +mod_version=1.0.0 +maven_group=net.touhoudiscord +archives_base_name=hardcore-redeploy + +# Dependencies +fabric_version=0.91.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..d64cd49 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..a80b22c --- /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.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/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/net/touhoudiscord/HardcoreRedeploy.java b/src/main/java/net/touhoudiscord/HardcoreRedeploy.java new file mode 100644 index 0000000..1c90d25 --- /dev/null +++ b/src/main/java/net/touhoudiscord/HardcoreRedeploy.java @@ -0,0 +1,48 @@ +package net.touhoudiscord; + +import net.fabricmc.api.ModInitializer; + +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.touhoudiscord.block.BuyStation; +import net.touhoudiscord.block.BuyStationEntity; +import net.touhoudiscord.commands.RedeployPlayerCommand; +import net.touhoudiscord.item.BuyStationItem; +import net.touhoudiscord.status.RedeployingStatusEffect; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import software.bernie.geckolib.GeckoLib; + +public class HardcoreRedeploy implements ModInitializer { + public static final String MOD_ID = "hardcore-redeploy"; + public static final Logger LOGGER = LoggerFactory.getLogger("hardcore-redeploy"); + + public static final StatusEffect REDEPLOYING = new RedeployingStatusEffect(); + public static final Block BUY_STATION = Registry.register(Registries.BLOCK, new Identifier(HardcoreRedeploy.MOD_ID, "buy_station"), new BuyStation(FabricBlockSettings.copyOf(Blocks.HOPPER).nonOpaque())); + public static final Item BUY_STATION_ITEM = Registry.register(Registries.ITEM, new Identifier(HardcoreRedeploy.MOD_ID, "buy_station"), new BuyStationItem(HardcoreRedeploy.BUY_STATION, new FabricItemSettings())); + public static BlockEntityType BUY_STATION_ENTITY; + + @Override + public void onInitialize() { + LOGGER.info("Initializing Hardcore Redeploy"); + + GeckoLib.initialize(); + + BUY_STATION_ENTITY = Registry.register(Registries.BLOCK_ENTITY_TYPE, + new Identifier(HardcoreRedeploy.MOD_ID, "buy_station_entity"), + FabricBlockEntityTypeBuilder.create(BuyStationEntity::new, + HardcoreRedeploy.BUY_STATION).build()); + Registry.register(Registries.STATUS_EFFECT, new Identifier(HardcoreRedeploy.MOD_ID, "redeploying"), REDEPLOYING); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> RedeployPlayerCommand.register(dispatcher)); + } +} \ No newline at end of file diff --git a/src/main/java/net/touhoudiscord/HardcoreRedeployClient.java b/src/main/java/net/touhoudiscord/HardcoreRedeployClient.java new file mode 100644 index 0000000..5a99d37 --- /dev/null +++ b/src/main/java/net/touhoudiscord/HardcoreRedeployClient.java @@ -0,0 +1,12 @@ +package net.touhoudiscord; + +import net.fabricmc.api.ClientModInitializer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; +import net.touhoudiscord.block.client.BuyStationRenderer; + +public class HardcoreRedeployClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + BlockEntityRendererFactories.register(HardcoreRedeploy.BUY_STATION_ENTITY, BuyStationRenderer::new); + } +} \ No newline at end of file diff --git a/src/main/java/net/touhoudiscord/RedeployPlayer.java b/src/main/java/net/touhoudiscord/RedeployPlayer.java new file mode 100644 index 0000000..4c97c75 --- /dev/null +++ b/src/main/java/net/touhoudiscord/RedeployPlayer.java @@ -0,0 +1,13 @@ +package net.touhoudiscord; + +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.world.GameMode; + +public class RedeployPlayer { + public static void redeploy(ServerPlayerEntity spectator, ServerPlayerEntity target) { + if (!target.getServerWorld().getDimension().hasCeiling()) spectator.addStatusEffect(new StatusEffectInstance(HardcoreRedeploy.REDEPLOYING, 20*20, 0)); + spectator.teleport(target.getServerWorld(), target.getPos().x, target.getServerWorld().getDimension().hasCeiling() ? target.getPos().y : 320, target.getPos().z, 0, 30); + spectator.changeGameMode(GameMode.SURVIVAL); + } +} diff --git a/src/main/java/net/touhoudiscord/block/BuyStation.java b/src/main/java/net/touhoudiscord/block/BuyStation.java new file mode 100644 index 0000000..920f2d7 --- /dev/null +++ b/src/main/java/net/touhoudiscord/block/BuyStation.java @@ -0,0 +1,31 @@ +package net.touhoudiscord.block; + +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldView; +import org.jetbrains.annotations.Nullable; + +public class BuyStation extends BlockWithEntity { + public BuyStation(Settings settings) { + super(settings); + } + + @Nullable + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new BuyStationEntity(pos, state); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + return super.canPlaceAt(state, world, pos); + } +} diff --git a/src/main/java/net/touhoudiscord/block/BuyStationEntity.java b/src/main/java/net/touhoudiscord/block/BuyStationEntity.java new file mode 100644 index 0000000..9995ca9 --- /dev/null +++ b/src/main/java/net/touhoudiscord/block/BuyStationEntity.java @@ -0,0 +1,45 @@ +package net.touhoudiscord.block; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.touhoudiscord.HardcoreRedeploy; +import software.bernie.geckolib.animatable.GeoBlockEntity; +import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; +import software.bernie.geckolib.core.animatable.instance.SingletonAnimatableInstanceCache; +import software.bernie.geckolib.core.animation.*; +import software.bernie.geckolib.util.RenderUtils; + +public class BuyStationEntity extends BlockEntity implements GeoBlockEntity { + private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this); + + private static final RawAnimation OPEN = RawAnimation.begin().thenPlay("animation.model.open").thenLoop("animation.model.idle"); + private static final RawAnimation CLOSE = RawAnimation.begin().thenPlay("animation.model.close"); + + public BuyStationEntity(BlockPos pos, BlockState state) { + super(HardcoreRedeploy.BUY_STATION_ENTITY, pos, state); + } + + @Override + public void registerControllers(AnimatableManager.ControllerRegistrar controllers) { + controllers.add(new AnimationController<>(this, "buystationcontroller", 0, state -> { + Vec3d pos = state.getAnimatable().getPos().toCenterPos(); + if (state.getAnimatable().getWorld().getClosestPlayer(pos.x, pos.y, pos.z, 5, false) instanceof PlayerEntity) + return state.setAndContinue(OPEN); + else + return state.setAndContinue(CLOSE); + })); + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return cache; + } + + @Override + public double getTick(Object blockEntity) { + return RenderUtils.getCurrentTick(); + } +} diff --git a/src/main/java/net/touhoudiscord/block/client/BuyStationModel.java b/src/main/java/net/touhoudiscord/block/client/BuyStationModel.java new file mode 100644 index 0000000..c21a218 --- /dev/null +++ b/src/main/java/net/touhoudiscord/block/client/BuyStationModel.java @@ -0,0 +1,23 @@ +package net.touhoudiscord.block.client; + +import net.minecraft.util.Identifier; +import net.touhoudiscord.HardcoreRedeploy; +import net.touhoudiscord.block.BuyStationEntity; +import software.bernie.geckolib.model.GeoModel; + +public class BuyStationModel extends GeoModel { + @Override + public Identifier getModelResource(BuyStationEntity animatable) { + return new Identifier(HardcoreRedeploy.MOD_ID, "geo/buy_station.geo.json"); + } + + @Override + public Identifier getTextureResource(BuyStationEntity animatable) { + return new Identifier(HardcoreRedeploy.MOD_ID, "textures/block/buy_station.png"); + } + + @Override + public Identifier getAnimationResource(BuyStationEntity animatable) { + return new Identifier(HardcoreRedeploy.MOD_ID, "animations/buy_station.animation.json"); + } +} diff --git a/src/main/java/net/touhoudiscord/block/client/BuyStationRenderer.java b/src/main/java/net/touhoudiscord/block/client/BuyStationRenderer.java new file mode 100644 index 0000000..03e4267 --- /dev/null +++ b/src/main/java/net/touhoudiscord/block/client/BuyStationRenderer.java @@ -0,0 +1,11 @@ +package net.touhoudiscord.block.client; + +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.touhoudiscord.block.BuyStationEntity; +import software.bernie.geckolib.renderer.GeoBlockRenderer; + +public class BuyStationRenderer extends GeoBlockRenderer { + public BuyStationRenderer(BlockEntityRendererFactory.Context context) { + super(new BuyStationModel()); + } +} diff --git a/src/main/java/net/touhoudiscord/commands/RedeployPlayerCommand.java b/src/main/java/net/touhoudiscord/commands/RedeployPlayerCommand.java new file mode 100644 index 0000000..298f7ce --- /dev/null +++ b/src/main/java/net/touhoudiscord/commands/RedeployPlayerCommand.java @@ -0,0 +1,42 @@ +package net.touhoudiscord.commands; + +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.command.CommandSource; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.world.GameMode; +import net.touhoudiscord.HardcoreRedeploy; +import net.touhoudiscord.RedeployPlayer; + +import static net.minecraft.server.command.CommandManager.*; + +public class RedeployPlayerCommand { + + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(literal("redeployplayer") + .requires(source -> source.hasPermissionLevel(4)) + .then(argument("player", EntityArgumentType.player()) + .suggests((context, builder) -> { + PlayerManager playerManager = (context.getSource()).getServer().getPlayerManager(); + return CommandSource.suggestMatching(playerManager.getPlayerList().stream().filter( + (player) -> player.interactionManager.getGameMode() == GameMode.SPECTATOR + ).map( + (player) -> player.getGameProfile().getName() + ), builder); + }) + .executes(context -> { + if (context.getSource().getPlayer() == null) return 0; + + ServerPlayerEntity player = EntityArgumentType.getPlayer(context, "player"); + RedeployPlayer.redeploy(player, context.getSource().getPlayer()); + context.getSource().sendFeedback(() -> Text.literal("Redeployed ").append(player.getName()), false); + + return 1; + }))); + + HardcoreRedeploy.LOGGER.info("Registered RedeployPlayer command"); + } +} diff --git a/src/main/java/net/touhoudiscord/item/BuyStationItem.java b/src/main/java/net/touhoudiscord/item/BuyStationItem.java new file mode 100644 index 0000000..994c27e --- /dev/null +++ b/src/main/java/net/touhoudiscord/item/BuyStationItem.java @@ -0,0 +1,58 @@ +package net.touhoudiscord.item; + +import net.minecraft.block.Block; +import net.minecraft.client.render.item.BuiltinModelItemRenderer; +import net.minecraft.item.BlockItem; +import net.touhoudiscord.item.client.BuyStationItemRenderer; +import software.bernie.geckolib.animatable.GeoItem; +import software.bernie.geckolib.animatable.SingletonGeoAnimatable; +import software.bernie.geckolib.animatable.client.RenderProvider; +import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; +import software.bernie.geckolib.core.animatable.instance.SingletonAnimatableInstanceCache; +import software.bernie.geckolib.core.animation.*; +import software.bernie.geckolib.core.object.PlayState; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.function.Consumer; +import java.util.function.Supplier; + +public class BuyStationItem extends BlockItem implements GeoItem { + private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this); + private final Supplier renderProvider = GeoItem.makeRenderer(this); + + public BuyStationItem(Block block, Settings settings) { + super(block, settings); + SingletonGeoAnimatable.registerSyncedAnimatable(this); + } + + @Override + public void createRenderer(Consumer consumer) { + consumer.accept(new RenderProvider() { + private final BuyStationItemRenderer renderer = new BuyStationItemRenderer(); + @Override + public BuiltinModelItemRenderer getCustomRenderer() { + return this.renderer; + } + }); + } + + @Override + public Supplier getRenderProvider() { + return renderProvider; + } + + @Override + public void registerControllers(AnimatableManager.ControllerRegistrar controllers) { + controllers.add(new AnimationController<>(this, "buystationitemcontroller", 0, state -> PlayState.STOP)); + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return cache; + } + + @Override + public double getTick(Object itemStack) { + return RenderUtils.getCurrentTick(); + } +} diff --git a/src/main/java/net/touhoudiscord/item/client/BuyStationItemModel.java b/src/main/java/net/touhoudiscord/item/client/BuyStationItemModel.java new file mode 100644 index 0000000..1e44bf0 --- /dev/null +++ b/src/main/java/net/touhoudiscord/item/client/BuyStationItemModel.java @@ -0,0 +1,23 @@ +package net.touhoudiscord.item.client; + +import net.minecraft.util.Identifier; +import net.touhoudiscord.HardcoreRedeploy; +import net.touhoudiscord.item.BuyStationItem; +import software.bernie.geckolib.model.GeoModel; + +public class BuyStationItemModel extends GeoModel { + @Override + public Identifier getModelResource(BuyStationItem animatable) { + return new Identifier(HardcoreRedeploy.MOD_ID, "geo/buy_station.geo.json"); + } + + @Override + public Identifier getTextureResource(BuyStationItem animatable) { + return new Identifier(HardcoreRedeploy.MOD_ID, "textures/block/buy_station.png"); + } + + @Override + public Identifier getAnimationResource(BuyStationItem animatable) { + return new Identifier(HardcoreRedeploy.MOD_ID, "animations/buy_station.animation.json"); + } +} diff --git a/src/main/java/net/touhoudiscord/item/client/BuyStationItemRenderer.java b/src/main/java/net/touhoudiscord/item/client/BuyStationItemRenderer.java new file mode 100644 index 0000000..29a9282 --- /dev/null +++ b/src/main/java/net/touhoudiscord/item/client/BuyStationItemRenderer.java @@ -0,0 +1,10 @@ +package net.touhoudiscord.item.client; + +import net.touhoudiscord.item.BuyStationItem; +import software.bernie.geckolib.renderer.GeoItemRenderer; + +public class BuyStationItemRenderer extends GeoItemRenderer { + public BuyStationItemRenderer() { + super(new BuyStationItemModel()); + } +} diff --git a/src/main/java/net/touhoudiscord/mixin/RedeployingMixin.java b/src/main/java/net/touhoudiscord/mixin/RedeployingMixin.java new file mode 100644 index 0000000..4c88b2f --- /dev/null +++ b/src/main/java/net/touhoudiscord/mixin/RedeployingMixin.java @@ -0,0 +1,22 @@ +package net.touhoudiscord.mixin; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.registry.tag.DamageTypeTags; +import net.touhoudiscord.HardcoreRedeploy; +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.CallbackInfoReturnable; + +@Mixin(LivingEntity.class) +public abstract class RedeployingMixin { + @Shadow public abstract boolean hasStatusEffect(StatusEffect effect); + + @Inject(at = @At("HEAD"), method = "damage", cancellable = true) + private void init(DamageSource source, float amount, CallbackInfoReturnable cir) { + if (source.isIn(DamageTypeTags.IS_FALL) && this.hasStatusEffect(HardcoreRedeploy.REDEPLOYING)) cir.setReturnValue(false); + } +} \ No newline at end of file diff --git a/src/main/java/net/touhoudiscord/status/RedeployingStatusEffect.java b/src/main/java/net/touhoudiscord/status/RedeployingStatusEffect.java new file mode 100644 index 0000000..2e8b5fe --- /dev/null +++ b/src/main/java/net/touhoudiscord/status/RedeployingStatusEffect.java @@ -0,0 +1,10 @@ +package net.touhoudiscord.status; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectCategory; + +public class RedeployingStatusEffect extends StatusEffect { + public RedeployingStatusEffect() { + super(StatusEffectCategory.BENEFICIAL, 0xFFFFFF); + } +} diff --git a/src/main/resources/assets/hardcore-redeploy/animations/buy_station.animation.json b/src/main/resources/assets/hardcore-redeploy/animations/buy_station.animation.json new file mode 100644 index 0000000..13b9736 --- /dev/null +++ b/src/main/resources/assets/hardcore-redeploy/animations/buy_station.animation.json @@ -0,0 +1,269 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.model.open": { + "animation_length": 1, + "bones": { + "THELID": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [-72.5, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, 3, -8] + } + } + }, + "topshelf": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.25": { + "vector": [-25, 0, 0] + }, + "1.0": { + "vector": [-10, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.25": { + "vector": [0, 6, -2] + }, + "0.4167": { + "vector": [0, 6, -2] + }, + "0.625": { + "vector": [0, 5, -2] + }, + "1.0": { + "vector": [0, 2, -2] + } + } + }, + "botshelfR": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, 2, 0] + }, + "0.6667": { + "vector": [-11, 3, 0], + "easing": "easeOutBack" + } + } + }, + "botshelfL": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, 2, 0] + }, + "0.6667": { + "vector": [11, 3, 0], + "easing": "easeOutBack" + } + } + }, + "hingeL": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, 2, 0] + }, + "0.6667": { + "vector": [1, 3, 0], + "easing": "easeOutBack" + } + } + }, + "hingeR": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3333": { + "vector": [0, 2, 0] + }, + "0.6667": { + "vector": [-1, 3, 0], + "easing": "easeOutBack" + } + } + } + } + }, + "animation.model.idle": { + "animation_length": 0.25, + "bones": { + "THELID": { + "rotation": { + "vector": [-72.5, 0, 0] + }, + "position": { + "vector": [0, 3, -8] + } + }, + "topshelf": { + "rotation": { + "vector": [-10, 0, 0] + }, + "position": { + "vector": [0, 2, -2] + } + }, + "botshelfR": { + "position": { + "vector": [-11, 3, 0], + "easing": "easeOutBack" + } + }, + "botshelfL": { + "position": { + "vector": [11, 3, 0], + "easing": "easeOutBack" + } + }, + "hingeL": { + "position": { + "vector": [1, 3, 0], + "easing": "easeOutBack" + } + }, + "hingeR": { + "position": { + "vector": [-1, 3, 0], + "easing": "easeOutBack" + } + } + } + }, + "animation.model.close": { + "animation_length": 1.33333, + "bones": { + "THELID": { + "rotation": { + "0.4583": { + "vector": [-72.5, 0, 0] + }, + "1.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.4583": { + "vector": [0, 3, -8] + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "topshelf": { + "rotation": { + "0.0": { + "vector": [-10, 0, 0] + }, + "0.5833": { + "vector": [-25, 0, 0] + }, + "1.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 2, -2] + }, + "0.25": { + "vector": [0, 5, -2] + }, + "0.375": { + "vector": [0, 6, -2] + }, + "0.5833": { + "vector": [0, 6, -2] + }, + "1.0": { + "vector": [0, 0, 0] + } + } + }, + "botshelfR": { + "position": { + "0.0": { + "vector": [-11, 3, 0], + "easing": "easeOutBack" + }, + "0.2917": { + "vector": [0, 2, 0] + }, + "0.5417": { + "vector": [0, 0, 0] + } + } + }, + "botshelfL": { + "position": { + "0.0": { + "vector": [11, 3, 0], + "easing": "easeOutBack" + }, + "0.2917": { + "vector": [0, 2, 0] + }, + "0.5417": { + "vector": [0, 0, 0] + } + } + }, + "hingeL": { + "position": { + "0.0": { + "vector": [1, 3, 0], + "easing": "easeOutBack" + }, + "0.2917": { + "vector": [0, 2, 0] + }, + "0.5833": { + "vector": [0, 0, 0] + } + } + }, + "hingeR": { + "position": { + "0.0": { + "vector": [-1, 3, 0], + "easing": "easeOutBack" + }, + "0.2917": { + "vector": [0, 2, 0] + }, + "0.5833": { + "vector": [0, 0, 0] + } + } + } + } + } + }, + "geckolib_format_version": 2 +} \ No newline at end of file diff --git a/src/main/resources/assets/hardcore-redeploy/blockstates/buy_station.json b/src/main/resources/assets/hardcore-redeploy/blockstates/buy_station.json new file mode 100644 index 0000000..dcf3530 --- /dev/null +++ b/src/main/resources/assets/hardcore-redeploy/blockstates/buy_station.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "hardcore-redeploy:block/buy_station" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hardcore-redeploy/geo/buy_station.geo.json b/src/main/resources/assets/hardcore-redeploy/geo/buy_station.geo.json new file mode 100644 index 0000000..c0dcf2c --- /dev/null +++ b/src/main/resources/assets/hardcore-redeploy/geo/buy_station.geo.json @@ -0,0 +1,376 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.unknown", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "THEBOX", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [14, 0, -6], + "size": [1, 8, 12], + "uv": { + "north": {"uv": [2, 2], "uv_size": [1, 8]}, + "east": {"uv": [42, 22], "uv_size": [13, 14]}, + "south": {"uv": [42, 22], "uv_size": [13, 14]}, + "west": {"uv": [24, 10], "uv_size": [24, 10]}, + "up": {"uv": [2, -10], "uv_size": [1, 12]}, + "down": {"uv": [50, 20], "uv_size": [-1, -14]} + } + }, + { + "origin": [-15, 0, -7], + "size": [30, 8, 1], + "uv": { + "north": {"uv": [0, 6], "uv_size": [50, 14]}, + "east": {"uv": [49, 6], "uv_size": [1, 14]}, + "south": {"uv": [0, 0], "uv_size": [50, 20]}, + "west": {"uv": [49, 6], "uv_size": [1, 14]}, + "up": {"uv": [0, 20], "uv_size": [50, -1]}, + "down": {"uv": [0, 20], "uv_size": [50, -1]} + } + }, + { + "origin": [-14, 0, -6], + "size": [28, 1, 12], + "uv": { + "north": {"uv": [2, 2], "uv_size": [28, 1]}, + "east": {"uv": [-10, 2], "uv_size": [12, 1]}, + "south": {"uv": [42, 2], "uv_size": [28, 1]}, + "west": {"uv": [30, 2], "uv_size": [12, 1]}, + "up": {"uv": [0, 21], "uv_size": [40, 15]}, + "down": {"uv": [0, 36], "uv_size": [40, -15]} + } + }, + { + "origin": [-15, 0, 6], + "size": [30, 8, 1], + "uv": { + "north": {"uv": [0, 0], "uv_size": [50, 20]}, + "east": {"uv": [49, 6], "uv_size": [1, 14]}, + "south": {"uv": [0, 6], "uv_size": [50, 14]}, + "west": {"uv": [1, 12], "uv_size": [-1, 8]}, + "up": {"uv": [0, 20], "uv_size": [50, -1]}, + "down": {"uv": [0, 19], "uv_size": [50, 1]} + } + }, + { + "origin": [-3, 3, 7], + "size": [6, 4, 0.1], + "uv": { + "north": {"uv": [39, 47], "uv_size": [6, 4]}, + "east": {"uv": [2, 2], "uv_size": [4, 4]}, + "south": {"uv": [42, 52], "uv_size": [21, 12]}, + "west": {"uv": [8, 2], "uv_size": [0, 4]}, + "up": {"uv": [2, 2], "uv_size": [6, 0]}, + "down": {"uv": [8, 2], "uv_size": [6, 0]} + } + }, + { + "origin": [-15, 0, -6], + "size": [1, 8, 12], + "uv": { + "north": {"uv": [52, 24], "uv_size": [1, 9]}, + "east": {"uv": [24, 10], "uv_size": [24, 10]}, + "south": {"uv": [66, 33], "uv_size": [1, 8]}, + "west": {"uv": [41, 21], "uv_size": [15, 15]}, + "up": {"uv": [53, 21], "uv_size": [1, 12]}, + "down": {"uv": [50, 20], "uv_size": [-1, -14]} + } + } + ] + }, + { + "name": "THELID", + "pivot": [0, 12, 0], + "rotation": [0, 0, -180], + "cubes": [ + { + "origin": [14, 12, -6], + "size": [1, 4, 12], + "uv": { + "north": {"uv": [2, 2], "uv_size": [1, 4]}, + "east": {"uv": [23, 3], "uv_size": [12, 4]}, + "south": {"uv": [15, 2], "uv_size": [1, 4]}, + "west": {"uv": [22, 14], "uv_size": [24, 6]}, + "up": {"uv": [0, 1], "uv_size": [47, -1]}, + "down": {"uv": [0, 1], "uv_size": [47, -1]} + } + }, + { + "origin": [-15, 12, -7], + "size": [30, 4, 1], + "uv": { + "north": {"uv": [0, 14], "uv_size": [50, 6]}, + "east": {"uv": [1, 4], "uv_size": [-1, 4]}, + "south": {"uv": [2, 11], "uv_size": [30, 4]}, + "west": {"uv": [0, 8], "uv_size": [1, 4]}, + "up": {"uv": [0, 1], "uv_size": [47, -1]}, + "down": {"uv": [0, 1], "uv_size": [47, -1]} + } + }, + { + "origin": [-14, 12, -6], + "size": [28, 2, 12], + "uv": { + "north": {"uv": [2, 2], "uv_size": [28, 2]}, + "east": {"uv": [-10, 2], "uv_size": [12, 2]}, + "south": {"uv": [42, 2], "uv_size": [28, 2]}, + "west": {"uv": [30, 2], "uv_size": [12, 2]}, + "up": {"uv": [1, 35], "uv_size": [38, -13]}, + "down": {"uv": [1, 19], "uv_size": [47, -17]} + } + }, + { + "origin": [-15, 12, 6], + "size": [30, 4, 1], + "uv": { + "north": {"uv": [2, 2], "uv_size": [30, 4]}, + "east": {"uv": [0, 4], "uv_size": [1, 4]}, + "south": {"uv": [0, 14], "uv_size": [50, 6]}, + "west": {"uv": [0, 9], "uv_size": [1, 4]}, + "up": {"uv": [0, 1], "uv_size": [47, -1]}, + "down": {"uv": [0, 1], "uv_size": [47, -1]} + } + }, + { + "origin": [-15, 12, -6], + "size": [1, 4, 12], + "uv": { + "north": {"uv": [2, 2], "uv_size": [1, 4]}, + "east": {"uv": [22, 14], "uv_size": [24, 6]}, + "south": {"uv": [15, 2], "uv_size": [1, 4]}, + "west": {"uv": [3, 2], "uv_size": [12, 4]}, + "up": {"uv": [0, 1], "uv_size": [47, -1]}, + "down": {"uv": [0, 1], "uv_size": [47, -1]} + } + } + ] + }, + { + "name": "topshelf", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [-11, 7, -5], + "size": [22, 2, 10], + "uv": { + "north": {"uv": [0, 39], "uv_size": [38, 8]}, + "east": {"uv": [36, 37], "uv_size": [28, 9]}, + "south": {"uv": [0, 39], "uv_size": [38, 8]}, + "west": {"uv": [36, 37], "uv_size": [28, 9]}, + "up": {"uv": [40, 36], "uv_size": [-40, -15]}, + "down": {"uv": [24, 2], "uv_size": [22, -10]} + } + }, + { + "origin": [-8, 9, -3], + "size": [7, 1, 6], + "uv": { + "north": {"uv": [36, 37], "uv_size": [19, 2]}, + "east": {"uv": [36, 37], "uv_size": [19, 2]}, + "south": {"uv": [36, 37], "uv_size": [19, 2]}, + "west": {"uv": [36, 37], "uv_size": [19, 2]}, + "up": {"uv": [41, 63], "uv_size": [-19, -12]}, + "down": {"uv": [19, 34], "uv_size": [19, -12]} + } + }, + { + "origin": [2, 9, -2], + "size": [6, 2, 4], + "uv": { + "north": {"uv": [64, 16], "uv_size": [-14, 4]}, + "east": {"uv": [62, 16], "uv_size": [2, 4]}, + "south": {"uv": [64, 16], "uv_size": [-14, 4]}, + "west": {"uv": [62, 16], "uv_size": [2, 4]}, + "up": {"uv": [64, 10], "uv_size": [-14, 6]}, + "down": {"uv": [47, 30], "uv_size": [6, -7]} + } + } + ] + }, + { + "name": "botshelfR", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [-11, 5, -5], + "size": [11, 2, 10], + "uv": { + "north": {"uv": [36, 37], "uv_size": [28, 9]}, + "east": {"uv": [36, 37], "uv_size": [28, 9]}, + "south": {"uv": [36, 37], "uv_size": [28, 9]}, + "west": {"uv": [36, 37], "uv_size": [28, 9]}, + "up": {"uv": [0, 21], "uv_size": [21, 15]}, + "down": {"uv": [0, 20], "uv_size": [22, -20]} + } + }, + { + "origin": [-2.5, 6.3, -3.3], + "size": [5, 2, 1], + "pivot": [0, 0, 0], + "rotation": [0, 90, 0], + "uv": { + "north": {"uv": [44, 48], "uv_size": [6, 4]}, + "east": {"uv": [60, 28], "uv_size": [3, 4]}, + "south": {"uv": [44, 48], "uv_size": [6, 4]}, + "west": {"uv": [59, 24], "uv_size": [3, 4]}, + "up": {"uv": [58, 29], "uv_size": [5, 2]}, + "down": {"uv": [58, 26], "uv_size": [5, -2]} + } + }, + { + "origin": [-2.5, 6.3, -5.3], + "size": [5, 2, 1], + "pivot": [0, 0, 0], + "rotation": [0, 90, 0], + "uv": { + "north": {"uv": [44, 48], "uv_size": [6, 4]}, + "east": {"uv": [60, 28], "uv_size": [3, 4]}, + "south": {"uv": [44, 48], "uv_size": [6, 4]}, + "west": {"uv": [59, 24], "uv_size": [3, 4]}, + "up": {"uv": [58, 29], "uv_size": [5, 2]}, + "down": {"uv": [58, 26], "uv_size": [5, -2]} + } + }, + { + "origin": [-2.5, 6.3, -7.3], + "size": [5, 2, 1], + "pivot": [0, 0, 0], + "rotation": [0, 90, 0], + "uv": { + "north": {"uv": [44, 48], "uv_size": [6, 4]}, + "east": {"uv": [60, 28], "uv_size": [3, 4]}, + "south": {"uv": [44, 48], "uv_size": [6, 4]}, + "west": {"uv": [59, 24], "uv_size": [3, 4]}, + "up": {"uv": [58, 29], "uv_size": [5, 2]}, + "down": {"uv": [58, 26], "uv_size": [5, -2]} + } + }, + { + "origin": [-2.5, 6.3, -9.3], + "size": [5, 2, 1], + "pivot": [0, 0, 0], + "rotation": [0, 90, 0], + "uv": { + "north": {"uv": [44, 48], "uv_size": [6, 4]}, + "east": {"uv": [60, 28], "uv_size": [3, 4]}, + "south": {"uv": [44, 48], "uv_size": [6, 4]}, + "west": {"uv": [59, 24], "uv_size": [3, 4]}, + "up": {"uv": [58, 29], "uv_size": [5, 2]}, + "down": {"uv": [58, 26], "uv_size": [5, -2]} + } + } + ] + }, + { + "name": "botshelfL", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [-4.75, 6.2, -8], + "size": [4, 0.5, 3], + "pivot": [0, 0, 0], + "rotation": [-176, -81, 165], + "uv": { + "north": {"uv": [51, 8], "uv_size": [13, 1]}, + "east": {"uv": [51, 0], "uv_size": [1, 9]}, + "south": {"uv": [51, 8], "uv_size": [13, 1]}, + "west": {"uv": [51, 0], "uv_size": [1, 9]}, + "up": {"uv": [51, 9], "uv_size": [13, -9]}, + "down": {"uv": [56, 7], "uv_size": [3, -5]} + } + }, + { + "origin": [-2, 7, -9], + "size": [4, 0.5, 3], + "pivot": [0, 0, 0], + "rotation": [0, -90, 0], + "uv": { + "north": {"uv": [51, 8], "uv_size": [13, 1]}, + "east": {"uv": [51, 0], "uv_size": [1, 9]}, + "south": {"uv": [51, 8], "uv_size": [13, 1]}, + "west": {"uv": [51, 0], "uv_size": [1, 9]}, + "up": {"uv": [51, 9], "uv_size": [13, -9]}, + "down": {"uv": [56, 7], "uv_size": [3, -5]} + } + }, + { + "origin": [-4, 7.45, -9.6], + "size": [4, 0.5, 3], + "pivot": [0, 0, 0], + "rotation": [178.29031, -72.99287, -178.36504], + "uv": { + "north": {"uv": [51, 8], "uv_size": [13, 1]}, + "east": {"uv": [51, 0], "uv_size": [1, 9]}, + "south": {"uv": [51, 8], "uv_size": [13, 1]}, + "west": {"uv": [51, 0], "uv_size": [1, 9]}, + "up": {"uv": [51, 9], "uv_size": [13, -9]}, + "down": {"uv": [56, 7], "uv_size": [3, -5]} + } + }, + { + "origin": [0, 5, -5], + "size": [11, 2, 10], + "uv": { + "north": {"uv": [36, 37], "uv_size": [28, 9]}, + "east": {"uv": [36, 37], "uv_size": [28, 9]}, + "south": {"uv": [36, 37], "uv_size": [28, 9]}, + "west": {"uv": [36, 37], "uv_size": [28, 9]}, + "up": {"uv": [19, 21], "uv_size": [21, 15]}, + "down": {"uv": [28, 20], "uv_size": [22, -20]} + } + } + ] + }, + { + "name": "hingeL", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [5, 3, -4], + "size": [6, 2, 8], + "uv": { + "north": {"uv": [11, 64], "uv_size": [-11, -11]}, + "east": {"uv": [12, 53], "uv_size": [10, 11]}, + "south": {"uv": [0, 64], "uv_size": [11, -11]}, + "west": {"uv": [12, 53], "uv_size": [10, 11]}, + "up": {"uv": [22, 64], "uv_size": [-10, -11]}, + "down": {"uv": [22, 64], "uv_size": [-10, -11]} + } + } + ] + }, + { + "name": "hingeR", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [5, 3, -4], + "size": [6, 2, 8], + "pivot": [0, 0, 0], + "rotation": [0, 180, 0], + "uv": { + "north": {"uv": [11, 64], "uv_size": [-11, -11]}, + "east": {"uv": [12, 53], "uv_size": [10, 11]}, + "south": {"uv": [0, 64], "uv_size": [11, -11]}, + "west": {"uv": [12, 53], "uv_size": [10, 11]}, + "up": {"uv": [22, 64], "uv_size": [-10, -11]}, + "down": {"uv": [22, 64], "uv_size": [-10, -11]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/hardcore-redeploy/lang/en_us.json b/src/main/resources/assets/hardcore-redeploy/lang/en_us.json new file mode 100644 index 0000000..c2730d5 --- /dev/null +++ b/src/main/resources/assets/hardcore-redeploy/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "block.hardcore-redeploy.buy_station": "Buy Station", + "effect.hardcore-redeploy.redeploying": "Redeploying" +} \ No newline at end of file diff --git a/src/main/resources/assets/hardcore-redeploy/models/block/buy_station.json b/src/main/resources/assets/hardcore-redeploy/models/block/buy_station.json new file mode 100644 index 0000000..e86cd08 --- /dev/null +++ b/src/main/resources/assets/hardcore-redeploy/models/block/buy_station.json @@ -0,0 +1,11 @@ +{ + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 64, + 64 + ], + "textures": { + "particle": "minecraft:block/hopper_outside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hardcore-redeploy/models/item/buy_station.json b/src/main/resources/assets/hardcore-redeploy/models/item/buy_station.json new file mode 100644 index 0000000..3f1b0df --- /dev/null +++ b/src/main/resources/assets/hardcore-redeploy/models/item/buy_station.json @@ -0,0 +1,3 @@ +{ + "parent": "hardcore-redeploy:block/buy_station" +} \ No newline at end of file diff --git a/src/main/resources/assets/hardcore-redeploy/textures/block/buy_station.png b/src/main/resources/assets/hardcore-redeploy/textures/block/buy_station.png new file mode 100644 index 0000000..8cc50a7 Binary files /dev/null and b/src/main/resources/assets/hardcore-redeploy/textures/block/buy_station.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e23f91b --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,38 @@ +{ + "schemaVersion": 1, + "id": "hardcore-redeploy", + "version": "${version}", + "name": "Hardcore Redeploy", + "description": "A mod that allows reviving players in hardcore servers, at a cost", + "authors": [ + "Hexugory", + "Kaptcha" + ], + "contact": { + "homepage": "", + "sources": "https://git.touhoudiscord.net/Hexugory/HardcoreRedeploy" + }, + "license": "LGPL-3.0", + "icon": "assets/hardcore-redeploy/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "net.touhoudiscord.HardcoreRedeploy" + ], + "client": [ + "net.touhoudiscord.HardcoreRedeployClient" + ] + }, + "mixins": [ + "hardcore-redeploy.mixins.json" + ], + "depends": { + "fabricloader": ">=0.14.25", + "minecraft": "~1.20.1", + "java": ">=17", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/hardcore-redeploy.mixins.json b/src/main/resources/hardcore-redeploy.mixins.json new file mode 100644 index 0000000..4270c3a --- /dev/null +++ b/src/main/resources/hardcore-redeploy.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "net.touhoudiscord.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "RedeployingMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file