Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-30 20:29:14 +00:00
Code Issues Releases Activity

Configurable left shooting and adjusting limits

Browse Source
This commit is contained in:
Samsuik
2024-08-09 21:52:32 +01:00
parent 80e3aa46dc
commit 8b90ea7fec
2 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0003-Sakura-Configuration-Files.patch
View File

@@ -647,10 +647,10 @@ index 0000000000000000000000000000000000000000..dd5a70f70c2e7bdc30b8f5655b0b7a08
+}
diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..2ed95ba385e3937fde99d4ee3e7845e77591aa89
index 0000000000000000000000000000000000000000..5c639ca9f4e61bba31b4174f2501a313727fba4f
--- /dev/null
+++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
@@ -0,0 +1,219 @@
@@ -0,0 +1,230 @@
+package me.samsuik.sakura.configuration;
+
+import com.mojang.logging.LogUtils;
@@ -707,6 +707,17 @@ index 0000000000000000000000000000000000000000..2ed95ba385e3937fde99d4ee3e7845e7
+ public double treatAllBlocksAsFullWhenMovingFasterThan = 64.0;
+ public boolean loadChunks = false;
+
+ public Restrictions restrictions = new Restrictions();
+ public class Restrictions extends ConfigurationPart {
+ @Comment("The amount of blocks that can be travelled before changing direction is restricted")
+ public IntOr.Disabled leftShootingThreshold = IntOr.Disabled.DISABLED;
+ @Comment(
+ "Maximum amount of blocks that a cannon can adjust\n" +
+ "It is recommended that this value kept sane and is more than 64 blocks"
+ )
+ public IntOr.Disabled maxAdjustDistance = IntOr.Disabled.DISABLED;
+ }
+
+ public Tnt tnt = new Tnt();
+ public class Tnt extends ConfigurationPart {
+ public boolean forcePositionUpdates;

73
patches/server/0081-Configurable-left-shooting-and-adjusting-limits.patch Normal file
View File

@@ -0,0 +1,73 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Fri, 9 Aug 2024 20:43:53 +0100
Subject: [PATCH] Configurable left shooting and adjusting limits
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 42642b77213567e9bf6acb3728f75e76e3f3447c..09cdb4fb53552e23a4870649a6f834d9c2b36780 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -746,6 +746,24 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return Math.max(x, z) >= travelDistanceLimit;
}
// Sakura end - entity travel distance limits
+ // Sakura start - configurable left shooting and adjusting limits
+ public final void limitLeftShooting() {
+ Vec3 movement = this.getDeltaMovement();
+ int threshold = this.level.sakuraConfig().cannons.restrictions.leftShootingThreshold.or(-1);
+ if (threshold > 0 && (movement.x != 0.0 || movement.z != 0.0) && this.origin != null) {
+ double travelledX = Math.abs(this.getX() - this.origin.getX());
+ double travelledZ = Math.abs(this.getZ() - this.origin.getZ());
+ boolean xSmaller = travelledX < travelledZ; // intended
+
+ // Once entities have travelled past the threshold changing direction is restricted.
+ if (xSmaller && travelledX > threshold) {
+ this.setDeltaMovement(movement.multiply(1.0, 1.0, 0.0)); // limit z
+ } else if (!xSmaller && travelledZ > threshold) {
+ this.setDeltaMovement(movement.multiply(0.0, 1.0, 1.0)); // limit x
+ }
+ }
+ }
+ // Sakura end - configurable left shooting and adjusting limits
public Entity(EntityType<?> type, Level world) {
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
@@ -1777,6 +1795,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
final boolean xSmaller = this.physics == null || this.physics.afterOrEqual(1_14_0) ? Math.abs(x) < Math.abs(z)
: this.physics.isLegacy() && Math.abs(x) > Math.abs(z);
// Sakura end - physics version api
+ // Sakura start - configurable left shooting and adjusting limits
+ // NOTE: If scanAndCollide is made redundant by paper move this logic into CollisionUtil.
+ // This is being after xSmaller is intentional, we do not want to change the adjust direction.
+ int adjustDistance = this.level.sakuraConfig().cannons.restrictions.maxAdjustDistance.or(-1);
+ if (adjustDistance > 0) {
+ if (xSmaller) { // adjust z -> x
+ if (Math.abs(z) > adjustDistance) {
+ // limit z adjust and remove momentum to replicate it hitting a block
+ this.setDeltaMovement(this.getDeltaMovement().multiply(1.0, 1.0, 0.0));
+ z = Math.floor(this.getZ() + Math.copySign(adjustDistance, z)) - this.getZ() + 0.5;
+ }
+ } else { // adjust x -> z
+ if (Math.abs(x) > adjustDistance) {
+ this.setDeltaMovement(this.getDeltaMovement().multiply(0.0, 1.0, 1.0));
+ x = Math.floor(this.getX() + Math.copySign(adjustDistance, x)) - this.getX() + 0.5;
+ }
+ }
+ }
+ // Sakura end - configurable left shooting and adjusting limits
if (y != 0.0) {
y = scanY(currBoundingBox, y, voxelList, bbList);
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index ab88fc1db9740ab249b332a6c01a6d6e2a998c1c..c7ee16e80eab05fb80cc8ad04315cc68fa933af5 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -257,6 +257,7 @@ public class FallingBlockEntity extends Entity {
// Sakura end - physics version api
}
+ this.limitLeftShooting(); // Sakura - configurable left shooting and adjusting limits
this.moveBasic(MoverType.SELF, this.getDeltaMovement()); // Sakura - optimise simple entity movement
// Paper start - Configurable falling blocks height nerf
if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {