icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tickspeed server - client separation.

Browse Source
This commit is contained in:
gnembon committed 2023-05-14 23:36:55 +02:00
1 parent 755ec1daa8
commit e0a3060339
21 files changed
+505 -237
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/network/ClientNetworkHandler.java
+4 -4
View File
@@ -65,15 +65,15 @@ public class ClientNetworkHandler
}
}
});
dataHandlers.put("TickRate", (p, t) -> TickSpeed.tickrate(((NumericTag)t).getAsFloat(), false));
dataHandlers.put("TickRate", (p, t) -> TickSpeed.tickrateClient(((NumericTag)t).getAsFloat()));
dataHandlers.put("TickingState", (p, t) -> {
CompoundTag tickingState = (CompoundTag)t;
TickSpeed.setFrozenState(tickingState.getBoolean("is_paused"), tickingState.getBoolean("deepFreeze"));
TickSpeed.setFrozenStateClient(tickingState.getBoolean("is_paused"), tickingState.getBoolean("deepFreeze"));
});
dataHandlers.put("SuperHotState", (p, t) -> {
TickSpeed.is_superHot = ((ByteTag) t).equals(ByteTag.ONE);
TickSpeed.setSuperHotClient(((ByteTag) t).equals(ByteTag.ONE));
});
dataHandlers.put("TickPlayerActiveTimeout", (p, t) -> TickSpeed.player_active_timeout = ((NumericTag)t).getAsInt());
dataHandlers.put("TickPlayerActiveTimeout", (p, t) -> TickSpeed.setPlayer_active_timeoutClient(((NumericTag)t).getAsInt()));
dataHandlers.put("scShape", (p, t) -> { // deprecated // and unused // should remove for 1.17
if (CarpetClient.shapes != null)
CarpetClient.shapes.addShape((CompoundTag)t);
src/main/java/carpet/network/ServerNetworkHandler.java
+12 -11
View File
@@ -23,6 +23,7 @@ import net.minecraft.nbt.Tag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
public class ServerNetworkHandler
@@ -144,10 +145,10 @@ public class ServerNetworkHandler
}
}
public static void updateTickSpeedToConnectedPlayers()
public static void updateTickSpeedToConnectedPlayers(MinecraftServer server)
{
if (CarpetSettings.superSecretSetting) return;
for (ServerPlayer player : remoteCarpetPlayers.keySet())
for (ServerPlayer player : validCarpetPlayers)
{
player.connection.send(new ClientboundCustomPayloadPacket(
CarpetClient.CARPET_CHANNEL,
@@ -156,10 +157,10 @@ public class ServerNetworkHandler
}
}
public static void updateFrozenStateToConnectedPlayers()
public static void updateFrozenStateToConnectedPlayers(MinecraftServer server)
{
if (CarpetSettings.superSecretSetting) return;
for (ServerPlayer player : remoteCarpetPlayers.keySet())
for (ServerPlayer player : validCarpetPlayers)
{
player.connection.send(new ClientboundCustomPayloadPacket(
CarpetClient.CARPET_CHANNEL,
@@ -168,10 +169,10 @@ public class ServerNetworkHandler
}
}
public static void updateSuperHotStateToConnectedPlayers()
public static void updateSuperHotStateToConnectedPlayers(MinecraftServer server)
{
if(CarpetSettings.superSecretSetting) return;
for (ServerPlayer player : remoteCarpetPlayers.keySet())
for (ServerPlayer player : validCarpetPlayers)
{
player.connection.send(new ClientboundCustomPayloadPacket(
CarpetClient.CARPET_CHANNEL,
@@ -180,10 +181,10 @@ public class ServerNetworkHandler
}
}
public static void updateTickPlayerActiveTimeoutToConnectedPlayers()
public static void updateTickPlayerActiveTimeoutToConnectedPlayers(MinecraftServer server)
{
if (CarpetSettings.superSecretSetting) return;
for (ServerPlayer player : remoteCarpetPlayers.keySet())
for (ServerPlayer player : validCarpetPlayers)
{
player.connection.send(new ClientboundCustomPayloadPacket(
CarpetClient.CARPET_CHANNEL,
@@ -256,7 +257,7 @@ public class ServerNetworkHandler
}
private DataBuilder withTickRate()
{
tag.putFloat("TickRate", TickSpeed.tickrate);
tag.putFloat("TickRate", TickSpeed.gTRM().map(trm -> trm.tickrate).orElse(20.0f));
return this;
}
private DataBuilder withFrozenState()
@@ -269,12 +270,12 @@ public class ServerNetworkHandler
}
private DataBuilder withSuperHotState()
{
tag.putBoolean("SuperHotState", TickSpeed.is_superHot);
tag.putBoolean("SuperHotState", TickSpeed.gTRM().map(trm -> trm.is_superHot).orElse(false));
return this;
}
private DataBuilder withTickPlayerActiveTimeout()
{
tag.putInt("TickPlayerActiveTimeout", TickSpeed.player_active_timeout);
tag.putInt("TickPlayerActiveTimeout", TickSpeed.gTRM().map(trm -> trm.player_active_timeout).orElse(0));
return this;
}
private DataBuilder withRule(CarpetRule<?> rule)