diff --git a/build.gradle b/build.gradle index c876d06..66d4033 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.5.7' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 73d593d..5af04b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.9 -loader_version=0.14.21 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.7 #Fabric api -fabric_version=0.85.0+1.20.1 +fabric_version=0.96.11+1.20.4 # Mod Properties mod_version=1.0.5 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..d64cd49 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 84a0b92..a80b22c 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.2.1-bin.zip +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 index c53aefa..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original 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. @@ -32,10 +32,10 @@ # 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». +# * 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: # @@ -55,7 +55,7 @@ # 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 +# 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/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' +# 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 @@ -133,22 +131,29 @@ 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. + 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 @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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. + +# 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" \ @@ -205,6 +214,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..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 execute +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 @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe 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 @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :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/mendedminecarts/AbstractMinecartEntityAccess.java b/src/main/java/mendedminecarts/AbstractMinecartEntityAccess.java index e854b6f..8aeb09c 100644 --- a/src/main/java/mendedminecarts/AbstractMinecartEntityAccess.java +++ b/src/main/java/mendedminecarts/AbstractMinecartEntityAccess.java @@ -1,5 +1,9 @@ package mendedminecarts; public interface AbstractMinecartEntityAccess { + void updateDisplayInfo(); + MinecartDisplayData getDisplayInfo(); + + } diff --git a/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_Client.java b/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_Client.java index 1ff7199..1d113c1 100644 --- a/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_Client.java +++ b/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_Client.java @@ -9,7 +9,7 @@ import net.minecraft.entity.vehicle.AbstractMinecartEntity; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; @@ -18,9 +18,9 @@ @Mixin(AbstractMinecartEntity.class) public abstract class AbstractMinecartEntityMixin_Client extends Entity implements AbstractMinecartEntityAccess { + @Unique private MinecartDisplayData displayData; - @Shadow public abstract void updateTrackedPositionAndAngles(double x, double y, double z, float yaw, float pitch, int interpolationSteps, boolean interpolate); public AbstractMinecartEntityMixin_Client(EntityType type, World world) { super(type, world); @@ -46,23 +46,20 @@ private boolean simulateCartsOnClientLikeOnServer(World instance) { // } @Inject( - method = "updateTrackedPositionAndAngles(DDDFFIZ)V", + method = "updateTrackedPositionAndAngles(DDDFFI)V", at = @At("HEAD"), cancellable = true ) - private void setCartPosLikeOtherEntities(double x, double y, double z, float yaw, float pitch, int interpolationSteps, boolean interpolate, CallbackInfo ci) { + private void setCartPosLikeOtherEntities(double x, double y, double z, float yaw, float pitch, int interpolationSteps, CallbackInfo ci) { if (this.getWorld().isClient && (MendedMinecartsMod.ACCURATE_CLIENT_MINECARTS.isEnabled() || MendedMinecartsMod.NO_CLIENT_CART_INTERPOLATION.isEnabled())) { ci.cancel(); - super.updateTrackedPositionAndAngles(x, y, z, yaw, pitch, interpolationSteps, interpolate); + super.updateTrackedPositionAndAngles(x, y, z, yaw, pitch, interpolationSteps); } // this.displayData = MinecartDisplayData.withPos(this, new Vec3d(x, y, z)); } - @Inject( - method = "tick", - at = @At("HEAD") - ) - private void updateDisplayInfo(CallbackInfo ci) { + @Override + public void updateDisplayInfo() { if (!this.getWorld().isClient()) { return; } diff --git a/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_YawFix.java b/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_YawFix.java index 7068a1b..0fa5732 100644 --- a/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_YawFix.java +++ b/src/main/java/mendedminecarts/mixin/AbstractMinecartEntityMixin_YawFix.java @@ -12,6 +12,7 @@ import net.minecraft.world.World; import net.minecraft.world.entity.EntityChangeListener; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -27,7 +28,7 @@ public AbstractMinecartEntityMixin_YawFix(EntityType type, World world) { at = @At( value = "INVOKE", target = "Lnet/minecraft/entity/vehicle/AbstractMinecartEntity;setRotation(FF)V", - ordinal = 2 + ordinal = 1 ) ) private void setRotationBetter(AbstractMinecartEntity instance, float yaw, float pitch) { @@ -39,6 +40,7 @@ private void setRotationBetter(AbstractMinecartEntity instance, float yaw, float this.setRotation(yaw, pitch); } + @Unique private boolean fixRotationToRail(float yaw, float pitch) { BlockState blockState = this.getWorld().getBlockState(this.getBlockPos()); if (blockState.getBlock() instanceof AbstractRailBlock railBlock) { diff --git a/src/main/java/mendedminecarts/mixin/ClientWorldMixin.java b/src/main/java/mendedminecarts/mixin/ClientWorldMixin.java new file mode 100644 index 0000000..231a512 --- /dev/null +++ b/src/main/java/mendedminecarts/mixin/ClientWorldMixin.java @@ -0,0 +1,25 @@ +package mendedminecarts.mixin; + +import mendedminecarts.AbstractMinecartEntityAccess; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.Entity; +import net.minecraft.world.tick.TickManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ClientWorld.class) +public class ClientWorldMixin { + + @Redirect( + method = "method_32124", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/tick/TickManager;shouldSkipTick(Lnet/minecraft/entity/Entity;)Z") + ) + private boolean shouldSkipTick(TickManager instance, Entity entity) { + boolean b = instance.shouldSkipTick(entity); + if (entity instanceof AbstractMinecartEntityAccess) { + ((AbstractMinecartEntityAccess) entity).updateDisplayInfo(); + } + return b; + } +} diff --git a/src/main/java/mendedminecarts/mixin/boat/BoatEntityMixin.java b/src/main/java/mendedminecarts/mixin/boat/BoatEntityMixin.java index c17de66..58914b7 100644 --- a/src/main/java/mendedminecarts/mixin/boat/BoatEntityMixin.java +++ b/src/main/java/mendedminecarts/mixin/boat/BoatEntityMixin.java @@ -20,14 +20,14 @@ public BoatEntityMixin(EntityType type, World world) { } @Inject( - method = "updateTrackedPositionAndAngles(DDDFFIZ)V", + method = "updateTrackedPositionAndAngles(DDDFFI)V", at = @At("HEAD"), cancellable = true ) - private void setCartPosLikeOtherEntities(double x, double y, double z, float yaw, float pitch, int interpolationSteps, boolean interpolate, CallbackInfo ci) { + private void setCartPosLikeOtherEntities(double x, double y, double z, float yaw, float pitch, int interpolationSteps, CallbackInfo ci) { if (this.getWorld().isClient && (MendedMinecartsMod.ACCURATE_CLIENT_BOATS.isEnabled())) { ci.cancel(); - super.updateTrackedPositionAndAngles(x, y, z, yaw, pitch, interpolationSteps, interpolate); + super.updateTrackedPositionAndAngles(x, y, z, yaw, pitch, interpolationSteps); } } diff --git a/src/main/java/mendedminecarts/mixin/settings/ClientPlayNetworkHandlerMixin.java b/src/main/java/mendedminecarts/mixin/settings/ClientPlayNetworkHandlerMixin.java index bbfe923..958008a 100644 --- a/src/main/java/mendedminecarts/mixin/settings/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/mendedminecarts/mixin/settings/ClientPlayNetworkHandlerMixin.java @@ -2,9 +2,7 @@ import mendedminecarts.settings.SettingSync; import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; -import net.minecraft.util.Identifier; +import net.minecraft.network.packet.CustomPayload; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -16,14 +14,14 @@ public class ClientPlayNetworkHandlerMixin { @Inject( method = "onCustomPayload", - at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", shift = At.Shift.BEFORE, remap = false), + at = @At(value = "HEAD"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD ) - public void onCustomPayload(CustomPayloadS2CPacket packet, CallbackInfo ci, Identifier identifier, PacketByteBuf packetByteBuf) { - if (packet.getChannel().equals(SettingSync.CHANNEL)) { + public void onCustomPayload(CustomPayload payload, CallbackInfo ci) { + if (payload instanceof SettingSync.MendedMinecartsSettingPayload mmsp) { ci.cancel(); - SettingSync.handleData(packetByteBuf); + SettingSync.handleData(mmsp); } } } diff --git a/src/main/java/mendedminecarts/mixin/settings/CustomPayloadS2CPacketMixin.java b/src/main/java/mendedminecarts/mixin/settings/CustomPayloadS2CPacketMixin.java new file mode 100644 index 0000000..639bbc1 --- /dev/null +++ b/src/main/java/mendedminecarts/mixin/settings/CustomPayloadS2CPacketMixin.java @@ -0,0 +1,29 @@ +package mendedminecarts.mixin.settings; + +import com.google.common.collect.ImmutableMap; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import mendedminecarts.settings.SettingSync; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.packet.CustomPayload; +import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(CustomPayloadS2CPacket.class) +public class CustomPayloadS2CPacketMixin { + //Add the MendedMinecartsSetting to the Reader + @WrapOperation( + method = "", + at = @At( + value = "INVOKE", + remap = false, + target = "Lcom/google/common/collect/ImmutableMap$Builder;build()Lcom/google/common/collect/ImmutableMap;" + ) + ) + private static ImmutableMap> put_MendedMinecartsSettings(ImmutableMap.Builder> instance, Operation>> original) { + instance.put(SettingSync.CHANNEL, SettingSync.MendedMinecartsSettingPayload::new); + return original.call(instance); + } +} diff --git a/src/main/java/mendedminecarts/mixin/settings/PlayerManagerMixin.java b/src/main/java/mendedminecarts/mixin/settings/PlayerManagerMixin.java index c467e91..7b40e50 100644 --- a/src/main/java/mendedminecarts/mixin/settings/PlayerManagerMixin.java +++ b/src/main/java/mendedminecarts/mixin/settings/PlayerManagerMixin.java @@ -3,6 +3,7 @@ import mendedminecarts.settings.SettingSync; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ConnectedClientData; import net.minecraft.server.network.ServerPlayerEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -15,7 +16,7 @@ public class PlayerManagerMixin { method = "onPlayerConnect", at = @At("RETURN") ) - private void syncSettings(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) { + private void syncSettings(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { SettingSync.PLAYER_MANAGER = (PlayerManager) (Object) this; SettingSync.updateAllToPlayer(player); } diff --git a/src/main/java/mendedminecarts/settings/SettingSync.java b/src/main/java/mendedminecarts/settings/SettingSync.java index 1b60ef7..dbfebf7 100644 --- a/src/main/java/mendedminecarts/settings/SettingSync.java +++ b/src/main/java/mendedminecarts/settings/SettingSync.java @@ -1,9 +1,9 @@ package mendedminecarts.settings; -import io.netty.buffer.Unpooled; import mendedminecarts.MendedMinecartsMod; import net.minecraft.network.PacketByteBuf; -import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; +import net.minecraft.network.packet.CustomPayload; +import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; @@ -12,34 +12,52 @@ public class SettingSync { public static final Identifier CHANNEL = new Identifier("mendedminecarts:settings"); public static PlayerManager PLAYER_MANAGER = null; - public static void handleData(PacketByteBuf data) { + public static void handleData(MendedMinecartsSettingPayload payload) { try { - int version = data.readInt(); - if (MendedMinecartsMod.SETTING_VERSION == version) { - int settingIndex = data.readInt(); - String settingValue = data.readString(); - if (settingIndex >= 0 && settingIndex < MendedMinecartsMod.FLAT_SETTINGS.size()) { - MendedMinecartsMod.FLAT_SETTINGS.get(settingIndex).setFromStringValue(settingValue); - } - } + payload.setting.setFromStringValue(payload.value); } catch (Exception ignored) { } } - public static CustomPayloadS2CPacket makeSettingPacket(Setting setting) { - PacketByteBuf packetByteBuf = new PacketByteBuf(Unpooled.buffer()); - packetByteBuf.writeInt(MendedMinecartsMod.SETTING_VERSION); - packetByteBuf.writeInt(MendedMinecartsMod.FLAT_SETTINGS.indexOf(setting)); - packetByteBuf.writeString(setting.getStringValue()); + public record MendedMinecartsSettingPayload(Setting setting, String value) implements CustomPayload { + + public MendedMinecartsSettingPayload(Setting setting) { + this(setting, setting.getStringValue()); + } + + public MendedMinecartsSettingPayload(PacketByteBuf buf) { + this(checkVersionAndGetSetting(buf), buf.readString()); + } + + private static Setting checkVersionAndGetSetting(PacketByteBuf buf) { + if (buf.readInt() != MendedMinecartsMod.SETTING_VERSION) { + throw new IllegalArgumentException("Invalid setting version"); + } + return MendedMinecartsMod.FLAT_SETTINGS.get(buf.readInt()); + } + + @Override + public void write(PacketByteBuf buf) { + buf.writeInt(MendedMinecartsMod.SETTING_VERSION); + buf.writeInt(MendedMinecartsMod.FLAT_SETTINGS.indexOf(setting)); + buf.writeString(value); + } + + @Override + public Identifier id() { + return CHANNEL; + } + } - return new CustomPayloadS2CPacket(CHANNEL, packetByteBuf); + public static MendedMinecartsSettingPayload makeSettingPacket(Setting setting) { + return new MendedMinecartsSettingPayload(setting); } public static void updateAllToPlayer(ServerPlayerEntity player) { for (Setting setting : MendedMinecartsMod.FLAT_SETTINGS) { - CustomPayloadS2CPacket packet = makeSettingPacket(setting); - player.networkHandler.sendPacket(packet); + MendedMinecartsSettingPayload payload = makeSettingPacket(setting); + player.networkHandler.sendPacket(new CustomPayloadS2CPacket(payload)); } } @@ -48,7 +66,7 @@ public static void updateToClients(Setting setting) { if (playerManager == null) { return; } - CustomPayloadS2CPacket packet = makeSettingPacket(setting); - playerManager.sendToAll(packet); + MendedMinecartsSettingPayload payload = makeSettingPacket(setting); + playerManager.sendToAll(new CustomPayloadS2CPacket(payload)); } } diff --git a/src/main/resources/mendedminecarts.mixins.json b/src/main/resources/mendedminecarts.mixins.json index 2a7e8bc..a329939 100644 --- a/src/main/resources/mendedminecarts.mixins.json +++ b/src/main/resources/mendedminecarts.mixins.json @@ -24,10 +24,12 @@ "placement.AbstractRailBlockMixin", "placement.DetectorRailBlockMixin", "settings.ClientPlayNetworkHandlerMixin", + "settings.CustomPayloadS2CPacketMixin", "settings.PlayerManagerMixin" ], "client": [ "AbstractMinecartEntityMixin_Client", + "ClientWorldMixin", "WorldRendererMixin_Client" ], "injectors": {