Fretux/Ascend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix player tick logic to track timing per player, optimize stat sync, and clean up unused code

Browse Source
This commit is contained in:
fretuks
2026-05-19 19:54:08 +02:00
parent df16594e00
commit 73b0ba1ebf
5 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/fretux/ascend/event/ActivityEvents.java
+13 -28
View File
@@ -9,7 +9,6 @@ import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.effect.MobEffectCategory;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.ai.gossip.GossipType;
import net.minecraft.world.entity.npc.Villager;
import net.minecraft.world.entity.player.Player;
@@ -32,17 +31,11 @@ import net.minecraft.world.entity.animal.SnowGolem;
import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraft.world.phys.AABB;
import java.util.Objects;
import java.util.UUID;
@Mod.EventBusSubscriber(modid = AscendMod.MODID)
public class ActivityEvents {
private static int agilityTickCounter = 0;
private static int fortitudeTickCounter = 0;
private static int willpowerTickCounter = 0;
private static int charismaTickCounter = 0;
@SubscribeEvent
public static void onMobKilled(LivingDeathEvent event) {
if (event.getSource().getEntity() instanceof Player player && !player.level().isClientSide) {
@@ -86,25 +79,22 @@ public class ActivityEvents {
public static void onPlayerTickFortitude(TickEvent.PlayerTickEvent event) {
Player player = event.player;
if (player.level().isClientSide || event.phase != TickEvent.Phase.END) return;
fortitudeTickCounter++;
if (fortitudeTickCounter % 100 == 0) {
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
boolean hasNegativeEffect = player.getActiveEffects().stream()
.anyMatch(e -> e.getEffect().getCategory() == MobEffectCategory.HARMFUL);
if (player.getFoodData().getFoodLevel() <= 6 || hasNegativeEffect) {
stats.addAscendXP((int) (AscendConfig.COMMON.xpPerDamageTaken.get() * AscendConfig.COMMON.xpMultiplier.get()));
PlayerStatsProvider.sync(player);
}
});
}
if (player.tickCount % 100 != 0) return;
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
boolean hasNegativeEffect = player.getActiveEffects().stream()
.anyMatch(e -> e.getEffect().getCategory() == MobEffectCategory.HARMFUL);
if (player.getFoodData().getFoodLevel() <= 6 || hasNegativeEffect) {
stats.addAscendXP((int) (AscendConfig.COMMON.xpPerDamageTaken.get() * AscendConfig.COMMON.xpMultiplier.get()));
PlayerStatsProvider.sync(player);
}
});
}
@SubscribeEvent
public static void onPlayerTickAgility(TickEvent.PlayerTickEvent event) {
Player player = event.player;
if (player.level().isClientSide || event.phase != TickEvent.Phase.END) return;
agilityTickCounter++;
if (agilityTickCounter % 40 != 0) return;
if (player.tickCount % 40 != 0) return;
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
boolean didAgileThing =
player.isSprinting()
@@ -142,16 +132,15 @@ public class ActivityEvents {
public static void onPlayerTickWillpower(TickEvent.PlayerTickEvent event) {
Player player = event.player;
if (player.level().isClientSide || event.phase != TickEvent.Phase.END) return;
willpowerTickCounter++;
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
int willpower = stats.getAttributeLevel("willpower");
if (willpower > 0 && willpowerTickCounter % 80 == 0) {
if (willpower > 0 && player.tickCount % 80 == 0) {
float regen = StatEffects.getWillpowerHealthRegen(willpower);
if (regen > 0.0f && player.getHealth() < player.getMaxHealth()) {
player.heal(regen);
}
}
if (willpowerTickCounter % 200 != 0) return;
if (player.tickCount % 200 != 0) return;
boolean hasNegativeEffect = player.getActiveEffects().stream()
.anyMatch(e -> e.getEffect().getCategory() == MobEffectCategory.HARMFUL);
boolean lowHealth = player.getHealth() <= player.getMaxHealth() * 0.25f;
@@ -171,8 +160,7 @@ public class ActivityEvents {
public static void onPlayerTickCharisma(TickEvent.PlayerTickEvent event) {
Player player = event.player;
if (player.level().isClientSide || event.phase != TickEvent.Phase.END) return;
charismaTickCounter++;
if (charismaTickCounter % 40 != 0) return;
if (player.tickCount % 40 != 0) return;
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
int charisma = stats.getAttributeLevel("charisma");
if (charisma <= 0) return;
@@ -222,9 +210,6 @@ public class ActivityEvents {
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
var heldItem = player.getMainHandItem();
if (heldItem.isEmpty()) return;
double attackSpeed = Objects.requireNonNull(player.getAttribute(
Attributes.ATTACK_SPEED
)).getBaseValue();
stats.addAscendXP(3);
PlayerStatsProvider.sync(player);
});
src/main/java/net/fretux/ascend/event/PlayerEvents.java
+1
View File
@@ -32,6 +32,7 @@ public class PlayerEvents {
newStats.deserializeNBT(oldStats.serializeNBT());
})
);
event.getOriginal().invalidateCaps();
if (!event.getEntity().level().isClientSide) {
StatEffects.applyAll(event.getEntity());
if (event.isWasDeath()) {
src/main/java/net/fretux/ascend/player/PlayerStatsProvider.java
+4 -1
View File
@@ -39,9 +39,12 @@ public class PlayerStatsProvider implements ICapabilitySerializable<CompoundTag>
}
public static void sync(Player player) {
if (!(player instanceof ServerPlayer serverPlayer)) {
return;
}
player.getCapability(PlayerStatsProvider.PLAYER_STATS).ifPresent(stats -> {
CompoundTag data = stats.serializeNBT();
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player),
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer),
new ClientboundSyncStatsPacket(data));
});
}