diff --git a/build.gradle b/build.gradle index 55792af..49fb2b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ import net.fabricmc.loom.task.RemapJarTask plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' - id 'io.github.ladysnake.chenille' version '0.13.0' + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'io.github.ladysnake.chenille' version '0.13.1' id 'io.github.juuxel.loom-quiltflower' version "1.6.0" } diff --git a/changelog.md b/changelog.md index 37166be..801fbf1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,12 @@ +------------------------------------------------------ +Version 3.2.0 +------------------------------------------------------ +- Updated to MC 1.21 + ------------------------------------------------------ Version 3.1.0 ------------------------------------------------------ -- Updated to 1.20.6 +- Updated to MC 1.20.6 ------------------------------------------------------ Version 3.0.1 @@ -12,13 +17,13 @@ Version 3.0.1 ------------------------------------------------------ Version 3.0.0 ------------------------------------------------------ -- Updated to 1.20.4 +- Updated to MC 1.20.4 - **BREAKING (for developers) :** Changed package from `io.github.ladysnake` to `org.ladysnake` ------------------------------------------------------ Version 2.10.2 ------------------------------------------------------ -- Fixed incompatibility with Effective 3.0 +- Fixed incompatibility with Effective 2.2 ------------------------------------------------------ Version 2.10.1 diff --git a/gradle.properties b/gradle.properties index 587a070..1b417bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.3 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 loader_version=0.15.11 -fabric_version=0.100.4+1.20.6 +fabric_version=0.100.7+1.21 # Other Dependencies jb_annotations_version = 23.0.0 apiguardian_version = 1.1.2 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.2.0 maven_group = org.ladysnake archives_base_name = impersonate diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c6c09d1..09206a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -cca = "6.0.0" +cca = "6.1.1" fpa = "0.2-SNAPSHOT" -elmendorf = "0.12.0-SNAPSHOT" +elmendorf = "0.13.0" [libraries] cca-base = { module = "org.ladysnake.cardinal-components-api:cardinal-components-base", version.ref = "cca" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d951fac..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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 -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 +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 -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"' +# 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" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ 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. + 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" = "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 +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 -# 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 +# 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" = "true" -o "$msys" = "true" ] ; 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 +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 - 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\"" + 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 - i=`expr $i + 1` + # 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 - 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" +# 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 index 5093609..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -54,31 +55,16 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 -: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 @@ -86,17 +72,19 @@ 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% +"%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%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/src/main/java/org/ladysnake/impersonate/Impersonate.java b/src/main/java/org/ladysnake/impersonate/Impersonate.java index 9f41283..44031ad 100644 --- a/src/main/java/org/ladysnake/impersonate/Impersonate.java +++ b/src/main/java/org/ladysnake/impersonate/Impersonate.java @@ -46,7 +46,7 @@ public final class Impersonate implements ModInitializer, EntityComponentInitial ); public static Identifier id(String path) { - return new Identifier("impersonate", path); + return Identifier.of("impersonate", path); } @Override diff --git a/src/main/java/org/ladysnake/impersonate/impl/ImpersonateCommand.java b/src/main/java/org/ladysnake/impersonate/impl/ImpersonateCommand.java index 62f8a08..726290b 100644 --- a/src/main/java/org/ladysnake/impersonate/impl/ImpersonateCommand.java +++ b/src/main/java/org/ladysnake/impersonate/impl/ImpersonateCommand.java @@ -29,6 +29,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; +import org.ladysnake.impersonate.Impersonate; import org.ladysnake.impersonate.Impersonator; import java.util.Collection; @@ -40,7 +41,7 @@ public final class ImpersonateCommand { - public static final Identifier DEFAULT_IMPERSONATION_KEY = new Identifier("impersonate:command"); + public static final Identifier DEFAULT_IMPERSONATION_KEY = Impersonate.id("command"); public static void register(CommandDispatcher dispatcher) { dispatcher.register(literal("impersonate") diff --git a/src/main/java/org/ladysnake/impersonate/impl/ReloadSkinPacket.java b/src/main/java/org/ladysnake/impersonate/impl/ReloadSkinPacket.java index 02d2eb2..40ef0ad 100644 --- a/src/main/java/org/ladysnake/impersonate/impl/ReloadSkinPacket.java +++ b/src/main/java/org/ladysnake/impersonate/impl/ReloadSkinPacket.java @@ -1,3 +1,20 @@ +/* + * Impersonate + * Copyright (C) 2020-2024 Ladysnake + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; If not, see . + */ package org.ladysnake.impersonate.impl; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/org/ladysnake/impersonate/impl/ServerPlayerSkins.java b/src/main/java/org/ladysnake/impersonate/impl/ServerPlayerSkins.java index e5275d0..b360e0d 100644 --- a/src/main/java/org/ladysnake/impersonate/impl/ServerPlayerSkins.java +++ b/src/main/java/org/ladysnake/impersonate/impl/ServerPlayerSkins.java @@ -24,12 +24,10 @@ import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.PropertyMap; import com.mojang.datafixers.util.Pair; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PlayerLookup; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.entity.Entity; import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.network.packet.CustomPayload; import net.minecraft.network.packet.s2c.play.CommonPlayerSpawnInfo; import net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket; import net.minecraft.network.packet.s2c.play.EntityStatusEffectS2CPacket; @@ -39,10 +37,9 @@ import net.minecraft.network.packet.s2c.play.PlayerRemoveS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerChunkLoadingManager; import net.minecraft.server.world.ServerChunkManager; import net.minecraft.server.world.ServerWorld; -import net.minecraft.server.world.ThreadedAnvilChunkStorage; -import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.world.biome.source.BiomeAccess; import net.minecraft.world.chunk.ChunkManager; @@ -52,7 +49,7 @@ import org.ladysnake.impersonate.Impersonate; import org.ladysnake.impersonate.Impersonator; import org.ladysnake.impersonate.impl.mixin.EntityTrackerAccessor; -import org.ladysnake.impersonate.impl.mixin.ThreadedAnvilChunkStorageAccessor; +import org.ladysnake.impersonate.impl.mixin.ServerChunkLoadingManagerAccessor; import javax.net.ssl.HttpsURLConnection; import java.io.IOException; @@ -148,8 +145,8 @@ private static void reloadSkin(ServerPlayerEntity player) { ChunkManager manager = player.getWorld().getChunkManager(); assert manager instanceof ServerChunkManager; - ThreadedAnvilChunkStorage storage = ((ServerChunkManager) manager).threadedAnvilChunkStorage; - EntityTrackerAccessor trackerEntry = ((ThreadedAnvilChunkStorageAccessor) storage).getEntityTrackers().get(player.getId()); + ServerChunkLoadingManager storage = ((ServerChunkManager) manager).chunkLoadingManager; + EntityTrackerAccessor trackerEntry = ((ServerChunkLoadingManagerAccessor) storage).getEntityTrackers().get(player.getId()); for (ServerPlayerEntity tracking : PlayerLookup.tracking(player)) { trackerEntry.getEntry().startTracking(tracking); diff --git a/src/main/java/org/ladysnake/impersonate/impl/mixin/EntityTrackerAccessor.java b/src/main/java/org/ladysnake/impersonate/impl/mixin/EntityTrackerAccessor.java index 0d8ee4e..ab6eee3 100644 --- a/src/main/java/org/ladysnake/impersonate/impl/mixin/EntityTrackerAccessor.java +++ b/src/main/java/org/ladysnake/impersonate/impl/mixin/EntityTrackerAccessor.java @@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -@Mixin(targets = "net.minecraft.server.world.ThreadedAnvilChunkStorage$EntityTracker") +@Mixin(targets = "net.minecraft.server.world.ServerChunkLoadingManager$EntityTracker") public interface EntityTrackerAccessor { @Accessor EntityTrackerEntry getEntry(); diff --git a/src/main/java/org/ladysnake/impersonate/impl/mixin/ThreadedAnvilChunkStorageAccessor.java b/src/main/java/org/ladysnake/impersonate/impl/mixin/ServerChunkLoadingManagerAccessor.java similarity index 86% rename from src/main/java/org/ladysnake/impersonate/impl/mixin/ThreadedAnvilChunkStorageAccessor.java rename to src/main/java/org/ladysnake/impersonate/impl/mixin/ServerChunkLoadingManagerAccessor.java index 70a3177..f944e0e 100644 --- a/src/main/java/org/ladysnake/impersonate/impl/mixin/ThreadedAnvilChunkStorageAccessor.java +++ b/src/main/java/org/ladysnake/impersonate/impl/mixin/ServerChunkLoadingManagerAccessor.java @@ -18,12 +18,12 @@ package org.ladysnake.impersonate.impl.mixin; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import net.minecraft.server.world.ThreadedAnvilChunkStorage; +import net.minecraft.server.world.ServerChunkLoadingManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -@Mixin(ThreadedAnvilChunkStorage.class) -public interface ThreadedAnvilChunkStorageAccessor { +@Mixin(ServerChunkLoadingManager.class) +public interface ServerChunkLoadingManagerAccessor { @Accessor Int2ObjectMap getEntityTrackers(); } diff --git a/src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java b/src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java index 9cb8a62..d8def1f 100644 --- a/src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java +++ b/src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java @@ -18,12 +18,12 @@ package org.ladysnake.impersonate.impl.mixin.compat; import com.mojang.authlib.GameProfile; -import net.minecraft.client.render.entity.PlayerModelPart; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerModelPart; import org.jetbrains.annotations.Nullable; -import org.ladysnake.impersonate.Impersonator; import org.ladysnake.effective.cosmetics.EffectiveCosmetics; import org.ladysnake.effective.cosmetics.data.PlayerCosmeticData; +import org.ladysnake.impersonate.Impersonator; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -35,7 +35,7 @@ @Mixin(EffectiveCosmetics.class) public abstract class EffectiveCosmeticsMixin { - @Shadow + @Shadow(remap = false) private static Map PLAYER_COSMETICS; @SuppressWarnings({"MixinAnnotationTarget", "UnresolvedMixinReference", "InvalidInjectorMethodSignature"}) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3f230ff..3c56e2e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -40,7 +40,7 @@ } ], "depends": { - "minecraft": "~1.20.5-", + "minecraft": ">=1.21-", "fabric": "*", "cardinal-components-base": "^6.0.0-", "cardinal-components-entity": "^6.0.0-", diff --git a/src/main/resources/mixins.impersonate.common.json b/src/main/resources/mixins.impersonate.common.json index 906a7f4..187e5d8 100644 --- a/src/main/resources/mixins.impersonate.common.json +++ b/src/main/resources/mixins.impersonate.common.json @@ -16,7 +16,7 @@ "ServerCommonNetworkHandlerMixin", "ServerPlayerEntityMixin", "TextMixin", - "ThreadedAnvilChunkStorageAccessor", + "ServerChunkLoadingManagerAccessor", "TranslatableTextContentMixin" ], "injectors": { diff --git a/src/testmod/java/org/ladysnake/impersonatest/ImpersonateTestSuite.java b/src/testmod/java/org/ladysnake/impersonatest/ImpersonateTestSuite.java index f5e297c..0501d83 100644 --- a/src/testmod/java/org/ladysnake/impersonatest/ImpersonateTestSuite.java +++ b/src/testmod/java/org/ladysnake/impersonatest/ImpersonateTestSuite.java @@ -53,7 +53,7 @@ public class ImpersonateTestSuite implements FabricGameTest { - public static final Identifier IMPERSONATION_KEY = new Identifier("impersonatest", "key"); + public static final Identifier IMPERSONATION_KEY = Impersonatest.id("key"); @GameTest(templateName = EMPTY_STRUCTURE) public void nameChanges(TestContext ctx) { @@ -117,16 +117,16 @@ public void nameInChatGetsRevealed(TestContext ctx) throws NoSuchAlgorithmExcept messagePacker.pack(new MessageBody(text, timestamp, salt, lastSeenMessages)), new LastSeenMessageList.Acknowledgment(0, new BitSet()) )); -// ctx.verifyConnection(player, conn -> conn.sent( -// ChatMessageS2CPacket.class, -// chatPacket -> chatPacket.serializedParameters().name().getString() -// .equals("impersonated(test-mock-player)")) -// ); -// ctx.verifyConnection(otherPlayer, conn -> conn.sent( -// ChatMessageS2CPacket.class, -// chatPacket -> chatPacket.serializedParameters().name().getString() -// .equals("impersonated")) -// ); + ctx.verifyConnection(player, conn -> conn.sent( + ChatMessageS2CPacket.class, + chatPacket -> chatPacket.serializedParameters().name().getString() + .equals("impersonated(test-mock-player)")) + ); + ctx.verifyConnection(otherPlayer, conn -> conn.sent( + ChatMessageS2CPacket.class, + chatPacket -> chatPacket.serializedParameters().name().getString() + .equals("impersonated")) + ); ctx.complete(); } finally { playerManager.removeFromOperators(player.getGameProfile()); diff --git a/src/testmod/java/org/ladysnake/impersonatest/Impersonatest.java b/src/testmod/java/org/ladysnake/impersonatest/Impersonatest.java index 1e8a10c..624abb7 100644 --- a/src/testmod/java/org/ladysnake/impersonatest/Impersonatest.java +++ b/src/testmod/java/org/ladysnake/impersonatest/Impersonatest.java @@ -26,7 +26,7 @@ public final class Impersonatest implements ModInitializer { public static Identifier id(String path) { - return new Identifier("impersonatest", path); + return Identifier.of("impersonatest", path); } @Override