GeyserMC-Mirror/GeyserModelEngine-plugin
1
0
Fork 0
mirror of https://github.com/xSquishyLiam/mc-GeyserModelEngine-plugin.git synced 2025-12-19 14:59:19 +00:00
Code Issues Releases Activity

send data as soon as possible

Browse Source
This commit is contained in:
zimzaza4
2024-09-22 17:37:10 +08:00
parent 24eec89adc
commit 472246460a
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/re/imc/geysermodelengine/model/EntityTask.java
View File

@@ -124,15 +124,14 @@ public class EntityTask {
BaseEntity<?> base = modeledEntity.getBase(); BaseEntity<?> base = modeledEntity.getBase();
// Optional<Player> player = viewers.stream().findAny(); // Optional<Player> player = viewers.stream().findAny();
// if (player.isEmpty()) return; // if (player.isEmpty()) return
for (Player viewer : viewers) {
updateEntityProperties(viewer, false); updateEntityProperties(viewers, false);
// do not actually use this, atleast bundle these up ;(
sendScale(viewers, false);
sendColor(viewers, false);
// do not actually use this, atleast bundle these up ;(
sendScale(viewer, false);
sendColor(viewer, false);
}
} }
@@ -158,36 +157,39 @@ public class EntityTask {
model.getEntity().sendSpawnPacket(Collections.singletonList(player)); model.getEntity().sendSpawnPacket(Collections.singletonList(player));
Bukkit.getScheduler().runTaskLaterAsynchronously(GeyserModelEngine.getInstance(), () -> { Bukkit.getScheduler().runTaskLaterAsynchronously(GeyserModelEngine.getInstance(), () -> {
sendHitBox(player); sendHitBox(player);
sendScale(player, true); sendScale(Collections.singleton(player), true);
sendColor(player, true); sendColor(Collections.singleton(player), true);
updateEntityProperties(player, true); updateEntityProperties(Collections.singleton(player), true);
}, 8); }, 1);
}, delay); }, delay);
} }
public void sendScale(Player player, boolean firstSend) { public void sendScale(Collection<Player> players, boolean firstSend) {
if (player == null) return; if (players.isEmpty()) {
return;
}
Vector3f scale = model.getActiveModel().getScale(); Vector3f scale = model.getActiveModel().getScale();
float average = (scale.x + scale.y + scale.z) / 3; float average = (scale.x + scale.y + scale.z) / 3;
if (!firstSend) { if (!firstSend) {
if (average == lastScale) return; if (average == lastScale) return;
} }
EntityUtils.sendCustomScale(player, model.getEntity().getEntityId(), average); for (Player player : players) {
EntityUtils.sendCustomScale(player, model.getEntity().getEntityId(), average);
}
lastScale = average; lastScale = average;
} }
public void sendColor(Player player, boolean firstSend) { public void sendColor(Collection<Player> players, boolean firstSend) {
if (player == null) return; if (players.isEmpty()) return;
Color color = new Color(model.getActiveModel().getDefaultTint().asARGB()); Color color = new Color(model.getActiveModel().getDefaultTint().asARGB());
if (firstSend) { if (firstSend) {
if (color.equals(lastColor)) return; if (color.equals(lastColor)) return;
} }
EntityUtils.sendCustomColor(player, model.getEntity().getEntityId(), color); for (Player player : players) {
EntityUtils.sendCustomColor(player, model.getEntity().getEntityId(), color);
}
lastColor = color; lastColor = color;
} }
public void setAnimationProperty(int currentAnimProperty) { public void setAnimationProperty(int currentAnimProperty) {
@@ -221,7 +223,7 @@ public class EntityTask {
} }
public void updateEntityProperties(Player player, boolean ignore) { public void updateEntityProperties(Collection<Player> players, boolean ignore) {
int entity = model.getEntity().getEntityId(); int entity = model.getEntity().getEntityId();
Map<String, Boolean> boneUpdates = new HashMap<>(); Map<String, Boolean> boneUpdates = new HashMap<>();
@@ -293,7 +295,9 @@ public class EntityTask {
System.out.println(intUpdates); System.out.println(intUpdates);
*/ */
EntityUtils.sendIntProperties(player, entity, intUpdates); for (Player player : players) {
EntityUtils.sendIntProperties(player, entity, intUpdates);
}
} }
private String unstripName(ModelBone bone) { private String unstripName(ModelBone bone) {