diff --git a/build.gradle b/build.gradle index 80dbe2f..c29af87 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '1.0-SNAPSHOT' id 'maven-publish' id "com.github.johnrengelman.shadow" version "7.1.2" } @@ -46,28 +46,28 @@ allprojects { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation ('com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:1.18-SNAPSHOT'){ + modImplementation ('com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:v2.2.4-1.19'){ exclude(group: "net.fabricmc.fabric-api") transitive(false) } - include 'com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:1.18-SNAPSHOT' + include 'com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:v2.2.4-1.19' - modImplementation ('com.github.qouteall.ImmersivePortalsMod:q_misc_util:1.18-SNAPSHOT'){ + modImplementation ('com.github.qouteall.ImmersivePortalsMod:q_misc_util:v2.2.4-1.19'){ exclude(group: "net.fabricmc.fabric-api") transitive(false) } - include 'com.github.qouteall.ImmersivePortalsMod:q_misc_util:1.18-SNAPSHOT' + include 'com.github.qouteall.ImmersivePortalsMod:q_misc_util:v2.2.4-1.19' compileOnly 'com.google.code.findbugs:jsr305:3.0.2' - modImplementation 'software.bernie.geckolib:geckolib-fabric-1.18:3.0.35' + modImplementation 'software.bernie.geckolib:geckolib-fabric-1.19:3.1.20' - modImplementation('com.terraformersmc:modmenu:3.1.0') + modImplementation('com.terraformersmc:modmenu:4.0.6') - modApi("me.shedaniel.cloth:cloth-config-fabric:6.2.57") { + modApi("me.shedaniel.cloth:cloth-config-fabric:8.2.88") { exclude(group: "net.fabricmc.fabric-api") } - include("me.shedaniel.cloth:cloth-config-fabric:6.2.57") + include("me.shedaniel.cloth:cloth-config-fabric:8.2.88") // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. diff --git a/gradle.properties b/gradle.properties index ecd3064..e3e6b08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.18.2 -yarn_mappings=1.18.2+build.2 -loader_version=0.13.3 -fabric_version=0.48.0+1.18.2 +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.18 +loader_version=0.14.9 +fabric_version=0.62.0+1.19.2 # Mod Properties -mod_version=3.0.2 +mod_version=4.0.0 maven_group=tk.meowmc archives_base_name=portalgun diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..41d9927 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 84d1f85..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..1b6c787 100644 --- 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,101 @@ # ############################################################################## -## -## 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/master/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" +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 +121,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,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,95 @@ 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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. +# -# 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" +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..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ 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% @@ -64,21 +64,6 @@ 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 @@ -86,7 +71,7 @@ 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 diff --git a/src/main/java/tk/meowmc/portalgun/client/PortalgunClient.java b/src/main/java/tk/meowmc/portalgun/client/PortalgunClient.java index 3dc672d..9ce518f 100644 --- a/src/main/java/tk/meowmc/portalgun/client/PortalgunClient.java +++ b/src/main/java/tk/meowmc/portalgun/client/PortalgunClient.java @@ -6,8 +6,8 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry; -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; @@ -85,8 +85,8 @@ public void onInitializeClient() { EntityModelLayerRegistry.registerModelLayer(OVERLAY_MODEL_LAYER, PortalOverlayModel::getTexturedModelData); - EntityRendererRegistry.INSTANCE.register(Portalgun.CUSTOM_PORTAL, PortalEntityRenderer::new); - EntityRendererRegistry.INSTANCE.register(Portalgun.PORTAL_OVERLAY, PortalOverlayRenderer::new); + EntityRendererRegistry.register(Portalgun.CUSTOM_PORTAL, PortalEntityRenderer::new); + EntityRendererRegistry.register(Portalgun.PORTAL_OVERLAY, PortalOverlayRenderer::new); ClientPlayNetworking.registerGlobalReceiver(PacketID, PortalgunClient::onEntitySpawn); } diff --git a/src/main/java/tk/meowmc/portalgun/client/renderer/models/ClawModel.java b/src/main/java/tk/meowmc/portalgun/client/renderer/models/ClawModel.java index fd72274..b73594a 100644 --- a/src/main/java/tk/meowmc/portalgun/client/renderer/models/ClawModel.java +++ b/src/main/java/tk/meowmc/portalgun/client/renderer/models/ClawModel.java @@ -8,17 +8,17 @@ public class ClawModel extends AnimatedGeoModel { @Override - public Identifier getModelLocation(ClawItem object) { + public Identifier getModelResource(ClawItem object) { return id("geo/portalgun_claw.geo.json"); } @Override - public Identifier getTextureLocation(ClawItem object) { + public Identifier getTextureResource(ClawItem object) { return id("textures/item/portal_gun.png"); } @Override - public Identifier getAnimationFileLocation(ClawItem animatable) { + public Identifier getAnimationResource(ClawItem animatable) { return null; } } diff --git a/src/main/java/tk/meowmc/portalgun/client/renderer/models/PortalGunModel.java b/src/main/java/tk/meowmc/portalgun/client/renderer/models/PortalGunModel.java index da7501f..4a95f36 100644 --- a/src/main/java/tk/meowmc/portalgun/client/renderer/models/PortalGunModel.java +++ b/src/main/java/tk/meowmc/portalgun/client/renderer/models/PortalGunModel.java @@ -12,7 +12,7 @@ public class PortalGunModel extends AnimatedGeoModel { PortalGunConfig config = AutoConfig.getConfigHolder(PortalGunConfig.class).getConfig(); @Override - public Identifier getModelLocation(PortalGunItem object) { + public Identifier getModelResource(PortalGunItem object) { /*if (config.enabled.enableOldPortalGunModel) return id("geo/portalgun_og.geo.json"); else*/ @@ -20,7 +20,7 @@ public Identifier getModelLocation(PortalGunItem object) { } @Override - public Identifier getTextureLocation(PortalGunItem object) { + public Identifier getTextureResource(PortalGunItem object) { /*if (config.enabled.enableOldPortalGunModel) return id("textures/item/portal_gun_og.png"); else*/ @@ -28,7 +28,7 @@ public Identifier getTextureLocation(PortalGunItem object) { } @Override - public Identifier getAnimationFileLocation(PortalGunItem animatable) { + public Identifier getAnimationResource(PortalGunItem animatable) { /*if (config.enabled.enableOldPortalGunModel) return id("animations/portalgun_og.animation.json"); else*/ diff --git a/src/main/java/tk/meowmc/portalgun/entities/CustomPortal.java b/src/main/java/tk/meowmc/portalgun/entities/CustomPortal.java index d893aca..bfe17cb 100644 --- a/src/main/java/tk/meowmc/portalgun/entities/CustomPortal.java +++ b/src/main/java/tk/meowmc/portalgun/entities/CustomPortal.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Level; import org.jetbrains.annotations.NotNull; import qouteall.imm_ptl.core.McHelper; -import qouteall.imm_ptl.core.PehkuiInterface; +import qouteall.imm_ptl.core.compat.PehkuiInterface; import qouteall.imm_ptl.core.mc_utils.IPEntityEventListenableEntity; import qouteall.imm_ptl.core.portal.*; import qouteall.q_misc_util.Helper; diff --git a/src/main/java/tk/meowmc/portalgun/misc/MinecraftClientMethods.java b/src/main/java/tk/meowmc/portalgun/misc/MinecraftClientMethods.java index 5014519..05f5a5a 100644 --- a/src/main/java/tk/meowmc/portalgun/misc/MinecraftClientMethods.java +++ b/src/main/java/tk/meowmc/portalgun/misc/MinecraftClientMethods.java @@ -153,7 +153,7 @@ private static ActionResult myInteractBlock(Hand hand, ClientWorld targetWorld, client.player.world = targetWorld; client.world = targetWorld; isContextSwitched = true; - var4 = client.interactionManager.interactBlock(client.player, targetWorld, hand, blockHitResult); + var4 = client.interactionManager.interactBlock(client.player, hand, blockHitResult); } finally { client.player.world = oldWorld; client.world = oldWorld; diff --git a/src/main/java/tk/meowmc/portalgun/mixin/ClientPlayerEntityMixin.java b/src/main/java/tk/meowmc/portalgun/mixin/ClientPlayerEntityMixin.java index 141f200..95475d6 100644 --- a/src/main/java/tk/meowmc/portalgun/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/tk/meowmc/portalgun/mixin/ClientPlayerEntityMixin.java @@ -5,6 +5,7 @@ import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.world.ClientWorld; +import net.minecraft.network.encryption.PlayerPublicKey; import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket; import net.minecraft.util.Hand; import org.spongepowered.asm.mixin.Final; @@ -20,8 +21,8 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity @Final public ClientPlayNetworkHandler networkHandler; - public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) { - super(world, profile); + public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey playerPublicKey) { + super(world, profile, playerPublicKey); } /** diff --git a/src/main/resources/assets/portalgun/lang/de_de.json b/src/main/resources/assets/portalgun/lang/de_de.json new file mode 100644 index 0000000..73ea0c0 --- /dev/null +++ b/src/main/resources/assets/portalgun/lang/de_de.json @@ -0,0 +1,13 @@ +{ + "item.portalgun.portal_gun": "Aperture Science Handheld Dual-Portalgerät", + "item.portalgun.portalgun_body": "Portal Gerätekörper", + "item.portalgun.portalgun_claw": "Portal Geräteklaue", + "subtitles.portalgun.portal1_shoot": "Primäres Portal erstellt", + "subtitles.portalgun.portal2_shoot": "Sekundäres Portal erstellt", + "subtitles.portalgun.portal_open": "Portal geöffnet", + "subtitles.portalgun.portal_close": "Portal geschlossen", + "key.portalgun.clearportals": "Lösche Portale", + "category.portalgun": "Portal Gun", + "text.autoconfig.portalgun.option.enabled.portalFunneling": "Portal Schleusen", + "text.autoconfig.portalgun.title": "Portal Gun Fabric Optionen" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f052a13..333f70b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ "depends": { "fabricloader": ">=0.8.0", "fabric": "*", - "minecraft": "1.18.x", + "minecraft": "1.19.x", "geckolib3": "*" }, "accessWidener": "portalgun.accesswidener"