Release KnockbackSync-OG
This commit is contained in:
NotAlexNoyle committed
1 parent
3b13e277f7
commit
6169116dc7
47 files changed
+370
-1597
No files matched your search
+5
-1
@@ -7,8 +7,12 @@ dependency-reduced-pom.xml
|
||||
# Ignore maven build files
|
||||
target/
|
||||
|
||||
# Eclipse files
|
||||
.classpath
|
||||
.project
|
||||
.settings/
|
||||
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
run/
|
||||
run/
|
||||
@@ -0,0 +1,37 @@
|
||||
KnockbackSync
|
||||
=============
|
||||
|
||||
KnockbackSync is licensed under the GNU General Public License v3.0 or later.
|
||||
See README.md (section "License") and https://www.gnu.org/licenses/gpl-3.0.en.html.
|
||||
|
||||
Bundled / ported third-party code
|
||||
----------------------------------
|
||||
|
||||
This distribution contains a port of the 1.8 melee knockback formula from:
|
||||
|
||||
BukkitOldCombatMechanics (OldCombatMechanics)
|
||||
Copyright (c) the OldCombatMechanics contributors (kernitus et al.)
|
||||
https://github.com/kernitus/BukkitOldCombatMechanics
|
||||
Licensed under the Mozilla Public License, Version 2.0 (MPL-2.0)
|
||||
https://mozilla.org/MPL/2.0/
|
||||
|
||||
The ported code lives in:
|
||||
|
||||
common/src/main/java/me/caseload/knockbacksync/util/LegacyKnockback.java
|
||||
|
||||
It is derived from OldCombatMechanics' module
|
||||
`kernitus.plugin.OldCombatMechanics.module.ModulePlayerKnockback`.
|
||||
|
||||
License compatibility
|
||||
---------------------
|
||||
|
||||
The OldCombatMechanics source files are distributed under the standard MPL-2.0
|
||||
notice (Exhibit A) and do NOT carry the "Incompatible With Secondary Licenses"
|
||||
notice (Exhibit B). Under MPL-2.0 section 3.3, such Covered Software may be
|
||||
distributed as part of a Larger Work governed by a "Secondary License" — which
|
||||
MPL-2.0 section 1.12 defines to include the GNU General Public License, Version
|
||||
3. Accordingly, the ported file may be combined with and distributed alongside
|
||||
the GPL-3.0-or-later code that makes up the rest of KnockbackSync.
|
||||
|
||||
The terms of the MPL-2.0 continue to govern the ported file itself; its MPL
|
||||
header is retained. The combined/Larger Work is offered under GPL-3.0-or-later.
|
||||
@@ -1,169 +1,15 @@
|
||||
[](https://modrinth.com/plugin/knockbacksync)
|
||||
# KnockbackSync-OG
|
||||
|
||||
Tired of inconsistent knockback ruining your PvP experience? Our plugin recalculates knockback as if it were done clientside, leveling the playing field and ensuring every player enjoys a fair fight, no matter their connection quality.
|
||||
|
||||
Minecraft doesn’t factor in network latency when determining a player's actions on the server. This causes the server to receive outdated information that doesn’t reflect the player's clientside position, leading to varying knockback effects based on connection quality.
|
||||
|
||||
This plugin intercepts and adjusts knockback calculations to match what would occur clientside, effectively mitigating the disadvantages caused by high latency. By synchronizing knockback handling, we ensure that players experience consistent and fair knockback, providing a balanced and competitive environment for all."
|
||||
|
||||
Showcase: https://www.youtube.com/watch?v=SVokpr3v-TA
|
||||
|
||||
Official Discord: https://discord.gg/nnpqpAtyVW
|
||||
|
||||
## Frequently Asked Questions (FAQ)
|
||||
|
||||
### Does this change put high ping players at a disadvantage?
|
||||
**It depends on the player.** Some may notice a difference if they're used to relying on high ping to reduce knockback. For others, it could actually be an advantage.
|
||||
|
||||
### How does this change benefit high ping players?
|
||||
**Knockback control.** For example, it will be easier to escape crit chains and punish crit.
|
||||
|
||||
### Why was the configurability of ping offset removed?
|
||||
**It promotes consistency across all servers.** Extensive testing with top players has shown that an offset of 25 provides a balanced experience for everyone.
|
||||
|
||||
### How do I change the ping offset?
|
||||
**You must run a modified build of KnockbackSync.** The variable can be changed inside of the [PlayerData](common/src/main/java/me/caseload/knockbacksync/player/PlayerData.java) class.
|
||||
|
||||
## What servers are using this plugin?
|
||||
| IP | Location | Region | Ping Offset | spike_threshold |
|
||||
|------------------|-----------------------------------|--------|-------------|-----------------|
|
||||
| `pvparcade.club` | Ashburn, Virginia, United States | NA | 20 | 15 |
|
||||
| `stray.gg` | Ashburn, Virginia, United States | NA | 25 | 20 |
|
||||
| `eu.stray.gg` | Frankfurt, Hesse, Germany | EU | 25 | 20 |
|
||||
| `valed.gg` | Frankfurt, Hesse, Germany | EU | 25 | 20 |
|
||||
| `eu.catpvp.xyz` | Frankfurt, Hesse, Germany | EU | 25 | 20 |
|
||||
| `as.catpvp.xyz` | Singapore | AS | 25 | 20 |
|
||||
| `na.catpvp.xyz` | New York, New York, United States | NA | 25 | 20 |
|
||||
| `hyperium.pl` | Wrocław, Dolnośląskie, Poland | EU | 25 | 20 |
|
||||
|
||||
## Commands
|
||||
---
|
||||
### /knockbacksync ping [target]
|
||||
|
||||
**Description:**
|
||||
|
||||
This command allows you to check the ping of a player, including jitter. If no target is specified, it will check your own ping.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.ping` (defaults to true for players)
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync ping`: Checks your own ping.
|
||||
* `/knockbacksync ping Steve`: Checks the ping of a player named Steve.
|
||||
|
||||
**Output:**
|
||||
|
||||
* If a pong packet has been received: "Your last ping packet took [ping]ms. Jitter: [jitter]ms." or "[Player]'s last ping packet took [ping]ms. Jitter: [jitter]ms."
|
||||
* If a pong packet has not been received: "Pong not received. Your estimated ping is [estimated ping]ms." or "Pong not received. [Player]'s estimated ping is [estimated ping]ms."
|
||||
|
||||
**Notes:**
|
||||
|
||||
* The estimated ping is based on the player's platform reported ping.
|
||||
* Jitter represents the variation in ping over time.
|
||||
---
|
||||
### /knockbacksync status [target]
|
||||
|
||||
**Description:**
|
||||
|
||||
This command allows you to check the KnockbackSync status of a player or the server. If no target is specified, it will show both the global status and your own status.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.status.self` (defaults to true for players): Allows checking your own status.
|
||||
* `knockbacksync.status.other` (defaults to op only): Allows checking the status of other players.
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync status`: Shows the global status and your own status.
|
||||
* `/knockbacksync status Steve`: Shows the status of a player named Steve.
|
||||
|
||||
**Output:**
|
||||
|
||||
* **Global status:** "Global KnockbackSync status: [Enabled/Disabled]"
|
||||
* **Player status:** "[Player]'s KnockbackSync status: [Enabled/Disabled]" (or "Disabled (Global toggle is off)" if the global toggle is off)
|
||||
|
||||
**Notes:**
|
||||
|
||||
* The player status will be "Disabled" if the global toggle is off, even if the player has individually enabled KnockbackSync.
|
||||
* The messages displayed by this command are configurable in the `config.yml` file.
|
||||
---
|
||||
### /knockbacksync toggle [target]
|
||||
|
||||
**Description:**
|
||||
|
||||
This command allows you to toggle KnockbackSync for yourself, another player, or globally.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.toggle.self` (defaults to true for players): Allows toggling KnockbackSync for yourself.
|
||||
* `knockbacksync.toggle.other` (defaults to op only): Allows toggling KnockbackSync for other players.
|
||||
* `knockbacksync.toggle.global` (defaults to op only): Allows toggling KnockbackSync globally for the server.
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync toggle`: Toggles KnockbackSync globally (if you have permission) or for yourself.
|
||||
* `/knockbacksync toggle Steve`: Toggles KnockbackSync for a player named Steve.
|
||||
|
||||
**Output:**
|
||||
|
||||
* **Global toggle:** Sends a message indicating whether KnockbackSync has been enabled or disabled globally. The messages are configurable in the `config.yml` file.
|
||||
* **Player toggle:** Sends a message indicating whether KnockbackSync has been enabled or disabled for the specified player. The messages are configurable in the `config.yml` file.
|
||||
* **Ineligible player:** If a player is ineligible for KnockbackSync (e.g., due to permissions), a configurable message will be sent.
|
||||
* **KnockbackSync disabled:** If KnockbackSync is disabled globally and you try to toggle it for a player, a message will be sent indicating that KnockbackSync is disabled.
|
||||
|
||||
**Notes:**
|
||||
|
||||
* If KnockbackSync is disabled globally, toggling it for a player will have no effect until KnockbackSync is enabled globally.
|
||||
* Players can only toggle KnockbackSync for themselves if they have the `knockbacksync.toggle.self` permission.
|
||||
* Operators can toggle KnockbackSync for other players and globally.
|
||||
---
|
||||
### /knockbacksync reload
|
||||
|
||||
**Description:**
|
||||
|
||||
This command reloads the KnockbackSync plugin's configuration file.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.reload` (defaults to op only)
|
||||
|
||||
**Examples:**
|
||||
* `/knockbacksync reload`
|
||||
|
||||
**Output:**
|
||||
|
||||
* Sends a message to the command sender indicating that the configuration has been reloaded. The message is configurable in the `config.yml` file.
|
||||
|
||||
**Notes:**
|
||||
|
||||
* This command is useful for applying changes made to the configuration file without restarting the server.
|
||||
---
|
||||
### /knockbacksync toggleoffground
|
||||
|
||||
**Description:**
|
||||
|
||||
This command toggles the experimental off-ground knockback synchronization feature.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.toggleoffground` (defaults to op only)
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync toggleoffground`
|
||||
|
||||
**Output:**
|
||||
|
||||
* Sends a message indicating whether the experimental off-ground knockback synchronization has been enabled or disabled. The messages are configurable in the `config.yml` file.
|
||||
|
||||
**Notes:**
|
||||
|
||||
* **This command currently does not do anything as off-ground synchronization has yet to be implemented.**
|
||||
* This feature is experimental and may not work as expected.
|
||||
Soft fork of KnockbackSync to ensure compatibility with OldCombatMechanics on Purpur 1.19.4.
|
||||
|
||||
## License
|
||||
GNU General Public License v3.0 or later
|
||||
|
||||
See [LICENSE](https://www.gnu.org/licenses/gpl-3.0.en.html) to see the full text.
|
||||
See [LICENSE](https://www.gnu.org/licenses/gpl-3.0.en.html) to see the full text.
|
||||
|
||||
The optional legacy (1.8) knockback formula
|
||||
(`common/src/main/java/me/caseload/knockbacksync/util/LegacyKnockback.java`) is a
|
||||
port from [OldCombatMechanics](https://github.com/kernitus/BukkitOldCombatMechanics),
|
||||
which is licensed under the Mozilla Public License 2.0 (MPL-2.0). MPL-2.0 permits
|
||||
combining that code into this GPL-3.0-or-later work as a Larger Work (MPL-2.0
|
||||
§3.3 / §1.12). See the [NOTICE](NOTICE) file for details.
|
||||
+1
-1
@@ -2,8 +2,8 @@ import java.io.ByteArrayOutputStream
|
||||
|
||||
plugins {
|
||||
id("java")
|
||||
eclipse
|
||||
id("com.gradleup.shadow") version "9.2.2" apply false
|
||||
id("fabric-loom") version "1.14.6" apply false
|
||||
}
|
||||
|
||||
fun getGitCommitHash(project: Project): String? {
|
||||
|
||||
+28
-1
@@ -1,16 +1,22 @@
|
||||
package me.caseload.knockbacksync.listener.bukkit;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.listener.PlayerDamageListener;
|
||||
import me.caseload.knockbacksync.player.BukkitPlayer;
|
||||
import me.caseload.knockbacksync.util.MultiLibUtil;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.attribute.AttributeInstance;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
|
||||
public class BukkitPlayerDamageListener extends PlayerDamageListener implements Listener {
|
||||
|
||||
private static boolean knockbackResistanceStripUnsupported = false;
|
||||
|
||||
@EventHandler(ignoreCancelled = true)
|
||||
public void onPlayerDamage(EntityDamageByEntityEvent event) {
|
||||
Entity victim = event.getEntity();
|
||||
@@ -21,6 +27,27 @@ public class BukkitPlayerDamageListener extends PlayerDamageListener implements
|
||||
if (MultiLibUtil.isExternalPlayer((Player) victim))
|
||||
return;
|
||||
|
||||
// Legacy (1.8) parity: with knockback resistance disabled (OCM default), nullify the
|
||||
// victim's knockback resistance so full 1.8 knockback applies and the velocity event
|
||||
// always fires. Must run before vanilla computes knockback (default priority is fine).
|
||||
if (Base.INSTANCE.getConfigManager().isLegacyKnockbackEnabled()
|
||||
&& !Base.INSTANCE.getConfigManager().isLegacyKnockbackResistanceEnabled()) {
|
||||
stripKnockbackResistance((Player) victim);
|
||||
}
|
||||
|
||||
onPlayerDamage(new BukkitPlayer((Player) victim), new BukkitPlayer((Player) attacker));
|
||||
}
|
||||
}
|
||||
|
||||
private void stripKnockbackResistance(Player victim) {
|
||||
if (knockbackResistanceStripUnsupported) return;
|
||||
try {
|
||||
AttributeInstance attribute = victim.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE);
|
||||
if (attribute == null) return;
|
||||
attribute.getModifiers().forEach(attribute::removeModifier);
|
||||
} catch (Throwable t) {
|
||||
// Attribute enum/constant differs on this server version; disable to avoid log spam.
|
||||
knockbackResistanceStripUnsupported = true;
|
||||
Base.INSTANCE.getLogger().warning("Could not nullify knockback resistance for legacy knockback: " + t.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
+12
-4
@@ -16,7 +16,11 @@ import org.bukkit.util.Vector;
|
||||
|
||||
public class BukkitPlayerKnockbackListener extends PlayerKnockbackListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||
// HIGHEST so KnockbackSync is the last writer in the event chain: it owns the final
|
||||
// melee velocity. We read and write the EVENT velocity (not player.getVelocity()/
|
||||
// player.setVelocity()) so we integrate with the chain instead of fighting it. See
|
||||
// knockback-sync issue #7 (kernitus, Krymonota, Axionize).
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onPlayerVelocity(PlayerVelocityEvent event) {
|
||||
Player victim = event.getPlayer();
|
||||
EntityDamageEvent entityDamageEvent = victim.getLastDamageCause();
|
||||
@@ -34,7 +38,11 @@ public class BukkitPlayerKnockbackListener extends PlayerKnockbackListener imple
|
||||
if (MultiLibUtil.isExternalPlayer(victim))
|
||||
return;
|
||||
|
||||
Vector vector = victim.getVelocity();
|
||||
onPlayerVelocity(new BukkitPlayer(victim), new Vector3d(vector.getX(), vector.getY(), vector.getZ()));
|
||||
Vector eventVelocity = event.getVelocity();
|
||||
Vector3d result = onPlayerVelocity(new BukkitPlayer(victim),
|
||||
new Vector3d(eventVelocity.getX(), eventVelocity.getY(), eventVelocity.getZ()));
|
||||
|
||||
if (result != null)
|
||||
event.setVelocity(new Vector(result.getX(), result.getY(), result.getZ()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -183,6 +183,16 @@ public class BukkitPlayer implements PlatformPlayer {
|
||||
return bukkitPlayer.getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.KNOCKBACK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getWeaponKnockbackLevel() {
|
||||
// OCM parity: use the main hand item, or the off hand when the main hand is empty.
|
||||
org.bukkit.inventory.ItemStack mainHand = bukkitPlayer.getInventory().getItemInMainHand();
|
||||
org.bukkit.inventory.ItemStack weapon = mainHand.getType() == org.bukkit.Material.AIR
|
||||
? bukkitPlayer.getInventory().getItemInOffHand()
|
||||
: mainHand;
|
||||
return weapon.getEnchantmentLevel(Enchantment.KNOCKBACK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable Integer getNoDamageTicks() {
|
||||
return bukkitPlayer.getNoDamageTicks();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: KnockbackSync
|
||||
name: KnockbackSync-OG
|
||||
version: ${version}
|
||||
main: me.caseload.knockbacksync.BukkitLoaderPlugin
|
||||
api-version: '1.13' # We actually support 1.12.2, api-version was added later though
|
||||
|
||||
@@ -34,6 +34,19 @@ public class ConfigWrapper {
|
||||
return NumberConversions.toLong(value, def);
|
||||
}
|
||||
|
||||
public double getDouble(String path, double def) {
|
||||
Object value = getValue(path);
|
||||
if (value instanceof Number) return ((Number) value).doubleValue();
|
||||
if (value instanceof String) {
|
||||
try {
|
||||
return Double.parseDouble((String) value);
|
||||
} catch (NumberFormatException ignored) {
|
||||
return def;
|
||||
}
|
||||
}
|
||||
return def;
|
||||
}
|
||||
|
||||
public void set(String path, Object value) {
|
||||
setValue(path, value);
|
||||
}
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
package me.caseload.knockbacksync.listener;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.player.User;
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.manager.PlayerDataManager;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
import me.caseload.knockbacksync.util.LegacyKnockback;
|
||||
|
||||
public abstract class PlayerDamageListener {
|
||||
public void onPlayerDamage(PlatformPlayer victim, PlatformPlayer attacker) {
|
||||
if (!Base.INSTANCE.getConfigManager().isToggled())
|
||||
ConfigManager config = Base.INSTANCE.getConfigManager();
|
||||
if (!config.isToggled())
|
||||
return;
|
||||
|
||||
User user = victim.getUser();
|
||||
@@ -18,7 +22,16 @@ public abstract class PlayerDamageListener {
|
||||
if (playerData == null)
|
||||
return;
|
||||
|
||||
playerData.setVerticalVelocity(playerData.calculateVerticalVelocity(attacker)); // do not move this calculation
|
||||
if (config.isLegacyKnockbackEnabled()) {
|
||||
// KnockbackSync owns the full 1.8 melee velocity. Compute it now (we have the
|
||||
// attacker here) and store it for the PlayerVelocityEvent to apply + sync.
|
||||
Vector3d legacy = LegacyKnockback.compute(victim, attacker, playerData, config);
|
||||
playerData.setLegacyKnockback(legacy);
|
||||
// On-ground sync should target the legacy vertical value, not the 1.9 one.
|
||||
playerData.setVerticalVelocity(legacy.getY());
|
||||
} else {
|
||||
playerData.setVerticalVelocity(playerData.calculateVerticalVelocity(attacker)); // do not move this calculation
|
||||
}
|
||||
playerData.setLastDamageTicks(victim.getNoDamageTicks());
|
||||
playerData.updateCombat();
|
||||
|
||||
|
||||
+42
-15
@@ -5,29 +5,56 @@ import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState
|
||||
import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.manager.PlayerDataManager;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public abstract class PlayerKnockbackListener {
|
||||
|
||||
public void onPlayerVelocity(PlatformPlayer victim, Vector3d velocity) {
|
||||
if (!Base.INSTANCE.getConfigManager().isToggled())
|
||||
return;
|
||||
/**
|
||||
* Computes the melee velocity to apply to the victim.
|
||||
*
|
||||
* <p>The returned value, when non-null, MUST be written back by the platform layer.
|
||||
* Bukkit writes it to the {@code PlayerVelocityEvent} (so KnockbackSync is the last,
|
||||
* authoritative writer in the event chain rather than reading/writing the player's
|
||||
* live velocity out-of-band — see issue #7).</p>
|
||||
*
|
||||
* <p>When legacy (1.8) knockback is enabled, the 1.8 vector computed at damage time
|
||||
* replaces vanilla X/Z/Y, and latency Y-correction is applied on top of it. In that
|
||||
* mode this method always returns a velocity (the raw 1.8 vector when no correction
|
||||
* applies), so KnockbackSync owns the final melee velocity.</p>
|
||||
*
|
||||
* @return the velocity to apply, or {@code null} to leave the velocity unchanged.
|
||||
*/
|
||||
@Nullable
|
||||
public Vector3d onPlayerVelocity(PlatformPlayer victim, Vector3d velocity) {
|
||||
ConfigManager config = Base.INSTANCE.getConfigManager();
|
||||
if (!config.isToggled())
|
||||
return null;
|
||||
|
||||
User user = victim.getUser();
|
||||
if (user == null) return; // Prevent errors with players disconnecting while this is running (or with fake player?)
|
||||
if (user == null) return null; // Prevent errors with players disconnecting while this is running (or with fake player?)
|
||||
|
||||
PlayerData victimPlayerData = PlayerDataManager.getPlayerData(user);
|
||||
if (victimPlayerData == null)
|
||||
return;
|
||||
return null;
|
||||
|
||||
// Legacy 1.8 knockback: KnockbackSync owns the melee velocity. The 1.8 vector
|
||||
// (computed at damage time) replaces vanilla X/Z/Y. We still apply latency
|
||||
// Y-correction on top when conditions allow; otherwise the raw 1.8 vector is
|
||||
// applied. legacyKb == null means either legacy is off or none is pending, in
|
||||
// which case behaviour falls back to the original (Y-sync of the event velocity).
|
||||
Vector3d legacyKb = config.isLegacyKnockbackEnabled() ? victimPlayerData.consumeLegacyKnockback() : null;
|
||||
Vector3d base = (legacyKb != null) ? legacyKb : velocity;
|
||||
|
||||
if (victimPlayerData.getNotNullPing() < PlayerData.PING_OFFSET)
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
double distanceToGround = victimPlayerData.getDistanceToGround();
|
||||
if (distanceToGround <= 0)
|
||||
return; // minecraft already does the work for us
|
||||
return legacyKb; // minecraft already does the work for us
|
||||
|
||||
WrappedBlockState blockState = victim.getWorld().getBlockStateAt(victim.getLocation());
|
||||
if (victim.isGliding() ||
|
||||
@@ -35,21 +62,21 @@ public abstract class PlayerKnockbackListener {
|
||||
blockState.getType() == StateTypes.LAVA ||
|
||||
blockState.getType() == StateTypes.COBWEB ||
|
||||
blockState.getType() == StateTypes.SCAFFOLDING)
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
Vector3d adjustedVelocity;
|
||||
if (victimPlayerData.isOnGroundClientSide(velocity.getY(), distanceToGround)) {
|
||||
if (victimPlayerData.isOnGroundClientSide(base.getY(), distanceToGround)) {
|
||||
Integer damageTicks = victimPlayerData.getLastDamageTicks();
|
||||
if (damageTicks != null && damageTicks > 8)
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
adjustedVelocity = velocity.withY(victimPlayerData.getVerticalVelocity()); // Should be impossible to produce a NPE in this context
|
||||
adjustedVelocity = base.withY(victimPlayerData.getVerticalVelocity()); // Should be impossible to produce a NPE in this context
|
||||
}
|
||||
else if (victimPlayerData.isOffGroundSyncEnabled())
|
||||
adjustedVelocity = velocity.withY(victimPlayerData.getCompensatedOffGroundVelocity());
|
||||
adjustedVelocity = base.withY(victimPlayerData.getCompensatedOffGroundVelocity());
|
||||
else
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
victim.setVelocity(adjustedVelocity);
|
||||
return adjustedVelocity;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ import java.util.Map;
|
||||
@Setter
|
||||
public class ConfigManager {
|
||||
|
||||
public static final long CONFIG_VERSION = 7;
|
||||
public static final long CONFIG_VERSION = 8;
|
||||
|
||||
private boolean toggled;
|
||||
private boolean runnableEnabled;
|
||||
@@ -27,6 +27,16 @@ public class ConfigManager {
|
||||
private boolean notifyUpdate;
|
||||
private boolean autoUpdate;
|
||||
|
||||
// Legacy (1.8) knockback: makes KnockbackSync the single owner of melee velocity,
|
||||
// reproducing OldCombatMechanics' old-player-knockback values while still latency-syncing.
|
||||
private boolean legacyKnockbackEnabled;
|
||||
private double legacyKnockbackHorizontal;
|
||||
private double legacyKnockbackVertical;
|
||||
private double legacyKnockbackVerticalLimit;
|
||||
private double legacyKnockbackExtraHorizontal;
|
||||
private double legacyKnockbackExtraVertical;
|
||||
private boolean legacyKnockbackResistanceEnabled;
|
||||
|
||||
private long runnableInterval;
|
||||
private long combatTimer;
|
||||
private long spikeThreshold;
|
||||
@@ -114,6 +124,14 @@ public class ConfigManager {
|
||||
pingTask = Base.INSTANCE.getScheduler().runTaskTimerAsynchronously(new PingRunnable(), initialDelay, pingTaskRunnableInterval);
|
||||
}
|
||||
|
||||
legacyKnockbackEnabled = configWrapper.getBoolean("legacy_knockback.enabled", false);
|
||||
legacyKnockbackHorizontal = configWrapper.getDouble("legacy_knockback.horizontal", 0.4);
|
||||
legacyKnockbackVertical = configWrapper.getDouble("legacy_knockback.vertical", 0.4);
|
||||
legacyKnockbackVerticalLimit = configWrapper.getDouble("legacy_knockback.vertical_limit", 0.4);
|
||||
legacyKnockbackExtraHorizontal = configWrapper.getDouble("legacy_knockback.extra_horizontal", 0.5);
|
||||
legacyKnockbackExtraVertical = configWrapper.getDouble("legacy_knockback.extra_vertical", 0.1);
|
||||
legacyKnockbackResistanceEnabled = configWrapper.getBoolean("legacy_knockback.enable_knockback_resistance", false);
|
||||
|
||||
notifyUpdate = configWrapper.getBoolean("notify_updates", true);
|
||||
autoUpdate = configWrapper.getBoolean("auto_update", true);
|
||||
combatTimer = configWrapper.getLong("runnable.timer", 30L);
|
||||
|
||||
@@ -42,6 +42,16 @@ public interface PlatformPlayer {
|
||||
|
||||
int getMainHandKnockbackLevel();
|
||||
|
||||
/**
|
||||
* Knockback enchant level used for legacy (1.8) knockback bonus calculation.
|
||||
* Mirrors OldCombatMechanics: the main hand item, or the off hand item when the
|
||||
* main hand is empty. Defaults to the main hand level for platforms that do not
|
||||
* override it.
|
||||
*/
|
||||
default int getWeaponKnockbackLevel() {
|
||||
return getMainHandKnockbackLevel();
|
||||
}
|
||||
|
||||
@Nullable Integer getNoDamageTicks();
|
||||
|
||||
void setVelocity(Vector3d adjustedVelocity);
|
||||
|
||||
@@ -84,6 +84,10 @@ public class PlayerData {
|
||||
@Nullable @Setter private Double ping, previousPing;
|
||||
@Nullable @Setter private Double verticalVelocity;
|
||||
@Nullable @Setter private Integer lastDamageTicks;
|
||||
// Legacy (1.8) knockback computed at damage time, consumed by the next PlayerVelocityEvent.
|
||||
// Guarded by a short expiry so a stale value never affects an unrelated velocity event.
|
||||
@Nullable private Vector3d legacyKnockback;
|
||||
private long legacyKnockbackExpiryNanos;
|
||||
@Setter private double gravityAttribute = 0.08;
|
||||
@Setter private double knockbackResistanceAttribute = 0.0;
|
||||
public PingStrategy pingStrategy; // this is currently shared between all instances, but can be made per-player later
|
||||
@@ -95,6 +99,40 @@ public class PlayerData {
|
||||
this.pingStrategy = loadPingStrategy(Base.INSTANCE.getConfigManager());
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores the legacy (1.8) knockback to apply on the next PlayerVelocityEvent.
|
||||
* Expires shortly after so it can never be applied to an unrelated velocity event
|
||||
* (explosions, other plugins, etc.) if the expected velocity event never fires.
|
||||
*/
|
||||
public void setLegacyKnockback(@Nullable Vector3d legacyKnockback) {
|
||||
this.legacyKnockback = legacyKnockback;
|
||||
// 100ms window: damage and the resulting velocity event fire in the same tick.
|
||||
this.legacyKnockbackExpiryNanos = System.nanoTime() + 100_000_000L;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the pending legacy knockback if present and not expired, otherwise {@code null}.
|
||||
*/
|
||||
@Nullable
|
||||
public Vector3d peekLegacyKnockback() {
|
||||
if (legacyKnockback == null) return null;
|
||||
if (System.nanoTime() > legacyKnockbackExpiryNanos) {
|
||||
legacyKnockback = null;
|
||||
return null;
|
||||
}
|
||||
return legacyKnockback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns and clears the pending legacy knockback (if present and not expired).
|
||||
*/
|
||||
@Nullable
|
||||
public Vector3d consumeLegacyKnockback() {
|
||||
Vector3d v = peekLegacyKnockback();
|
||||
legacyKnockback = null;
|
||||
return v;
|
||||
}
|
||||
|
||||
public double getNotNullPing() {
|
||||
return ping != null ? ping : platformPlayer.getPing();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
/*
|
||||
* Legacy (Minecraft 1.8) melee knockback formula.
|
||||
*
|
||||
* This file is a port of the knockback calculation from BukkitOldCombatMechanics
|
||||
* (kernitus/BukkitOldCombatMechanics), module ModulePlayerKnockback, which is
|
||||
* licensed under the Mozilla Public License, v. 2.0:
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* The MPL-2.0 does not carry the "Incompatible With Secondary Licenses" notice
|
||||
* (Exhibit B), so per MPL-2.0 §3.3 this Covered Software may be distributed as
|
||||
* part of a Larger Work under the GNU General Public License v3.0-or-later that
|
||||
* governs the rest of KnockbackSync. The terms of the MPL continue to apply to
|
||||
* this file. See the NOTICE file at the project root for attribution details.
|
||||
*/
|
||||
package me.caseload.knockbacksync.util;
|
||||
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
|
||||
/**
|
||||
* Computes the exact 1.8-style melee knockback vector applied to a victim, so that
|
||||
* KnockbackSync can own the final melee velocity (horizontal + vertical) and then
|
||||
* latency-correct it, rather than letting vanilla knockback win.
|
||||
*
|
||||
* <p>The math is a faithful reproduction of OldCombatMechanics' legacy player
|
||||
* knockback so that values are identical to running OCM's old-player-knockback
|
||||
* module, while KnockbackSync remains the single writer of the velocity.</p>
|
||||
*/
|
||||
public final class LegacyKnockback {
|
||||
|
||||
private LegacyKnockback() {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param victim the player receiving knockback
|
||||
* @param attacker the attacking player
|
||||
* @param victimData the victim's tracked data (for knockback resistance attribute)
|
||||
* @param config the plugin configuration (legacy knockback tunables)
|
||||
* @return the 1.8-style velocity to apply to the victim, before latency Y-correction
|
||||
*/
|
||||
public static Vector3d compute(PlatformPlayer victim, PlatformPlayer attacker,
|
||||
PlayerData victimData, ConfigManager config) {
|
||||
final double knockbackHorizontal = config.getLegacyKnockbackHorizontal();
|
||||
final double knockbackVertical = config.getLegacyKnockbackVertical();
|
||||
final double knockbackVerticalLimit = config.getLegacyKnockbackVerticalLimit();
|
||||
final double knockbackExtraHorizontal = config.getLegacyKnockbackExtraHorizontal();
|
||||
final double knockbackExtraVertical = config.getLegacyKnockbackExtraVertical();
|
||||
final boolean netheriteKnockbackResistance = config.isLegacyKnockbackResistanceEnabled();
|
||||
|
||||
// Figure out base knockback direction (attacker -> victim) with vanilla jitter
|
||||
// when the two are stacked on the exact same column.
|
||||
double d0 = attacker.getX() - victim.getX();
|
||||
double d1;
|
||||
for (d1 = attacker.getZ() - victim.getZ(); d0 * d0 + d1 * d1 < 1.0E-4D;
|
||||
d1 = (Math.random() - Math.random()) * 0.01D) {
|
||||
d0 = (Math.random() - Math.random()) * 0.01D;
|
||||
}
|
||||
|
||||
final double magnitude = Math.sqrt(d0 * d0 + d1 * d1);
|
||||
|
||||
// Player velocity before any friction is applied (pre-knockback motion).
|
||||
final Vector3d v = victim.getVelocity();
|
||||
|
||||
// Apply friction (halve), then add base knockback.
|
||||
double vx = (v.getX() / 2) - (d0 / magnitude * knockbackHorizontal);
|
||||
double vy = (v.getY() / 2) + knockbackVertical;
|
||||
double vz = (v.getZ() / 2) - (d1 / magnitude * knockbackHorizontal);
|
||||
|
||||
// Bonus knockback for sprinting and the Knockback enchantment.
|
||||
int bonusKnockback = attacker.getWeaponKnockbackLevel();
|
||||
if (attacker.isSprinting()) {
|
||||
bonusKnockback++;
|
||||
}
|
||||
|
||||
// NOTE: vanilla caps vertical BEFORE adding the sprint/enchant bonus vertical.
|
||||
if (vy > knockbackVerticalLimit) {
|
||||
vy = knockbackVerticalLimit;
|
||||
}
|
||||
|
||||
if (bonusKnockback > 0) {
|
||||
final float yaw = attacker.getYaw();
|
||||
vx += -Math.sin(yaw * 3.1415927F / 180.0F) * (float) bonusKnockback * knockbackExtraHorizontal;
|
||||
vy += knockbackExtraVertical;
|
||||
vz += Math.cos(yaw * 3.1415927F / 180.0F) * (float) bonusKnockback * knockbackExtraHorizontal;
|
||||
}
|
||||
|
||||
if (netheriteKnockbackResistance) {
|
||||
// Each piece of netherite armour yields 10% horizontal resistance.
|
||||
final double resistance = 1 - victimData.getKnockbackResistanceAttribute();
|
||||
vx *= resistance;
|
||||
vz *= resistance;
|
||||
}
|
||||
|
||||
return new Vector3d(vx, vy, vz);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
#########################################
|
||||
|
||||
# Do not modify!
|
||||
config_version: 7
|
||||
config_version: 8
|
||||
|
||||
# Plugin enabled state
|
||||
# Toggleable using /knockbacksync toggle
|
||||
@@ -45,6 +45,28 @@ ping_strategy: "KEEPALIVE"
|
||||
# Whether to try to detect when player is offground and apply less kb
|
||||
enable_offground_synchronization: true
|
||||
|
||||
# Legacy (1.8) melee knockback.
|
||||
# When enabled, KnockbackSync computes the exact 1.8 player-vs-player knockback
|
||||
# (horizontal + vertical) itself and becomes the single owner of melee velocity,
|
||||
# then latency-syncs it as usual. This reproduces OldCombatMechanics'
|
||||
# old-player-knockback values for ALL clients 1.8+ while keeping them synced.
|
||||
#
|
||||
# IMPORTANT: if you enable this, DISABLE OldCombatMechanics' old-player-knockback
|
||||
# module (remove it from the active modeset). Running both at once makes two
|
||||
# plugins fight over PlayerVelocityEvent. KnockbackSync owns the velocity here.
|
||||
# OCM can still provide its other features (attack cooldown removal, etc.).
|
||||
legacy_knockback:
|
||||
enabled: true # Master toggle for legacy knockback
|
||||
horizontal: 0.4 # Base horizontal knockback (OCM: knockback-horizontal)
|
||||
vertical: 0.4 # Base vertical knockback (OCM: knockback-vertical)
|
||||
vertical_limit: 0.4 # Vertical cap before sprint/enchant bonus (OCM: knockback-vertical-limit)
|
||||
extra_horizontal: 0.5 # Bonus horizontal per sprint/Knockback level (OCM: knockback-extra-horizontal)
|
||||
extra_vertical: 0.1 # Bonus vertical when sprint/Knockback applies (OCM: knockback-extra-vertical)
|
||||
# When false (default, matching OCM), netherite/armour knockback resistance is
|
||||
# ignored so the velocity event always fires and full 1.8 knockback is applied.
|
||||
# When true, horizontal knockback is reduced by the victim's resistance attribute.
|
||||
enable_knockback_resistance: false
|
||||
|
||||
# This is the rate the server will use for (amongst other things) sending packets about entities to players
|
||||
# In other words it defines how often clients get updated velocity for other entities in the world
|
||||
# Note that certain events mark velocity as dirty and causes it to be immediately updated for 1 tick regardless of the tick interval
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
plugins {
|
||||
id("fabric-loom")
|
||||
}
|
||||
|
||||
loom {
|
||||
accessWidenerPath = file("src/main/resources/knockbacksync.accesswidener")
|
||||
}
|
||||
|
||||
base {
|
||||
archivesName.set("${rootProject.property("archives_base_name")}-fabric")
|
||||
}
|
||||
|
||||
// TODO migrate to only including sourceset for compile, test and javadoc tasks
|
||||
// Currently must build with gradle build -x test to skip test
|
||||
tasks.withType<JavaCompile>().configureEach {
|
||||
source(project(":common").sourceSets.main.get().allSource)
|
||||
}
|
||||
|
||||
tasks.withType<Javadoc>().configureEach {
|
||||
source(project(":common").sourceSets.main.get().allJava)
|
||||
}
|
||||
|
||||
tasks.named<JavaCompile>("compileTestJava") {
|
||||
exclude("**/*")
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven("https://jitpack.io") // Conditional Mixin
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(project(":common"))
|
||||
|
||||
minecraft("com.mojang:minecraft:${rootProject.property("minecraft_version")}")
|
||||
mappings("net.fabricmc:yarn:${rootProject.property("yarn_mappings")}")
|
||||
modImplementation("net.fabricmc:fabric-loader:${rootProject.property("loader_version")}")
|
||||
modImplementation(fabricApi.module("fabric-lifecycle-events-v1", "${rootProject.property("fabric_version")}"))
|
||||
modImplementation(fabricApi.module("fabric-events-interaction-v0", "${rootProject.property("fabric_version")}"))
|
||||
|
||||
include(modImplementation("me.lucko:fabric-permissions-api:0.6.1")!!)
|
||||
include(modImplementation("com.github.retrooper:packetevents-fabric:2.11.1+60a2c34-SNAPSHOT")!!)
|
||||
include(modImplementation("org.incendo:cloud-fabric:2.0.0-beta.15")!!)
|
||||
|
||||
include(implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.10")!!)
|
||||
include(implementation("org.yaml:snakeyaml:2.0")!!)
|
||||
include(implementation("org.kohsuke:github-api:1.326")!!)
|
||||
// Required for org.kohsuke.github
|
||||
include(implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")!!)
|
||||
include(implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.2")!!)
|
||||
include(implementation("com.fasterxml.jackson.core:jackson-core:2.17.2")!!)
|
||||
// Not requires in modern Minecraft. May be needed if fabric version is backported to older versions
|
||||
// include(implementation("org.apache.commons:commons-lang3:3.17.0")!!)
|
||||
// include(implementation("commons-io:commons-io:2.16.1")!!)
|
||||
|
||||
compileOnly("org.geysermc.floodgate:api:2.0-SNAPSHOT")
|
||||
compileOnly("org.projectlombok:lombok:1.18.34")
|
||||
compileOnly("io.netty:netty-all:4.1.72.Final")
|
||||
annotationProcessor("org.projectlombok:lombok:1.18.34")
|
||||
}
|
||||
|
||||
tasks.processResources {
|
||||
from(project(":common").sourceSets.main.get().resources)
|
||||
|
||||
inputs.property("version", project.version)
|
||||
inputs.property("minecraft_version", rootProject.property("minecraft_version"))
|
||||
inputs.property("loader_version", rootProject.property("loader_version"))
|
||||
filteringCharset = "UTF-8"
|
||||
|
||||
filesMatching("fabric.mod.json") {
|
||||
expand(
|
||||
"version" to project.version,
|
||||
"minecraft_version" to rootProject.property("minecraft_version")!!,
|
||||
"loader_version" to rootProject.property("loader_version")!!
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
package me.caseload.knockbacksync;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsAPI;
|
||||
import lombok.Getter;
|
||||
import me.caseload.knockbacksync.entity.EntityTickManager;
|
||||
import me.caseload.knockbacksync.listener.fabric.FabricPlayerDamageListener;
|
||||
import me.caseload.knockbacksync.listener.fabric.FabricPlayerKnockbackListener;
|
||||
import me.caseload.knockbacksync.listener.fabric.FabricTickRateChangeListener;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.permission.FabricPermissionChecker;
|
||||
import me.caseload.knockbacksync.permission.PermissionChecker;
|
||||
import me.caseload.knockbacksync.scheduler.FabricSchedulerAdapter;
|
||||
import me.caseload.knockbacksync.sender.FabricPlayerSelectorParser;
|
||||
import me.caseload.knockbacksync.sender.FabricSenderFactory;
|
||||
import me.caseload.knockbacksync.stats.custom.FabricStatsManager;
|
||||
import me.caseload.knockbacksync.stats.custom.PluginJarHashProvider;
|
||||
import me.caseload.knockbacksync.world.FabricServer;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.fabricmc.loader.api.ModContainer;
|
||||
import org.incendo.cloud.execution.ExecutionCoordinator;
|
||||
import org.incendo.cloud.fabric.FabricServerCommandManager;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Optional;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class FabricBase extends Base {
|
||||
|
||||
private final Logger logger = Logger.getLogger(FabricLoaderMod.class.getName());
|
||||
private final FabricPermissionChecker permissionChecker = new FabricPermissionChecker();
|
||||
@Getter
|
||||
private final FabricSenderFactory fabricSenderFactory = new FabricSenderFactory(this);
|
||||
private float tickRate = 20.0F;
|
||||
|
||||
public FabricBase() {
|
||||
super.configManager = new ConfigManager();
|
||||
super.playerSelectorParser = new FabricPlayerSelectorParser<>();
|
||||
super.commandManager = new FabricServerCommandManager<>(
|
||||
ExecutionCoordinator.simpleCoordinator(),
|
||||
fabricSenderFactory
|
||||
);
|
||||
super.statsManager = new FabricStatsManager();
|
||||
super.platformServer = new FabricServer();
|
||||
super.pluginJarHashProvider = new PluginJarHashProvider(getJarURL());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Logger getLogger() {
|
||||
return logger;
|
||||
}
|
||||
|
||||
@Override
|
||||
public File getDataFolder() {
|
||||
return FabricLoader.getInstance().getConfigDir().toFile();
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getResource(String filename) {
|
||||
return getClass().getResourceAsStream("/config.yml");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void load() {
|
||||
// Since we JiJ PacketEvents and depend on it on Fabric, we can always just get the API instance since it loads firsts
|
||||
// No need to make an API instance and load it
|
||||
}
|
||||
|
||||
@Override
|
||||
public void enable() {
|
||||
super.enable();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initializeScheduler() {
|
||||
scheduler = new FabricSchedulerAdapter();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPlatformListeners() {
|
||||
new FabricPlayerDamageListener().register();
|
||||
new FabricPlayerKnockbackListener().register();
|
||||
new FabricTickRateChangeListener().register();
|
||||
super.eventBus.registerStaticListeners(EntityTickManager.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getVersion() {
|
||||
return FabricLoader.getInstance().getModContainer("knockbacksync")
|
||||
.map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString())
|
||||
.orElse("unknown");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveDefaultConfig() {
|
||||
File configFile = new File(FabricLoader.getInstance().getConfigDir().toFile(), "config.yml");
|
||||
if (!configFile.exists()) {
|
||||
try (InputStream inputStream = getClass().getResourceAsStream("/config.yml")) {
|
||||
if (inputStream != null) {
|
||||
Files.copy(inputStream, configFile.toPath());
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionChecker getPermissionChecker() {
|
||||
return permissionChecker;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTickRate() {
|
||||
return this.tickRate;
|
||||
}
|
||||
|
||||
public void setTickRate(float tickRate) {
|
||||
this.tickRate = tickRate;
|
||||
}
|
||||
|
||||
public URL getJarURL() {
|
||||
URL jarUrl = null;
|
||||
Optional<ModContainer> modContainer = FabricLoader.getInstance().getModContainer("knockbacksync");
|
||||
if (modContainer.isPresent()) {
|
||||
String jarPath = modContainer.get().getRootPath().getFileSystem().toString();
|
||||
jarPath = jarPath.replaceAll("^jar:", "").replaceAll("!/$", "");
|
||||
try {
|
||||
jarUrl = new File(jarPath).toURI().toURL();
|
||||
} catch (MalformedURLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
return jarUrl;
|
||||
}
|
||||
|
||||
public void restartServer() {
|
||||
|
||||
}
|
||||
|
||||
public boolean hasRestartScript() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package me.caseload.knockbacksync;
|
||||
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public class FabricLoaderMod implements PreLaunchEntrypoint, ModInitializer {
|
||||
|
||||
private final Base core = new FabricBase();
|
||||
|
||||
public static MinecraftServer getServer() {
|
||||
return (MinecraftServer) FabricLoader.getInstance().getGameInstance();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPreLaunch() {
|
||||
ensureServer();
|
||||
core.load();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
ensureServer();
|
||||
core.enable();
|
||||
ServerLifecycleEvents.SERVER_STOPPING.register((server) -> {
|
||||
core.scheduler.shutdown();
|
||||
// bstats removal
|
||||
// core.statsManager.getMetrics().shutdown();
|
||||
});
|
||||
}
|
||||
|
||||
private void ensureServer() {
|
||||
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
|
||||
throw new IllegalStateException("This mod can only be run on servers");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package me.caseload.knockbacksync.callback;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
|
||||
public interface PlayerVelocityEvent {
|
||||
Event<PlayerVelocityEvent> EVENT = EventFactory.createArrayBacked(PlayerVelocityEvent.class,
|
||||
(listeners) -> (player, velocity) -> {
|
||||
for (PlayerVelocityEvent listener : listeners) {
|
||||
ActionResult result = listener.onVelocityChange(player, velocity);
|
||||
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
ActionResult onVelocityChange(ServerPlayerEntity player, Vec3d velocity);
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package me.caseload.knockbacksync.callback;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
||||
public interface TickRateChangeEvent {
|
||||
Event<TickRateChangeEvent> EVENT = EventFactory.createArrayBacked(TickRateChangeEvent.class,
|
||||
(listeners) -> (oldTickRate, newTickRate) -> {
|
||||
for (TickRateChangeEvent listener : listeners) {
|
||||
listener.onTickRateChange(oldTickRate, newTickRate);
|
||||
}
|
||||
});
|
||||
|
||||
void onTickRateChange(float oldTickRate, float newTickRate);
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
package me.caseload.knockbacksync.entity;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.ConfigWrapper;
|
||||
import me.caseload.knockbacksync.event.events.ConfigReloadEvent;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import me.caseload.knockbacksync.event.KBSyncEventHandler;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
public class EntityTickManager {
|
||||
private static final Map<EntityType<?>, Integer> customTickIntervals = new HashMap<>();
|
||||
|
||||
static {
|
||||
updateTickIntervals(Base.INSTANCE.getConfigManager().getConfigWrapper());
|
||||
}
|
||||
|
||||
@KBSyncEventHandler
|
||||
public static void updateTickIntervals(ConfigReloadEvent event) {
|
||||
ConfigWrapper configWrapper = event.getConfigManager().getConfigWrapper();
|
||||
updateTickIntervals(configWrapper);
|
||||
|
||||
// Map<String, Integer> entityIntervals = CustomUpdateIntervals.loadEntityIntervalsFromConfig();
|
||||
// for (ServerLevel level : FabricLoaderMod.getServer().getAllLevels()) {
|
||||
// CustomUpdateIntervals.updateIntervals(level, entityIntervals);
|
||||
// }
|
||||
}
|
||||
|
||||
private static void updateTickIntervals(ConfigWrapper configWrapper) {
|
||||
customTickIntervals.clear();
|
||||
for (String entityKey : configWrapper.getKeys("entity_tick_intervals")) {
|
||||
try {
|
||||
Optional<EntityType<?>> entityType = EntityType.get(entityKey.toLowerCase());
|
||||
if (entityType.isPresent()) {
|
||||
int interval = configWrapper.getInt("entity_tick_intervals." + entityKey, entityType.get().getTrackTickInterval());
|
||||
customTickIntervals.put(entityType.get(), interval);
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
System.err.println("Invalid entity type in config: " + entityKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static int getCustomUpdateInterval(EntityType<?> entityType) {
|
||||
return customTickIntervals.getOrDefault(entityType, entityType.getTrackTickInterval());
|
||||
}
|
||||
}
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
package me.caseload.knockbacksync.listener.fabric;
|
||||
|
||||
|
||||
import me.caseload.knockbacksync.listener.PlayerDamageListener;
|
||||
import me.caseload.knockbacksync.player.FabricPlayer;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
||||
public class FabricPlayerDamageListener extends PlayerDamageListener {
|
||||
|
||||
public void register() {
|
||||
AttackEntityCallback.EVENT.register((player, world, hand, entity, source) -> {
|
||||
onPlayerDamage((ServerPlayerEntity) player, entity);
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
}
|
||||
|
||||
private void onPlayerDamage(ServerPlayerEntity attacker, Entity victimEntity) {
|
||||
if (victimEntity instanceof PlayerEntity victim) {
|
||||
PlatformPlayer platformAttacker = new FabricPlayer(attacker);
|
||||
PlatformPlayer platformVictim = new FabricPlayer((ServerPlayerEntity) victim);
|
||||
super.onPlayerDamage(platformVictim, platformAttacker); // Call the shared method
|
||||
}
|
||||
}
|
||||
}
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
package me.caseload.knockbacksync.listener.fabric;
|
||||
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
|
||||
import me.caseload.knockbacksync.listener.PlayerKnockbackListener;
|
||||
import me.caseload.knockbacksync.player.FabricPlayer;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
import net.minecraft.entity.damage.DamageTypes;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
||||
public class FabricPlayerKnockbackListener extends PlayerKnockbackListener {
|
||||
|
||||
public void register() {
|
||||
PlayerVelocityEvent.EVENT.register((player, velocity) -> {
|
||||
DamageSource lastDamageSource = player.getRecentDamageSource();
|
||||
if (lastDamageSource == null)
|
||||
return ActionResult.PASS;
|
||||
|
||||
// Check if the damage is from a player attack
|
||||
if (!lastDamageSource.isOf(DamageTypes.PLAYER_ATTACK))
|
||||
return ActionResult.PASS;
|
||||
|
||||
onPlayerVelocity(new FabricPlayer(player), new Vector3d(velocity.x, velocity.y, velocity.z));
|
||||
// This SHOULD mean we return original velocity for Fabric (no modification here)
|
||||
// But since we set it ourselves due to following bukkit's design patterns and doing victim
|
||||
// We return a pass so velocity isn't set twice
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
}
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package me.caseload.knockbacksync.listener.fabric;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.FabricBase;
|
||||
import me.caseload.knockbacksync.callback.TickRateChangeEvent;
|
||||
|
||||
public class FabricTickRateChangeListener {
|
||||
public void register() {
|
||||
TickRateChangeEvent.EVENT.register((oldTickRate, newTickRate) -> {
|
||||
if (oldTickRate != newTickRate) {
|
||||
((FabricBase) Base.INSTANCE).setTickRate(newTickRate);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.entity.EntityTickManager;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.server.world.ServerChunkLoadingManager;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(ServerChunkLoadingManager.class)
|
||||
public abstract class ChunkMapMixin {
|
||||
|
||||
@Redirect(method = "loadEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/EntityType;getTrackTickInterval()I"))
|
||||
private int getCustomUpdateInterval(EntityType<?> entityType) {
|
||||
return EntityTickManager.getCustomUpdateInterval(entityType);
|
||||
}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.server.network.EntityTrackerEntry;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(EntityTrackerEntry.class)
|
||||
public class EntityTrackerEntryMixin {
|
||||
|
||||
@Shadow @Final private Entity entity;
|
||||
|
||||
// We inject exactly where 'this.entity.knockedBack = false' is about to happen.
|
||||
@Inject(method = "tick",
|
||||
at = @At(value = "FIELD",
|
||||
target = "Lnet/minecraft/entity/Entity;knockedBack:Z",
|
||||
opcode = Opcodes.PUTFIELD),
|
||||
cancellable = true)
|
||||
private void onKnockbackSync(CallbackInfo ci) {
|
||||
// This check ensures we are in the "if (entity.knockedBack)" block
|
||||
// and operating on a Player.
|
||||
if (this.entity instanceof ServerPlayerEntity serverPlayer) {
|
||||
|
||||
// 1. Capture the velocity CURRENTLY on the player
|
||||
Vec3d currentVelocity = serverPlayer.getVelocity();
|
||||
|
||||
// 2. Fire the event
|
||||
ActionResult result = PlayerVelocityEvent.EVENT.invoker().onVelocityChange(serverPlayer, currentVelocity);
|
||||
|
||||
if (result == ActionResult.FAIL) {
|
||||
// CASE: CANCELLED
|
||||
// We want to STOP the packet from sending.
|
||||
// We also want to keep 'knockedBack' as true (technically),
|
||||
// effectively acting like the block never happened.
|
||||
ci.cancel();
|
||||
}
|
||||
else if (result == ActionResult.SUCCESS) {
|
||||
// CASE: MODIFIED
|
||||
// The event handler has already updated the player's velocity:
|
||||
// player.setVelocity(newVel);
|
||||
|
||||
// We do NOT cancel. We let Vanilla proceed.
|
||||
// Vanilla will:
|
||||
// 1. Set knockedBack = false;
|
||||
// 2. Create a NEW packet reading the current velocity (which is now your custom velocity).
|
||||
// 3. Send it.
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(PlayerEntity.class)
|
||||
public class PlayerMixin {
|
||||
|
||||
@Inject(method = "knockbackTarget",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/server/network/ServerPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"),
|
||||
cancellable = true)
|
||||
private void onKnockback(Entity target, float strength, Vec3d playerTargetVelocity, CallbackInfo ci) {
|
||||
if (target instanceof ServerPlayerEntity serverPlayer && target.knockedBack) {
|
||||
|
||||
// 1. Get the "Proposed" Velocity (The knockback calculated lines above)
|
||||
Vec3d proposedVelocity = target.getVelocity();
|
||||
|
||||
// 2. Fire the Event
|
||||
ActionResult result = PlayerVelocityEvent.EVENT.invoker().onVelocityChange(serverPlayer, proposedVelocity);
|
||||
|
||||
if (result == ActionResult.FAIL) {
|
||||
// --- REPLICATING PAPER: CANCELLED ---
|
||||
// In Paper: if (event.isCancelled()) { cancelled = true; }
|
||||
// In Paper: if (!cancelled) { sendPacket; cleanup; }
|
||||
|
||||
// So, if cancelled, we stop EVERYTHING. We do not send packet, we do not reset velocity.
|
||||
ci.cancel();
|
||||
return;
|
||||
}
|
||||
|
||||
if (result == ActionResult.SUCCESS) {
|
||||
// --- REPLICATING PAPER: MODIFIED ---
|
||||
// In Paper: if (!velocity.equals(event.getVelocity())) { player.setVelocity(...) }
|
||||
// In Paper: if (!cancelled) { sendPacket; setDeltaMovement(currentMovement); }
|
||||
|
||||
// 1. The event listener should have already set the new velocity on the entity.
|
||||
// 2. We must send a NEW packet (because the one on the stack is old).
|
||||
serverPlayer.networkHandler.sendPacket(new EntityVelocityUpdateS2CPacket(target));
|
||||
|
||||
// 3. Replicate the Cleanup: Paper resets velocity to 'currentMovement' (playerTargetVelocity)
|
||||
// This prevents the server from thinking the player is flying, maintaining Client Authority.
|
||||
target.knockedBack = false;
|
||||
target.setVelocity(playerTargetVelocity);
|
||||
|
||||
// 4. Cancel the original logic so Vanilla doesn't send the old packet or do double cleanup.
|
||||
ci.cancel();
|
||||
}
|
||||
|
||||
// CASE: PASS
|
||||
// Vanilla behaves normally (Sends packet, does cleanup).
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.callback.TickRateChangeEvent;
|
||||
import net.minecraft.world.tick.TickManager;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(TickManager.class)
|
||||
public class TickRateManagerMixin {
|
||||
@Shadow
|
||||
protected float tickRate;
|
||||
|
||||
@Inject(method = "setTickRate", at = @At("HEAD"))
|
||||
private void onSetTickRate(float tickRate, CallbackInfo ci) {
|
||||
float oldTickRate = this.tickRate;
|
||||
TickRateChangeEvent.EVENT.invoker().onTickRateChange(oldTickRate, tickRate);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
public interface UpdateIntervalAccessor {
|
||||
void setUpdateInterval(int interval);
|
||||
}
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
package me.caseload.knockbacksync.permission;
|
||||
|
||||
import me.caseload.knockbacksync.player.FabricPlayer;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.sender.Sender;
|
||||
import me.lucko.fabric.api.permissions.v0.Permissions;
|
||||
import net.minecraft.server.command.ServerCommandSource;
|
||||
|
||||
public class FabricPermissionChecker implements PermissionChecker {
|
||||
|
||||
public boolean hasPermission(ServerCommandSource source, String permission) {
|
||||
return Permissions.check(source, permission, false);
|
||||
}
|
||||
|
||||
public boolean hasPermission(ServerCommandSource source, String permission, boolean defaultIfUnset) {
|
||||
return Permissions.check(source, permission, defaultIfUnset);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(Object nativeType, String s, boolean defaultIfUnset) {
|
||||
if (nativeType instanceof ServerCommandSource commandSourceStack) {
|
||||
return Permissions.check(commandSourceStack, s, defaultIfUnset);
|
||||
}
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(Sender source, String s, boolean defaultIfUnset) {
|
||||
return source.hasPermission(s);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(PlatformPlayer platformPlayer, String s) {
|
||||
return Permissions.check(((FabricPlayer) platformPlayer).fabricPlayer, s);
|
||||
}
|
||||
}
|
||||
@@ -1,174 +0,0 @@
|
||||
package me.caseload.knockbacksync.player;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
import com.github.retrooper.packetevents.protocol.player.User;
|
||||
import com.github.retrooper.packetevents.protocol.world.BoundingBox;
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import com.google.common.base.Preconditions;
|
||||
import me.caseload.knockbacksync.world.FabricWorld;
|
||||
import me.caseload.knockbacksync.world.PlatformWorld;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.enchantment.Enchantments;
|
||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
||||
import net.minecraft.entity.effect.StatusEffects;
|
||||
import net.minecraft.registry.BuiltinRegistries;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.RegistryKeys;
|
||||
import net.minecraft.registry.RegistryWrapper;
|
||||
import net.minecraft.registry.entry.RegistryEntry;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.math.Box;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public class FabricPlayer implements PlatformPlayer {
|
||||
public final ServerPlayerEntity fabricPlayer;
|
||||
public final User user;
|
||||
|
||||
private String clientBrand = "vanilla";
|
||||
|
||||
public FabricPlayer(ServerPlayerEntity player) {
|
||||
Preconditions.checkArgument(player != null);
|
||||
this.fabricPlayer = player;
|
||||
this.user = PacketEvents.getAPI().getPlayerManager().getUser(fabricPlayer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID getUUID() {
|
||||
return fabricPlayer.getUuid();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return fabricPlayer.getName().getString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getX() {
|
||||
return fabricPlayer.getX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getY() {
|
||||
return fabricPlayer.getY();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getZ() {
|
||||
return fabricPlayer.getZ();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPitch() {
|
||||
return fabricPlayer.getPitch();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getYaw() {
|
||||
return fabricPlayer.getYaw();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOnGround() {
|
||||
return fabricPlayer.isOnGround();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPing() {
|
||||
return fabricPlayer.networkHandler.getLatency();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGliding() {
|
||||
return fabricPlayer.isGliding();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformWorld getWorld() {
|
||||
return new FabricWorld(fabricPlayer.getEntityWorld());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vector3d getLocation() {
|
||||
return new Vector3d(fabricPlayer.getX(), fabricPlayer.getY(), fabricPlayer.getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(@NotNull String s) {
|
||||
fabricPlayer.sendMessage(Text.literal(s));
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getAttackCooldown() {
|
||||
// this is what paper does I have no idea how this works
|
||||
return fabricPlayer.getAttackCooldownProgress(0.5f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSprinting() {
|
||||
return fabricPlayer.isSprinting();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMainHandKnockbackLevel() {
|
||||
RegistryEntry<Enchantment> knockbackEntry = fabricPlayer.getEntityWorld().getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(Enchantments.KNOCKBACK);
|
||||
return EnchantmentHelper.getLevel(knockbackEntry, fabricPlayer.getMainHandStack());
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable Integer getNoDamageTicks() {
|
||||
return fabricPlayer.timeUntilRegen;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setVelocity(Vector3d adjustedVelocity) {
|
||||
fabricPlayer.setVelocity(adjustedVelocity.x, adjustedVelocity.y, adjustedVelocity.z);
|
||||
// TODO
|
||||
// fix paper-ism? for some reason setVelocity() in paper marks the entity as hurt marked every time its called?
|
||||
fabricPlayer.velocityDirty = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vector3d getVelocity() {
|
||||
final Vec3d fabricVelocity = fabricPlayer.getVelocity();
|
||||
return new Vector3d(fabricVelocity.x, fabricVelocity.y, fabricVelocity.z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getJumpPower() {
|
||||
double jumpVelocity = 0.42;
|
||||
StatusEffectInstance jumpEffect = fabricPlayer.getStatusEffect(StatusEffects.JUMP_BOOST);
|
||||
if (jumpEffect != null) {
|
||||
int amplifier = jumpEffect.getAmplifier();
|
||||
jumpVelocity += (amplifier + 1) * 0.1F;
|
||||
}
|
||||
|
||||
return jumpVelocity;
|
||||
}
|
||||
@Override
|
||||
public BoundingBox getBoundingBox() {
|
||||
Box boundingBox = fabricPlayer.getBoundingBox();
|
||||
return new BoundingBox(boundingBox.minX, boundingBox.minY, boundingBox.minZ, boundingBox.maxX, boundingBox.minY, boundingBox.maxZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable User getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setClientBrand(String brand) {
|
||||
this.clientBrand = brand;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getClientBrand() {
|
||||
return this.clientBrand;
|
||||
}
|
||||
}
|
||||
@@ -1,144 +0,0 @@
|
||||
package me.caseload.knockbacksync.scheduler;
|
||||
|
||||
import me.caseload.knockbacksync.FabricLoaderMod;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class FabricSchedulerAdapter implements SchedulerAdapter {
|
||||
// private final MinecraftServer server;
|
||||
private final Map<ScheduledTask, Runnable> taskMap = new HashMap<>();
|
||||
private final Map<Thread, Runnable> asyncTasks = new HashMap<>();
|
||||
|
||||
public FabricSchedulerAdapter() {
|
||||
ServerTickEvents.END_SERVER_TICK.register(this::handleTasks);
|
||||
}
|
||||
|
||||
private void handleTasks(MinecraftServer server) {
|
||||
Iterator<ScheduledTask> iterator = taskMap.keySet().iterator();
|
||||
while (iterator.hasNext()) {
|
||||
ScheduledTask task = iterator.next();
|
||||
if (server.getTicks() >= task.nextRunTick) {
|
||||
task.task.run();
|
||||
if (task.isPeriodic) {
|
||||
task.nextRunTick = server.getTicks() + task.period;
|
||||
} else {
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTask(Runnable task) {
|
||||
ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks(), 0, false);
|
||||
Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
|
||||
taskMap.put(scheduledTask, cancellationTask);
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskAsynchronously(Runnable task) {
|
||||
Thread thread = new Thread(task);
|
||||
Runnable cancellationTask = () -> {
|
||||
thread.interrupt();
|
||||
asyncTasks.remove(thread);
|
||||
};
|
||||
asyncTasks.put(thread, cancellationTask);
|
||||
thread.start();
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskLater(Runnable task, long delayTicks) {
|
||||
ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks() + delayTicks, 0, false);
|
||||
Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
|
||||
taskMap.put(scheduledTask, cancellationTask);
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskTimer(Runnable task, long delayTicks, long periodTicks) {
|
||||
ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks() + delayTicks, periodTicks, true);
|
||||
Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
|
||||
taskMap.put(scheduledTask, cancellationTask);
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskLaterAsynchronously(Runnable task, long delay) {
|
||||
Thread thread = new Thread(() -> {
|
||||
try {
|
||||
Thread.sleep(delay * 50); // Convert ticks to milliseconds
|
||||
task.run();
|
||||
} catch (InterruptedException e) {
|
||||
// Handle interruption
|
||||
}
|
||||
});
|
||||
Runnable cancellationTask = () -> {
|
||||
thread.interrupt();
|
||||
asyncTasks.remove(thread);
|
||||
};
|
||||
asyncTasks.put(thread, cancellationTask);
|
||||
thread.start();
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskTimerAsynchronously(Runnable task, long delay, long period) {
|
||||
Thread thread = new Thread(() -> {
|
||||
try {
|
||||
Thread.sleep(delay * 50); // Convert ticks to milliseconds
|
||||
while (!Thread.currentThread().isInterrupted()) {
|
||||
task.run();
|
||||
Thread.sleep(period * 50); // Convert ticks to milliseconds
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
// Handle interruption
|
||||
}
|
||||
});
|
||||
Runnable cancellationTask = () -> {
|
||||
thread.interrupt();
|
||||
asyncTasks.remove(thread);
|
||||
};
|
||||
asyncTasks.put(thread, cancellationTask);
|
||||
thread.start();
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdown() {
|
||||
// Create a new list to store the tasks that need to be executed
|
||||
List<Runnable> tasksToExecute = new ArrayList<>();
|
||||
|
||||
// Add the tasks from the taskMap to the tasksToExecute list
|
||||
tasksToExecute.addAll(taskMap.values());
|
||||
|
||||
// Add the tasks from the asyncTasks to the tasksToExecute list
|
||||
tasksToExecute.addAll(asyncTasks.values());
|
||||
|
||||
// Clear the taskMap and asyncTasks to avoid further modifications
|
||||
taskMap.clear();
|
||||
asyncTasks.clear();
|
||||
|
||||
// Execute the tasks in the tasksToExecute list
|
||||
for (Runnable task : tasksToExecute) {
|
||||
task.run();
|
||||
}
|
||||
}
|
||||
|
||||
private static class ScheduledTask {
|
||||
final Runnable task;
|
||||
final long period;
|
||||
final boolean isPeriodic;
|
||||
long nextRunTick;
|
||||
|
||||
ScheduledTask(Runnable task, long nextRunTick, long period, boolean isPeriodic) {
|
||||
this.task = task;
|
||||
this.nextRunTick = nextRunTick;
|
||||
this.period = period;
|
||||
this.isPeriodic = isPeriodic;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package me.caseload.knockbacksync.scheduler;
|
||||
|
||||
public class FabricTaskHandle implements AbstractTaskHandle {
|
||||
private final Runnable cancellationTask;
|
||||
private boolean cancelled = false;
|
||||
|
||||
public FabricTaskHandle(Runnable cancellationTask) {
|
||||
this.cancellationTask = cancellationTask;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getCancelled() {
|
||||
return this.cancelled;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cancel() {
|
||||
this.cancellationTask.run();
|
||||
this.cancelled = true;
|
||||
}
|
||||
}
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
package me.caseload.knockbacksync.sender;
|
||||
|
||||
import me.caseload.knockbacksync.command.generic.PlayerSelector;
|
||||
import me.caseload.knockbacksync.player.FabricPlayer;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
public class FabricPlayerSelectorAdapter implements PlayerSelector {
|
||||
private final org.incendo.cloud.minecraft.modded.data.SinglePlayerSelector fabricSelector;
|
||||
|
||||
public FabricPlayerSelectorAdapter(org.incendo.cloud.minecraft.modded.data.SinglePlayerSelector fabricSelector) {
|
||||
this.fabricSelector = fabricSelector;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSingle() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformPlayer getSinglePlayer() {
|
||||
return new FabricPlayer(fabricSelector.single()); // Assuming your ServerPlayer can be cast to Player
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<PlatformPlayer> getPlayers() {
|
||||
return Collections.singletonList(new FabricPlayer(fabricSelector.single())); // Assuming your ServerPlayer can be cast to Player
|
||||
}
|
||||
|
||||
@Override
|
||||
public String inputString() {
|
||||
return fabricSelector.inputString();
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package me.caseload.knockbacksync.sender;
|
||||
|
||||
import me.caseload.knockbacksync.command.generic.AbstractPlayerSelectorParser;
|
||||
import me.caseload.knockbacksync.command.generic.PlayerSelector;
|
||||
import org.incendo.cloud.context.CommandContext;
|
||||
import org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers;
|
||||
import org.incendo.cloud.parser.ParserDescriptor;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class FabricPlayerSelectorParser<C> extends AbstractPlayerSelectorParser<C> {
|
||||
|
||||
@Override
|
||||
public ParserDescriptor<C, PlayerSelector> descriptor() {
|
||||
return createDescriptor();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ParserDescriptor<C, ?> getPlatformSpecificDescriptor() {
|
||||
return VanillaArgumentParsers.singlePlayerSelectorParser();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected CompletableFuture<PlayerSelector> adaptToCommonSelector(CommandContext<C> context, Object platformSpecificSelector) {
|
||||
return CompletableFuture.completedFuture(new FabricPlayerSelectorAdapter((org.incendo.cloud.minecraft.modded.data.SinglePlayerSelector) platformSpecificSelector));
|
||||
}
|
||||
}
|
||||
@@ -1,99 +0,0 @@
|
||||
package me.caseload.knockbacksync.sender;
|
||||
|
||||
import me.caseload.knockbacksync.FabricBase;
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.permission.FabricPermissionChecker;
|
||||
import net.minecraft.server.command.CommandOutput;
|
||||
import net.minecraft.server.command.ServerCommandSource;
|
||||
import net.minecraft.server.rcon.RconCommandOutput;
|
||||
import net.minecraft.text.Text;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.incendo.cloud.SenderMapper;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class FabricSenderFactory extends SenderFactory<FabricBase, ServerCommandSource> implements SenderMapper<ServerCommandSource, Sender> {
|
||||
private final FabricBase plugin;
|
||||
|
||||
public FabricSenderFactory(FabricBase kbSyncFabricBase) {
|
||||
super(kbSyncFabricBase);
|
||||
this.plugin = kbSyncFabricBase;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected FabricBase getPlugin() {
|
||||
return this.plugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected UUID getUniqueId(ServerCommandSource commandSource) {
|
||||
if (commandSource.getEntity() != null) {
|
||||
return commandSource.getEntity().getUuid();
|
||||
}
|
||||
return Sender.CONSOLE_UUID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getName(ServerCommandSource commandSource) {
|
||||
String name = commandSource.getName();
|
||||
if (commandSource.getEntity() != null && name.equals("Server")) {
|
||||
return Sender.CONSOLE_NAME;
|
||||
}
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void sendMessage(ServerCommandSource sender, String message) {
|
||||
// final Locale locale;
|
||||
// if (sender.getEntity() instanceof ServerPlayer) {
|
||||
// String language = ((ServerPlayer) sender.getEntity()).clientInformation().language();
|
||||
// locale = language == null ? null : TranslationManager.parseLocale(language);
|
||||
// } else {
|
||||
// locale = null;
|
||||
// }
|
||||
// sender.sendFeedback(() -> toNativeText(TranslationManager.render(message, locale)), false);
|
||||
sender.sendFeedback(() -> Text.literal(message), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean hasPermission(ServerCommandSource commandSource, String node) {
|
||||
return ((FabricPermissionChecker) Base.INSTANCE.getPermissionChecker()).hasPermission(commandSource, node);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean hasPermission(ServerCommandSource commandSource, String node, boolean defaultIfUnset) {
|
||||
return ((FabricPermissionChecker) Base.INSTANCE.getPermissionChecker()).hasPermission(commandSource, node, defaultIfUnset);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void performCommand(ServerCommandSource sender, String command) {
|
||||
// sender.getServer().getCommandManager().executeWithPrefix(sender, command);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isConsole(ServerCommandSource sender) {
|
||||
CommandOutput output = sender.output;
|
||||
return output == sender.getServer() || // Console
|
||||
output.getClass() == RconCommandOutput.class || // Rcon
|
||||
(output == CommandOutput.DUMMY && sender.getName().equals("")); // Functions
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Sender map(@NonNull ServerCommandSource base) {
|
||||
return this.wrap(base);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull ServerCommandSource reverse(@NonNull Sender mapped) {
|
||||
return this.unwrap(mapped);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws Exception {
|
||||
|
||||
}
|
||||
|
||||
// public static Text toNativeText(Component component) {
|
||||
// return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component), DynamicRegistryManager.EMPTY);
|
||||
// }
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package me.caseload.knockbacksync.stats.custom;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
|
||||
public class FabricStatsManager extends StatsManager {
|
||||
public FabricStatsManager() {
|
||||
super(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
// no op remove bstats
|
||||
}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
package me.caseload.knockbacksync.util;
|
||||
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.server.command.ServerCommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
public class CommandUtil {
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, String message) {
|
||||
sendSuccessMessage(context, () -> getComponent(message), false);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, String message, boolean allowLogging) {
|
||||
sendSuccessMessage(context, () -> getComponent(message), allowLogging);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Text message) {
|
||||
sendSuccessMessage(context, () -> message, false);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Text message, boolean allowLogging) {
|
||||
sendSuccessMessage(context, () -> message, allowLogging);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Supplier<Text> messageSupplier) {
|
||||
sendSuccessMessage(context, messageSupplier, false);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Supplier<Text> messageSupplier, boolean allowLogging) {
|
||||
context.getSource().sendFeedback(messageSupplier, allowLogging);
|
||||
}
|
||||
|
||||
public static void sendFailureMessage(CommandContext<ServerCommandSource> context, String message) {
|
||||
sendFailureMessage(context, getComponent(message));
|
||||
}
|
||||
|
||||
public static void sendFailureMessage(CommandContext<ServerCommandSource> context, Text message) {
|
||||
context.getSource().sendError(message);
|
||||
}
|
||||
|
||||
public static Text getComponent(String message) {
|
||||
return Text.literal(message);
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package me.caseload.knockbacksync.util;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.ConfigWrapper;
|
||||
import me.caseload.knockbacksync.mixin.UpdateIntervalAccessor;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.server.world.ServerChunkLoadingManager;
|
||||
import net.minecraft.server.world.ServerChunkManager;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class CustomUpdateIntervals {
|
||||
private static final Map<String, Integer> entityIntervals = new HashMap<>();
|
||||
|
||||
public static void setInterval(String entityType, int interval) {
|
||||
entityIntervals.put(entityType, interval);
|
||||
}
|
||||
|
||||
public static int getInterval(String entityType, int defaultInterval) {
|
||||
return entityIntervals.getOrDefault(entityType, defaultInterval);
|
||||
}
|
||||
|
||||
public static void clear() {
|
||||
entityIntervals.clear();
|
||||
}
|
||||
|
||||
public static void updateIntervals(ServerWorld level, Map<String, Integer> entityIntervals) {
|
||||
for (Entity entity : level.iterateEntities()) {
|
||||
String entityType = entity.getType().getRegistryEntry().getIdAsString();
|
||||
if (entityIntervals.containsKey(entityType)) {
|
||||
ServerChunkLoadingManager.EntityTracker serverEntity = ((ServerChunkManager) entity.getEntityWorld().getChunkManager()).chunkLoadingManager.entityTrackers.get(entity.getId());
|
||||
if (serverEntity != null) {
|
||||
((UpdateIntervalAccessor) serverEntity).setUpdateInterval(entityIntervals.get(entityType));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Map<String, Integer> loadEntityIntervalsFromConfig() {
|
||||
Map<String, Integer> intervals = new HashMap<>();
|
||||
ConfigWrapper config = Base.INSTANCE.getConfigManager().getConfigWrapper();
|
||||
|
||||
String basePath = "entity_update_intervals";
|
||||
if (config.contains(basePath)) {
|
||||
for (String entityType : config.getKeys(basePath)) {
|
||||
int interval = config.getInt(basePath + "." + entityType, -1);
|
||||
if (interval > 0) {
|
||||
intervals.put(entityType, interval);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return intervals;
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package me.caseload.knockbacksync.world;
|
||||
|
||||
import me.caseload.knockbacksync.FabricLoaderMod;
|
||||
import me.caseload.knockbacksync.player.FabricPlayer;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import java.util.Collection;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class FabricServer implements PlatformServer {
|
||||
public Collection<PlatformPlayer> getOnlinePlayers() {
|
||||
return FabricLoaderMod.getServer().getPlayerManager().getPlayerList().stream()
|
||||
.map(FabricPlayer::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformPlayer getPlayer(UUID uuid) {
|
||||
return new FabricPlayer(FabricLoaderMod.getServer().getPlayerManager().getPlayer(uuid));
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformPlayer getPlayer(Object nativePlatformPlayer) {
|
||||
return new FabricPlayer((ServerPlayerEntity) nativePlatformPlayer);
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package me.caseload.knockbacksync.world;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.world.BlockFace;
|
||||
import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import com.github.retrooper.packetevents.util.Vector3i;
|
||||
import me.caseload.knockbacksync.world.raytrace.FluidHandling;
|
||||
import me.caseload.knockbacksync.world.raytrace.RayTraceResult;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.ShapeContext;
|
||||
import net.minecraft.util.hit.BlockHitResult;
|
||||
import net.minecraft.util.hit.HitResult;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.RaycastContext;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class FabricWorld implements PlatformWorld {
|
||||
private final World world;
|
||||
|
||||
public FabricWorld(World world) {
|
||||
this.world = world;
|
||||
}
|
||||
|
||||
@Override
|
||||
public WrappedBlockState getBlockStateAt(int x, int y, int z) {
|
||||
BlockState blockState = this.world.getBlockState(new BlockPos(x, y, z));
|
||||
return WrappedBlockState.getByGlobalId(Block.STATE_IDS.getRawId(blockState));
|
||||
}
|
||||
|
||||
@Override
|
||||
public WrappedBlockState getBlockStateAt(Vector3d loc) {
|
||||
return getBlockStateAt((int) Math.floor(loc.x), (int) Math.floor(loc.x), (int) Math.floor(loc.x));
|
||||
}
|
||||
|
||||
@Override
|
||||
public RayTraceResult rayTraceBlocks(Vector3d start, Vector3d direction, double maxDistance, FluidHandling fluidHandling, boolean ignorePassableBlocks) {
|
||||
Vec3d startVec = new Vec3d(start.getX(), start.getY(), start.getZ());
|
||||
Vec3d endVec = startVec.add(direction.getX() * maxDistance, direction.getY() * maxDistance, direction.getZ() * maxDistance);
|
||||
|
||||
BlockHitResult result = world.raycast(new RaycastContext(
|
||||
startVec,
|
||||
endVec,
|
||||
RaycastContext.ShapeType.OUTLINE,
|
||||
fluidHandling == FluidHandling.NONE ? RaycastContext.FluidHandling.NONE :
|
||||
fluidHandling == FluidHandling.SOURCE_ONLY ? RaycastContext.FluidHandling.SOURCE_ONLY :
|
||||
RaycastContext.FluidHandling.ANY,
|
||||
ShapeContext.absent()
|
||||
));
|
||||
|
||||
if (result.getType() == HitResult.Type.MISS) return null;
|
||||
|
||||
Vec3d hitLocation = result.getPos();
|
||||
BlockPos blockPos = result.getBlockPos();
|
||||
return new RayTraceResult(
|
||||
new Vector3d(hitLocation.x, hitLocation.y, hitLocation.z),
|
||||
BlockFace.getBlockFaceByValue(result.getSide().ordinal()),
|
||||
new Vector3i(blockPos.getX(), blockPos.getY(), blockPos.getZ()),
|
||||
getBlockStateAt(blockPos.getX(), blockPos.getY(), blockPos.getZ())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "knockbacksync",
|
||||
"version": "${version}",
|
||||
"name": "Knockback Sync",
|
||||
"description": "",
|
||||
"authors": [],
|
||||
"contact": {},
|
||||
"license": "All-Rights-Reserved",
|
||||
"icon": "assets/knockbacksync/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"preLaunch": [
|
||||
"me.caseload.knockbacksync.FabricLoaderMod"
|
||||
],
|
||||
"main": [
|
||||
"me.caseload.knockbacksync.FabricLoaderMod"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"knockbacksync.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.15.11",
|
||||
"fabric-lifecycle-events-v1": "*",
|
||||
"fabric-events-interaction-v0": "*",
|
||||
"minecraft": "~${minecraft_version}",
|
||||
"packetevents": "*"
|
||||
},
|
||||
"accessWidener": "knockbacksync.accesswidener"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
accessWidener v2 named
|
||||
|
||||
accessible field net/minecraft/server/command/ServerCommandSource output Lnet/minecraft/server/command/CommandOutput;
|
||||
accessible field net/minecraft/server/world/ServerChunkLoadingManager entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
|
||||
accessible class net/minecraft/server/world/ServerChunkLoadingManager$EntityTracker
|
||||
#accessible method net/minecraft/server/level/ChunkMap$TrackedEntity updatePlayers (Ljava/util/List;)V
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "me.caseload.knockbacksync.mixin",
|
||||
"compatibilityLevel": "JAVA_21",
|
||||
"mixins": [
|
||||
"ChunkMapMixin",
|
||||
"EntityTrackerEntryMixin",
|
||||
"PlayerMixin",
|
||||
"TickRateManagerMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
+3
-13
@@ -2,18 +2,8 @@
|
||||
org.gradle.jvmargs=-Xmx3G
|
||||
org.gradle.parallel=true
|
||||
|
||||
# Fabric Properties
|
||||
# check these on https://modmuss50.me/fabric.html
|
||||
minecraft_version=1.21.11
|
||||
yarn_mappings=1.21.11+build.3:v2
|
||||
loader_version=0.16.13
|
||||
|
||||
# Mod Properties
|
||||
# Plugin Properties
|
||||
maven_group=me.caseload
|
||||
archives_base_name=knockbacksync
|
||||
archives_base_name=knockbacksync-og
|
||||
|
||||
# Dependencies
|
||||
# check this on https://modmuss50.me/fabric.html
|
||||
fabric_version=0.140.0+1.21.11
|
||||
|
||||
githubRepo=CASELOAD7000/knockback-sync
|
||||
githubRepo=CASELOAD7000/knockback-sync
|
||||
+2
-2
@@ -7,6 +7,6 @@ pluginManagement {
|
||||
}
|
||||
}
|
||||
|
||||
include("common", "fabric", "bukkit")
|
||||
include("common", "bukkit")
|
||||
|
||||
rootProject.name = "KnockbackSync"
|
||||
rootProject.name = "KnockbackSync-OG"
|
||||
Reference in new issue
Block a user