From d6f45557635b1da09b505c3a9bc7ac2e6b8f59d0 Mon Sep 17 00:00:00 2001 From: Reider745 <70357814+Reider745@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:19:28 +0300 Subject: [PATCH] =?UTF-8?q?Feat:=20ItemContainer=20=D0=B1=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5=20=D0=B4=D1=83=D0=B4=D0=BE?= =?UTF-8?q?=D1=81=D0=B8=D1=82=20=D0=BB=D0=BE=D0=B3=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B0=D0=BC=D0=B8=20&=20=D1=83=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D1=8B=20tps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/reider745/commands/TpsCommand.java | 18 ++++++++++-------- .../apparatus/api/container/ItemContainer.java | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/reider745/commands/TpsCommand.java b/src/main/java/com/reider745/commands/TpsCommand.java index d63eab15..16e0255b 100644 --- a/src/main/java/com/reider745/commands/TpsCommand.java +++ b/src/main/java/com/reider745/commands/TpsCommand.java @@ -23,25 +23,27 @@ public class TpsCommand extends Command { long innerCoreSum = 0; for(long time : innerCoreTimes) if(time != 0) { - innerCoreSum += Math.min(20, 1000 / time); + innerCoreSum += time; aboba1++; } long nukkitSum = 0; for(long time : nukkitTimes) if(time != 0) { - nukkitSum += Math.min(20, 1000 / time); + nukkitSum += time; aboba2++; } - if(innerCoreSum != 0) - commandSender.sendMessage("Inner core tps: " + (innerCoreSum / aboba1)); - else + if(innerCoreSum != 0) { + final float avgTime = innerCoreSum / aboba1; + commandSender.sendMessage("Inner core tps: " + Math.min(20, 1000 / avgTime) + ", ms: "+avgTime); + }else commandSender.sendMessage("Inner core tps: 20.0"); - if(nukkitSum != 0) - commandSender.sendMessage("Nukkit tps: " + (nukkitSum / aboba2)); - else + if(nukkitSum != 0) { + final float avgTime = nukkitSum / aboba1; + commandSender.sendMessage("Nukkit tps: " + Math.min(20, 1000 / avgTime) + ", ms: "+avgTime); + }else commandSender.sendMessage("Nukkit tps: 20.0"); }catch (Exception e){ commandSender.sendMessage("Not enough information"); diff --git a/src/main/java/com/zhekasmirnov/apparatus/api/container/ItemContainer.java b/src/main/java/com/zhekasmirnov/apparatus/api/container/ItemContainer.java index 5daee7fa..d9074083 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/api/container/ItemContainer.java +++ b/src/main/java/com/zhekasmirnov/apparatus/api/container/ItemContainer.java @@ -529,7 +529,7 @@ public class ItemContainer implements WorkbenchField, ObjectSaverRegistry.IHashS networkEntity.send("bindings", new JSONObject(dirtyBindingsMap)); dirtyBindingsMap.clear(); }catch (Exception e){ - Logger.error(dirtyBindingsMap.toString(), e); + //Logger.error(dirtyBindingsMap.toString(), e); } } }