Skip to content

Change tick rate to float #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lambholl wants to merge 3 commits into
base: 1.21.1
Choose a base branch
from
Open

Change tick rate to float #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02d70c9
change rate to float
Lambholl Apr 1, 2025
bc54fe9
change rate to float
Lambholl Apr 1, 2025
e41f6b4
output tick with float type
Lambholl Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/client/java/io/github/dennisochulor/tickrate/TickIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public static void tick() {
if(!TickIndicator.isEnabled() || !TickRateClientManager.serverHasMod()) return;
MinecraftClient client = MinecraftClient.getInstance();
TickState chunkState = TickRateClientManager.getChunkState(client.player.getChunkPos().toLong());
int chunkRate = (int) chunkState.rate();
float chunkRate = (float) chunkState.rate();
TickState entityState = client.targetedEntity!=null ? TickRateClientManager.getEntityState(client.targetedEntity) : null;
int entityRate = (int) (entityState!=null ? entityState.rate() : 0);
float entityRate = (float) (entityState!=null ? entityState.rate() : 0.0f);

String chunkStateStr = "";
String entityStateStr = "";
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/github/dennisochulor/tickrate/api_impl/TickRateAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public float queryServer() {
@Override
public void rateServer(float rate) {
if(rate < 1) throw new IllegalArgumentException("rate must be >= 1");
int roundRate = Math.round(rate);
float roundRate = Math.round(rate*100)/100;
tickManager.tickRate$setServerRate(roundRate);
tickManager.tickRate$sendUpdatePacket();
send(() -> TickRateEvents.SERVER_RATE.invoker().onServerRate(roundRate));
Expand Down Expand Up @@ -138,9 +138,9 @@ public void rateEntity(Collection<? extends Entity> entities, float rate) {
entityCheck(entities);

int roundRate = Math.round(rate);
tickManager.tickRate$setEntityRate(roundRate, entities);
tickManager.tickRate$setEntityRate(rate, entities);
tickManager.tickRate$sendUpdatePacket();
send(() -> entities.forEach(entity -> TickRateEvents.ENTITY_RATE.invoker().onEntityRate(entity, roundRate)));
send(() -> entities.forEach(entity -> TickRateEvents.ENTITY_RATE.invoker().onEntityRate(entity, rate)));
}

@Override
Expand Down Expand Up @@ -209,7 +209,7 @@ public void rateChunk(World world, Collection<ChunkPos> chunks, float rate) {
if(rate < 1.0f && rate != 0.0f) throw new IllegalArgumentException("rate must be >= 1 or exactly 0");
chunkCheck(world, chunks);

int roundRate = Math.round(rate);
float roundRate = Math.round(rate*100)/100;
tickManager.tickRate$setChunkRate(rate, world, chunks);
tickManager.tickRate$sendUpdatePacket();
send(() -> chunks.forEach(chunkPos -> TickRateEvents.CHUNK_RATE.invoker().onChunkRate(world, chunkPos, roundRate)));
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/io/github/dennisochulor/tickrate/mixin/core/TickCommandMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ private static LiteralArgumentBuilder<ServerCommandSource> register(LiteralArgum
private static int executeRate(ServerCommandSource source, float rate) {
int roundRate = Math.round(rate); // can't actually accept decimals
ServerTickManager tickManager = source.getServer().getTickManager();
tickManager.tickRate$setServerRate(roundRate);
tickManager.tickRate$setServerRate(rate);
tickManager.tickRate$sendUpdatePacket();
send(source, () -> TickRateEvents.SERVER_RATE.invoker().onServerRate(roundRate));
source.sendFeedback(() -> Text.translatable("commands.tick.rate.success", roundRate), true);
send(source, () -> TickRateEvents.SERVER_RATE.invoker().onServerRate(rate));
source.sendFeedback(() -> Text.translatable("commands.tick.rate.success", rate), true);
return roundRate;
}

Expand Down Expand Up @@ -230,12 +230,12 @@ private static int executeChunkRate(ServerCommandSource source, List<ChunkPos> c

int roundRate = Math.round(rate); // can't actually accept decimals
ServerTickManager tickManager = source.getServer().getTickManager();
tickManager.tickRate$setChunkRate(roundRate, source.getWorld(), chunks);
tickManager.tickRate$setChunkRate(rate, source.getWorld(), chunks);
tickManager.tickRate$sendUpdatePacket();

send(source, () -> chunks.forEach(chunkPos -> TickRateEvents.CHUNK_RATE.invoker().onChunkRate(source.getWorld(), chunkPos, rate)));
if(roundRate != 0) {
source.sendFeedback(() -> Text.of("Set tick rate of " + chunks.size() + " chunks to " + roundRate + " TPS."), false);
source.sendFeedback(() -> Text.of("Set tick rate of " + chunks.size() + " chunks to " + rate + " TPS."), false);
return roundRate;
}
else {
Expand Down Expand Up @@ -312,11 +312,11 @@ private static int executeEntityRate(ServerCommandSource source, Collection<? ex
if(entityCheck(entities,source)) return 0;

ServerTickManager tickManager = source.getServer().getTickManager();
tickManager.tickRate$setEntityRate(roundRate, entities);
tickManager.tickRate$setEntityRate(rate, entities);
tickManager.tickRate$sendUpdatePacket();
send(source, () -> entities.forEach(entity -> TickRateEvents.ENTITY_RATE.invoker().onEntityRate(entity, rate)));
if(roundRate != 0) {
source.sendFeedback(() -> Text.of("Set tick rate of " + entities.size() + " entities to " + roundRate + " TPS."), false);
source.sendFeedback(() -> Text.of("Set tick rate of " + entities.size() + " entities to " + rate + " TPS."), false);
return roundRate;
}
else {
Expand Down