commit 8539fd58b18c074e737a10d08c07aa35e9ece98e Author: TheBrokenRail Date: Sat Mar 14 18:40:11 2020 -0400 1.0 Initial Release diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9563893 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8d689ff --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +# Changelog + +**1.0** +* Initial Release \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..1673e44 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent { + docker { + image 'openjdk:8-jdk' + } + } + stages { + stage('Build') { + steps { + sh './gradlew build' + } + post { + success { + archiveArtifacts artifacts: 'build/libs/*', fingerprint: true + } + } + } + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..886b254 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 TheBrokenRail + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..76dae68 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# ObsidianSpawn +Use Crying Obsidian to set your spawn-point in any dimension! + +## Changelog +[View Changelog](CHANGELOG.md) \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..60a6f94 --- /dev/null +++ b/build.gradle @@ -0,0 +1,76 @@ +plugins { + id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'com.matthewprenger.cursegradle' version '1.4.0' +} + +compileJava { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +archivesBaseName = project.archives_base_name +version = project.mod_version as Object +group = project.maven_group as Object + +minecraft { +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" +} + +processResources { + inputs.property 'version', version + + from(sourceSets.main.resources.srcDirs) { + include 'fabric.mod.json' + expand 'version': version + } + + from(sourceSets.main.resources.srcDirs) { + exclude 'fabric.mod.json' + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier 'sources' + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +if (project.hasProperty('curseforge.api_key')) { + curseforge { + apiKey = project.getProperty('curseforge.api_key') + project { + id = project.curseforge_id + changelog = 'A changelog can be found at https://gitea.thebrokenrail.com/TheBrokenRail/ObsidianSpawn/src/branch/master/CHANGELOG.md' + releaseType = 'release' + addGameVersion project.simple_minecraft_version + addGameVersion 'Fabric' + mainArtifact(remapJar) { + displayName = "ObsidianSpawn v${version} for ${project.minecraft_version}" + } + afterEvaluate { + uploadTask.dependsOn('remapJar') + } + } + options { + forgeGradleIntegration = false + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e6fda4c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://fabricmc.net/use +minecraft_version=20w11a +curseforge_id=367307 +simple_minecraft_version=1.16-Snapshot +yarn_mappings=20w11a+build.6 +loader_version=0.7.8+build.184 +# Mod Properties +mod_version=1.0.0 +maven_group=com.thebrokenrail +archives_base_name=obsidianspawn diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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..4a6ebce --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..8e25e6c --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-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%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/com/thebrokenrail/obsidianspawn/DataHolder.java b/src/main/java/com/thebrokenrail/obsidianspawn/DataHolder.java new file mode 100644 index 0000000..a3ab5b2 --- /dev/null +++ b/src/main/java/com/thebrokenrail/obsidianspawn/DataHolder.java @@ -0,0 +1,9 @@ +package com.thebrokenrail.obsidianspawn; + +import net.minecraft.world.dimension.DimensionType; + +public interface DataHolder { + void setSpawnDimension(DimensionType dimension); + + DimensionType getSpawnDimension(); +} diff --git a/src/main/java/com/thebrokenrail/obsidianspawn/ObsidianSpawn.java b/src/main/java/com/thebrokenrail/obsidianspawn/ObsidianSpawn.java new file mode 100644 index 0000000..e451389 --- /dev/null +++ b/src/main/java/com/thebrokenrail/obsidianspawn/ObsidianSpawn.java @@ -0,0 +1,19 @@ +package com.thebrokenrail.obsidianspawn; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.WorldView; + +import java.util.Optional; + +public class ObsidianSpawn { + public static Optional checkPosition(WorldView world, BlockPos spawnPos) { + Optional out = Optional.empty(); + BlockPos pos = spawnPos.offset(Direction.UP); + if (world.getBlockState(pos).isAir() && world.getBlockState(pos.offset(Direction.UP)).isAir()) { + out = Optional.of(new Vec3d((double) pos.getX() + 0.5d, pos.getY(), (double) pos.getZ() + 0.5d)); + } + return out; + } +} diff --git a/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinCryingObsidianBlock.java b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinCryingObsidianBlock.java new file mode 100644 index 0000000..1600af9 --- /dev/null +++ b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinCryingObsidianBlock.java @@ -0,0 +1,22 @@ +package com.thebrokenrail.obsidianspawn.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.block.CryingObsidianBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; + +@SuppressWarnings("unused") +@Mixin(CryingObsidianBlock.class) +public class MixinCryingObsidianBlock { + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (!world.isClient()) { + player.setPlayerSpawn(pos, false, true); + } + return ActionResult.SUCCESS; + } +} diff --git a/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinPlayerEntity.java b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinPlayerEntity.java new file mode 100644 index 0000000..3809697 --- /dev/null +++ b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinPlayerEntity.java @@ -0,0 +1,59 @@ +package com.thebrokenrail.obsidianspawn.mixin; + +import com.thebrokenrail.obsidianspawn.DataHolder; +import com.thebrokenrail.obsidianspawn.ObsidianSpawn; +import net.minecraft.block.Block; +import net.minecraft.block.CryingObsidianBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.WorldView; +import net.minecraft.world.dimension.DimensionType; +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; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.Optional; + +@SuppressWarnings("unused") +@Mixin(PlayerEntity.class) +public class MixinPlayerEntity implements DataHolder { + private DimensionType spawnDimension = DimensionType.OVERWORLD; + + @Inject(at = @At("HEAD"), method = "readCustomDataFromTag") + public void readCustomDataFromTag(CompoundTag tag, CallbackInfo info) { + spawnDimension = DimensionType.byRawId(tag.getInt("SpawnDimension")); + } + + @Inject(at = @At("HEAD"), method = "writeCustomDataToTag") + public void writeCustomDataToTag(CompoundTag tag, CallbackInfo info) { + tag.putInt("SpawnDimension", spawnDimension.getRawId()); + } + + @Inject(at = @At("HEAD"), method = "setPlayerSpawn") + public void setPlayerSpawn(BlockPos pos, boolean forced, boolean announceChange, CallbackInfo info) { + //noinspection ConstantConditions + setSpawnDimension(((PlayerEntity) (Object) this).dimension); + } + + @Inject(at = @At("HEAD"), method = "findRespawnPosition", cancellable = true) + private static void findRespawnPosition(WorldView world, BlockPos spawnPos, boolean allowNonBed, CallbackInfoReturnable> info) { + Block block = world.getBlockState(spawnPos).getBlock(); + if (block instanceof CryingObsidianBlock) { + info.setReturnValue(ObsidianSpawn.checkPosition(world, spawnPos)); + } + } + + @Override + public void setSpawnDimension(DimensionType spawnDimension) { + this.spawnDimension = spawnDimension; + } + + @Override + public DimensionType getSpawnDimension() { + return spawnDimension; + } +} diff --git a/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinServerPlayNetworkHandler.java b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinServerPlayNetworkHandler.java new file mode 100644 index 0000000..6ac8cdd --- /dev/null +++ b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinServerPlayNetworkHandler.java @@ -0,0 +1,35 @@ +package com.thebrokenrail.obsidianspawn.mixin; + +import com.thebrokenrail.obsidianspawn.DataHolder; +import com.thebrokenrail.obsidianspawn.ObsidianSpawn; +import net.minecraft.block.Block; +import net.minecraft.block.CryingObsidianBlock; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.world.WorldView; +import net.minecraft.world.dimension.DimensionType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +@SuppressWarnings("unused") +@Mixin(ServerPlayNetworkHandler.class) +public class MixinServerPlayNetworkHandler { + @ModifyArg(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;respawnPlayer(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/world/dimension/DimensionType;Z)Lnet/minecraft/server/network/ServerPlayerEntity;"), method = "onClientStatus", index = 1) + public DimensionType adjustRespawnDimension(ServerPlayerEntity player, DimensionType dimension, boolean alive) { + if (player.getSpawnPosition() != null) { + DimensionType type = ((DataHolder) player).getSpawnDimension(); + WorldView world = player.server.getWorld(type); + Block block = world.getBlockState(player.getSpawnPosition()).getBlock(); + if (!(block instanceof CryingObsidianBlock)) { + return DimensionType.OVERWORLD; + } else if (!ObsidianSpawn.checkPosition(world, player.getSpawnPosition()).isPresent()) { + return DimensionType.OVERWORLD; + } else { + return type; + } + } else { + return DimensionType.OVERWORLD; + } + } +} diff --git a/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinServerPlayerEntity.java b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinServerPlayerEntity.java new file mode 100644 index 0000000..f0dd7ee --- /dev/null +++ b/src/main/java/com/thebrokenrail/obsidianspawn/mixin/MixinServerPlayerEntity.java @@ -0,0 +1,20 @@ +package com.thebrokenrail.obsidianspawn.mixin; + +import com.thebrokenrail.obsidianspawn.DataHolder; +import net.minecraft.server.network.ServerPlayerEntity; +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; + +@SuppressWarnings("unused") +@Mixin(ServerPlayerEntity.class) +public abstract class MixinServerPlayerEntity implements DataHolder { + @Inject(at = @At("HEAD"), method = "copyFrom") + public void copyFrom(ServerPlayerEntity oldPlayer, boolean alive, CallbackInfo info) { + DataHolder oldData = (DataHolder) oldPlayer; + DataHolder newData = this; + + newData.setSpawnDimension(oldData.getSpawnDimension()); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/obsidianspawn/icon.png b/src/main/resources/assets/obsidianspawn/icon.png new file mode 100644 index 0000000..1ec4b2c Binary files /dev/null and b/src/main/resources/assets/obsidianspawn/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..07ae9d1 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,25 @@ +{ + "schemaVersion": 1, + "id": "obsidianspawn", + "version": "${version}", + "name": "ObsidianSpawn", + "description": "Use Crying Obsidian to set your spawn-point in any dimension!", + "authors": [ + "TheBrokenRail" + ], + "contact": { + "homepage": "https://thebrokenrail.com/", + "sources": "https://gitea.thebrokenrail.com/TheBrokenRail/ObsidianSpawn.git", + "issues": "https://gitea.thebrokenrail.com/TheBrokenRail/ObsidianSpawn/issues" + }, + "license": "MIT", + "icon": "assets/obsidianspawn/icon.png", + "environment": "*", + "mixins": [ + "obsidianspawn.mixins.json" + ], + "depends": { + "fabricloader": ">=0.7.4", + "minecraft": "1.16.x" + } +} diff --git a/src/main/resources/obsidianspawn.mixins.json b/src/main/resources/obsidianspawn.mixins.json new file mode 100644 index 0000000..3df39cc --- /dev/null +++ b/src/main/resources/obsidianspawn.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "package": "com.thebrokenrail.obsidianspawn.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinCryingObsidianBlock", + "MixinPlayerEntity", + "MixinServerPlayNetworkHandler", + "MixinServerPlayerEntity" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file